]> www.infradead.org Git - nvme.git/commitdiff
Merge branch '6.15/scsi-queue' into 6.15/scsi-fixes
authorMartin K. Petersen <martin.petersen@oracle.com>
Wed, 9 Apr 2025 02:04:31 +0000 (22:04 -0400)
committerMartin K. Petersen <martin.petersen@oracle.com>
Wed, 9 Apr 2025 02:04:31 +0000 (22:04 -0400)
Pull in remaining fixes from 6.15/scsi-queue.

Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
1  2 
drivers/scsi/hisi_sas/hisi_sas_main.c
drivers/scsi/hisi_sas/hisi_sas_v2_hw.c
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
drivers/scsi/megaraid/megaraid_sas_base.c
drivers/scsi/megaraid/megaraid_sas_fusion.c
drivers/scsi/smartpqi/smartpqi_init.c
drivers/ufs/core/ufshcd.c
drivers/ufs/host/ufs-exynos.c

Simple merge
Simple merge
index 0534390c2a35d0671156d79a4b1981a257d2fbfa,4c1a92218b269bed7cb46ba56ae359fdaaadb06b..44156041d88f20605c0d945c79ddc90a056726d3
@@@ -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;
Simple merge