lkml.org 
[lkml]   [2022]   [Jun]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.17 01/20] genirq: PM: Use runtime PM for chained interrupts
    Date
    From: Marc Zyngier <maz@kernel.org>

    [ Upstream commit 668a9fe5c6a1bcac6b65d5e9b91a9eca86f782a3 ]

    When requesting an interrupt, we correctly call into the runtime
    PM framework to guarantee that the underlying interrupt controller
    is up and running.

    However, we fail to do so for chained interrupt controllers, as
    the mux interrupt is not requested along the same path.

    Augment __irq_do_set_handler() to call into the runtime PM code
    in this case, making sure the PM flow is the same for all interrupts.

    Reported-by: Lucas Stach <l.stach@pengutronix.de>
    Tested-by: Liu Ying <victor.liu@nxp.com>
    Signed-off-by: Marc Zyngier <maz@kernel.org>
    Link: https://lore.kernel.org/r/26973cddee5f527ea17184c0f3fccb70bc8969a0.camel@pengutronix.de
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    kernel/irq/chip.c | 5 ++++-
    1 file changed, 4 insertions(+), 1 deletion(-)

    diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c
    index c09324663088..b171355eb57e 100644
    --- a/kernel/irq/chip.c
    +++ b/kernel/irq/chip.c
    @@ -1009,8 +1009,10 @@ __irq_do_set_handler(struct irq_desc *desc, irq_flow_handler_t handle,
    if (desc->irq_data.chip != &no_irq_chip)
    mask_ack_irq(desc);
    irq_state_set_disabled(desc);
    - if (is_chained)
    + if (is_chained) {
    desc->action = NULL;
    + WARN_ON(irq_chip_pm_put(irq_desc_get_irq_data(desc)));
    + }
    desc->depth = 1;
    }
    desc->handle_irq = handle;
    @@ -1036,6 +1038,7 @@ __irq_do_set_handler(struct irq_desc *desc, irq_flow_handler_t handle,
    irq_settings_set_norequest(desc);
    irq_settings_set_nothread(desc);
    desc->action = &chained_action;
    + WARN_ON(irq_chip_pm_get(irq_desc_get_irq_data(desc)));
    irq_activate_and_startup(desc, IRQ_RESEND);
    }
    }
    --
    2.35.1
    \
     
     \ /
      Last update: 2022-06-21 22:57    [W:3.151 / U:0.552 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site