mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 08:19:28 +00:00
phy: qcom-qmp: Correct READY_STATUS poll break condition
After issuing a PHY_START request to the QMP, the hardware documentation states that the software should wait for the PCS_READY_STATUS to become 1. With the introduction of commitc9b589791f
("phy: qcom: Utilize UFS reset controller") an additional 1ms delay was introduced between the start request and the check of the status bit. This greatly increases the chances for the hardware to actually becoming ready before the status bit is read. The result can be seen in that UFS PHY enabling is now reported as a failure in 10% of the boots on SDM845, which is a clear regression from the previous rare/occasional failure. This patch fixes the "break condition" of the poll to check for the correct state of the status bit. Unfortunately PCIe on 8996 and 8998 does not specify the mask_pcs_ready register, which means that the code checks a bit that's always 0. So the patch also fixes these, in order to not regress these targets. Fixes:73d7ec899b
("phy: qcom-qmp: Add msm8998 PCIe QMP PHY support") Fixes:e78f3d15e1
("phy: qcom-qmp: new qmp phy driver for qcom-chipsets") Cc: stable@vger.kernel.org Cc: Evan Green <evgreen@chromium.org> Cc: Marc Gonzalez <marc.w.gonzalez@free.fr> Cc: Vivek Gautam <vivek.gautam@codeaurora.org> Reviewed-by: Evan Green <evgreen@chromium.org> Reviewed-by: Niklas Cassel <niklas.cassel@linaro.org> Reviewed-by: Marc Gonzalez <marc.w.gonzalez@free.fr> Tested-by: Marc Gonzalez <marc.w.gonzalez@free.fr> Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org> Signed-off-by: Kishon Vijay Abraham I <kishon@ti.com>
This commit is contained in:
parent
1853bc0ae6
commit
885bd76596
1 changed files with 3 additions and 1 deletions
|
@ -1074,6 +1074,7 @@ static const struct qmp_phy_cfg msm8996_pciephy_cfg = {
|
||||||
|
|
||||||
.start_ctrl = PCS_START | PLL_READY_GATE_EN,
|
.start_ctrl = PCS_START | PLL_READY_GATE_EN,
|
||||||
.pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL,
|
.pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL,
|
||||||
|
.mask_pcs_ready = PHYSTATUS,
|
||||||
.mask_com_pcs_ready = PCS_READY,
|
.mask_com_pcs_ready = PCS_READY,
|
||||||
|
|
||||||
.has_phy_com_ctrl = true,
|
.has_phy_com_ctrl = true,
|
||||||
|
@ -1253,6 +1254,7 @@ static const struct qmp_phy_cfg msm8998_pciephy_cfg = {
|
||||||
|
|
||||||
.start_ctrl = SERDES_START | PCS_START,
|
.start_ctrl = SERDES_START | PCS_START,
|
||||||
.pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL,
|
.pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL,
|
||||||
|
.mask_pcs_ready = PHYSTATUS,
|
||||||
.mask_com_pcs_ready = PCS_READY,
|
.mask_com_pcs_ready = PCS_READY,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -1547,7 +1549,7 @@ static int qcom_qmp_phy_enable(struct phy *phy)
|
||||||
status = pcs + cfg->regs[QPHY_PCS_READY_STATUS];
|
status = pcs + cfg->regs[QPHY_PCS_READY_STATUS];
|
||||||
mask = cfg->mask_pcs_ready;
|
mask = cfg->mask_pcs_ready;
|
||||||
|
|
||||||
ret = readl_poll_timeout(status, val, !(val & mask), 1,
|
ret = readl_poll_timeout(status, val, val & mask, 1,
|
||||||
PHY_INIT_COMPLETE_TIMEOUT);
|
PHY_INIT_COMPLETE_TIMEOUT);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
dev_err(qmp->dev, "phy initialization timed-out\n");
|
dev_err(qmp->dev, "phy initialization timed-out\n");
|
||||||
|
|
Loading…
Reference in a new issue