scsi: ufs: ufs-qcom: Setup host power mode during init

Setup host power mode and its limitations during UFS host driver init to
avoid repetitive work during every power mode change.

Acked-by: Andrew Halaney <ahalaney@redhat.com>
Reviewed-by: Nitin Rawat <quic_nitirawa@quicinc.com>
Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Co-developed-by: Bao D. Nguyen <quic_nguyenb@quicinc.com>
Signed-off-by: Bao D. Nguyen <quic_nguyenb@quicinc.com>
Signed-off-by: Can Guo <quic_cang@quicinc.com>
Link: https://lore.kernel.org/r/1701520577-31163-4-git-send-email-quic_cang@quicinc.com
Tested-by: Neil Armstrong <neil.armstrong@linaro.org> # on SM8550-QRD
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
index c21ff2cd7aa6fc432b31efa49086e4b0b6104612..9a900196509f99405e78350a9ad397911d2af318 100644 (file)
--- a/drivers/ufs/host/ufs-qcom.c
+++ b/drivers/ufs/host/ufs-qcom.c
@@ -898,7 +898,7 @@ static int ufs_qcom_pwr_change_notify(struct ufs_hba *hba,
                                struct ufs_pa_layer_attr *dev_req_params)
 {
        struct ufs_qcom_host *host = ufshcd_get_variant(hba);
-       struct ufs_host_params host_params;
+       struct ufs_host_params *host_params = &host->host_params;
        int ret = 0;
 
        if (!dev_req_params) {
@@ -908,12 +908,7 @@ static int ufs_qcom_pwr_change_notify(struct ufs_hba *hba,
 
        switch (status) {
        case PRE_CHANGE:
-               ufshcd_init_host_params(&host_params);
-
-               /* This driver only supports symmetic gear setting i.e., hs_tx_gear == hs_rx_gear */
-               host_params.hs_tx_gear = host_params.hs_rx_gear = ufs_qcom_get_hs_gear(hba);
-
-               ret = ufshcd_negotiate_pwr_params(&host_params, dev_max_params, dev_req_params);
+               ret = ufshcd_negotiate_pwr_params(host_params, dev_max_params, dev_req_params);
                if (ret) {
                        dev_err(hba->dev, "%s: failed to determine capabilities\n",
                                        __func__);
@@ -1048,6 +1043,17 @@ static void ufs_qcom_advertise_quirks(struct ufs_hba *hba)
                hba->quirks |= UFSHCD_QUIRK_REINIT_AFTER_MAX_GEAR_SWITCH;
 }
 
+static void ufs_qcom_set_host_params(struct ufs_hba *hba)
+{
+       struct ufs_qcom_host *host = ufshcd_get_variant(hba);
+       struct ufs_host_params *host_params = &host->host_params;
+
+       ufshcd_init_host_params(host_params);
+
+       /* This driver only supports symmetic gear setting i.e., hs_tx_gear == hs_rx_gear */
+       host_params->hs_tx_gear = host_params->hs_rx_gear = ufs_qcom_get_hs_gear(hba);
+}
+
 static void ufs_qcom_set_caps(struct ufs_hba *hba)
 {
        struct ufs_qcom_host *host = ufshcd_get_variant(hba);
@@ -1272,6 +1278,7 @@ static int ufs_qcom_init(struct ufs_hba *hba)
 
        ufs_qcom_set_caps(hba);
        ufs_qcom_advertise_quirks(hba);
+       ufs_qcom_set_host_params(hba);
 
        err = ufs_qcom_ice_init(host);
        if (err)

diff --git a/drivers/ufs/host/ufs-qcom.h b/drivers/ufs/host/ufs-qcom.h
index 82cd1436f42d51c0649c36d41639193eb570aea1..11419ebd2082042efa6e69c1366a19fb434f4890 100644 (file)
--- a/drivers/ufs/host/ufs-qcom.h
+++ b/drivers/ufs/host/ufs-qcom.h
@@ -238,6 +238,7 @@ struct ufs_qcom_host {
 
        struct gpio_desc *device_reset;
 
+       struct ufs_host_params host_params;
        u32 phy_gear;
 
        bool esi_enabled;