mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 19:29:37 +00:00
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 Signed-off-by: afzal mohammed <afzal.mohd.ma@gmail.com> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> Link: https://lore.kernel.org/r/20200312064256.18735-1-afzal.mohd.ma@gmail.com
This commit is contained in:
parent
addf3727ad
commit
b4f00d5b20
6 changed files with 29 additions and 55 deletions
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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!");
|
||||
}
|
||||
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
|
|
|
@ -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");
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue