OSDN Git Service

scsi: libsas: Resume SAS host for phy reset or enable via sysfs
authorXiang Chen <chenxiang66@hisilicon.com>
Thu, 14 Jul 2022 18:23:22 +0000 (02:23 +0800)
committerMartin K. Petersen <martin.petersen@oracle.com>
Tue, 19 Jul 2022 03:04:12 +0000 (23:04 -0400)
Currently if a phy reset or enable phy is issued via sysfs when controller
is suspended, those operations will be ignored as SAS_HA_REGISTERED is
cleared. If RPM is enabled then we may aggressively suspend automatically.
In this case it may be difficult to enable or reset a phy via sysfs, so
resume the host in these scenarios.

Link: https://lore.kernel.org/r/1657823002-139010-6-git-send-email-john.garry@huawei.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>
drivers/scsi/libsas/sas_init.c

index dc35f0f..e4f7707 100644 (file)
@@ -531,6 +531,7 @@ static int queue_phy_reset(struct sas_phy *phy, int hard_reset)
        if (!d)
                return -ENOMEM;
 
+       pm_runtime_get_sync(ha->dev);
        /* libsas workqueue coordinates ata-eh reset with discovery */
        mutex_lock(&d->event_lock);
        d->reset_result = 0;
@@ -544,6 +545,7 @@ static int queue_phy_reset(struct sas_phy *phy, int hard_reset)
        if (rc == 0)
                rc = d->reset_result;
        mutex_unlock(&d->event_lock);
+       pm_runtime_put_sync(ha->dev);
 
        return rc;
 }
@@ -558,6 +560,7 @@ static int queue_phy_enable(struct sas_phy *phy, int enable)
        if (!d)
                return -ENOMEM;
 
+       pm_runtime_get_sync(ha->dev);
        /* libsas workqueue coordinates ata-eh reset with discovery */
        mutex_lock(&d->event_lock);
        d->enable_result = 0;
@@ -571,6 +574,7 @@ static int queue_phy_enable(struct sas_phy *phy, int enable)
        if (rc == 0)
                rc = d->enable_result;
        mutex_unlock(&d->event_lock);
+       pm_runtime_put_sync(ha->dev);
 
        return rc;
 }