From bdb2117c28ce3335a3c43e2271d3de72b10bdea1 Mon Sep 17 00:00:00 2001 From: Bart Van Assche Date: Thu, 28 Oct 2021 15:59:06 -0700 Subject: [PATCH] ANDROID: scsi: ufs: Re-enable runtime power management Android commit e7d848c921cf ("FROMLIST: scsi: ufs: Fix deadlock while suspending ufs host") disabled runtime power management. Re-enable runtime power management since runtime power management support has been fixed after that commit was merged. Bug: 204438323 Change-Id: I4d473262e90f242bc55eaa07b8a3bf7ab47c1a65 Signed-off-by: Bart Van Assche --- drivers/scsi/ufs/ufshcd.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index bb87889f60e9..ea87b6a31fd8 100644 --- a/drivers/scsi/ufs/ufshcd.c +++ b/drivers/scsi/ufs/ufshcd.c @@ -7382,6 +7382,16 @@ out: kfree(desc_buf); } +static inline void ufshcd_blk_pm_runtime_init(struct scsi_device *sdev) +{ + scsi_autopm_get_device(sdev); + blk_pm_runtime_init(sdev->request_queue, &sdev->sdev_gendev); + if (sdev->rpm_autosuspend) + pm_runtime_set_autosuspend_delay(&sdev->sdev_gendev, + RPM_AUTOSUSPEND_DELAY_MS); + scsi_autopm_put_device(sdev); +} + /** * ufshcd_scsi_add_wlus - Adds required W-LUs * @hba: per-adapter instance @@ -7428,14 +7438,17 @@ static int ufshcd_scsi_add_wlus(struct ufs_hba *hba) ret = PTR_ERR(hba->sdev_rpmb); goto remove_sdev_ufs_device; } + ufshcd_blk_pm_runtime_init(hba->sdev_rpmb); scsi_device_put(hba->sdev_rpmb); sdev_boot = __scsi_add_device(hba->host, 0, 0, ufshcd_upiu_wlun_to_scsi_wlun(UFS_UPIU_BOOT_WLUN), NULL); - if (IS_ERR(sdev_boot)) + if (IS_ERR(sdev_boot)) { dev_err(hba->dev, "%s: BOOT WLUN not found\n", __func__); - else + } else { + ufshcd_blk_pm_runtime_init(sdev_boot); scsi_device_put(sdev_boot); + } goto out; remove_sdev_ufs_device: