lkml.org 
[lkml]   [2015]   [May]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.0 161/220] gpio: mvebu: Fix mask/unmask managment per irq chip type
    Date
    4.0-stable review patch.  If anyone has any objections, please let me know.

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

    From: Gregory CLEMENT <gregory.clement@free-electrons.com>

    commit 61819549f572edd7fce53f228c0d8420cdc85f71 upstream.

    Level IRQ handlers and edge IRQ handler are managed by tow different
    sets of registers. But currently the driver uses the same mask for the
    both registers. It lead to issues with the following scenario:

    First, an IRQ is requested on a GPIO to be triggered on front. After,
    this an other IRQ is requested for a GPIO of the same bank but
    triggered on level. Then the first one will be also setup to be
    triggered on level. It leads to an interrupt storm.

    The different kind of handler are already associated with two
    different irq chip type. With this patch the driver uses a private
    mask for each one which solves this issue.

    It has been tested on an Armada XP based board and on an Armada 375
    board. For the both boards, with this patch is applied, there is no
    such interrupt storm when running the previous scenario.

    This bug was already fixed but in a different way in the legacy
    version of this driver by Evgeniy Dushistov:
    9ece8839b1277fb9128ff6833411614ab6c88d68 "ARM: orion: Fix for certain
    sequence of request_irq can cause irq storm". The fact the new version
    of the gpio drive could be affected had been discussed there:
    http://thread.gmane.org/gmane.linux.ports.arm.kernel/344670/focus=364012

    Reported-by: Evgeniy A. Dushistov <dushistov@mail.ru>
    Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpio/gpio-mvebu.c | 24 ++++++++++++++++--------
    1 file changed, 16 insertions(+), 8 deletions(-)

    --- a/drivers/gpio/gpio-mvebu.c
    +++ b/drivers/gpio/gpio-mvebu.c
    @@ -320,11 +320,13 @@ static void mvebu_gpio_edge_irq_mask(str
    {
    struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
    struct mvebu_gpio_chip *mvchip = gc->private;
    + struct irq_chip_type *ct = irq_data_get_chip_type(d);
    u32 mask = 1 << (d->irq - gc->irq_base);

    irq_gc_lock(gc);
    - gc->mask_cache &= ~mask;
    - writel_relaxed(gc->mask_cache, mvebu_gpioreg_edge_mask(mvchip));
    + ct->mask_cache_priv &= ~mask;
    +
    + writel_relaxed(ct->mask_cache_priv, mvebu_gpioreg_edge_mask(mvchip));
    irq_gc_unlock(gc);
    }

    @@ -332,11 +334,13 @@ static void mvebu_gpio_edge_irq_unmask(s
    {
    struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
    struct mvebu_gpio_chip *mvchip = gc->private;
    + struct irq_chip_type *ct = irq_data_get_chip_type(d);
    +
    u32 mask = 1 << (d->irq - gc->irq_base);

    irq_gc_lock(gc);
    - gc->mask_cache |= mask;
    - writel_relaxed(gc->mask_cache, mvebu_gpioreg_edge_mask(mvchip));
    + ct->mask_cache_priv |= mask;
    + writel_relaxed(ct->mask_cache_priv, mvebu_gpioreg_edge_mask(mvchip));
    irq_gc_unlock(gc);
    }

    @@ -344,11 +348,13 @@ static void mvebu_gpio_level_irq_mask(st
    {
    struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
    struct mvebu_gpio_chip *mvchip = gc->private;
    + struct irq_chip_type *ct = irq_data_get_chip_type(d);
    +
    u32 mask = 1 << (d->irq - gc->irq_base);

    irq_gc_lock(gc);
    - gc->mask_cache &= ~mask;
    - writel_relaxed(gc->mask_cache, mvebu_gpioreg_level_mask(mvchip));
    + ct->mask_cache_priv &= ~mask;
    + writel_relaxed(ct->mask_cache_priv, mvebu_gpioreg_level_mask(mvchip));
    irq_gc_unlock(gc);
    }

    @@ -356,11 +362,13 @@ static void mvebu_gpio_level_irq_unmask(
    {
    struct irq_chip_generic *gc = irq_data_get_irq_chip_data(d);
    struct mvebu_gpio_chip *mvchip = gc->private;
    + struct irq_chip_type *ct = irq_data_get_chip_type(d);
    +
    u32 mask = 1 << (d->irq - gc->irq_base);

    irq_gc_lock(gc);
    - gc->mask_cache |= mask;
    - writel_relaxed(gc->mask_cache, mvebu_gpioreg_level_mask(mvchip));
    + ct->mask_cache_priv |= mask;
    + writel_relaxed(ct->mask_cache_priv, mvebu_gpioreg_level_mask(mvchip));
    irq_gc_unlock(gc);
    }




    \
     
     \ /
      Last update: 2015-05-02 22:01    [W:4.286 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site