lkml.org 
[lkml]   [2019]   [Sep]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 040/124] ARM: OMAP1: ams-delta-fiq: Fix missing irq_ack
    Date
    From: Janusz Krzysztofik <jmkrzyszt@gmail.com>

    [ Upstream commit fa8397e45c64e60c80373bc19ee56e42a6bed9b6 ]

    Non-serio path of Amstrad Delta FIQ deferred handler depended on
    irq_ack() method provided by OMAP GPIO driver. That method has been
    removed by commit 693de831c6e5 ("gpio: omap: remove irq_ack method").
    Remove useless code from the deferred handler and reimplement the
    missing operation inside the base FIQ handler.

    Should another dependency - irq_unmask() - be ever removed from the OMAP
    GPIO driver, WARN once if missing.

    Signed-off-by: Janusz Krzysztofik <jmkrzyszt@gmail.com>
    Signed-off-by: Tony Lindgren <tony@atomide.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm/mach-omap1/ams-delta-fiq-handler.S | 3 ++-
    arch/arm/mach-omap1/ams-delta-fiq.c | 4 +---
    2 files changed, 3 insertions(+), 4 deletions(-)

    diff --git a/arch/arm/mach-omap1/ams-delta-fiq-handler.S b/arch/arm/mach-omap1/ams-delta-fiq-handler.S
    index 81159af44862e..14a6c3eb32985 100644
    --- a/arch/arm/mach-omap1/ams-delta-fiq-handler.S
    +++ b/arch/arm/mach-omap1/ams-delta-fiq-handler.S
    @@ -126,6 +126,8 @@ restart:
    orr r11, r11, r13 @ mask all requested interrupts
    str r11, [r12, #OMAP1510_GPIO_INT_MASK]

    + str r13, [r12, #OMAP1510_GPIO_INT_STATUS] @ ack all requested interrupts
    +
    ands r10, r13, #KEYBRD_CLK_MASK @ extract keyboard status - set?
    beq hksw @ no - try next source

    @@ -133,7 +135,6 @@ restart:
    @@@@@@@@@@@@@@@@@@@@@@
    @ Keyboard clock FIQ mode interrupt handler
    @ r10 now contains KEYBRD_CLK_MASK, use it
    - str r10, [r12, #OMAP1510_GPIO_INT_STATUS] @ ack the interrupt
    bic r11, r11, r10 @ unmask it
    str r11, [r12, #OMAP1510_GPIO_INT_MASK]

    diff --git a/arch/arm/mach-omap1/ams-delta-fiq.c b/arch/arm/mach-omap1/ams-delta-fiq.c
    index 0af2bf6f99331..fd87382a3f183 100644
    --- a/arch/arm/mach-omap1/ams-delta-fiq.c
    +++ b/arch/arm/mach-omap1/ams-delta-fiq.c
    @@ -69,9 +69,7 @@ static irqreturn_t deferred_fiq(int irq, void *dev_id)
    * interrupts default to since commit 80ac93c27441
    * requires interrupt already acked and unmasked.
    */
    - if (irq_chip->irq_ack)
    - irq_chip->irq_ack(d);
    - if (irq_chip->irq_unmask)
    + if (!WARN_ON_ONCE(!irq_chip->irq_unmask))
    irq_chip->irq_unmask(d);
    }
    for (; irq_counter[gpio] < fiq_count; irq_counter[gpio]++)
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-09-20 00:09    [W:4.790 / U:0.156 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site