From: Martin K. Petersen <martin.petersen@oracle.com>
Date: Wed, 9 Apr 2025 02:04:31 +0000 (-0400)
Subject: Merge branch '6.15/scsi-queue' into 6.15/scsi-fixes
X-Git-Tag: v6.15-rc3~38^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1af6f1a1433348c93f0b3a7a64f20a0a898ef78;p=thirdparty%2Flinux.git

Merge branch '6.15/scsi-queue' into 6.15/scsi-fixes

Pull in remaining fixes from 6.15/scsi-queue.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
---

a1af6f1a1433348c93f0b3a7a64f20a0a898ef78
diff --cc drivers/ufs/core/ufshcd.c
index 0534390c2a35d,4c1a92218b269..44156041d88f2
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@@ -10475,21 -10517,8 +10517,23 @@@ int ufshcd_init(struct ufs_hba *hba, vo
  	 */
  	spin_lock_init(&hba->clk_gating.lock);
  
 +	/*
 +	 * Set the default power management level for runtime and system PM.
 +	 * Host controller drivers can override them in their
 +	 * 'ufs_hba_variant_ops::init' callback.
 +	 *
 +	 * 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(
 +						UFS_SLEEP_PWR_MODE,
 +						UIC_LINK_HIBERN8_STATE);
 +	hba->spm_lvl = ufs_get_desired_pm_lvl_for_dev_link_state(
 +						UFS_SLEEP_PWR_MODE,
 +						UIC_LINK_HIBERN8_STATE);
 +
+ 	init_completion(&hba->dev_cmd.complete);
+ 
  	err = ufshcd_hba_init(hba);
  	if (err)
  		goto out_error;