public inbox for linux-scsi@vger.kernel.org
 help / color / mirror / Atom feed
From: Can Guo <cang@qti.qualcomm.com>
To: quic_cang@quicinc.com, bvanassche@acm.org, mani@kernel.org,
	stanley.chu@mediatek.com, adrian.hunter@intel.com,
	beanhuo@micron.com, avri.altman@wdc.com,
	junwoo80.lee@samsung.com, martin.petersen@oracle.com
Cc: linux-scsi@vger.kernel.org,
	"Bao D. Nguyen" <quic_nguyenb@quicinc.com>,
	Andy Gross <agross@kernel.org>,
	Bjorn Andersson <andersson@kernel.org>,
	Konrad Dybcio <konrad.dybcio@linaro.org>,
	"James E.J. Bottomley" <jejb@linux.ibm.com>,
	linux-arm-msm@vger.kernel.org (open list:ARM/QUALCOMM SUPPORT),
	linux-kernel@vger.kernel.org (open list)
Subject: [PATCH v2 7/7] scsi: ufs: ufs-qcom: Add support for UFS device version detection
Date: Mon,  6 Nov 2023 20:46:13 -0800	[thread overview]
Message-ID: <1699332374-9324-8-git-send-email-cang@qti.qualcomm.com> (raw)
In-Reply-To: <1699332374-9324-1-git-send-email-cang@qti.qualcomm.com>

From: "Bao D. Nguyen" <quic_nguyenb@quicinc.com>

A spare register in UFS host controller is used to indicate the UFS device
version. The spare register is populated by bootloader for now, but in
future it will be populated by HW automatically during link startup with
its best efforts in any boot stages prior to Linux.

During host driver init, read the spare register, if it is not populated
with a UFS device version, go ahead with the dual init mechanism. If a UFS
device version is in there, use the UFS device version together with host
controller's HW version to decide the proper PHY gear which should be used
to configure the UFS PHY without going through the second init.

Signed-off-by: Bao D. Nguyen <quic_nguyenb@quicinc.com>
Signed-off-by: Can Guo <quic_cang@quicinc.com>
---
 drivers/ufs/host/ufs-qcom.c | 23 ++++++++++++++++++-----
 drivers/ufs/host/ufs-qcom.h |  2 ++
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
index 94d34b5..b9f726d 100644
--- a/drivers/ufs/host/ufs-qcom.c
+++ b/drivers/ufs/host/ufs-qcom.c
@@ -1064,6 +1064,7 @@ 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;
+	u32 val, dev_major = 0;
 
 	ufshcd_init_host_param(host_params);
 
@@ -1071,12 +1072,24 @@ static void ufs_qcom_set_host_params(struct ufs_hba *hba)
 	host_params->hs_tx_gear = host_params->hs_rx_gear = ufs_qcom_get_hs_gear(hba);
 	host->phy_gear = host_params->hs_tx_gear;
 
-	/*
-	 * Power up the PHY using the minimum supported gear (UFS_HS_G2).
-	 * Switching to max gear will be performed during reinit if supported.
-	 */
-	if (host->hw_ver.major < 0x5)
+	if (host->hw_ver.major < 0x5) {
+		/*
+		 * Power up the PHY using the minimum supported gear (UFS_HS_G2).
+		 * Switching to max gear will be performed during reinit if supported.
+		 */
 		host->phy_gear = UFS_HS_G2;
+	} else {
+		val = ufshcd_readl(host->hba, REG_UFS_DEBUG_SPARE_CFG);
+		dev_major = FIELD_GET(GENMASK(7, 4), val);
+
+		/* UFS device version populated, no need to do init twice */
+		if (dev_major != 0)
+			hba->quirks &= ~UFSHCD_QUIRK_REINIT_AFTER_MAX_GEAR_SWITCH;
+
+		/* For UFS 3.1 and older, apply HS-G4 PHY gear to save power */
+		if (dev_major < 0x4 && dev_major > 0)
+			host->phy_gear = UFS_HS_G4;
+	}
 }
 
 static void ufs_qcom_set_caps(struct ufs_hba *hba)
diff --git a/drivers/ufs/host/ufs-qcom.h b/drivers/ufs/host/ufs-qcom.h
index ab94c54..e33c7c1 100644
--- a/drivers/ufs/host/ufs-qcom.h
+++ b/drivers/ufs/host/ufs-qcom.h
@@ -56,6 +56,8 @@ enum {
 	UFS_AH8_CFG				= 0xFC,
 
 	REG_UFS_CFG3				= 0x271C,
+
+	REG_UFS_DEBUG_SPARE_CFG			= 0x284C,
 };
 
 /* QCOM UFS host controller vendor specific debug registers */
-- 
2.7.4


  parent reply	other threads:[~2023-11-07  4:47 UTC|newest]

