[PATCH v4 02/22] irqchip: Orion: Fix getting generic chip pointer.

Jason Cooper jason at lakedaemon.net
Sat Feb 22 14:46:32 EST 2014


On Sat, Feb 22, 2014 at 08:14:44PM +0100, Andrew Lunn wrote:
> Enabling SPARSE_IRQ shows up a bug in the irq-orion bridge interrupt
> handler. The bridge interrupt is implemented using a single generic
> chip. Thus the parameter passed to irq_get_domain_generic_chip()
> should always be zero.
> 
> Signed-off-by: Andrew Lunn <andrew at lunn.ch>
> Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth at gmail.com>
> Acked-by: Arnd Bergmann <arnd at arndb.de>
> Tested-by: Jason Gunthorpe <jgunthorpe at obsidianresearch.com> (on kirkwood)
> ---
>  drivers/irqchip/irq-orion.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

tglx has already taken pull request containing this fix.

thx,

Jason.

> diff --git a/drivers/irqchip/irq-orion.c b/drivers/irqchip/irq-orion.c
> index e51d40031884..7d4e189ab4ec 100644
> --- a/drivers/irqchip/irq-orion.c
> +++ b/drivers/irqchip/irq-orion.c
> @@ -111,7 +111,8 @@ IRQCHIP_DECLARE(orion_intc, "marvell,orion-intc", orion_irq_init);
>  static void orion_bridge_irq_handler(unsigned int irq, struct irq_desc *desc)
>  {
>  	struct irq_domain *d = irq_get_handler_data(irq);
> -	struct irq_chip_generic *gc = irq_get_domain_generic_chip(d, irq);
> +
> +	struct irq_chip_generic *gc = irq_get_domain_generic_chip(d, 0);
>  	u32 stat = readl_relaxed(gc->reg_base + ORION_BRIDGE_IRQ_CAUSE) &
>  		   gc->mask_cache;
>  
> -- 
> 1.8.5.3
> 



More information about the linux-arm-kernel mailing list