scsi: ufs: core: Pass force_pmc to ufshcd_config_pwr_mode() as a parameter

Currently, callers must manually toggle hba->force_pmc before and after
calling ufshcd_config_pwr_mode() to force a Power Mode change. Introduce
enum ufshcd_pmc_policy and refactor ufshcd_config_pwr_mode() to accept
pmc_policy as a parameter to force a Power Mode change.

Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Reviewed-by: Bean Huo <beanhuo@micron.com>
Signed-off-by: Can Guo <can.guo@oss.qualcomm.com>
Reviewed-by: Peter Wang <peter.wang@mediatek.com>
Link: https://patch.msgid.link/20260325152154.1604082-3-can.guo@oss.qualcomm.com
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 33bbdd940b06d7761fa4effb7ff19be3541d19dd..44faab8b1770ef965feb1970abf0e7d7ff82dba2 100644 (file)
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -1408,7 +1408,8 @@ static int ufshcd_scale_gear(struct ufs_hba *hba, u32 target_gear, bool scale_up
 
 config_pwr_mode:
        /* check if the power mode needs to be changed or not? */
-       ret = ufshcd_config_pwr_mode(hba, &new_pwr_info);
+       ret = ufshcd_config_pwr_mode(hba, &new_pwr_info,
+                                    UFSHCD_PMC_POLICY_DONT_FORCE);
        if (ret)
                dev_err(hba->dev, "%s: failed err %d, old gear: (tx %d rx %d), new gear: (tx %d rx %d)",
                        __func__, ret,
@@ -4249,7 +4250,8 @@ int ufshcd_dme_get_attr(struct ufs_hba *hba, u32 attr_sel,
                        pwr_mode_change = true;
                }
                if (pwr_mode_change) {
-                       ret = ufshcd_change_power_mode(hba, &temp_pwr_info);
+                       ret = ufshcd_change_power_mode(hba, &temp_pwr_info,
+                                                      UFSHCD_PMC_POLICY_DONT_FORCE);
                        if (ret)
                                goto out;
                }
@@ -4273,7 +4275,8 @@ int ufshcd_dme_get_attr(struct ufs_hba *hba, u32 attr_sel,
 
        if (peer && (hba->quirks & UFSHCD_QUIRK_DME_PEER_ACCESS_AUTO_MODE)
            && pwr_mode_change)
-               ufshcd_change_power_mode(hba, &orig_pwr_info);
+               ufshcd_change_power_mode(hba, &orig_pwr_info,
+                                        UFSHCD_PMC_POLICY_DONT_FORCE);
 out:
        return ret;
 }
@@ -4665,6 +4668,7 @@ static int ufshcd_get_max_pwr_mode(struct ufs_hba *hba)
  * ufshcd_dme_change_power_mode() - UniPro DME Power Mode change sequence
  * @hba: per-adapter instance
  * @pwr_mode: pointer to the target power mode (gear/lane) attributes
+ * @pmc_policy: Power Mode change policy
  *
  * This function handles the low-level DME (Device Management Entity)
  * configuration required to transition the UFS link to a new power mode. It
@@ -4680,12 +4684,13 @@ static int ufshcd_get_max_pwr_mode(struct ufs_hba *hba)
  * Return: 0 on success, non-zero error code on failure.
  */
 static int ufshcd_dme_change_power_mode(struct ufs_hba *hba,
-                                       struct ufs_pa_layer_attr *pwr_mode)
+                                       struct ufs_pa_layer_attr *pwr_mode,
+                                       enum ufshcd_pmc_policy pmc_policy)
 {
        int ret;
 
        /* if already configured to the requested pwr_mode */
-       if (!hba->force_pmc &&
+       if (pmc_policy == UFSHCD_PMC_POLICY_DONT_FORCE &&
            pwr_mode->gear_rx == hba->pwr_info.gear_rx &&
            pwr_mode->gear_tx == hba->pwr_info.gear_tx &&
            pwr_mode->lane_rx == hba->pwr_info.lane_rx &&
@@ -4768,6 +4773,7 @@ static int ufshcd_dme_change_power_mode(struct ufs_hba *hba,
  * ufshcd_change_power_mode() - Change UFS Link Power Mode
  * @hba: per-adapter instance
  * @pwr_mode: pointer to the target power mode (gear/lane) attributes
+ * @pmc_policy: Power Mode change policy
  *
  * This function handles the high-level sequence for changing the UFS link
  * power mode. It triggers vendor-specific pre-change notification,
@@ -4777,13 +4783,14 @@ static int ufshcd_dme_change_power_mode(struct ufs_hba *hba,
  * Return: 0 on success, non-zero error code on failure.
  */
 int ufshcd_change_power_mode(struct ufs_hba *hba,
-                            struct ufs_pa_layer_attr *pwr_mode)
+                            struct ufs_pa_layer_attr *pwr_mode,
+                            enum ufshcd_pmc_policy pmc_policy)
 {
        int ret;
 
        ufshcd_vops_pwr_change_notify(hba, PRE_CHANGE, pwr_mode);
 
-       ret = ufshcd_dme_change_power_mode(hba, pwr_mode);
+       ret = ufshcd_dme_change_power_mode(hba, pwr_mode, pmc_policy);
 
        if (!ret)
                ufshcd_vops_pwr_change_notify(hba, POST_CHANGE, pwr_mode);
@@ -4796,11 +4803,13 @@ EXPORT_SYMBOL_GPL(ufshcd_change_power_mode);
  * ufshcd_config_pwr_mode - configure a new power mode
  * @hba: per-adapter instance
  * @desired_pwr_mode: desired power configuration
+ * @pmc_policy: Power Mode change policy
  *
  * Return: 0 upon success; < 0 upon failure.
  */
 int ufshcd_config_pwr_mode(struct ufs_hba *hba,
-               struct ufs_pa_layer_attr *desired_pwr_mode)
+                          struct ufs_pa_layer_attr *desired_pwr_mode,
+                          enum ufshcd_pmc_policy pmc_policy)
 {
        struct ufs_pa_layer_attr final_params = { 0 };
        int ret;
@@ -4815,7 +4824,7 @@ int ufshcd_config_pwr_mode(struct ufs_hba *hba,
                memcpy(&final_params, desired_pwr_mode, sizeof(final_params));
        }
 
-       return ufshcd_change_power_mode(hba, &final_params);
+       return ufshcd_change_power_mode(hba, &final_params, pmc_policy);
 }
 EXPORT_SYMBOL_GPL(ufshcd_config_pwr_mode);
 
@@ -6872,14 +6881,13 @@ again:
                 * are sent via bsg and/or sysfs.
                 */
                down_write(&hba->clk_scaling_lock);
-               hba->force_pmc = true;
-               pmc_err = ufshcd_config_pwr_mode(hba, &(hba->pwr_info));
+               pmc_err = ufshcd_config_pwr_mode(hba, &hba->pwr_info,
+                                                UFSHCD_PMC_POLICY_FORCE);
                if (pmc_err) {
                        needs_reset = true;
                        dev_err(hba->dev, "%s: Failed to restore power mode, err = %d\n",
                                        __func__, pmc_err);
                }
-               hba->force_pmc = false;
                ufshcd_print_pwr_info(hba);
                up_write(&hba->clk_scaling_lock);
                spin_lock_irqsave(hba->host->host_lock, flags);
@@ -9154,7 +9162,8 @@ static int ufshcd_post_device_init(struct ufs_hba *hba)
        if (hba->dev_ref_clk_freq != REF_CLK_FREQ_INVAL)
                ufshcd_set_dev_ref_clk(hba);
        /* Gear up to HS gear. */
-       ret = ufshcd_config_pwr_mode(hba, &hba->max_pwr_info.info);
+       ret = ufshcd_config_pwr_mode(hba, &hba->max_pwr_info.info,
+                                    UFSHCD_PMC_POLICY_DONT_FORCE);
        if (ret) {
                dev_err(hba->dev, "%s: Failed setting power mode, err = %d\n",
                        __func__, ret);

diff --git a/drivers/ufs/host/ufshcd-pci.c b/drivers/ufs/host/ufshcd-pci.c
index 8a4f2381a32ece22d6894c1130c0fee85302c043..38d458711c99b9856aba2e72032660144fcdf3ea 100644 (file)
--- a/drivers/ufs/host/ufshcd-pci.c
+++ b/drivers/ufs/host/ufshcd-pci.c
@@ -145,7 +145,8 @@ static int ufs_intel_set_lanes(struct ufs_hba *hba, u32 lanes)
 
        pwr_info.lane_rx = lanes;
        pwr_info.lane_tx = lanes;
-       ret = ufshcd_change_power_mode(hba, &pwr_info);
+       ret = ufshcd_change_power_mode(hba, &pwr_info,
+                                      UFSHCD_PMC_POLICY_DONT_FORCE);
        if (ret)
                dev_err(hba->dev, "%s: Setting %u lanes, err = %d\n",
                        __func__, lanes, ret);

diff --git a/include/ufs/ufshcd.h b/include/ufs/ufshcd.h
index 51c2555bea73db88b7cdacb2946f8061932030e2..16facaee3e7713149aa5b7a55ee27c5918cf2749 100644 (file)
--- a/include/ufs/ufshcd.h
+++ b/include/ufs/ufshcd.h
@@ -529,6 +529,17 @@ enum ufshcd_state {
        UFSHCD_STATE_ERROR,
 };
 
+/**
+ * enum ufshcd_pmc_policy - Power Mode change policy
+ * @UFSHCD_PMC_POLICY_DONT_FORCE: Do not force a Power Mode change.
+ * @UFSHCD_PMC_POLICY_FORCE: Force a Power Mode change even if current Power
+ *     Mode is same as target Power Mode.
+ */
+enum ufshcd_pmc_policy {
+       UFSHCD_PMC_POLICY_DONT_FORCE,
+       UFSHCD_PMC_POLICY_FORCE,
+};
+
 enum ufshcd_quirks {
        /* Interrupt aggregation support is broken */
        UFSHCD_QUIRK_BROKEN_INTR_AGGR                   = 1 << 0,
@@ -882,7 +893,6 @@ enum ufshcd_mcq_opr {
  * @saved_uic_err: sticky UIC error mask
  * @ufs_stats: various error counters
  * @force_reset: flag to force eh_work perform a full reset
- * @force_pmc: flag to force a power mode change
  * @silence_err_logs: flag to silence error logs
  * @dev_cmd: ufs device management command information
  * @last_dme_cmd_tstamp: time stamp of the last completed DME command
@@ -1036,7 +1046,6 @@ struct ufs_hba {
        u32 saved_uic_err;
        struct ufs_stats ufs_stats;
        bool force_reset;
-       bool force_pmc;
        bool silence_err_logs;
 
        /* Device management request data */
@@ -1363,9 +1372,11 @@ extern int ufshcd_dme_set_attr(struct ufs_hba *hba, u32 attr_sel,
 extern int ufshcd_dme_get_attr(struct ufs_hba *hba, u32 attr_sel,
                               u32 *mib_val, u8 peer);
 extern int ufshcd_change_power_mode(struct ufs_hba *hba,
-                                   struct ufs_pa_layer_attr *pwr_mode);
+                                   struct ufs_pa_layer_attr *pwr_mode,
+                                   enum ufshcd_pmc_policy pmc_policy);
 extern int ufshcd_config_pwr_mode(struct ufs_hba *hba,
-                       struct ufs_pa_layer_attr *desired_pwr_mode);
+                                 struct ufs_pa_layer_attr *desired_pwr_mode,
+                                 enum ufshcd_pmc_policy pmc_policy);
 extern int ufshcd_uic_change_pwr_mode(struct ufs_hba *hba, u8 mode);
 
 /* UIC command interfaces for DME primitives */