summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNitin Rawat <quic_nitirawa@quicinc.com>2025-05-26 21:08:12 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-06-19 15:40:47 +0200
commit63665a9bf8349e0baa688f70cd04ac9469413080 (patch)
tree627ecf3842f623d0816856930ce226b0ec56f2d4
parent2245ade1fcf2e8c87e6a9245a5817a023f2dce89 (diff)
scsi: ufs: qcom: Prevent calling phy_exit() before phy_init()
[ Upstream commit 7831003165d37ecb7b33843fcee05cada0359a82 ] Prevent calling phy_exit() before phy_init() to avoid abnormal power count and the following warning during boot up. [5.146763] phy phy-1d80000.phy.0: phy_power_on was called before phy_init Fixes: 7bac65687510 ("scsi: ufs: qcom: Power off the PHY if it was already powered on in ufs_qcom_power_up_sequence()") Signed-off-by: Nitin Rawat <quic_nitirawa@quicinc.com> Link: https://lore.kernel.org/r/20250526153821.7918-2-quic_nitirawa@quicinc.com Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com> Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/ufs/host/ufs-qcom.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/ufs/host/ufs-qcom.c b/drivers/ufs/host/ufs-qcom.c
index 2b000c1708ce..31649f908dd4 100644
--- a/drivers/ufs/host/ufs-qcom.c
+++ b/drivers/ufs/host/ufs-qcom.c
@@ -454,10 +454,9 @@ static int ufs_qcom_power_up_sequence(struct ufs_hba *hba)
if (ret)
return ret;
- if (phy->power_count) {
+ if (phy->power_count)
phy_power_off(phy);
- phy_exit(phy);
- }
+
/* phy initialization - calibrate the phy */
ret = phy_init(phy);