From: Can Guo <quic_cang@quicinc.com>
To: quic_cang@quicinc.com, mani@kernel.org, quic_nguyenb@quicinc.com,
quic_nitirawa@quicinc.com, martin.petersen@oracle.com
Cc: linux-scsi@vger.kernel.org, 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:UNIVERSAL FLASH STORAGE
HOST CONTROLLER DRIVER...),
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH 2/6] scsi: ufs: ufs-qcom: Add support for UFS device version detection
Date: Sun, 10 Sep 2023 22:59:23 -0700 [thread overview]
Message-ID: <1694411968-14413-3-git-send-email-quic_cang@quicinc.com> (raw)
In-Reply-To: <1694411968-14413-1-git-send-email-quic_cang@quicinc.com>
From: "Bao D. Nguyen" <quic_nguyenb@quicinc.com>
Retrieve UFS device version from UFS host controller's spare register
which is populated by bootloader, and use the UFS device version together
with host controller's HW version to decide the proper power modes which
should be used to configure the UFS PHY.
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 | 30 +++++++++++++++++++++++-------
drivers/ufs/host/ufs-qcom.h | 2 ++
2 files changed, 25 insertions(+), 7 deletions(-)
diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
index 710f079..8a9d54f 100644
--- a/drivers/ufs/host/ufs-qcom.c
+++ b/drivers/ufs/host/ufs-qcom.c
@@ -1030,7 +1030,7 @@ static void ufs_qcom_advertise_quirks(struct ufs_hba *hba)
| UFSHCD_QUIRK_BROKEN_PA_RXHSUNTERMCAP);
}
- if (host->hw_ver.major > 0x3)
+ if (host->hw_ver.major > 0x3 && host->hw_ver.major < 0x5)
hba->quirks |= UFSHCD_QUIRK_REINIT_AFTER_MAX_GEAR_SWITCH;
}
@@ -1038,11 +1038,33 @@ static void ufs_qcom_set_pwr_mode_limits(struct ufs_hba *hba)
{
struct ufs_qcom_host *host = ufshcd_get_variant(hba);
struct ufs_dev_params *host_pwr_cap = &host->host_pwr_cap;
+ u32 val, dev_major = 0;
ufshcd_init_pwr_dev_param(host_pwr_cap);
/* This driver only supports symmetic gear setting i.e., hs_tx_gear == hs_rx_gear */
host_pwr_cap->hs_tx_gear = host_pwr_cap->hs_rx_gear = ufs_qcom_get_hs_gear(hba);
+ host->phy_gear = host_pwr_cap->hs_rx_gear;
+
+ 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);
+
+ if (host->hw_ver.major == 0x5 && (dev_major >= 0x4 ||
+ dev_major == 0)) {
+ /* For UFS 4.0 and newer, or dev version is not populated */
+ host_pwr_cap->hs_rate = PA_HS_MODE_A;
+ } else if (dev_major < 0x4 && dev_major > 0) {
+ /* For UFS 3.1 and older, apply HS-G4 PHY settings to save power */
+ host->phy_gear = UFS_HS_G4;
+ }
+ }
}
static void ufs_qcom_set_caps(struct ufs_hba *hba)
@@ -1287,12 +1309,6 @@ static int ufs_qcom_init(struct ufs_hba *hba)
dev_warn(dev, "%s: failed to configure the testbus %d\n",
__func__, err);
- /*
- * 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;
-
return 0;
out_variant_clear:
diff --git a/drivers/ufs/host/ufs-qcom.h b/drivers/ufs/host/ufs-qcom.h
index 4db64d9..e10889f 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
next prev parent reply other threads:[~2023-09-11 6:06 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1694411968-14413-1-git-send-email-quic_cang@quicinc.com>
2023-09-11 5:59 ` [PATCH 1/6] scsi: ufs: ufs-qcom: Setup host power mode during init Can Guo
2023-09-14 12:40 ` Nitin Rawat
2023-09-19 10:36 ` Manivannan Sadhasivam
2023-10-31 13:09 ` Can Guo
2023-09-11 5:59 ` Can Guo [this message]
2023-09-11 9:17 ` [PATCH 2/6] scsi: ufs: ufs-qcom: Add support for UFS device version detection Konrad Dybcio
2023-09-11 9:42 ` Can Guo
2023-09-11 9:46 ` Konrad Dybcio
2023-09-11 10:02 ` Can Guo
2023-09-15 2:31 ` Dmitry Baryshkov
2023-09-19 12:08 ` Manivannan Sadhasivam
2023-09-19 22:27 ` Dmitry Baryshkov
2023-09-20 10:23 ` Manivannan Sadhasivam
2023-09-20 11:13 ` Dmitry Baryshkov
2023-09-20 11:51 ` Manivannan Sadhasivam
2023-10-18 12:47 ` Manivannan Sadhasivam
2023-10-26 19:31 ` Konrad Dybcio
2023-10-27 12:22 ` Manivannan Sadhasivam
2023-09-15 12:48 ` Konrad Dybcio
2023-10-18 14:02 ` Neil Armstrong
[not found] ` <059cc112-7fb6-4da4-bc25-4eede0252f0e@linaro.org>
2023-10-31 5:06 ` Can Guo
2023-10-31 9:30 ` neil.armstrong
2023-09-11 5:59 ` [PATCH 3/6] phy: qualcomm: phy-qcom-qmp-ufs: Add High Speed Gear 5 support for SM8550 Can Guo
2023-09-14 12:26 ` Nitin Rawat
2023-09-15 2:07 ` Can Guo
2023-09-19 12:10 ` Manivannan Sadhasivam
2023-09-11 5:59 ` [PATCH 4/6] phy: qualcomm: phy-qcom-qmp-ufs: Move data structs and setting tables to header Can Guo
2023-09-14 11:44 ` Nitin Rawat
2023-09-14 12:28 ` Dmitry Baryshkov
2023-09-19 12:15 ` Manivannan Sadhasivam
2023-09-19 22:30 ` Dmitry Baryshkov
2023-09-20 10:19 ` Manivannan Sadhasivam
2023-09-21 14:02 ` Bjorn Andersson
2023-09-22 18:23 ` Manivannan Sadhasivam
2023-09-21 13:58 ` Bjorn Andersson
2023-09-11 5:59 ` [PATCH 5/6] scsi: ufs: ufs-sysfs: Expose UFS power info Can Guo
2023-09-14 11:33 ` Nitin Rawat
2023-09-15 1:59 ` Can Guo
2023-09-19 12:16 ` Manivannan Sadhasivam
2023-10-31 8:08 ` Can Guo
2023-10-26 19:53 ` Bart Van Assche
2023-10-31 4:46 ` Can Guo
2023-09-11 5:59 ` [PATCH 6/6] scsi: ufs: ufs-sysfs: Introduce UFS power info sysfs nodes Can Guo
2023-09-14 11:35 ` Nitin Rawat
2023-09-15 2:00 ` Can Guo
2023-09-18 15:36 ` Bart Van Assche
2023-10-31 4:53 ` 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=1694411968-14413-3-git-send-email-quic_cang@quicinc.com \
--to=quic_cang@quicinc.com \
--cc=agross@kernel.org \
--cc=andersson@kernel.org \
--cc=jejb@linux.ibm.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_nguyenb@quicinc.com \
--cc=quic_nitirawa@quicinc.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
all inboxes | Powered by JetHome®