powerpc: Replace setup_irq() by request_irq()
Subsystems (4)
PATCH v3 1/1 powerpc: 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 powerpc maintainers,
if okay w/ this change, please consider taking it thr' your tree, else please let me know.
Regards
afzal
Link to v2 & v1,
[v2] https://lkml.kernel.org/r/[email protected]
[v1] https://lkml.kernel.org/r/[email protected]
v3:
* Split out from tree wide series, as Thomas suggested to get it thr' respective maintainers
* Modify pr_err displayed in case of error
* Re-arrange code & choose pr_err args 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/powerpc/platforms/85xx/mpc85xx_cds.c | 10 +++----- arch/powerpc/platforms/8xx/cpm1.c | 9 ++----- arch/powerpc/platforms/8xx/m8xx_setup.c | 9 ++----- arch/powerpc/platforms/chrp/setup.c | 14 ++++------- arch/powerpc/platforms/powermac/pic.c | 29 +++++++++-------------- arch/powerpc/platforms/powermac/smp.c | 12 ++++------ 6 files changed, 28 insertions(+), 55 deletions(-)
arch/powerpc/platforms/85xx/mpc85xx_cds.c +3 -7
@@ -218,12 +218,6 @@ static irqreturn_t mpc85xx_8259_cascade_action(int irq, void *dev_id) {return IRQ_HANDLED ; } - -static struct irqaction mpc85xxcds_8259_irqaction = { - .handler = mpc85xx_8259_cascade_action, - .flags =IRQF_SHARED |IRQF_NO_THREAD , - .name ="8259 cascade" , -};#endif /* PPC_I8259 */ #endif /* CONFIG_PCI */
@@ -271,7 +265,9 @@ static int mpc85xx_cds_8259_attach(void)* disabled when the last user of the shared IRQ line frees their * interrupt. */ -if ((ret =setup_irq (cascade_irq, &mpc85xxcds_8259_irqaction))) { + ret =request_irq (cascade_irq, mpc85xx_8259_cascade_action, +IRQF_SHARED |IRQF_NO_THREAD ,"8259 cascade" ,NULL ); +if (ret) {printk (KERN_ERR "Failed to setup cascade interrupt\n" );return ret; }
arch/powerpc/platforms/8xx/cpm1.c +2 -7
@@ -120,12 +120,6 @@ static irqreturn_t cpm_error_interrupt(int irq, void *dev)return IRQ_HANDLED ; } -static struct irqaction cpm_error_irqaction = { - .handler = cpm_error_interrupt, - .flags =IRQF_NO_THREAD , - .name ="error" , -}; -static const struct irq_domain_ops cpm_pic_host_ops = { .map = cpm_pic_host_map, };
@@ -187,7 +181,8 @@ unsigned int __init cpm_pic_init(void)if (!eirq) goto end; -if (setup_irq (eirq, &cpm_error_irqaction)) +if (request_irq (eirq, cpm_error_interrupt,IRQF_NO_THREAD ,"error" , +NULL ))printk (KERN_ERR "Could not allocate CPM error IRQ!" );setbits32 (&cpic_reg->cpic_cicr,CICR_IEN );
arch/powerpc/platforms/8xx/m8xx_setup.c +2 -7
@@ -39,12 +39,6 @@ static irqreturn_t timebase_interrupt(int irq, void *dev)return IRQ_HANDLED ; } -static struct irqaction tbint_irqaction = { - .handler = timebase_interrupt, - .flags =IRQF_NO_THREAD , - .name ="tbint" , -}; -/* per-board overridable init_internal_rtc() function. */ void __init __attribute__ ((weak))init_internal_rtc (void )
@@ -157,7 +151,8 @@ void __init mpc8xx_calibrate_decr(void) (TBSCR_TBF | TBSCR_TBE));immr_unmap (sys_tmr2); -if (setup_irq (virq, &tbint_irqaction)) +if (request_irq (virq, timebase_interrupt,IRQF_NO_THREAD ,"tbint" , +NULL ))panic ("Could not allocate timer IRQ!" ); }
arch/powerpc/platforms/chrp/setup.c +5 -9
@@ -451,13 +451,6 @@ static void __init chrp_find_openpic(void)of_node_put (np); } -#if defined(CONFIG_VT ) && defined(CONFIG_INPUT_ADBHID ) && defined(CONFIG_XMON ) -static struct irqaction xmon_irqaction = { - .handler = xmon_irq, - .name ="XMON break" , -}; -#endif -static void __init chrp_find_8259 (void ) {struct device_node *np, *pic =NULL ;
@@ -541,8 +534,11 @@ static void __init chrp_init_IRQ(void)if (of_node_is_type (kbd->parent,"adb" ))break ;of_node_put (kbd); -if (kbd) -setup_irq (HYDRA_INT_ADB_NMI , &xmon_irqaction); +if (kbd) { +if (request_irq (HYDRA_INT_ADB_NMI , xmon_irq,0 ,"XMON break" , +NULL )) +pr_err ("Failed to register XMON break interrupt\n" ); + }#endif }
arch/powerpc/platforms/powermac/pic.c +11 -18
@@ -250,20 +250,6 @@ static unsigned int pmac_pic_get_irq(void)return irq_linear_revmap (pmac_pic_host, irq); } -#ifdef CONFIG_XMON -static struct irqaction xmon_action = { - .handler = xmon_irq, - .flags =IRQF_NO_THREAD , - .name ="NMI - XMON" -}; -#endif - -static struct irqaction gatwick_cascade_action = { - .handler = gatwick_action, - .flags =IRQF_NO_THREAD , - .name ="cascade" , -}; -static int pmac_pic_host_match (struct irq_domain *h,struct device_node *node,enum irq_domain_bus_token bus_token) {
@@ -384,12 +370,17 @@ static void __init pmac_pic_probe_oldstyle(void)out_le32 (&pmac_irq_hw[i]->enable,0 );/* Hookup cascade irq */ -if (slave && pmac_irq_cascade) -setup_irq (pmac_irq_cascade, &gatwick_cascade_action); +if (slave && pmac_irq_cascade) { +if (request_irq (pmac_irq_cascade, gatwick_action, +IRQF_NO_THREAD ,"cascade" ,NULL )) +pr_err ("Failed to register cascade interrupt\n" ); + }printk (KERN_INFO "irq: System has %d possible interrupts\n" , max_irqs);#ifdef CONFIG_XMON -setup_irq (irq_create_mapping (NULL ,20 ), &xmon_action); + i =irq_create_mapping (NULL ,20 ); +if (request_irq (i, xmon_irq,IRQF_NO_THREAD ,"NMI - XMON" ,NULL )) +pr_err ("Failed to register NMI-XMON interrupt\n" );#endif }
@@ -441,7 +432,9 @@ static void __init pmac_pic_setup_mpic_nmi(struct mpic *mpic) nmi_irq =irq_of_parse_and_map (pswitch,0 );if (nmi_irq) {mpic_irq_set_priority (nmi_irq,9 ); -setup_irq (nmi_irq, &xmon_action); +if (request_irq (nmi_irq, xmon_irq,IRQF_NO_THREAD , +"NMI - XMON" ,NULL )) +pr_err ("Failed to register NMI-XMON interrupt\n" ); }of_node_put (pswitch); }
arch/powerpc/platforms/powermac/smp.c +5 -7
@@ -399,21 +399,19 @@ static int __init smp_psurge_kick_cpu(int nr)return 0 ; } -static struct irqaction psurge_irqaction = { - .handler = psurge_ipi_intr, - .flags =IRQF_PERCPU |IRQF_NO_THREAD , - .name ="primary IPI" , -}; -static void __init smp_psurge_setup_cpu (int cpu_nr) { +unsigned long flags =IRQF_PERCPU |IRQF_NO_THREAD ; +int irq; +if (cpu_nr !=0 || !psurge_start)return ;/* reset the entry point so if we get another intr we won't * try to startup again */ out_be32 (psurge_start,0x100 ); -if (setup_irq (irq_create_mapping (NULL ,30 ), &psurge_irqaction)) + irq =irq_create_mapping (NULL ,30 ); +if (request_irq (irq, psurge_ipi_intr, flags,"primary IPI" ,NULL ))printk (KERN_ERR "Couldn't get primary IPI interrupt" ); }
Signature · 1 line
2.25.1
PATCH v4 1/1 powerpc: 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
---
v4:
* pass non-NULL dev_id while requesting shared irq in mpc85xx_cds.c, as
request_irq() can fail due to sanity check, which is not done in setup_irq()
v3:
* Split out from tree wide series, as Thomas suggested to get it thr' respective maintainers
* Modify pr_err displayed in case of error
* Re-arrange code & choose pr_err args 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/powerpc/platforms/85xx/mpc85xx_cds.c | 11 ++++----- arch/powerpc/platforms/8xx/cpm1.c | 9 ++----- arch/powerpc/platforms/8xx/m8xx_setup.c | 9 ++----- arch/powerpc/platforms/chrp/setup.c | 14 ++++------- arch/powerpc/platforms/powermac/pic.c | 29 +++++++++-------------- arch/powerpc/platforms/powermac/smp.c | 12 ++++------ 6 files changed, 29 insertions(+), 55 deletions(-)
arch/powerpc/platforms/85xx/mpc85xx_cds.c +4 -7
@@ -218,12 +218,6 @@ static irqreturn_t mpc85xx_8259_cascade_action(int irq, void *dev_id) {return IRQ_HANDLED ; } - -static struct irqaction mpc85xxcds_8259_irqaction = { - .handler = mpc85xx_8259_cascade_action, - .flags =IRQF_SHARED |IRQF_NO_THREAD , - .name ="8259 cascade" , -};#endif /* PPC_I8259 */ #endif /* CONFIG_PCI */
@@ -271,7 +265,10 @@ static int mpc85xx_cds_8259_attach(void)* disabled when the last user of the shared IRQ line frees their * interrupt. */ -if ((ret =setup_irq (cascade_irq, &mpc85xxcds_8259_irqaction))) { + ret =request_irq (cascade_irq, mpc85xx_8259_cascade_action, +IRQF_SHARED |IRQF_NO_THREAD ,"8259 cascade" , + cascade_node); +if (ret) {printk (KERN_ERR "Failed to setup cascade interrupt\n" );return ret; }
arch/powerpc/platforms/8xx/cpm1.c +2 -7
@@ -120,12 +120,6 @@ static irqreturn_t cpm_error_interrupt(int irq, void *dev)return IRQ_HANDLED ; } -static struct irqaction cpm_error_irqaction = { - .handler = cpm_error_interrupt, - .flags =IRQF_NO_THREAD , - .name ="error" , -}; -static const struct irq_domain_ops cpm_pic_host_ops = { .map = cpm_pic_host_map, };
@@ -187,7 +181,8 @@ unsigned int __init cpm_pic_init(void)if (!eirq) goto end; -if (setup_irq (eirq, &cpm_error_irqaction)) +if (request_irq (eirq, cpm_error_interrupt,IRQF_NO_THREAD ,"error" , +NULL ))printk (KERN_ERR "Could not allocate CPM error IRQ!" );setbits32 (&cpic_reg->cpic_cicr,CICR_IEN );
arch/powerpc/platforms/8xx/m8xx_setup.c +2 -7
@@ -39,12 +39,6 @@ static irqreturn_t timebase_interrupt(int irq, void *dev)return IRQ_HANDLED ; } -static struct irqaction tbint_irqaction = { - .handler = timebase_interrupt, - .flags =IRQF_NO_THREAD , - .name ="tbint" , -}; -/* per-board overridable init_internal_rtc() function. */ void __init __attribute__ ((weak))init_internal_rtc (void )
@@ -157,7 +151,8 @@ void __init mpc8xx_calibrate_decr(void) (TBSCR_TBF | TBSCR_TBE));immr_unmap (sys_tmr2); -if (setup_irq (virq, &tbint_irqaction)) +if (request_irq (virq, timebase_interrupt,IRQF_NO_THREAD ,"tbint" , +NULL ))panic ("Could not allocate timer IRQ!" ); }
arch/powerpc/platforms/chrp/setup.c +5 -9
@@ -451,13 +451,6 @@ static void __init chrp_find_openpic(void)of_node_put (np); } -#if defined(CONFIG_VT ) && defined(CONFIG_INPUT_ADBHID ) && defined(CONFIG_XMON ) -static struct irqaction xmon_irqaction = { - .handler = xmon_irq, - .name ="XMON break" , -}; -#endif -static void __init chrp_find_8259 (void ) {struct device_node *np, *pic =NULL ;
@@ -541,8 +534,11 @@ static void __init chrp_init_IRQ(void)if (of_node_is_type (kbd->parent,"adb" ))break ;of_node_put (kbd); -if (kbd) -setup_irq (HYDRA_INT_ADB_NMI , &xmon_irqaction); +if (kbd) { +if (request_irq (HYDRA_INT_ADB_NMI , xmon_irq,0 ,"XMON break" , +NULL )) +pr_err ("Failed to register XMON break interrupt\n" ); + }#endif }
arch/powerpc/platforms/powermac/pic.c +11 -18
@@ -250,20 +250,6 @@ static unsigned int pmac_pic_get_irq(void)return irq_linear_revmap (pmac_pic_host, irq); } -#ifdef CONFIG_XMON -static struct irqaction xmon_action = { - .handler = xmon_irq, - .flags =IRQF_NO_THREAD , - .name ="NMI - XMON" -}; -#endif - -static struct irqaction gatwick_cascade_action = { - .handler = gatwick_action, - .flags =IRQF_NO_THREAD , - .name ="cascade" , -}; -static int pmac_pic_host_match (struct irq_domain *h,struct device_node *node,enum irq_domain_bus_token bus_token) {
@@ -384,12 +370,17 @@ static void __init pmac_pic_probe_oldstyle(void)out_le32 (&pmac_irq_hw[i]->enable,0 );/* Hookup cascade irq */ -if (slave && pmac_irq_cascade) -setup_irq (pmac_irq_cascade, &gatwick_cascade_action); +if (slave && pmac_irq_cascade) { +if (request_irq (pmac_irq_cascade, gatwick_action, +IRQF_NO_THREAD ,"cascade" ,NULL )) +pr_err ("Failed to register cascade interrupt\n" ); + }printk (KERN_INFO "irq: System has %d possible interrupts\n" , max_irqs);#ifdef CONFIG_XMON -setup_irq (irq_create_mapping (NULL ,20 ), &xmon_action); + i =irq_create_mapping (NULL ,20 ); +if (request_irq (i, xmon_irq,IRQF_NO_THREAD ,"NMI - XMON" ,NULL )) +pr_err ("Failed to register NMI-XMON interrupt\n" );#endif }
@@ -441,7 +432,9 @@ static void __init pmac_pic_setup_mpic_nmi(struct mpic *mpic) nmi_irq =irq_of_parse_and_map (pswitch,0 );if (nmi_irq) {mpic_irq_set_priority (nmi_irq,9 ); -setup_irq (nmi_irq, &xmon_action); +if (request_irq (nmi_irq, xmon_irq,IRQF_NO_THREAD , +"NMI - XMON" ,NULL )) +pr_err ("Failed to register NMI-XMON interrupt\n" ); }of_node_put (pswitch); }
arch/powerpc/platforms/powermac/smp.c +5 -7
@@ -399,21 +399,19 @@ static int __init smp_psurge_kick_cpu(int nr)return 0 ; } -static struct irqaction psurge_irqaction = { - .handler = psurge_ipi_intr, - .flags =IRQF_PERCPU |IRQF_NO_THREAD , - .name ="primary IPI" , -}; -static void __init smp_psurge_setup_cpu (int cpu_nr) { +unsigned long flags =IRQF_PERCPU |IRQF_NO_THREAD ; +int irq; +if (cpu_nr !=0 || !psurge_start)return ;/* reset the entry point so if we get another intr we won't * try to startup again */ out_be32 (psurge_start,0x100 ); -if (setup_irq (irq_create_mapping (NULL ,30 ), &psurge_irqaction)) + irq =irq_create_mapping (NULL ,30 ); +if (request_irq (irq, psurge_ipi_intr, flags,"primary IPI" ,NULL ))printk (KERN_ERR "Couldn't get primary IPI interrupt" ); }
Signature · 1 line
2.18.0
Hi Michael Ellerman,
Quoted 11 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]>
This patch is seen in next-test branch for last 4-5 days, i don't know exactly how powerpc workflow happens, so a question - this would be appear in linux-next soon right ? (for last 4-5 days i had been daily checking -next, but not appearing there).
Sorry for the query for this trivial patch, i am asking because Thomas had mentioned [1] to get setup_irq() cleanup thr' respective maintainers (earlier it was part of tree-wide series), check -next after -rc6 & resubmit ignored ones to him, this patch is neither in -next, neither ignored, so i am at a loss what to do :(
And i would prefer to let each patch go thr' respective maintainers so that only least patches has to be sent to Thomas. Bigger problem is that core removal patch of setup_irq() can be sent to him only after making sure that it's tree-wide usage has been removed.
Regards
afzal
Michael Ellerman
reviewerQuoted 10 lines · afzal mohammed
Hi Michael Ellerman,
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 8 lines
Quoted 3 lines
[1] https://lkml.kernel.org/r/alpine.DEB.2.20.1710191609480.1971@nanos
Signed-off-by afzal mohammed <[email protected]>This patch is seen in next-test branch for last 4-5 days, i don't know exactly how powerpc workflow happens, so a question - this would be appear in linux-next soon right ? (for last 4-5 days i had been daily checking -next, but not appearing there).
Yeah it will appear in next "soon".
It's been stuck behind a big series that has hit some bugs during testing, so that has delayed me pushing the whole branch.
Quoted 5 lines
Sorry for the query for this trivial patch, i am asking because Thomas had mentioned [1] to get
setup_irq()cleanup thr' respective maintainers (earlier it was part of tree-wide series), check -next after -rc6 & resubmit ignored ones to him, this patch is neither in -next, neither ignored, so i am at a loss what to do :(
That's OK. I will take this one, you can stop worrying about it.
It should appear in next tomorrow or Friday.
cheers
Michael Ellerman
AppliedQuoted 11 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]>
Applied to powerpc next, thanks.
https://git.kernel.org/powerpc/c/b4f00d5b2098320a0d4c4a6d31099bc0c9a85b02
cheers