scsi: ufs: core: Honor runtime/system PM levels if set by host controller drivers

Otherwise, the default levels will override the levels set by the host
controller drivers.

Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Link: https://lore.kernel.org/r/20241219-ufs-qcom-suspend-fix-v3-2-63c4b95a70b9@linaro.org
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index d1e19a2ccf49dd74b1c2df2175e1a20911aac152..9c26e8767515b25dfdf670bc9d678b97e867d739 100644 (file)
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -10590,14 +10590,17 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)
        }
 
        /*
-        * Set the default power management level for runtime and system PM.
+        * Set the default power management level for runtime and system PM if
+        * not set by the host controller drivers.
         * Default power saving mode is to keep UFS link in Hibern8 state
         * and UFS device in sleep state.
         */
-       hba->rpm_lvl = ufs_get_desired_pm_lvl_for_dev_link_state(
+       if (!hba->rpm_lvl)
+               hba->rpm_lvl = ufs_get_desired_pm_lvl_for_dev_link_state(
                                                UFS_SLEEP_PWR_MODE,
                                                UIC_LINK_HIBERN8_STATE);
-       hba->spm_lvl = ufs_get_desired_pm_lvl_for_dev_link_state(
+       if (!hba->spm_lvl)
+               hba->spm_lvl = ufs_get_desired_pm_lvl_for_dev_link_state(
                                                UFS_SLEEP_PWR_MODE,
                                                UIC_LINK_HIBERN8_STATE);