ARM: footbridge: replace setup_irq() by request_irq()
Subsystems (3)
PATCH v3 1/1 ARM: footbridge: 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 sub-arch maintainers,
If the patch is okay, please take it thr' your tree.
Regards
afzal
v3:
* Split out from series, also create subarch level patch as Thomas suggested to take it thr' respective maintainers
* Modify string displayed in case of error as suggested by Thomas
* Re-arrange code as required to improve readability
* Remove irrelevant parts from commit message & improve
v2:
* Replace pr_err("request_irq() on %s failed" by
pr_err("%s: request_irq() failed"* Commit message massage
arch/arm/mach-footbridge/dc21285-timer.c | 11 +++-------- arch/arm/mach-footbridge/isa-irq.c | 10 ++++------ arch/arm/mach-footbridge/isa-timer.c | 11 +++-------- 3 files changed, 10 insertions(+), 22 deletions(-)
arch/arm/mach-footbridge/dc21285-timer.c +3 -8
@@ -101,13 +101,6 @@ static irqreturn_t timer1_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static struct irqaction footbridge_timer_irq = { - .name ="dc21285_timer1" , - .handler = timer1_interrupt, - .flags =IRQF_TIMER |IRQF_IRQPOLL , - .dev_id = &ckevt_dc21285, -}; -/* * Set up timer interrupt. */
@@ -118,7 +111,9 @@ void __init footbridge_timer_init(void)clocksource_register_hz (&cksrc_dc21285, rate); -setup_irq (ce->irq, &footbridge_timer_irq); +if (request_irq (ce->irq, timer1_interrupt,IRQF_TIMER |IRQF_IRQPOLL , +"dc21285_timer1" , &ckevt_dc21285)) +pr_err ("Failed to request irq %d (dc21285_timer1)" , ce->irq); ce->cpumask =cpumask_of (smp_processor_id ());clockevents_config_and_register (ce, rate,0x4 ,0xffffff );
arch/arm/mach-footbridge/isa-irq.c +4 -6
@@ -96,11 +96,6 @@ static void isa_irq_handler(struct irq_desc *desc)generic_handle_irq (isa_irq); } -static struct irqaction irq_cascade = { - .handler = no_action, - .name ="cascade" , -}; -static struct resource pic1_resource = { .name ="pic1" , .start =0x20 ,
@@ -146,6 +141,8 @@ void __init isa_init_irq(unsigned int host_irq) }if (host_irq != (unsigned int )-1 ) { +int irq =IRQ_ISA_CASCADE ; +for (irq =_ISA_IRQ (0 ); irq <_ISA_IRQ (8 ); irq++) {irq_set_chip_and_handler (irq, &isa_lo_chip, handle_level_irq);
@@ -160,7 +157,8 @@ void __init isa_init_irq(unsigned int host_irq)request_resource (&ioport_resource, &pic1_resource);request_resource (&ioport_resource, &pic2_resource); -setup_irq (IRQ_ISA_CASCADE , &irq_cascade); +if (request_irq (irq, no_action,0 ,"cascade" ,NULL )) +pr_err ("Failed to request irq %d (cascade)\n" , irq);irq_set_chained_handler (host_irq, isa_irq_handler);
arch/arm/mach-footbridge/isa-timer.c +3 -8
@@ -25,17 +25,12 @@ static irqreturn_t pit_timer_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static struct irqaction pit_timer_irq = { - .name ="pit" , - .handler = pit_timer_interrupt, - .flags =IRQF_TIMER |IRQF_IRQPOLL , - .dev_id = &i8253_clockevent, -}; -void __init isa_timer_init (void ) {clocksource_i8253_init (); -setup_irq (i8253_clockevent.irq, &pit_timer_irq); +if (request_irq (i8253_clockevent.irq, pit_timer_interrupt, +IRQF_TIMER |IRQF_IRQPOLL ,"pit" , &i8253_clockevent)) +pr_err ("Failed to request irq %d(pit)\n" , i8253_clockevent.irq);clockevent_i8253_init (false); }
Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Russell King - ARM Linux admin
maintainerQuoted 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]>---
Hi sub-arch maintainers,If the patch is okay, please take it thr' your tree.
This patch causes a build warning:
arch/arm/mach-footbridge/isa-irq.c:113:15: warning: unused variable 'irq' [-Wunused-variable]
because you introduce a new 'int irq' variable in a sub-block where the parent already declares 'irq', causing the parent 'irq' to be unused.
Hence, I'm dropping this patch.
I think you need to look more carefully at the code you are modifying, and maybe even build test it. Cross compilers are available from kernel.org.
Russell.
Quoted 119 lines
Regards
afzalv3:
* Split out from series, also create subarch level patch as Thomas suggested to take it thr' respective maintainers
* Modify string displayed in case of error as suggested by Thomas
* Re-arrange code as required to improve readability
* Remove irrelevant parts from commit message & improvev2:
* Replace pr_err("request_irq() on %s failed" bypr_err("%s: request_irq() failed"* Commit message massage
arch/arm/mach-footbridge/dc21285-timer.c | 11 +++-------- arch/arm/mach-footbridge/isa-irq.c | 10 ++++------ arch/arm/mach-footbridge/isa-timer.c | 11 +++-------- 3 files changed, 10 insertions(+), 22 deletions(-)arch/arm/mach-footbridge/dc21285-timer.c +3
-8@@ -101,13 +101,6 @@ static irqreturn_t timer1_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static struct irqaction footbridge_timer_irq = { - .name ="dc21285_timer1" , - .handler = timer1_interrupt, - .flags =IRQF_TIMER |IRQF_IRQPOLL , - .dev_id = &ckevt_dc21285, -}; -/* * Set up timer interrupt. */ @@ -118,7 +111,9 @@ void __init footbridge_timer_init(void)clocksource_register_hz (&cksrc_dc21285, rate); -setup_irq (ce->irq, &footbridge_timer_irq); +if (request_irq (ce->irq, timer1_interrupt,IRQF_TIMER |IRQF_IRQPOLL , +"dc21285_timer1" , &ckevt_dc21285)) +pr_err ("Failed to request irq %d (dc21285_timer1)" , ce->irq); ce->cpumask =cpumask_of (smp_processor_id ());clockevents_config_and_register (ce, rate,0x4 ,0xffffff );arch/arm/mach-footbridge/isa-irq.c +4
-6@@ -96,11 +96,6 @@ static void isa_irq_handler(struct irq_desc *desc)generic_handle_irq (isa_irq); } -static struct irqaction irq_cascade = { - .handler = no_action, - .name ="cascade" , -}; -static struct resource pic1_resource = { .name ="pic1" , .start =0x20 ,@@ -146,6 +141,8 @@ void __init isa_init_irq(unsigned int host_irq) }if (host_irq != (unsigned int )-1 ) { +int irq =IRQ_ISA_CASCADE ; +for (irq =_ISA_IRQ (0 ); irq <_ISA_IRQ (8 ); irq++) {irq_set_chip_and_handler (irq, &isa_lo_chip, handle_level_irq);@@ -160,7 +157,8 @@ void __init isa_init_irq(unsigned int host_irq)request_resource (&ioport_resource, &pic1_resource);request_resource (&ioport_resource, &pic2_resource); -setup_irq (IRQ_ISA_CASCADE , &irq_cascade); +if (request_irq (irq, no_action,0 ,"cascade" ,NULL )) +pr_err ("Failed to request irq %d (cascade)\n" , irq);irq_set_chained_handler (host_irq, isa_irq_handler);arch/arm/mach-footbridge/isa-timer.c +3
-8@@ -25,17 +25,12 @@ static irqreturn_t pit_timer_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static struct irqaction pit_timer_irq = { - .name ="pit" , - .handler = pit_timer_interrupt, - .flags =IRQF_TIMER |IRQF_IRQPOLL , - .dev_id = &i8253_clockevent, -}; -void __init isa_timer_init (void ) {clocksource_i8253_init (); -setup_irq (i8253_clockevent.irq, &pit_timer_irq); +if (request_irq (i8253_clockevent.irq, pit_timer_interrupt, +IRQF_TIMER |IRQF_IRQPOLL ,"pit" , &i8253_clockevent)) +pr_err ("Failed to request irq %d(pit)\n" , i8253_clockevent.irq);clockevent_i8253_init (false); }Signature · 7 lines
2.25.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Signature · 2 lines
RMK's Patch system: https://www.armlinux.org.uk/developer/patches/ FTTC broadband for 0.8mile line in suburbia: sync at 10.2Mbps down 587kbps up
Hi Russell,
Quoted 7 lines · Russell King - ARM Linux admin
This patch causes a build warning:
Hence, I'm dropping this patch.
I think you need to look more carefully at the code you are modifying, and maybe even build test it. Cross compilers are available from kernel.org.
Sorry for the sloppy approach.
i build & boot tested only using ARM multi_v7_defconfig which was building only few of my changes, i had the cross compiler. i was trying to rely on kbuild test robot for the other configs earlier, from the begining instead i should have made sure that each modified code builds w/o warning.
i am fixing it.
Regards
afzal
PATCH v4 1/1 ARM: footbridge: replace setup_irq() by request_irq()
In reply to Russell King - ARM Linux adminrequest_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
---
v4:
* Fix build warning in isa-irq.c & ensure no build warnings
v3:
* Split out from series, also create subarch level patch as Thomas suggested to take it thr' respective maintainers
* Modify string displayed in case of error as suggested by Thomas
* Re-arrange code as required to improve readability
* Remove irrelevant parts from commit message & improve
v2:
* Replace pr_err("request_irq() on %s failed" by
pr_err("%s: request_irq() failed"* Commit message massage
arch/arm/mach-footbridge/dc21285-timer.c | 11 +++-------- arch/arm/mach-footbridge/isa-irq.c | 10 ++++------ arch/arm/mach-footbridge/isa-timer.c | 11 +++-------- 3 files changed, 10 insertions(+), 22 deletions(-)
arch/arm/mach-footbridge/dc21285-timer.c +3 -8
@@ -101,13 +101,6 @@ static irqreturn_t timer1_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static struct irqaction footbridge_timer_irq = { - .name ="dc21285_timer1" , - .handler = timer1_interrupt, - .flags =IRQF_TIMER |IRQF_IRQPOLL , - .dev_id = &ckevt_dc21285, -}; -/* * Set up timer interrupt. */
@@ -118,7 +111,9 @@ void __init footbridge_timer_init(void)clocksource_register_hz (&cksrc_dc21285, rate); -setup_irq (ce->irq, &footbridge_timer_irq); +if (request_irq (ce->irq, timer1_interrupt,IRQF_TIMER |IRQF_IRQPOLL , +"dc21285_timer1" , &ckevt_dc21285)) +pr_err ("Failed to request irq %d (dc21285_timer1)" , ce->irq); ce->cpumask =cpumask_of (smp_processor_id ());clockevents_config_and_register (ce, rate,0x4 ,0xffffff );
arch/arm/mach-footbridge/isa-irq.c +4 -6
@@ -96,11 +96,6 @@ static void isa_irq_handler(struct irq_desc *desc)generic_handle_irq (isa_irq); } -static struct irqaction irq_cascade = { - .handler = no_action, - .name ="cascade" , -}; -static struct resource pic1_resource = { .name ="pic1" , .start =0x20 ,
@@ -160,7 +155,10 @@ void __init isa_init_irq(unsigned int host_irq)request_resource (&ioport_resource, &pic1_resource);request_resource (&ioport_resource, &pic2_resource); -setup_irq (IRQ_ISA_CASCADE , &irq_cascade); + + irq =IRQ_ISA_CASCADE ; +if (request_irq (irq, no_action,0 ,"cascade" ,NULL )) +pr_err ("Failed to request irq %u (cascade)\n" , irq);irq_set_chained_handler (host_irq, isa_irq_handler);
arch/arm/mach-footbridge/isa-timer.c +3 -8
@@ -25,17 +25,12 @@ static irqreturn_t pit_timer_interrupt(int irq, void *dev_id)return IRQ_HANDLED ; } -static struct irqaction pit_timer_irq = { - .name ="pit" , - .handler = pit_timer_interrupt, - .flags =IRQF_TIMER |IRQF_IRQPOLL , - .dev_id = &i8253_clockevent, -}; -void __init isa_timer_init (void ) {clocksource_i8253_init (); -setup_irq (i8253_clockevent.irq, &pit_timer_irq); +if (request_irq (i8253_clockevent.irq, pit_timer_interrupt, +IRQF_TIMER |IRQF_IRQPOLL ,"pit" , &i8253_clockevent)) +pr_err ("Failed to request irq %d(pit)\n" , i8253_clockevent.irq);clockevent_i8253_init (false); }
Signature · 1 line
2.25.1