| Message ID | 20221111084255.8963-6-johan+linaro@kernel.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | phy: qcom-qmp-combo: preparatory fixes (set 1/3) | expand |
On 11/11/2022 11:42, Johan Hovold wrote: > Drop the confused runtime-suspend type check which effectively broke > runtime PM if the DP child node happens to be parsed before the USB > child node during probe (e.g. due to order of child nodes in the > devicetree). > > Instead use the new driver data USB PHY pointer to access the USB > configuration and resources. > > Fixes: ac0d239936bd ("phy: qcom-qmp: Add support for runtime PM") I belive the Fixes tag is incorrect. One can not easily backport this patch on top of the original ac0d239936bd. I'd suggest to point the Fixes tags to the addition of phy-qcom-qmp-combo.c > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
On Sat, Nov 12, 2022 at 09:17:29AM +0300, Dmitry Baryshkov wrote: > On 11/11/2022 11:42, Johan Hovold wrote: > > Drop the confused runtime-suspend type check which effectively broke > > runtime PM if the DP child node happens to be parsed before the USB > > child node during probe (e.g. due to order of child nodes in the > > devicetree). > > > > Instead use the new driver data USB PHY pointer to access the USB > > configuration and resources. > > > > Fixes: ac0d239936bd ("phy: qcom-qmp: Add support for runtime PM") > > I belive the Fixes tag is incorrect. One can not easily backport this > patch on top of the original ac0d239936bd. I'd suggest to point the > Fixes tags to the addition of phy-qcom-qmp-combo.c The Fixes tag should document the commit introducing the bug regardless of what kind of changes happened in between. That said, the tag should have been Fixes: 52e013d0bffa ("phy: qcom-qmp: Add support for DP in USB3+DP combo phy") as this wasn't an issue before adding DP support, which intentionally relied on these hard-coded indexes ("luckily USB3 is the first phy"). Johan
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c index 17707f68d482..fde30205f332 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c @@ -2207,15 +2207,11 @@ static void qmp_combo_disable_autonomous_mode(struct qmp_phy *qphy) static int __maybe_unused qmp_combo_runtime_suspend(struct device *dev) { struct qcom_qmp *qmp = dev_get_drvdata(dev); - struct qmp_phy *qphy = qmp->phys[0]; + struct qmp_phy *qphy = qmp->usb_phy; const struct qmp_phy_cfg *cfg = qphy->cfg; dev_vdbg(dev, "Suspending QMP phy, mode:%d\n", qphy->mode); - /* Supported only for USB3 PHY and luckily USB3 is the first phy */ - if (cfg->type != PHY_TYPE_USB3) - return 0; - if (!qmp->init_count) { dev_vdbg(dev, "PHY not initialized, bailing out\n"); return 0; @@ -2232,16 +2228,12 @@ static int __maybe_unused qmp_combo_runtime_suspend(struct device *dev) static int __maybe_unused qmp_combo_runtime_resume(struct device *dev) { struct qcom_qmp *qmp = dev_get_drvdata(dev); - struct qmp_phy *qphy = qmp->phys[0]; + struct qmp_phy *qphy = qmp->usb_phy; const struct qmp_phy_cfg *cfg = qphy->cfg; int ret = 0; dev_vdbg(dev, "Resuming QMP phy, mode:%d\n", qphy->mode); - /* Supported only for USB3 PHY and luckily USB3 is the first phy */ - if (cfg->type != PHY_TYPE_USB3) - return 0; - if (!qmp->init_count) { dev_vdbg(dev, "PHY not initialized, bailing out\n"); return 0;
Drop the confused runtime-suspend type check which effectively broke runtime PM if the DP child node happens to be parsed before the USB child node during probe (e.g. due to order of child nodes in the devicetree). Instead use the new driver data USB PHY pointer to access the USB configuration and resources. Fixes: ac0d239936bd ("phy: qcom-qmp: Add support for runtime PM") Signed-off-by: Johan Hovold <johan+linaro@kernel.org> --- drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)