m68k: Replace setup_irq() by request_irq()
Subsystems (2)
PATCH v3 1/1 m68k: Replace setup_irq() by request_irq()
request_irq() is preferred over setup_irq(). Invocations of setup_irq() occur after memory allocators are ready.
Per tglx[1], setup_irq() existed in olden days when allocators were not ready by the time early interrupts were initialized.
Hence replace setup_irq() by request_irq().
[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos
---
Hi Greg,
i have removed your Tested-by due to the modifications, if possible, please test & let me know.
Regards
afzal
v3:
* Instead of tree wide series, arch specific patch (per tglx)
* Strip irrelevant portions & more tweaking in commit message
* Remove name indirection in pr_err string, print irq # and symbolic error name in case of error
* s/pr_err/pr_debug
v2:
* Replace pr_err("request_irq() on %s failed" by
pr_err("%s: request_irq() failed" * Commit message massage
* remove now irrelevant comment lines at 3 places
arch/m68k/68000/timers.c | 16 +++++++--------- arch/m68k/coldfire/pit.c | 16 +++++++--------- arch/m68k/coldfire/sltimers.c | 24 ++++++++++-------------- arch/m68k/coldfire/timers.c | 26 ++++++++++---------------- 4 files changed, 34 insertions(+), 48 deletions(-)
arch/m68k/68000/timers.c +7 -9
@@ -68,14 +68,6 @@ static irqreturn_t hw_tick(int irq, void *dummy)/***************************************************************************/ -static struct irqaction m68328_timer_irq = { - .name ="timer" , - .flags =IRQF_TIMER , - .handler = hw_tick, -}; - -/***************************************************************************/ -static u64 m68328_read_clk (struct clocksource *cs) {unsigned long flags;
@@ -102,11 +94,17 @@ static struct clocksource m68328_clk = {void hw_timer_init (irq_handler_t handler) { +int ret; +/* disable timer 1 */ TCTL =0 ;/* set ISR */ -setup_irq (TMR_IRQ_NUM , &m68328_timer_irq); + ret =request_irq (TMR_IRQ_NUM , hw_tick,IRQF_TIMER ,"timer" ,NULL ); +if (ret) { +pr_debug ("Failed to request irq %d (timer): %pe\n" ,TMR_IRQ_NUM , +ERR_PTR (ret)); + }/* Restart mode, Enable int, Set clock source */ TCTL =TCTL_OM |TCTL_IRQEN |CLOCK_SOURCE ;
arch/m68k/coldfire/pit.c +7 -9
@@ -111,14 +111,6 @@ static irqreturn_t pit_tick(int irq, void *dummy)/***************************************************************************/ -static struct irqaction pit_irq = { - .name ="timer" , - .flags =IRQF_TIMER , - .handler = pit_tick, -}; - -/***************************************************************************/ -static u64 pit_read_clk (struct clocksource *cs) {unsigned long flags;
@@ -146,6 +138,8 @@ static struct clocksource pit_clk = {void hw_timer_init (irq_handler_t handler) { +int ret; + cf_pit_clockevent.cpumask =cpumask_of (smp_processor_id ()); cf_pit_clockevent.mult =div_sc (FREQ ,NSEC_PER_SEC ,32 ); cf_pit_clockevent.max_delta_ns =
@@ -156,7 +150,11 @@ void hw_timer_init(irq_handler_t handler) cf_pit_clockevent.min_delta_ticks =0x3f ;clockevents_register_device (&cf_pit_clockevent); -setup_irq (MCF_IRQ_PIT1 , &pit_irq); + ret =request_irq (MCF_IRQ_PIT1 , pit_tick,IRQF_TIMER ,"timer" ,NULL ); +if (ret) { +pr_debug ("Failed to request irq %d (timer): %pe\n" , +MCF_IRQ_PIT1 ,ERR_PTR (ret)); + }clocksource_register_hz (&pit_clk,FREQ ); }
arch/m68k/coldfire/sltimers.c +10 -14
@@ -50,18 +50,19 @@ irqreturn_t mcfslt_profile_tick(int irq, void *dummy)return IRQ_HANDLED ; } -static struct irqaction mcfslt_profile_irq = { - .name ="profile timer" , - .flags =IRQF_TIMER , - .handler = mcfslt_profile_tick, -}; -void mcfslt_profile_init (void ) { +int ret; +printk (KERN_INFO "PROFILE: lodging TIMER 1 @ %dHz as profile timer\n" ,PROFILEHZ ); -setup_irq (MCF_IRQ_PROFILER , &mcfslt_profile_irq); + ret =request_irq (MCF_IRQ_PROFILER , mcfslt_profile_tick,IRQF_TIMER , +"profile timer" ,NULL ); +if (ret) { +pr_debug ("Failed to request irq %d (profile timer): %pe\n" , +MCF_IRQ_PROFILER ,ERR_PTR (ret)); + }/* Set up TIMER 2 as high speed profile clock */ __raw_writel (MCF_BUSCLK /PROFILEHZ -1 ,PA (MCFSLT_STCNT ));
@@ -92,12 +93,6 @@ static irqreturn_t mcfslt_tick(int irq, void *dummy)return timer_interrupt (irq, dummy); } -static struct irqaction mcfslt_timer_irq = { - .name ="timer" , - .flags =IRQF_TIMER , - .handler = mcfslt_tick, -}; -static u64 mcfslt_read_clk (struct clocksource *cs) {unsigned long flags;
@@ -140,7 +135,8 @@ void hw_timer_init(irq_handler_t handler) mcfslt_cnt = mcfslt_cycles_per_jiffy; timer_interrupt = handler; -setup_irq (MCF_IRQ_TIMER , &mcfslt_timer_irq); +if (request_irq (MCF_IRQ_TIMER , mcfslt_tick,IRQF_TIMER ,"timer" ,NULL )) +pr_err ("%s: request_irq() failed\n" ,"timer" );clocksource_register_hz (&mcfslt_clk,MCF_BUSCLK );
arch/m68k/coldfire/timers.c +10 -16
@@ -82,14 +82,6 @@ static irqreturn_t mcftmr_tick(int irq, void *dummy)/***************************************************************************/ -static struct irqaction mcftmr_timer_irq = { - .name ="timer" , - .flags =IRQF_TIMER , - .handler = mcftmr_tick, -}; - -/***************************************************************************/ -static u64 mcftmr_read_clk (struct clocksource *cs) {unsigned long flags;
@@ -118,6 +110,8 @@ static struct clocksource mcftmr_clk = {void hw_timer_init (irq_handler_t handler) { +int r; +__raw_writew (MCFTIMER_TMR_DISABLE ,TA (MCFTIMER_TMR )); mcftmr_cycles_per_jiffy =FREQ /HZ ;/*
@@ -134,7 +128,11 @@ void hw_timer_init(irq_handler_t handler) timer_interrupt = handler;init_timer_irq (); -setup_irq (MCF_IRQ_TIMER , &mcftmr_timer_irq); + r =request_irq (MCF_IRQ_TIMER , mcftmr_tick,IRQF_TIMER ,"timer" ,NULL ); +if (r) { +pr_debug ("Failed to request irq %d (timer): %pe\n" , +MCF_IRQ_TIMER ,ERR_PTR (r)); + }#ifdef CONFIG_HIGHPROFILE coldfire_profile_init ();
@@ -170,12 +168,6 @@ irqreturn_t coldfire_profile_tick(int irq, void *dummy)/***************************************************************************/ -static struct irqaction coldfire_profile_irq = { - .name ="profile timer" , - .flags =IRQF_TIMER , - .handler = coldfire_profile_tick, -}; -void coldfire_profile_init (void ) { printk(KERN_INFO "PROFILE: lodging TIMER2 @ %dHz as profile timer\n",
@@ -188,7 +180,9 @@ void coldfire_profile_init(void)__raw_writew (MCFTIMER_TMR_ENORI |MCFTIMER_TMR_CLK16 |MCFTIMER_TMR_RESTART |MCFTIMER_TMR_ENABLE ,PA (MCFTIMER_TMR )); -setup_irq (MCF_IRQ_PROFILER , &coldfire_profile_irq); +if (request_irq (MCF_IRQ_PROFILER , coldfire_profile_tick,IRQF_TIMER , +"profile timer" ,NULL )) +pr_err ("%s: request_irq() failed\n" ,"profile timer" ); }/***************************************************************************/
Signature · 1 line
2.25.1
Huh, i messed it up in a hurry, i forgot to make modifications in 2 places, i will send v4 after handling those 2 cases as well.
Regards
afzal
Quoted 239 lines · afzal mohammed
request_irq()is preferred oversetup_irq(). Invocations ofsetup_irq()occur after memory allocators are ready.Per tglx[1],
setup_irq()existed in olden days when allocators were not ready by the time early interrupts were initialized.Hence replace
setup_irq()byrequest_irq().[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos
Signed-off-by afzal mohammed <[email protected]>---
Hi Greg,
i have removed your Tested-by due to the modifications, if possible, please test & let me know.
Regards
afzalv3:
* Instead of tree wide series, arch specific patch (per tglx)
* Strip irrelevant portions & more tweaking in commit message
* Remove name indirection inpr_errstring, print irq # and symbolic error name in case of error
* s/pr_err/pr_debug
v2:
* Replace pr_err("request_irq() on %s failed" bypr_err("%s: request_irq() failed"* Commit message massage
* remove now irrelevant comment lines at 3 placesarch/m68k/68000/timers.c | 16 +++++++--------- arch/m68k/coldfire/pit.c | 16 +++++++--------- arch/m68k/coldfire/sltimers.c | 24 ++++++++++-------------- arch/m68k/coldfire/timers.c | 26 ++++++++++---------------- 4 files changed, 34 insertions(+), 48 deletions(-)arch/m68k/68000/timers.c +7
-9@@ -68,14 +68,6 @@ static irqreturn_t hw_tick(int irq, void *dummy)/***************************************************************************/ -static struct irqaction m68328_timer_irq = { - .name ="timer" , - .flags =IRQF_TIMER , - .handler = hw_tick, -}; - -/***************************************************************************/ -static u64 m68328_read_clk (struct clocksource *cs) {unsigned long flags;@@ -102,11 +94,17 @@ static struct clocksource m68328_clk = {void hw_timer_init (irq_handler_t handler) { +int ret; +/* disable timer 1 */ TCTL =0 ;/* set ISR */ -setup_irq (TMR_IRQ_NUM , &m68328_timer_irq); + ret =request_irq (TMR_IRQ_NUM , hw_tick,IRQF_TIMER ,"timer" ,NULL ); +if (ret) { +pr_debug ("Failed to request irq %d (timer): %pe\n" ,TMR_IRQ_NUM , +ERR_PTR (ret)); + }/* Restart mode, Enable int, Set clock source */ TCTL =TCTL_OM |TCTL_IRQEN |CLOCK_SOURCE ;arch/m68k/coldfire/pit.c +7
-9@@ -111,14 +111,6 @@ static irqreturn_t pit_tick(int irq, void *dummy)/***************************************************************************/ -static struct irqaction pit_irq = { - .name ="timer" , - .flags =IRQF_TIMER , - .handler = pit_tick, -}; - -/***************************************************************************/ -static u64 pit_read_clk (struct clocksource *cs) {unsigned long flags;@@ -146,6 +138,8 @@ static struct clocksource pit_clk = {void hw_timer_init (irq_handler_t handler) { +int ret; + cf_pit_clockevent.cpumask =cpumask_of (smp_processor_id ()); cf_pit_clockevent.mult =div_sc (FREQ ,NSEC_PER_SEC ,32 ); cf_pit_clockevent.max_delta_ns =@@ -156,7 +150,11 @@ void hw_timer_init(irq_handler_t handler) cf_pit_clockevent.min_delta_ticks =0x3f ;clockevents_register_device (&cf_pit_clockevent); -setup_irq (MCF_IRQ_PIT1 , &pit_irq); + ret =request_irq (MCF_IRQ_PIT1 , pit_tick,IRQF_TIMER ,"timer" ,NULL ); +if (ret) { +pr_debug ("Failed to request irq %d (timer): %pe\n" , +MCF_IRQ_PIT1 ,ERR_PTR (ret)); + }clocksource_register_hz (&pit_clk,FREQ ); }arch/m68k/coldfire/sltimers.c +10
-14@@ -50,18 +50,19 @@ irqreturn_t mcfslt_profile_tick(int irq, void *dummy)return IRQ_HANDLED ; } -static struct irqaction mcfslt_profile_irq = { - .name ="profile timer" , - .flags =IRQF_TIMER , - .handler = mcfslt_profile_tick, -}; -void mcfslt_profile_init (void ) { +int ret; +printk (KERN_INFO "PROFILE: lodging TIMER 1 @ %dHz as profile timer\n" ,PROFILEHZ ); -setup_irq (MCF_IRQ_PROFILER , &mcfslt_profile_irq); + ret =request_irq (MCF_IRQ_PROFILER , mcfslt_profile_tick,IRQF_TIMER , +"profile timer" ,NULL ); +if (ret) { +pr_debug ("Failed to request irq %d (profile timer): %pe\n" , +MCF_IRQ_PROFILER ,ERR_PTR (ret)); + }/* Set up TIMER 2 as high speed profile clock */ __raw_writel (MCF_BUSCLK /PROFILEHZ -1 ,PA (MCFSLT_STCNT ));@@ -92,12 +93,6 @@ static irqreturn_t mcfslt_tick(int irq, void *dummy)return timer_interrupt (irq, dummy); } -static struct irqaction mcfslt_timer_irq = { - .name ="timer" , - .flags =IRQF_TIMER , - .handler = mcfslt_tick, -}; -static u64 mcfslt_read_clk (struct clocksource *cs) {unsigned long flags;@@ -140,7 +135,8 @@ void hw_timer_init(irq_handler_t handler) mcfslt_cnt = mcfslt_cycles_per_jiffy; timer_interrupt = handler; -setup_irq (MCF_IRQ_TIMER , &mcfslt_timer_irq); +if (request_irq (MCF_IRQ_TIMER , mcfslt_tick,IRQF_TIMER ,"timer" ,NULL )) +pr_err ("%s: request_irq() failed\n" ,"timer" );clocksource_register_hz (&mcfslt_clk,MCF_BUSCLK );arch/m68k/coldfire/timers.c +10
-16@@ -82,14 +82,6 @@ static irqreturn_t mcftmr_tick(int irq, void *dummy)/***************************************************************************/ -static struct irqaction mcftmr_timer_irq = { - .name ="timer" , - .flags =IRQF_TIMER , - .handler = mcftmr_tick, -}; - -/***************************************************************************/ -static u64 mcftmr_read_clk (struct clocksource *cs) {unsigned long flags;@@ -118,6 +110,8 @@ static struct clocksource mcftmr_clk = {void hw_timer_init (irq_handler_t handler) { +int r; +__raw_writew (MCFTIMER_TMR_DISABLE ,TA (MCFTIMER_TMR )); mcftmr_cycles_per_jiffy =FREQ /HZ ;/* @@ -134,7 +128,11 @@ void hw_timer_init(irq_handler_t handler) timer_interrupt = handler;init_timer_irq (); -setup_irq (MCF_IRQ_TIMER , &mcftmr_timer_irq); + r =request_irq (MCF_IRQ_TIMER , mcftmr_tick,IRQF_TIMER ,"timer" ,NULL ); +if (r) { +pr_debug ("Failed to request irq %d (timer): %pe\n" , +MCF_IRQ_TIMER ,ERR_PTR (r)); + }#ifdef CONFIG_HIGHPROFILE coldfire_profile_init ();@@ -170,12 +168,6 @@ irqreturn_t coldfire_profile_tick(int irq, void *dummy)/***************************************************************************/ -static struct irqaction coldfire_profile_irq = { - .name ="profile timer" , - .flags =IRQF_TIMER , - .handler = coldfire_profile_tick, -}; -void coldfire_profile_init (void ) { printk(KERN_INFO "PROFILE: lodging TIMER2 @ %dHz as profile timer\n",@@ -188,7 +180,9 @@ void coldfire_profile_init(void)__raw_writew (MCFTIMER_TMR_ENORI |MCFTIMER_TMR_CLK16 |MCFTIMER_TMR_RESTART |MCFTIMER_TMR_ENABLE ,PA (MCFTIMER_TMR )); -setup_irq (MCF_IRQ_PROFILER , &coldfire_profile_irq); +if (request_irq (MCF_IRQ_PROFILER , coldfire_profile_tick,IRQF_TIMER , +"profile timer" ,NULL )) +pr_err ("%s: request_irq() failed\n" ,"profile timer" ); }/***************************************************************************/ Signature · 1 line
2.25.1
PATCH v4 1/1 m68k: Replace setup_irq() by request_irq()
In reply to afzal mohammedrequest_irq() is preferred over setup_irq(). Invocations of setup_irq() occur after memory allocators are ready.
Per tglx[1], setup_irq() existed in olden days when allocators were not ready by the time early interrupts were initialized.
Hence replace setup_irq() by request_irq().
[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos
---
Hi Greg,
i have removed your Tested-by due to the modifications, if possible, please test & let me know.
Regards
afzal
v4:
* Add modifications done per v3, but missed at couple of places
v3:
* Instead of tree wide series, arch specific patch (per tglx)
* Strip irrelevant portions & more tweaking in commit message
* Remove name indirection in pr_err string, print irq # and symbolic error name in case of error
* s/pr_err/pr_debug
v2:
* Replace pr_err("request_irq() on %s failed" by
pr_err("%s: request_irq() failed" * Commit message massage
* remove now irrelevant comment lines at 3 places
arch/m68k/68000/timers.c | 16 +++++++--------- arch/m68k/coldfire/pit.c | 16 +++++++--------- arch/m68k/coldfire/sltimers.c | 29 +++++++++++++++-------------- arch/m68k/coldfire/timers.c | 31 +++++++++++++++---------------- 4 files changed, 44 insertions(+), 48 deletions(-)
arch/m68k/68000/timers.c +7 -9
@@ -68,14 +68,6 @@ static irqreturn_t hw_tick(int irq, void *dummy)/***************************************************************************/ -static struct irqaction m68328_timer_irq = { - .name ="timer" , - .flags =IRQF_TIMER , - .handler = hw_tick, -}; - -/***************************************************************************/ -static u64 m68328_read_clk (struct clocksource *cs) {unsigned long flags;
@@ -102,11 +94,17 @@ static struct clocksource m68328_clk = {void hw_timer_init (irq_handler_t handler) { +int ret; +/* disable timer 1 */ TCTL =0 ;/* set ISR */ -setup_irq (TMR_IRQ_NUM , &m68328_timer_irq); + ret =request_irq (TMR_IRQ_NUM , hw_tick,IRQF_TIMER ,"timer" ,NULL ); +if (ret) { +pr_debug ("Failed to request irq %d (timer): %pe\n" ,TMR_IRQ_NUM , +ERR_PTR (ret)); + }/* Restart mode, Enable int, Set clock source */ TCTL =TCTL_OM |TCTL_IRQEN |CLOCK_SOURCE ;
arch/m68k/coldfire/pit.c +7 -9
@@ -111,14 +111,6 @@ static irqreturn_t pit_tick(int irq, void *dummy)/***************************************************************************/ -static struct irqaction pit_irq = { - .name ="timer" , - .flags =IRQF_TIMER , - .handler = pit_tick, -}; - -/***************************************************************************/ -static u64 pit_read_clk (struct clocksource *cs) {unsigned long flags;
@@ -146,6 +138,8 @@ static struct clocksource pit_clk = {void hw_timer_init (irq_handler_t handler) { +int ret; + cf_pit_clockevent.cpumask =cpumask_of (smp_processor_id ()); cf_pit_clockevent.mult =div_sc (FREQ ,NSEC_PER_SEC ,32 ); cf_pit_clockevent.max_delta_ns =
@@ -156,7 +150,11 @@ void hw_timer_init(irq_handler_t handler) cf_pit_clockevent.min_delta_ticks =0x3f ;clockevents_register_device (&cf_pit_clockevent); -setup_irq (MCF_IRQ_PIT1 , &pit_irq); + ret =request_irq (MCF_IRQ_PIT1 , pit_tick,IRQF_TIMER ,"timer" ,NULL ); +if (ret) { +pr_debug ("Failed to request irq %d (timer): %pe\n" , +MCF_IRQ_PIT1 ,ERR_PTR (ret)); + }clocksource_register_hz (&pit_clk,FREQ ); }
arch/m68k/coldfire/sltimers.c +15 -14
@@ -50,18 +50,19 @@ irqreturn_t mcfslt_profile_tick(int irq, void *dummy)return IRQ_HANDLED ; } -static struct irqaction mcfslt_profile_irq = { - .name ="profile timer" , - .flags =IRQF_TIMER , - .handler = mcfslt_profile_tick, -}; -void mcfslt_profile_init (void ) { +int ret; +printk (KERN_INFO "PROFILE: lodging TIMER 1 @ %dHz as profile timer\n" ,PROFILEHZ ); -setup_irq (MCF_IRQ_PROFILER , &mcfslt_profile_irq); + ret =request_irq (MCF_IRQ_PROFILER , mcfslt_profile_tick,IRQF_TIMER , +"profile timer" ,NULL ); +if (ret) { +pr_debug ("Failed to request irq %d (profile timer): %pe\n" , +MCF_IRQ_PROFILER ,ERR_PTR (ret)); + }/* Set up TIMER 2 as high speed profile clock */ __raw_writel (MCF_BUSCLK /PROFILEHZ -1 ,PA (MCFSLT_STCNT ));
@@ -92,12 +93,6 @@ static irqreturn_t mcfslt_tick(int irq, void *dummy)return timer_interrupt (irq, dummy); } -static struct irqaction mcfslt_timer_irq = { - .name ="timer" , - .flags =IRQF_TIMER , - .handler = mcfslt_tick, -}; -static u64 mcfslt_read_clk (struct clocksource *cs) {unsigned long flags;
@@ -126,6 +121,8 @@ static struct clocksource mcfslt_clk = {void hw_timer_init (irq_handler_t handler) { +int r; + mcfslt_cycles_per_jiffy =MCF_BUSCLK /HZ ;/* * The coldfire slice timer (SLT) runs from STCNT to 0 included,
@@ -140,7 +137,11 @@ void hw_timer_init(irq_handler_t handler) mcfslt_cnt = mcfslt_cycles_per_jiffy; timer_interrupt = handler; -setup_irq (MCF_IRQ_TIMER , &mcfslt_timer_irq); + r =request_irq (MCF_IRQ_TIMER , mcfslt_tick,IRQF_TIMER ,"timer" ,NULL ); +if (r) { +pr_debug ("Failed to request irq %d (timer): %pe\n" , +MCF_IRQ_TIMER ,ERR_PTR (r)); + }clocksource_register_hz (&mcfslt_clk,MCF_BUSCLK );
arch/m68k/coldfire/timers.c +15 -16
@@ -82,14 +82,6 @@ static irqreturn_t mcftmr_tick(int irq, void *dummy)/***************************************************************************/ -static struct irqaction mcftmr_timer_irq = { - .name ="timer" , - .flags =IRQF_TIMER , - .handler = mcftmr_tick, -}; - -/***************************************************************************/ -static u64 mcftmr_read_clk (struct clocksource *cs) {unsigned long flags;
@@ -118,6 +110,8 @@ static struct clocksource mcftmr_clk = {void hw_timer_init (irq_handler_t handler) { +int r; +__raw_writew (MCFTIMER_TMR_DISABLE ,TA (MCFTIMER_TMR )); mcftmr_cycles_per_jiffy =FREQ /HZ ;/*
@@ -134,7 +128,11 @@ void hw_timer_init(irq_handler_t handler) timer_interrupt = handler;init_timer_irq (); -setup_irq (MCF_IRQ_TIMER , &mcftmr_timer_irq); + r =request_irq (MCF_IRQ_TIMER , mcftmr_tick,IRQF_TIMER ,"timer" ,NULL ); +if (r) { +pr_debug ("Failed to request irq %d (timer): %pe\n" , +MCF_IRQ_TIMER ,ERR_PTR (r)); + }#ifdef CONFIG_HIGHPROFILE coldfire_profile_init ();
@@ -170,14 +168,10 @@ irqreturn_t coldfire_profile_tick(int irq, void *dummy)/***************************************************************************/ -static struct irqaction coldfire_profile_irq = { - .name ="profile timer" , - .flags =IRQF_TIMER , - .handler = coldfire_profile_tick, -}; -void coldfire_profile_init (void ) { +int ret; +printk (KERN_INFO "PROFILE: lodging TIMER2 @ %dHz as profile timer\n" ,PROFILEHZ );
@@ -188,7 +182,12 @@ void coldfire_profile_init(void)__raw_writew (MCFTIMER_TMR_ENORI |MCFTIMER_TMR_CLK16 |MCFTIMER_TMR_RESTART |MCFTIMER_TMR_ENABLE ,PA (MCFTIMER_TMR )); -setup_irq (MCF_IRQ_PROFILER , &coldfire_profile_irq); + ret =request_irq (MCF_IRQ_PROFILER , coldfire_profile_tick,IRQF_TIMER , +"profile timer" ,NULL ); +if (ret) { +pr_debug ("Failed to request irq %d (profile timer): %pe\n" , +MCF_IRQ_PROFILER ,ERR_PTR (ret)); + } }/***************************************************************************/
Signature · 1 line
2.25.1
PATCH v5 1/1 m68k: Replace setup_irq() by request_irq()
request_irq() is preferred over setup_irq(). Invocations of setup_irq() occur after memory allocators are ready.
Per tglx[1], setup_irq() existed in olden days when allocators were not ready by the time early interrupts were initialized.
Hence replace setup_irq() by request_irq().
[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos
---
v5:
* Revert to pr_err
v4:
* Add modifications done per v3, but missed at couple of places
v3:
* Instead of tree wide series, arch specific patch (per tglx)
* Strip irrelevant portions & more tweaking in commit message
* Remove name indirection in pr_err string, print irq # and symbolic error name in case of error
* s/pr_err/pr_debug
v2:
* Replace pr_err("request_irq() on %s failed" by
pr_err("%s: request_irq() failed" * Commit message massage
* remove now irrelevant comment lines at 3 places
arch/m68k/68000/timers.c | 16 +++++++--------- arch/m68k/coldfire/pit.c | 16 +++++++--------- arch/m68k/coldfire/sltimers.c | 29 +++++++++++++++-------------- arch/m68k/coldfire/timers.c | 31 +++++++++++++++---------------- 4 files changed, 44 insertions(+), 48 deletions(-)
arch/m68k/68000/timers.c +7 -9
@@ -68,14 +68,6 @@ static irqreturn_t hw_tick(int irq, void *dummy)/***************************************************************************/ -static struct irqaction m68328_timer_irq = { - .name ="timer" , - .flags =IRQF_TIMER , - .handler = hw_tick, -}; - -/***************************************************************************/ -static u64 m68328_read_clk (struct clocksource *cs) {unsigned long flags;
@@ -102,11 +94,17 @@ static struct clocksource m68328_clk = {void hw_timer_init (irq_handler_t handler) { +int ret; +/* disable timer 1 */ TCTL =0 ;/* set ISR */ -setup_irq (TMR_IRQ_NUM , &m68328_timer_irq); + ret =request_irq (TMR_IRQ_NUM , hw_tick,IRQF_TIMER ,"timer" ,NULL ); +if (ret) { +pr_err ("Failed to request irq %d (timer): %pe\n" ,TMR_IRQ_NUM , +ERR_PTR (ret)); + }/* Restart mode, Enable int, Set clock source */ TCTL =TCTL_OM |TCTL_IRQEN |CLOCK_SOURCE ;
arch/m68k/coldfire/pit.c +7 -9
@@ -111,14 +111,6 @@ static irqreturn_t pit_tick(int irq, void *dummy)/***************************************************************************/ -static struct irqaction pit_irq = { - .name ="timer" , - .flags =IRQF_TIMER , - .handler = pit_tick, -}; - -/***************************************************************************/ -static u64 pit_read_clk (struct clocksource *cs) {unsigned long flags;
@@ -146,6 +138,8 @@ static struct clocksource pit_clk = {void hw_timer_init (irq_handler_t handler) { +int ret; + cf_pit_clockevent.cpumask =cpumask_of (smp_processor_id ()); cf_pit_clockevent.mult =div_sc (FREQ ,NSEC_PER_SEC ,32 ); cf_pit_clockevent.max_delta_ns =
@@ -156,7 +150,11 @@ void hw_timer_init(irq_handler_t handler) cf_pit_clockevent.min_delta_ticks =0x3f ;clockevents_register_device (&cf_pit_clockevent); -setup_irq (MCF_IRQ_PIT1 , &pit_irq); + ret =request_irq (MCF_IRQ_PIT1 , pit_tick,IRQF_TIMER ,"timer" ,NULL ); +if (ret) { +pr_err ("Failed to request irq %d (timer): %pe\n" ,MCF_IRQ_PIT1 , +ERR_PTR (ret)); + }clocksource_register_hz (&pit_clk,FREQ ); }
arch/m68k/coldfire/sltimers.c +15 -14
@@ -50,18 +50,19 @@ irqreturn_t mcfslt_profile_tick(int irq, void *dummy)return IRQ_HANDLED ; } -static struct irqaction mcfslt_profile_irq = { - .name ="profile timer" , - .flags =IRQF_TIMER , - .handler = mcfslt_profile_tick, -}; -void mcfslt_profile_init (void ) { +int ret; +printk (KERN_INFO "PROFILE: lodging TIMER 1 @ %dHz as profile timer\n" ,PROFILEHZ ); -setup_irq (MCF_IRQ_PROFILER , &mcfslt_profile_irq); + ret =request_irq (MCF_IRQ_PROFILER , mcfslt_profile_tick,IRQF_TIMER , +"profile timer" ,NULL ); +if (ret) { +pr_err ("Failed to request irq %d (profile timer): %pe\n" , +MCF_IRQ_PROFILER ,ERR_PTR (ret)); + }/* Set up TIMER 2 as high speed profile clock */ __raw_writel (MCF_BUSCLK /PROFILEHZ -1 ,PA (MCFSLT_STCNT ));
@@ -92,12 +93,6 @@ static irqreturn_t mcfslt_tick(int irq, void *dummy)return timer_interrupt (irq, dummy); } -static struct irqaction mcfslt_timer_irq = { - .name ="timer" , - .flags =IRQF_TIMER , - .handler = mcfslt_tick, -}; -static u64 mcfslt_read_clk (struct clocksource *cs) {unsigned long flags;
@@ -126,6 +121,8 @@ static struct clocksource mcfslt_clk = {void hw_timer_init (irq_handler_t handler) { +int r; + mcfslt_cycles_per_jiffy =MCF_BUSCLK /HZ ;/* * The coldfire slice timer (SLT) runs from STCNT to 0 included,
@@ -140,7 +137,11 @@ void hw_timer_init(irq_handler_t handler) mcfslt_cnt = mcfslt_cycles_per_jiffy; timer_interrupt = handler; -setup_irq (MCF_IRQ_TIMER , &mcfslt_timer_irq); + r =request_irq (MCF_IRQ_TIMER , mcfslt_tick,IRQF_TIMER ,"timer" ,NULL ); +if (r) { +pr_err ("Failed to request irq %d (timer): %pe\n" ,MCF_IRQ_TIMER , +ERR_PTR (r)); + }clocksource_register_hz (&mcfslt_clk,MCF_BUSCLK );
arch/m68k/coldfire/timers.c +15 -16
@@ -82,14 +82,6 @@ static irqreturn_t mcftmr_tick(int irq, void *dummy)/***************************************************************************/ -static struct irqaction mcftmr_timer_irq = { - .name ="timer" , - .flags =IRQF_TIMER , - .handler = mcftmr_tick, -}; - -/***************************************************************************/ -static u64 mcftmr_read_clk (struct clocksource *cs) {unsigned long flags;
@@ -118,6 +110,8 @@ static struct clocksource mcftmr_clk = {void hw_timer_init (irq_handler_t handler) { +int r; +__raw_writew (MCFTIMER_TMR_DISABLE ,TA (MCFTIMER_TMR )); mcftmr_cycles_per_jiffy =FREQ /HZ ;/*
@@ -134,7 +128,11 @@ void hw_timer_init(irq_handler_t handler) timer_interrupt = handler;init_timer_irq (); -setup_irq (MCF_IRQ_TIMER , &mcftmr_timer_irq); + r =request_irq (MCF_IRQ_TIMER , mcftmr_tick,IRQF_TIMER ,"timer" ,NULL ); +if (r) { +pr_err ("Failed to request irq %d (timer): %pe\n" ,MCF_IRQ_TIMER , +ERR_PTR (r)); + }#ifdef CONFIG_HIGHPROFILE coldfire_profile_init ();
@@ -170,14 +168,10 @@ irqreturn_t coldfire_profile_tick(int irq, void *dummy)/***************************************************************************/ -static struct irqaction coldfire_profile_irq = { - .name ="profile timer" , - .flags =IRQF_TIMER , - .handler = coldfire_profile_tick, -}; -void coldfire_profile_init (void ) { +int ret; +printk (KERN_INFO "PROFILE: lodging TIMER2 @ %dHz as profile timer\n" ,PROFILEHZ );
@@ -188,7 +182,12 @@ void coldfire_profile_init(void)__raw_writew (MCFTIMER_TMR_ENORI |MCFTIMER_TMR_CLK16 |MCFTIMER_TMR_RESTART |MCFTIMER_TMR_ENABLE ,PA (MCFTIMER_TMR )); -setup_irq (MCF_IRQ_PROFILER , &coldfire_profile_irq); + ret =request_irq (MCF_IRQ_PROFILER , coldfire_profile_tick,IRQF_TIMER , +"profile timer" ,NULL ); +if (ret) { +pr_err ("Failed to request irq %d (profile timer): %pe\n" , +MCF_IRQ_PROFILER ,ERR_PTR (ret)); + } }/***************************************************************************/
Signature · 1 line
2.25.1
Hi Afzal,
Quoted 8 lines · afzal mohammed
request_irq()is preferred oversetup_irq(). Invocations ofsetup_irq()occur after memory allocators are ready.Per tglx[1],
setup_irq()existed in olden days when allocators were not ready by the time early interrupts were initialized.Hence replace
setup_irq()byrequest_irq().
Quoted 7 lines
[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos
Signed-off-by afzal mohammed <[email protected]>---
v5:
* Revert topr_err
You have been busy :-)
I have retested and everything works as expected, so:
I have applied this to the m68knommu git tree, for next branch.
One comment below, but it is not important.
Quoted 144 lines
v4:
* Add modifications done per v3, but missed at couple of places
v3:
* Instead of tree wide series, arch specific patch (per tglx)
* Strip irrelevant portions & more tweaking in commit message
* Remove name indirection inpr_errstring, print irq # and symbolic error name in case of error
* s/pr_err/pr_debug
v2:
* Replace pr_err("request_irq() on %s failed" bypr_err("%s: request_irq() failed"* Commit message massage
* remove now irrelevant comment lines at 3 placesarch/m68k/68000/timers.c | 16 +++++++--------- arch/m68k/coldfire/pit.c | 16 +++++++--------- arch/m68k/coldfire/sltimers.c | 29 +++++++++++++++-------------- arch/m68k/coldfire/timers.c | 31 +++++++++++++++---------------- 4 files changed, 44 insertions(+), 48 deletions(-)arch/m68k/68000/timers.c +7
-9@@ -68,14 +68,6 @@ static irqreturn_t hw_tick(int irq, void *dummy)/***************************************************************************/ -static struct irqaction m68328_timer_irq = { - .name ="timer" , - .flags =IRQF_TIMER , - .handler = hw_tick, -}; - -/***************************************************************************/ -static u64 m68328_read_clk (struct clocksource *cs) {unsigned long flags;@@ -102,11 +94,17 @@ static struct clocksource m68328_clk = {void hw_timer_init (irq_handler_t handler) { +int ret; +/* disable timer 1 */ TCTL =0 ;/* set ISR */ -setup_irq (TMR_IRQ_NUM , &m68328_timer_irq); + ret =request_irq (TMR_IRQ_NUM , hw_tick,IRQF_TIMER ,"timer" ,NULL ); +if (ret) { +pr_err ("Failed to request irq %d (timer): %pe\n" ,TMR_IRQ_NUM , +ERR_PTR (ret)); + }/* Restart mode, Enable int, Set clock source */ TCTL =TCTL_OM |TCTL_IRQEN |CLOCK_SOURCE ;arch/m68k/coldfire/pit.c +7
-9@@ -111,14 +111,6 @@ static irqreturn_t pit_tick(int irq, void *dummy)/***************************************************************************/ -static struct irqaction pit_irq = { - .name ="timer" , - .flags =IRQF_TIMER , - .handler = pit_tick, -}; - -/***************************************************************************/ -static u64 pit_read_clk (struct clocksource *cs) {unsigned long flags;@@ -146,6 +138,8 @@ static struct clocksource pit_clk = {void hw_timer_init (irq_handler_t handler) { +int ret; + cf_pit_clockevent.cpumask =cpumask_of (smp_processor_id ()); cf_pit_clockevent.mult =div_sc (FREQ ,NSEC_PER_SEC ,32 ); cf_pit_clockevent.max_delta_ns =@@ -156,7 +150,11 @@ void hw_timer_init(irq_handler_t handler) cf_pit_clockevent.min_delta_ticks =0x3f ;clockevents_register_device (&cf_pit_clockevent); -setup_irq (MCF_IRQ_PIT1 , &pit_irq); + ret =request_irq (MCF_IRQ_PIT1 , pit_tick,IRQF_TIMER ,"timer" ,NULL ); +if (ret) { +pr_err ("Failed to request irq %d (timer): %pe\n" ,MCF_IRQ_PIT1 , +ERR_PTR (ret)); + }clocksource_register_hz (&pit_clk,FREQ ); }arch/m68k/coldfire/sltimers.c +8
-13@@ -50,18 +50,19 @@ irqreturn_t mcfslt_profile_tick(int irq, void *dummy)return IRQ_HANDLED ; } -static struct irqaction mcfslt_profile_irq = { - .name ="profile timer" , - .flags =IRQF_TIMER , - .handler = mcfslt_profile_tick, -}; -void mcfslt_profile_init (void ) { +int ret; +printk (KERN_INFO "PROFILE: lodging TIMER 1 @ %dHz as profile timer\n" ,PROFILEHZ ); -setup_irq (MCF_IRQ_PROFILER , &mcfslt_profile_irq); + ret =request_irq (MCF_IRQ_PROFILER , mcfslt_profile_tick,IRQF_TIMER , +"profile timer" ,NULL ); +if (ret) { +pr_err ("Failed to request irq %d (profile timer): %pe\n" , +MCF_IRQ_PROFILER ,ERR_PTR (ret)); + }/* Set up TIMER 2 as high speed profile clock */ __raw_writel (MCF_BUSCLK /PROFILEHZ -1 ,PA (MCFSLT_STCNT ));@@ -92,12 +93,6 @@ static irqreturn_t mcfslt_tick(int irq, void *dummy)return timer_interrupt (irq, dummy); } -static struct irqaction mcfslt_timer_irq = { - .name ="timer" , - .flags =IRQF_TIMER , - .handler = mcfslt_tick, -}; -static u64 mcfslt_read_clk (struct clocksource *cs) {unsigned long flags;
arch/m68k/coldfire/sltimers.c static struct clocksource mcfslt_clk = { · line 124
Quoted 4 lines
arch/m68k/coldfire/sltimers.c +1
-0@@ -126,6 +121,8 @@ static struct clocksource mcfslt_clk = {void hw_timer_init (irq_handler_t handler) { +int r;
You used 'r' here as the error return value holder.
But in the previous cases you used 'ret'.
I would have used the same name everywhere ('ret' probably being the most commonly used in the kernel).
Regards
Greg
Quoted 90 lines
arch/m68k/coldfire/sltimers.c +6
-1+ mcfslt_cycles_per_jiffy =MCF_BUSCLK /HZ ;/* * The coldfire slice timer (SLT) runs from STCNT to 0 included, @@ -140,7 +137,11 @@ void hw_timer_init(irq_handler_t handler) mcfslt_cnt = mcfslt_cycles_per_jiffy; timer_interrupt = handler; -setup_irq (MCF_IRQ_TIMER , &mcfslt_timer_irq); + r =request_irq (MCF_IRQ_TIMER , mcfslt_tick,IRQF_TIMER ,"timer" ,NULL ); +if (r) { +pr_err ("Failed to request irq %d (timer): %pe\n" ,MCF_IRQ_TIMER , +ERR_PTR (r)); + }clocksource_register_hz (&mcfslt_clk,MCF_BUSCLK );arch/m68k/coldfire/timers.c +15
-16@@ -82,14 +82,6 @@ static irqreturn_t mcftmr_tick(int irq, void *dummy)/***************************************************************************/ -static struct irqaction mcftmr_timer_irq = { - .name ="timer" , - .flags =IRQF_TIMER , - .handler = mcftmr_tick, -}; - -/***************************************************************************/ -static u64 mcftmr_read_clk (struct clocksource *cs) {unsigned long flags;@@ -118,6 +110,8 @@ static struct clocksource mcftmr_clk = {void hw_timer_init (irq_handler_t handler) { +int r; +__raw_writew (MCFTIMER_TMR_DISABLE ,TA (MCFTIMER_TMR )); mcftmr_cycles_per_jiffy =FREQ /HZ ;/* @@ -134,7 +128,11 @@ void hw_timer_init(irq_handler_t handler) timer_interrupt = handler;init_timer_irq (); -setup_irq (MCF_IRQ_TIMER , &mcftmr_timer_irq); + r =request_irq (MCF_IRQ_TIMER , mcftmr_tick,IRQF_TIMER ,"timer" ,NULL ); +if (r) { +pr_err ("Failed to request irq %d (timer): %pe\n" ,MCF_IRQ_TIMER , +ERR_PTR (r)); + }#ifdef CONFIG_HIGHPROFILE coldfire_profile_init ();@@ -170,14 +168,10 @@ irqreturn_t coldfire_profile_tick(int irq, void *dummy)/***************************************************************************/ -static struct irqaction coldfire_profile_irq = { - .name ="profile timer" , - .flags =IRQF_TIMER , - .handler = coldfire_profile_tick, -}; -void coldfire_profile_init (void ) { +int ret; +printk (KERN_INFO "PROFILE: lodging TIMER2 @ %dHz as profile timer\n" ,PROFILEHZ );@@ -188,7 +182,12 @@ void coldfire_profile_init(void)__raw_writew (MCFTIMER_TMR_ENORI |MCFTIMER_TMR_CLK16 |MCFTIMER_TMR_RESTART |MCFTIMER_TMR_ENABLE ,PA (MCFTIMER_TMR )); -setup_irq (MCF_IRQ_PROFILER , &coldfire_profile_irq); + ret =request_irq (MCF_IRQ_PROFILER , coldfire_profile_tick,IRQF_TIMER , +"profile timer" ,NULL ); +if (ret) { +pr_err ("Failed to request irq %d (profile timer): %pe\n" , +MCF_IRQ_PROFILER ,ERR_PTR (ret)); + } }/***************************************************************************/
Hi Greg,
Quoted 5 lines · Greg Ungerer
I have retested and everything works as expected, so:
Tested-by Greg Ungerer <[email protected]>I have applied this to the m68knommu git tree, for next branch.
Thanks
Quoted 8 lines
Review
Quoted 3 lines
void hw_timer_init(irq_handler_t handler) {(quoted diff) +1
-0+ int r;You used 'r' here as the error return value holder.
But in the previous cases you used 'ret'.
I would have used the same name everywhere ('ret' probably being the most commonly used in the kernel).
That was a circus to dodge 80 char limit, i did think about it while making the changes whether to do or not. If 'ret' is used request_irq() line had to be split to two, slightly affecting the readability and since 'r' was a local variable (though conventionally 'ret' or 'err' is used) went ahead that way. Even if 're' is used as the local variable, it would be 81 chars ;)
Let me know if you want to change it.
Regards
afzal
Quoted 6 lines
Quoted 6 lines
arch/m68k/coldfire/sltimers.c +5
-1-setup_irq (MCF_IRQ_TIMER , &mcfslt_timer_irq); + r =request_irq (MCF_IRQ_TIMER , mcfslt_tick,IRQF_TIMER ,"timer" ,NULL ); +if (r) { +pr_err ("Failed to request irq %d (timer): %pe\n" ,MCF_IRQ_TIMER , +ERR_PTR (r)); + }
Greg Ungerer
maintainerHi Afzal,
Quoted 21 lines · afzal mohammed
Hi Greg,
Quoted 5 lines · Greg Ungerer
I have retested and everything works as expected, so:
Tested-by Greg Ungerer <[email protected]>I have applied this to the m68knommu git tree, for next branch.
Thanks
Quoted 8 lines
Review
Quoted 3 lines
void hw_timer_init(irq_handler_t handler) {(quoted diff) +1
-0+ int r;You used 'r' here as the error return value holder.
But in the previous cases you used 'ret'.
I would have used the same name everywhere ('ret' probably being the most commonly used in the kernel).
Quoted 8 lines
That was a circus to dodge 80 char limit, i did think about it while making the changes whether to do or not. If 'ret' is used
request_irq()line had to be split to two, slightly affecting the readability and since 'r' was a local variable (though conventionally 'ret' or 'err' is used) went ahead that way. Even if 're' is used as the local variable, it would be 81 chars ;)Let me know if you want to change it.
Understand. No, no need to change it.
Regards
Greg
Quoted 9 lines
Regards
afzalQuoted 6 lines
Quoted 6 lines
arch/m68k/coldfire/sltimers.c +5
-1-setup_irq (MCF_IRQ_TIMER , &mcfslt_timer_irq); + r =request_irq (MCF_IRQ_TIMER , mcfslt_tick,IRQF_TIMER ,"timer" ,NULL ); +if (r) { +pr_err ("Failed to request irq %d (timer): %pe\n" ,MCF_IRQ_TIMER , +ERR_PTR (r)); + }