Messages in this thread | | | Date | Fri, 13 Jan 2023 09:09:35 +0100 | From | Johan Hovold <> | Subject | Re: [PATCH 5.15.y 4/4] phy: qcom-qmp-combo: fix runtime suspend |
| |
On Thu, Jan 12, 2023 at 04:54:05PM -0800, Stephen Boyd wrote: > From: Johan Hovold <johan+linaro@kernel.org> > > commit c7b98de745cffdceefc077ad5cf9cda032ef8959 upstream. > > 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: 52e013d0bffa ("phy: qcom-qmp: Add support for DP in USB3+DP combo phy") > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > Signed-off-by: Johan Hovold <johan+linaro@kernel.org> > Link: https://lore.kernel.org/r/20221114081346.5116-6-johan+linaro@kernel.org > Signed-off-by: Vinod Koul <vkoul@kernel.org> > [swboyd@chromium.org: Backport to pre-split driver] > Signed-off-by: Stephen Boyd <swboyd@chromium.org> > --- > drivers/phy/qualcomm/phy-qcom-qmp.c | 12 ++---------- > 1 file changed, 2 insertions(+), 10 deletions(-) > > diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c > index 9fda6d283f20..d928afe2ebba 100644 > --- a/drivers/phy/qualcomm/phy-qcom-qmp.c > +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c > @@ -4985,15 +4985,11 @@ static void qcom_qmp_phy_disable_autonomous_mode(struct qmp_phy *qphy) > static int __maybe_unused qcom_qmp_phy_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);
So this doesn't work currently either as the usb_phy pointer is not set for PCIe and UFS PHYs.
> > - /* 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;
Johan
| |