lkml.org 
[lkml]   [2014]   [Mar]   [5]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.11 064/131] irqchip: orion: Fix getting generic chip pointer.
    Date
    3.11.10.6 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Andrew Lunn <andrew@lunn.ch>

    commit d86e9af6336c0ad586a5dbd70064253d40bbb5ff upstream.

    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@lunn.ch>
    Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
    Fixes: 9dbd90f17e4f ("irqchip: Add support for Marvell Orion SoCs")
    Signed-off-by: Jason Cooper <jason@lakedaemon.net>
    Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
    ---
    drivers/irqchip/irq-orion.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    diff --git a/drivers/irqchip/irq-orion.c b/drivers/irqchip/irq-orion.c
    index 0dfdc5c..8e41be6 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.9.0


    \
     
     \ /
      Last update: 2014-03-09 17:01    [W:6.242 / U:0.016 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site