scsi: ufs-hisi: Re-factor ufshcd_get_pwr_dev_param

ufshcd_get_pwr_dev_param function and ufs_dev_params struct have been
relocated to ufs core. Switch ufs-hisi to the common interface.

Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
Reviewed-by: Avri Altman <avri.altman@wdc.com>
Acked-by: Bean Huo <beanhuo@micron.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/ufs/ufs-hisi.c b/drivers/scsi/ufs/ufs-hisi.c
index 2f592df..7aed0a1 100644 (file)
--- a/drivers/scsi/ufs/ufs-hisi.c
+++ b/drivers/scsi/ufs/ufs-hisi.c
@@ -293,108 +293,7 @@ static int ufs_hisi_link_startup_notify(struct ufs_hba *hba,
        return err;
 }
 
-struct ufs_hisi_dev_params {
-       u32 pwm_rx_gear; /* pwm rx gear to work in */
-       u32 pwm_tx_gear; /* pwm tx gear to work in */
-       u32 hs_rx_gear;  /* hs rx gear to work in */
-       u32 hs_tx_gear;  /* hs tx gear to work in */
-       u32 rx_lanes;    /* number of rx lanes */
-       u32 tx_lanes;    /* number of tx lanes */
-       u32 rx_pwr_pwm;  /* rx pwm working pwr */
-       u32 tx_pwr_pwm;  /* tx pwm working pwr */
-       u32 rx_pwr_hs;   /* rx hs working pwr */
-       u32 tx_pwr_hs;   /* tx hs working pwr */
-       u32 hs_rate;     /* rate A/B to work in HS */
-       u32 desired_working_mode;
-};
-
-static int ufs_hisi_get_pwr_dev_param(
-                                   struct ufs_hisi_dev_params *hisi_param,
-                                   struct ufs_pa_layer_attr *dev_max,
-                                   struct ufs_pa_layer_attr *agreed_pwr)
-{
-       int min_hisi_gear;
-       int min_dev_gear;
-       bool is_dev_sup_hs = false;
-       bool is_hisi_max_hs = false;
-
-       if (dev_max->pwr_rx == FASTAUTO_MODE || dev_max->pwr_rx == FAST_MODE)
-               is_dev_sup_hs = true;
-
-       if (hisi_param->desired_working_mode == FAST) {
-               is_hisi_max_hs = true;
-               min_hisi_gear = min_t(u32, hisi_param->hs_rx_gear,
-                                      hisi_param->hs_tx_gear);
-       } else {
-               min_hisi_gear = min_t(u32, hisi_param->pwm_rx_gear,
-                                      hisi_param->pwm_tx_gear);
-       }
-
-       /*
-        * device doesn't support HS but
-        * hisi_param->desired_working_mode is HS,
-        * thus device and hisi_param don't agree
-        */
-       if (!is_dev_sup_hs && is_hisi_max_hs) {
-               pr_err("%s: device not support HS\n", __func__);
-               return -ENOTSUPP;
-       } else if (is_dev_sup_hs && is_hisi_max_hs) {
-               /*
-                * since device supports HS, it supports FAST_MODE.
-                * since hisi_param->desired_working_mode is also HS
-                * then final decision (FAST/FASTAUTO) is done according
-                * to hisi_params as it is the restricting factor
-                */
-               agreed_pwr->pwr_rx = agreed_pwr->pwr_tx =
-                       hisi_param->rx_pwr_hs;
-       } else {
-               /*
-                * here hisi_param->desired_working_mode is PWM.
-                * it doesn't matter whether device supports HS or PWM,
-                * in both cases hisi_param->desired_working_mode will
-                * determine the mode
-                */
-               agreed_pwr->pwr_rx = agreed_pwr->pwr_tx =
-                       hisi_param->rx_pwr_pwm;
-       }
-
-       /*
-        * we would like tx to work in the minimum number of lanes
-        * between device capability and vendor preferences.
-        * the same decision will be made for rx
-        */
-       agreed_pwr->lane_tx =
-               min_t(u32, dev_max->lane_tx, hisi_param->tx_lanes);
-       agreed_pwr->lane_rx =
-               min_t(u32, dev_max->lane_rx, hisi_param->rx_lanes);
-
-       /* device maximum gear is the minimum between device rx and tx gears */
-       min_dev_gear = min_t(u32, dev_max->gear_rx, dev_max->gear_tx);
-
-       /*
-        * if both device capabilities and vendor pre-defined preferences are
-        * both HS or both PWM then set the minimum gear to be the chosen
-        * working gear.
-        * if one is PWM and one is HS then the one that is PWM get to decide
-        * what is the gear, as it is the one that also decided previously what
-        * pwr the device will be configured to.
-        */
-       if ((is_dev_sup_hs && is_hisi_max_hs) ||
-           (!is_dev_sup_hs && !is_hisi_max_hs))
-               agreed_pwr->gear_rx = agreed_pwr->gear_tx =
-                       min_t(u32, min_dev_gear, min_hisi_gear);
-       else
-               agreed_pwr->gear_rx = agreed_pwr->gear_tx = min_hisi_gear;
-
-       agreed_pwr->hs_rate = hisi_param->hs_rate;
-
-       pr_info("ufs final power mode: gear = %d, lane = %d, pwr = %d, rate = %d\n",
-               agreed_pwr->gear_rx, agreed_pwr->lane_rx, agreed_pwr->pwr_rx,
-               agreed_pwr->hs_rate);
-       return 0;
-}
-
-static void ufs_hisi_set_dev_cap(struct ufs_hisi_dev_params *hisi_param)
+static void ufs_hisi_set_dev_cap(struct ufs_dev_params *hisi_param)
 {
        hisi_param->rx_lanes = UFS_HISI_LIMIT_NUM_LANES_RX;
        hisi_param->tx_lanes = UFS_HISI_LIMIT_NUM_LANES_TX;
@@ -477,7 +376,7 @@ static int ufs_hisi_pwr_change_notify(struct ufs_hba *hba,
                                       struct ufs_pa_layer_attr *dev_max_params,
                                       struct ufs_pa_layer_attr *dev_req_params)
 {
-       struct ufs_hisi_dev_params ufs_hisi_cap;
+       struct ufs_dev_params ufs_hisi_cap;
        int ret = 0;
 
        if (!dev_req_params) {
@@ -490,8 +389,8 @@ static int ufs_hisi_pwr_change_notify(struct ufs_hba *hba,
        switch (status) {
        case PRE_CHANGE:
                ufs_hisi_set_dev_cap(&ufs_hisi_cap);
-               ret = ufs_hisi_get_pwr_dev_param(
-                       &ufs_hisi_cap, dev_max_params, dev_req_params);
+               ret = ufshcd_get_pwr_dev_param(&ufs_hisi_cap,
+                                              dev_max_params, dev_req_params);
                if (ret) {
                        dev_err(hba->dev,
                            "%s: failed to determine capabilities\n", __func__);