Thread overview: 53+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-11-07  4:46 [PATCH v2 0/7] Enable HS-G5 support on SM8550 Can Guo
2023-11-07  4:46 ` [PATCH v2 1/7] scsi: ufs: host: Rename structure ufs_dev_params to ufs_host_params Can Guo
2023-11-07 19:36   ` Andrew Halaney
2023-11-08  7:44     ` Can Guo
2023-11-07 20:56   ` Bart Van Assche
2023-11-08  7:48     ` Can Guo
2023-11-07  4:46 ` [PATCH v2 2/7] scsi: ufs: ufs-qcom: Setup host power mode during init Can Guo
2023-11-07 20:14   ` Andrew Halaney
2023-11-08  7:47     ` Can Guo
2023-11-08  5:07   ` Manivannan Sadhasivam
2023-11-08  8:07     ` Can Guo
2023-11-07  4:46 ` [PATCH v2 3/7] scsi: ufs: ufs-qcom: Allow the first init start with the maximum supported gear Can Guo
2023-11-08  5:23   ` Manivannan Sadhasivam
2023-11-08  8:21     ` Can Guo
2023-11-08  8:23       ` Can Guo
2023-11-09  3:47       ` Manivannan Sadhasivam
2023-11-09  4:07         ` Can Guo
2023-11-09  7:47           ` Manivannan Sadhasivam
2023-11-07  4:46 ` [PATCH v2 4/7] scsi: ufs: ufs-qcom: Limit HS-G5 Rate-A to hosts with HW version 5 Can Guo
2023-11-08  5:25   ` Manivannan Sadhasivam
2023-11-08  8:42     ` Can Guo
2023-11-09  3:27       ` Manivannan Sadhasivam
2023-11-07  4:46 ` [PATCH v2 5/7] scsi: ufs: ufs-qcom: Set initial PHY gear to max HS gear for HW ver 5 and newer Can Guo
2023-11-08  5:34   ` Manivannan Sadhasivam
2023-11-08  8:46     ` Can Guo
2023-11-07  4:46 ` [PATCH v2 6/7] phy: qualcomm: phy-qcom-qmp-ufs: Add High Speed Gear 5 support for SM8550 Can Guo
2023-11-07 13:18   ` Dmitry Baryshkov
2023-11-08  5:49     ` Manivannan Sadhasivam
2023-11-08  6:56       ` Dmitry Baryshkov
2023-11-09  3:24         ` Manivannan Sadhasivam
2023-11-09  9:40           ` Dmitry Baryshkov
2023-11-09 10:42             ` Manivannan Sadhasivam
2023-11-09 11:00               ` Dmitry Baryshkov
2023-11-09 16:04                 ` Manivannan Sadhasivam
2023-11-09 22:11                   ` Dmitry Baryshkov
2023-11-10 13:18                     ` Manivannan Sadhasivam
2023-11-10 14:40                       ` Can Guo
2023-11-11  4:12                         ` Manivannan Sadhasivam
2023-11-12  5:13                           ` Can Guo
2023-11-14  6:12                             ` Manivannan Sadhasivam
2023-11-14  9:15                             ` Dmitry Baryshkov
2023-11-15  7:51                               ` Can Guo
2023-11-08  9:19       ` Can Guo
2023-11-09  3:26         ` Manivannan Sadhasivam
2023-11-08  9:02     ` Can Guo
2023-11-10  8:47   ` neil.armstrong
2023-11-10  9:03     ` Can Guo
2023-11-10  9:17       ` neil.armstrong
2023-11-10  9:32         ` Can Guo
2023-11-10  9:35           ` neil.armstrong
2023-11-07  4:46 ` Can Guo [this message]
2023-11-08  5:11 ` [PATCH v2 0/7] Enable HS-G5 support on SM8550 Manivannan Sadhasivam
2023-11-08  8:09   ` Can Guo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1699332374-9324-8-git-send-email-cang@qti.qualcomm.com \
    --to=cang@qti.qualcomm.com \
    --cc=adrian.hunter@intel.com \
    --cc=agross@kernel.org \
    --cc=andersson@kernel.org \
    --cc=avri.altman@wdc.com \
    --cc=beanhuo@micron.com \
    --cc=bvanassche@acm.org \
    --cc=jejb@linux.ibm.com \
    --cc=junwoo80.lee@samsung.com \
    --cc=konrad.dybcio@linaro.org \
    --cc=linux-arm-msm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-scsi@vger.kernel.org \
    --cc=mani@kernel.org \
    --cc=martin.petersen@oracle.com \
    --cc=quic_cang@quicinc.com \
    --cc=quic_nguyenb@quicinc.com \
    --cc=stanley.chu@mediatek.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox