lkml.org 
[lkml]   [2022]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.18 142/879] scsi: hisi_sas: Undo RPM resume for failed notify phy event for v3 HW
    Date
    From: Xiang Chen <chenxiang66@hisilicon.com>

    [ Upstream commit 9b5387fe5af38116b452259d87cd66594b6277c1 ]

    If we fail to notify the phy up event then undo the RPM resume, as the phy
    up notify event handling pairs with that RPM resume.

    Link: https://lore.kernel.org/r/1651839939-101188-1-git-send-email-john.garry@huawei.com
    Reported-by: Yihang Li <liyihang6@hisilicon.com>
    Tested-by: Yihang Li <liyihang6@hisilicon.com>
    Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com>
    Signed-off-by: John Garry <john.garry@huawei.com>
    Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 10 ++++++++--
    1 file changed, 8 insertions(+), 2 deletions(-)

    diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
    index 79f87d7c3e68..7d819fc0395e 100644
    --- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
    +++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
    @@ -1563,9 +1563,15 @@ static irqreturn_t phy_up_v3_hw(int phy_no, struct hisi_hba *hisi_hba)

    phy->port_id = port_id;

    - /* Call pm_runtime_put_sync() with pairs in hisi_sas_phyup_pm_work() */
    + /*
    + * Call pm_runtime_get_noresume() which pairs with
    + * hisi_sas_phyup_pm_work() -> pm_runtime_put_sync().
    + * For failure call pm_runtime_put() as we are in a hardirq context.
    + */
    pm_runtime_get_noresume(dev);
    - hisi_sas_notify_phy_event(phy, HISI_PHYE_PHY_UP_PM);
    + res = hisi_sas_notify_phy_event(phy, HISI_PHYE_PHY_UP_PM);
    + if (!res)
    + pm_runtime_put(dev);

    res = IRQ_HANDLED;

    --
    2.35.1


    \
     
     \ /
      Last update: 2022-06-08 00:13    [W:4.454 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site