Commit Message
Greg KH
Oct. 19, 2022, 8:31 a.m. UTC
From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> [ Upstream commit 0a40891b83f257b25a2b983758f72f6813f361cb ] On SDM845 one of PCIe PHYs (the QHP one) has the same region for TX and RX registers. Since the commit 4be26f695ffa ("phy: qcom-qmp-pcie: fix memleak on probe deferral") added checking that resources are not allocated beforehand, this PHY can not be probed anymore. Fix this by skipping the map of ->rx resource on the QHP PHY and assign it manually. Fixes: 4be26f695ffa ("phy: qcom-qmp-pcie: fix memleak on probe deferral") Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Reviewed-by: Johan Hovold <johan+linaro@kernel.org> Link: https://lore.kernel.org/r/20220926172514.880776-1-dmitry.baryshkov@linaro.org Signed-off-by: Vinod Koul <vkoul@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org> --- drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
Comments
On Wed, Oct 19, 2022 at 10:31:12AM +0200, Greg Kroah-Hartman wrote: > From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > [ Upstream commit 0a40891b83f257b25a2b983758f72f6813f361cb ] > > On SDM845 one of PCIe PHYs (the QHP one) has the same region for TX and > RX registers. Since the commit 4be26f695ffa ("phy: qcom-qmp-pcie: fix > memleak on probe deferral") added checking that resources are not > allocated beforehand, this PHY can not be probed anymore. Fix this by > skipping the map of ->rx resource on the QHP PHY and assign it manually. > > Fixes: 4be26f695ffa ("phy: qcom-qmp-pcie: fix memleak on probe deferral") This one is not needed in 6.0 since the offending commit should not be backported. > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > Reviewed-by: Johan Hovold <johan+linaro@kernel.org> > Link: https://lore.kernel.org/r/20220926172514.880776-1-dmitry.baryshkov@linaro.org > Signed-off-by: Vinod Koul <vkoul@kernel.org> > Signed-off-by: Sasha Levin <sashal@kernel.org> Johan
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c index 819bcd975ba4..0baf62d80214 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c @@ -2333,7 +2333,10 @@ int qcom_qmp_phy_pcie_create(struct device *dev, struct device_node *np, int id, if (IS_ERR(qphy->tx)) return PTR_ERR(qphy->tx); - qphy->rx = devm_of_iomap(dev, np, 1, NULL); + if (of_device_is_compatible(dev->of_node, "qcom,sdm845-qhp-pcie-phy")) + qphy->rx = qphy->tx; + else + qphy->rx = devm_of_iomap(dev, np, 1, NULL); if (IS_ERR(qphy->rx)) return PTR_ERR(qphy->rx);