Re: [PATCH] Fix early request_irq

[Kumar Gala]

Andrew,

Please apply this patch from Tom Rini.  I've tested it for PowerPC MPC85xx
parts and it works.

Signed-off-by: Kumar Gala <kumar.gala@xxxxxxxxxxxxx>


- kumar

On Fri, 29 Oct 2004, Tom Rini wrote:

> On Fri, Oct 29, 2004 at 03:21:04PM +0100, Christoph Hellwig wrote:
> > On Fri, Oct 29, 2004 at 05:05:09PM +0300, Pantelis Antoniou wrote:
> > > Hi there
> > >
> > > The recent consolidation of the IRQ code has caused
> > > a number of PPC embedded cpus to stop working.
> > >
> > > The problem is that on init_IRQ these platforms call
> > > request_irq very early, which in turn calls kmalloc
> > > without the memory subsystem being initialized.
> > >
> > > The following patch fixes it by keeping a small static
> > > array of irqactions just for this purpose.
> >
> > This is bogus.  Switch them to use setup_irq instead like
> > I did for pmac.
>
> I wish you would have updated everyone else :)  Spreading to a slightly
> larget audiance, here's a patch which backs out the fix Randy Vinson
> came up with, and makes i8259_init() and openpic_hookup_cascade() use
> setup_irq (tested on LoPEC).  This also converts the rest of the
> request_irq callers that were expecting the old behavior (psurge SMP,
> chrp xmon, 85xx, some 82xx).  This is more untested, but looks correct.
> I've left 8xx alone in this as it needs other changes before it would
> make sense.
>
> Signed-off-by: Tom Rini <trini@xxxxxxxxxxxxxxxxxxx>
>
> --- 1.36/arch/ppc/platforms/chrp_setup.c	2004-10-27 15:05:16
> -07:00
> +++ edited/arch/ppc/platforms/chrp_setup.c	2004-10-29 08:24:31
> -07:00
> @@ -371,15 +371,13 @@
>  	}
>  }
>
> -static int __init
> -chrp_request_cascade(void)
> -{
> -	/* We have a cascade on OpenPIC IRQ 0, Linux IRQ 16 */
> -	openpic_hookup_cascade(NUM_8259_INTERRUPTS, "82c59 cascade",
> -			       i8259_irq);
> -	return 0;
> -}
> -arch_initcall(chrp_request_cascade);
> +#if defined(CONFIG_VT) && defined(CONFIG_INPUT_ADBHID) && defined(XMON)
> +static struct irqaction xmon_irqaction = {
> +	.handler = xmon_irq,
> +	.mask = CPU_MASK_NONE,
> +	.name = "XMON break",
> +};
> +#endif
>
>  void __init chrp_init_IRQ(void)
>  {
> @@ -410,6 +408,9 @@
>  	OpenPIC_NumInitSenses = NR_IRQS - NUM_8259_INTERRUPTS;
>
>  	openpic_init(NUM_8259_INTERRUPTS);
> +	/* We have a cascade on OpenPIC IRQ 0, Linux IRQ 16 */
> +	openpic_hookup_cascade(NUM_8259_INTERRUPTS, "82c59 cascade",
> +			       i8259_irq);
>
>  	for (i = 0; i < NUM_8259_INTERRUPTS; i++)
>  		irq_desc[i].handler = &i8259_pic;
> @@ -423,7 +424,7 @@
>  		    && strcmp(kbd->parent->type, "adb") == 0)
>  			break;
>  	if (kbd)
> -		request_irq(HYDRA_INT_ADB_NMI, xmon_irq, 0, "XMON
> break", 0);
> +		setup_irq(HYDRA_INT_ADB_NMI, &xmon_irqaction);
>  #endif
>  }
>
> --- 1.27/arch/ppc/platforms/lopec.c	2004-10-27 15:05:16 -07:00
> +++ edited/arch/ppc/platforms/lopec.c	2004-10-29 08:08:28 -07:00
> @@ -258,17 +258,6 @@
>  }
>  #endif /* BLK_DEV_IDE */
>
> -static int __init
> -lopec_request_cascade(void)
> -{
> -	/* We have a cascade on OpenPIC IRQ 0, Linux IRQ 16 */
> -	openpic_hookup_cascade(NUM_8259_INTERRUPTS, "82c59 cascade",
> -			&i8259_irq);
> -
> -	return 0;
> -}
> -arch_initcall(lopec_request_cascade);
> -
>  static void __init
>  lopec_init_IRQ(void)
>  {
> @@ -281,6 +270,10 @@
>  	OpenPIC_NumInitSenses = sizeof(lopec_openpic_initsenses);
>
>  	mpc10x_set_openpic();
> +
> +	/* We have a cascade on OpenPIC IRQ 0, Linux IRQ 16 */
> +	openpic_hookup_cascade(NUM_8259_INTERRUPTS, "82c59 cascade",
> +			&i8259_irq);
>
>  	/* Map i8259 interrupts */
>  	for(i = 0; i < NUM_8259_INTERRUPTS; i++)
> --- 1.19/arch/ppc/platforms/mcpn765.c	2004-10-27 15:05:16 -07:00
> +++ edited/arch/ppc/platforms/mcpn765.c	2004-10-29 08:08:28 -07:00
> @@ -363,15 +363,6 @@
>  	return;
>  }
>
> -static int __init
> -mcpn765_request_cascade(void)
> -{
> -	openpic_hookup_cascade(NUM_8259_INTERRUPTS, "82c59 cascade",
> -			i8259_irq);
> -	return 0;
> -}
> -arch_initcall(mcpn765_request_cascade);
> -
>  /*
>   * Interrupt setup and service.
>   * Have MPIC on HAWK and cascaded 8259s on VIA 82586 cascaded to MPIC.
> @@ -385,6 +376,8 @@
>  		ppc_md.progress("init_irq: enter", 0);
>
>  	openpic_init(NUM_8259_INTERRUPTS);
> +	openpic_hookup_cascade(NUM_8259_INTERRUPTS, "82c59 cascade",
> +			i8259_irq);
>
>  	for(i=0; i < NUM_8259_INTERRUPTS; i++)
>  		irq_desc[i].handler = &i8259_pic;
> --- 1.11/arch/ppc/platforms/mvme5100.c	2004-10-27 15:05:16 -07:00
> +++ edited/arch/ppc/platforms/mvme5100.c	2004-10-29 09:01:35
> -07:00
> @@ -204,17 +204,6 @@
>  	return;
>  }
>
> -static int __init
> -mvme5100_request_cascade(void)
> -{
> -#ifdef CONFIG_MVME5100_IPMC761_PRESENT
> -	openpic_hookup_cascade(NUM_8259_INTERRUPTS, "82c59 cascade",
> -			&i8259_irq);
> -#endif
> -	return 0;
> -}
> -arch_initcall(mvme5100_request_cascade);
> -
>  /*
>   * Interrupt setup and service.
>   * Have MPIC on HAWK and cascaded 8259s on Winbond cascaded to MPIC.
> @@ -232,12 +221,14 @@
>  	openpic_set_sources(0, 16, OpenPIC_Addr + 0x10000);
>  #ifdef CONFIG_MVME5100_IPMC761_PRESENT
>  	openpic_init(NUM_8259_INTERRUPTS);
> +	openpic_hookup_cascade(NUM_8259_INTERRUPTS, "82c59 cascade",
> +			&i8259_irq);
>
>  	/* Map i8259 interrupts. */
>  	for (i = 0; i < NUM_8259_INTERRUPTS; i++)
>  		irq_desc[i].handler = &i8259_pic;
>
> -	i8259_init((long)NULL);
> +	i8259_init(0);
>  #else
>  	openpic_init(0);
>  #endif
> --- 1.20/arch/ppc/platforms/pmac_smp.c	2004-09-07 23:32:57 -07:00
> +++ edited/arch/ppc/platforms/pmac_smp.c	2004-10-29 08:24:27
> -07:00
> @@ -405,6 +405,13 @@
>  	smp_tb_synchronized = 1;
>  }
>
> +static struct irqaction psurge_irqaction = {
> +	.handler = psurge_primary_intr,
> +	.flags = SA_INTERRUPT,
> +	.mask = CPU_MASK_NONE,
> +	.name = "primary IPI",
> +};
> +
>  static void __init smp_psurge_setup_cpu(int cpu_nr)
>  {
>
> @@ -421,7 +428,7 @@
>  		/* reset the entry point so if we get another intr we
> won't
>  		 * try to startup again */
>  		out_be32(psurge_start, 0x100);
> -		if (request_irq(30, psurge_primary_intr, SA_INTERRUPT,
> "primary IPI", NULL))
> +		if (setup_irq(30, &psurge_irqaction))
>  			printk(KERN_ERR "Couldn't get primary IPI
> interrupt");
>  	}
>
> --- 1.23/arch/ppc/platforms/pplus.c	2004-10-27 15:05:16 -07:00
> +++ edited/arch/ppc/platforms/pplus.c	2004-10-29 08:08:28 -07:00
> @@ -654,16 +654,6 @@
>  		return irq;
>  }
>
> -static int __init
> -pplus_request_cascade(void)
> -{
> -	if (OpenPIC_Addr != NULL)
> -		openpic_hookup_cascade(NUM_8259_INTERRUPTS, "82c59
> cascade",
> -				i8259_irq);
> -	return 0;
> -}
> -arch_initcall(pplus_request_cascade);
> -
>  static void __init pplus_init_IRQ(void)
>  {
>  	int i;
> @@ -678,6 +668,8 @@
>
>  		openpic_set_sources(0, 16, OpenPIC_Addr + 0x10000);
>  		openpic_init(NUM_8259_INTERRUPTS);
> +		openpic_hookup_cascade(NUM_8259_INTERRUPTS, "82c59
> cascade",
> +					i8259_irq);
>  		ppc_md.get_irq = openpic_get_irq;
>  	}
>
> --- 1.58/arch/ppc/platforms/prep_setup.c	2004-10-28 13:55:20
> -07:00
> +++ edited/arch/ppc/platforms/prep_setup.c	2004-10-29 08:08:28
> -07:00
> @@ -958,17 +958,6 @@
>  	}
>  }
>
> -static int __init
> -prep_request_cascade(void)
> -{
> -	if (OpenPIC_Addr != NULL)
> -		/* We have a cascade on OpenPIC IRQ 0, Linux IRQ 16 */
> -		openpic_hookup_cascade(NUM_8259_INTERRUPTS, "82c59
> cascade",
> -				i8259_irq);
> -	return 0;
> -}
> -arch_initcall(prep_request_cascade);
> -
>  static void __init
>  prep_init_IRQ(void)
>  {
> @@ -977,6 +966,9 @@
>
>  	if (OpenPIC_Addr != NULL) {
>  		openpic_init(NUM_8259_INTERRUPTS);
> +		/* We have a cascade on OpenPIC IRQ 0, Linux IRQ 16 */
> +		openpic_hookup_cascade(NUM_8259_INTERRUPTS, "82c59
> cascade",
> +				       i8259_irq);
>  	}
>  	for ( i = 0 ; i < NUM_8259_INTERRUPTS ; i++ )
>  		irq_desc[i].handler = &i8259_pic;
> --- 1.21/arch/ppc/platforms/sandpoint.c	2004-10-27 15:55:36 -07:00
> +++ edited/arch/ppc/platforms/sandpoint.c	2004-10-29 08:08:28
> -07:00
> @@ -383,15 +383,6 @@
>
>  arch_initcall(sandpoint_request_io);
>
> -static int __init
> -sandpoint_request_cascade(void)
> -{
> -	openpic_hookup_cascade(NUM_8259_INTERRUPTS, "82c59 cascade",
> -			i8259_irq);
> -	return 0;
> -}
> -arch_initcall(sandpoint_request_cascade);
> -
>  /*
>   * Interrupt setup and service.  Interrrupts on the Sandpoint come
>   * from the four PCI slots plus the 8259 in the Winbond Super I/O
> (SIO).
> @@ -407,6 +398,8 @@
>  	OpenPIC_NumInitSenses = sizeof(sandpoint_openpic_initsenses);
>
>  	mpc10x_set_openpic();
> +	openpic_hookup_cascade(NUM_8259_INTERRUPTS, "82c59 cascade",
> +			i8259_irq);
>
>  	/*
>  	 * openpic_init() has set up irq_desc[16-31] to be openpic
> --- 1.9/arch/ppc/platforms/sbc82xx.c	2004-10-18 22:26:40 -07:00
> +++ edited/arch/ppc/platforms/sbc82xx.c	2004-10-29 08:25:12 -07:00
> @@ -146,6 +146,13 @@
>  	return IRQ_HANDLED;
>  }
>
> +static struct irqaction sbc82xx_i8259_irqaction = {
> +	.handler = sbc82xx_i8259_demux,
> +	.flags = SA_INTERRUPT,
> +	.mask = CPU_MASK_NONE,
> +	.name = "i8259 demux",
> +};
> +
>  void __init sbc82xx_init_IRQ(void)
>  {
>  	volatile memctl_cpm2_t *mc = &cpm2_immr->im_memctl;
> @@ -186,8 +193,7 @@
>  	sbc82xx_i8259_map[1] = sbc82xx_i8259_mask; /* Set interrupt mask
> */
>
>  	/* Request cascade IRQ */
> -	if (request_irq(SIU_INT_IRQ6, sbc82xx_i8259_demux, SA_INTERRUPT,
> -			"i8259 demux", 0)) {
> +	if (setup_irq(SIU_INT_IRQ6, &sbc82xx_i8259_irqaction)) {
>  		printk("Installation of i8259 IRQ demultiplexer
> failed.\n");
>  	}
>  }
> --- 1.2/arch/ppc/platforms/85xx/mpc8560_ads.c	2004-10-18 22:26:40
> -07:00
> +++ edited/arch/ppc/platforms/85xx/mpc8560_ads.c	2004-10-29
> 08:33:52 -07:00
> @@ -150,6 +150,13 @@
>  	return IRQ_HANDLED;
>  }
>
> +static struct irqaction cpm2_irqaction = {
> +	.handler = cpm2_cascade,
> +	.flags = SA_INTERRUPT,
> +	.mask = CPU_MASK_NONE,
> +	.name = "cpm2_cascade",
> +};
> +
>  static void __init
>  mpc8560_ads_init_IRQ(void)
>  {
> @@ -173,7 +180,7 @@
>  	immap->im_intctl.ic_scprrh = 0x05309770;
>  	immap->im_intctl.ic_scprrl = 0x05309770;
>
> -	request_irq(MPC85xx_IRQ_CPM, cpm2_cascade, SA_INTERRUPT,
> "cpm2_cascade", NULL);
> +	setup_irq(MPC85xx_IRQ_CPM, &cpm2_irqaction);
>
>  	return;
>  }
> --- 1.4/arch/ppc/platforms/85xx/mpc85xx_cds_common.c	2004-10-18
> 22:26:40 -07:00
> +++ edited/arch/ppc/platforms/85xx/mpc85xx_cds_common.c	2004-10-29
> 08:33:46 -07:00
> @@ -193,6 +193,13 @@
>  	while((irq = cpm2_get_irq(regs)) >= 0)
>  		__do_IRQ(irq, regs);
>  }
> +
> +static struct irqaction cpm2_irqaction = {
> +	.handler = cpm2_cascade,
> +	.flags = SA_INTERRUPT,
> +	.mask = CPU_MASK_NONE,
> +	.name = "cpm2_cascade",
> +};
>  #endif /* CONFIG_CPM2 */
>
>  void __init
> @@ -235,7 +242,7 @@
>  	immap->im_intctl.ic_scprrh = 0x05309770;
>  	immap->im_intctl.ic_scprrl = 0x05309770;
>
> -	request_irq(MPC85xx_IRQ_CPM, cpm2_cascade, SA_INTERRUPT,
> "cpm2_cascade", NULL);
> +	setup_irq(MPC85xx_IRQ_CPM, &cpm2_irqaction);
>  #endif
>
>          return;
> --- 1.14/arch/ppc/syslib/i8259.c	2004-10-27 15:05:16 -07:00
> +++ edited/arch/ppc/syslib/i8259.c	2004-10-29 08:35:13 -07:00
> @@ -151,16 +151,12 @@
>  	"8259 edge control", 0x4d0, 0x4d1, IORESOURCE_BUSY
>  };
>
> -static int __init
> -i8259_hook_cascade(void)
> -{
> -	/* reserve our resources */
> -	request_irq( i8259_pic_irq_offset + 2, no_action, SA_INTERRUPT,
> -				"82c59 secondary cascade", NULL );
> -	return 0;
> -}
> -
> -arch_initcall(i8259_hook_cascade);
> +static struct irqaction i8259_irqaction = {
> +	.handler = no_action,
> +	.flags = SA_INTERRUPT,
> +	.mask = CPU_MASK_NONE,
> +	.name = "82c59 secondary cascade",
> +};
>
>  /*
>   * i8259_init()
> @@ -195,6 +191,8 @@
>
>  	spin_unlock_irqrestore(&i8259_lock, flags);
>
> +	/* reserve our resources */
> +	setup_irq( i8259_pic_irq_offset + 2, &i8259_irqaction);
>  	request_resource(&ioport_resource, &pic1_iores);
>  	request_resource(&ioport_resource, &pic2_iores);
>  	request_resource(&ioport_resource, &pic_edgectrl_iores);
> --- 1.39/arch/ppc/syslib/open_pic.c	2004-09-22 13:28:16 -07:00
> +++ edited/arch/ppc/syslib/open_pic.c	2004-10-29 08:34:13 -07:00
> @@ -681,13 +681,21 @@
>  /*
>   * Hookup a cascade to the OpenPIC.
>   */
> +
> +static struct irqaction openpic_cascade_irqaction = {
> +	.handler = no_action,
> +	.flags = SA_INTERRUPT,
> +	.mask = CPU_MASK_NONE,
> +};
> +
>  void __init
>  openpic_hookup_cascade(u_int irq, char *name,
>  	int (*cascade_fn)(struct pt_regs *))
>  {
>  	openpic_cascade_irq = irq;
>  	openpic_cascade_fn = cascade_fn;
> -	if (request_irq(irq, no_action, SA_INTERRUPT, name, NULL))
> +
> +	if (setup_irq(irq, &openpic_cascade_irqaction))
>  		printk("Unable to get OpenPIC IRQ %d for cascade\n",
>  				irq - open_pic_irq_offset);
>  }
>
> --
> Tom Rini
> http://gate.crashing.org/~trini/
>

-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/