lkml.org 
[lkml]   [2020]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.4 018/203] gpio: zynq: Fix for bug in zynq_gpio_restore_context API
    Date
    From: Swapna Manupati <swapna.manupati@xilinx.com>

    commit 36f2e7207f21a83ca0054116191f119ac64583ab upstream.

    This patch writes the inverse value of Interrupt Mask Status
    register into the Interrupt Enable register in
    zynq_gpio_restore_context API to fix the bug.

    Fixes: e11de4de28c0 ("gpio: zynq: Add support for suspend resume")
    Signed-off-by: Swapna Manupati <swapna.manupati@xilinx.com>
    Signed-off-by: Michal Simek <michal.simek@xilinx.com>
    Signed-off-by: Srinivas Neeli <srinivas.neeli@xilinx.com>
    Link: https://lore.kernel.org/r/1577362338-28744-2-git-send-email-srinivas.neeli@xilinx.com
    Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/gpio/gpio-zynq.c | 8 +++++---
    1 file changed, 5 insertions(+), 3 deletions(-)

    --- a/drivers/gpio/gpio-zynq.c
    +++ b/drivers/gpio/gpio-zynq.c
    @@ -681,6 +681,8 @@ static void zynq_gpio_restore_context(st
    unsigned int bank_num;

    for (bank_num = 0; bank_num < gpio->p_data->max_bank; bank_num++) {
    + writel_relaxed(ZYNQ_GPIO_IXR_DISABLE_ALL, gpio->base_addr +
    + ZYNQ_GPIO_INTDIS_OFFSET(bank_num));
    writel_relaxed(gpio->context.datalsw[bank_num],
    gpio->base_addr +
    ZYNQ_GPIO_DATA_LSW_OFFSET(bank_num));
    @@ -690,9 +692,6 @@ static void zynq_gpio_restore_context(st
    writel_relaxed(gpio->context.dirm[bank_num],
    gpio->base_addr +
    ZYNQ_GPIO_DIRM_OFFSET(bank_num));
    - writel_relaxed(gpio->context.int_en[bank_num],
    - gpio->base_addr +
    - ZYNQ_GPIO_INTEN_OFFSET(bank_num));
    writel_relaxed(gpio->context.int_type[bank_num],
    gpio->base_addr +
    ZYNQ_GPIO_INTTYPE_OFFSET(bank_num));
    @@ -702,6 +701,9 @@ static void zynq_gpio_restore_context(st
    writel_relaxed(gpio->context.int_any[bank_num],
    gpio->base_addr +
    ZYNQ_GPIO_INTANY_OFFSET(bank_num));
    + writel_relaxed(~(gpio->context.int_en[bank_num]),
    + gpio->base_addr +
    + ZYNQ_GPIO_INTEN_OFFSET(bank_num));
    }
    }


    \
     
     \ /
      Last update: 2020-01-17 00:21    [W:4.074 / U:0.404 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site