From f573762ff524ebf182f0646edb5e2e2069a38e6c Mon Sep 17 00:00:00 2001 From: Jianqun Xu Date: Wed, 30 Nov 2022 16:35:45 +0800 Subject: [PATCH] soc: rockchip: rk_fiq_debugger fix the 'cpu' to unsigned long Change-Id: I5f432f86226f30df8a565407544ee46e7129e045 Signed-off-by: Jianqun Xu --- drivers/firmware/rockchip_sip.c | 5 ++--- drivers/soc/rockchip/rk_fiq_debugger.c | 2 +- include/linux/rockchip/rockchip_sip.h | 7 +++++-- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/firmware/rockchip_sip.c b/drivers/firmware/rockchip_sip.c index 5251aa48d672..1072dbd753d2 100644 --- a/drivers/firmware/rockchip_sip.c +++ b/drivers/firmware/rockchip_sip.c @@ -332,8 +332,7 @@ static int fiq_sip_enabled; static int fiq_target_cpu; static phys_addr_t ft_fiq_mem_phy; static void __iomem *ft_fiq_mem_base; -static void (*sip_fiq_debugger_uart_irq_tf)(struct pt_regs *_pt_regs, - unsigned long cpu); +static sip_fiq_debugger_uart_irq_tf_cb_t sip_fiq_debugger_uart_irq_tf; static struct pt_regs fiq_pt_regs; int sip_fiq_debugger_is_enabled(void) @@ -435,7 +434,7 @@ static void sip_fiq_debugger_uart_irq_tf_cb(unsigned long sp_el1, __invoke_sip_fn_smc(SIP_UARTDBG_FN, 0, 0, UARTDBG_CFG_OSHDL_TO_OS); } -int sip_fiq_debugger_uart_irq_tf_init(u32 irq_id, void *callback_fn) +int sip_fiq_debugger_uart_irq_tf_init(u32 irq_id, sip_fiq_debugger_uart_irq_tf_cb_t callback_fn) { struct arm_smccc_res res; diff --git a/drivers/soc/rockchip/rk_fiq_debugger.c b/drivers/soc/rockchip/rk_fiq_debugger.c index bdeb8c9f6999..f8b45b900fb3 100644 --- a/drivers/soc/rockchip/rk_fiq_debugger.c +++ b/drivers/soc/rockchip/rk_fiq_debugger.c @@ -648,7 +648,7 @@ static void rk_fiq_debugger_enable_debug(struct platform_device *pdev, bool val) sip_fiq_debugger_enable_debug(val); } -static void fiq_debugger_uart_irq_tf(struct pt_regs *_pt_regs, u64 cpu) +static void fiq_debugger_uart_irq_tf(struct pt_regs *_pt_regs, unsigned long cpu) { fiq_debugger_fiq(_pt_regs, cpu); } diff --git a/include/linux/rockchip/rockchip_sip.h b/include/linux/rockchip/rockchip_sip.h index 7ac568d60cb3..3504da1755b3 100644 --- a/include/linux/rockchip/rockchip_sip.h +++ b/include/linux/rockchip/rockchip_sip.h @@ -201,6 +201,9 @@ enum { HDMIRX_INFO_NOTIFY = 2, }; +struct pt_regs; +typedef void (*sip_fiq_debugger_uart_irq_tf_cb_t)(struct pt_regs *_pt_regs, unsigned long cpu); + /* * Rules: struct arm_smccc_res contains result and data, details: * @@ -235,7 +238,7 @@ ulong sip_cpu_logical_map_mpidr(u32 cpu); /***************************fiq debugger **************************************/ void sip_fiq_debugger_enable_fiq(bool enable, uint32_t tgt_cpu); void sip_fiq_debugger_enable_debug(bool enable); -int sip_fiq_debugger_uart_irq_tf_init(u32 irq_id, void *callback_fn); +int sip_fiq_debugger_uart_irq_tf_init(u32 irq_id, sip_fiq_debugger_uart_irq_tf_cb_t callback_fn); int sip_fiq_debugger_set_print_port(u32 port_phyaddr, u32 baudrate); int sip_fiq_debugger_request_share_memory(void); int sip_fiq_debugger_get_target_cpu(void); @@ -356,7 +359,7 @@ static inline void sip_fiq_debugger_enable_fiq static inline void sip_fiq_debugger_enable_debug(bool enable) { return; } static inline int sip_fiq_debugger_uart_irq_tf_init(u32 irq_id, - void *callback_fn) + sip_fiq_debugger_uart_irq_tf_cb_t callback_fn) { return 0; }