]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
scsi: ufs: ufs-pci: Fix default runtime and system PM levels
authorAdrian Hunter <adrian.hunter@intel.com>
Wed, 23 Jul 2025 16:58:50 +0000 (19:58 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 28 Aug 2025 14:30:57 +0000 (16:30 +0200)
commit 6de7435e6b81fe52c0ab4c7e181f6b5decd18eb1 upstream.

Intel MTL-like host controllers support auto-hibernate.  Using
auto-hibernate with manual (driver initiated) hibernate produces more
complex operation.  For example, the host controller will have to exit
auto-hibernate simply to allow the driver to enter hibernate state
manually.  That is not recommended.

The default rpm_lvl and spm_lvl is 3, which includes manual hibernate.

Change the default values to 2, which does not.

Note, to be simpler to backport to stable kernels, utilize the UFS PCI
driver's ->late_init() call back.  Recent commits have made it possible
to set up a controller-specific default in the regular ->init() call
back, but not all stable kernels have those changes.

Fixes: 4049f7acef3e ("scsi: ufs: ufs-pci: Add support for Intel MTL")
Cc: stable@vger.kernel.org
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Link: https://lore.kernel.org/r/20250723165856.145750-3-adrian.hunter@intel.com
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/ufs/host/ufshcd-pci.c

index 4a0c16444a8bd6758479bb69edf654964e148167..570067483a049cd0707a7379b722f8c08f1888ff 100644 (file)
@@ -468,10 +468,23 @@ static int ufs_intel_adl_init(struct ufs_hba *hba)
        return ufs_intel_common_init(hba);
 }
 
+static void ufs_intel_mtl_late_init(struct ufs_hba *hba)
+{
+       hba->rpm_lvl = UFS_PM_LVL_2;
+       hba->spm_lvl = UFS_PM_LVL_2;
+}
+
 static int ufs_intel_mtl_init(struct ufs_hba *hba)
 {
+       struct ufs_host *ufs_host;
+       int err;
+
        hba->caps |= UFSHCD_CAP_CRYPTO | UFSHCD_CAP_WB_EN;
-       return ufs_intel_common_init(hba);
+       err = ufs_intel_common_init(hba);
+       /* Get variant after it is set in ufs_intel_common_init() */
+       ufs_host = ufshcd_get_variant(hba);
+       ufs_host->late_init = ufs_intel_mtl_late_init;
+       return err;
 }
 
 static int ufs_qemu_get_hba_mac(struct ufs_hba *hba)