From ee2fe3b951103f9d25623d2f7d8246d8c80f1d09 Mon Sep 17 00:00:00 2001 From: Sasha Levin Date: Tue, 27 Dec 2022 08:05:12 -0500 Subject: [PATCH] Drop phy-qcom-qmp-combo-fix-runtime-suspend.patch Signed-off-by: Sasha Levin --- ...y-qcom-qmp-combo-fix-runtime-suspend.patch | 69 ------------------- queue-5.10/series | 1 - ...y-qcom-qmp-combo-fix-runtime-suspend.patch | 69 ------------------- queue-5.15/series | 1 - 4 files changed, 140 deletions(-) delete mode 100644 queue-5.10/phy-qcom-qmp-combo-fix-runtime-suspend.patch delete mode 100644 queue-5.15/phy-qcom-qmp-combo-fix-runtime-suspend.patch diff --git a/queue-5.10/phy-qcom-qmp-combo-fix-runtime-suspend.patch b/queue-5.10/phy-qcom-qmp-combo-fix-runtime-suspend.patch deleted file mode 100644 index 34c62abc2c0..00000000000 --- a/queue-5.10/phy-qcom-qmp-combo-fix-runtime-suspend.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 5611e9f50349b50caffc774a88a6b48a118cf9c6 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 14 Nov 2022 09:13:45 +0100 -Subject: phy: qcom-qmp-combo: fix runtime suspend - -From: Johan Hovold - -[ Upstream commit c7b98de745cffdceefc077ad5cf9cda032ef8959 ] - -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 -Signed-off-by: Johan Hovold -Link: https://lore.kernel.org/r/20221114081346.5116-6-johan+linaro@kernel.org -Signed-off-by: Vinod Koul -Signed-off-by: Sasha Levin ---- - drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 12 ++---------- - 1 file changed, 2 insertions(+), 10 deletions(-) - -diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c -index c7309e981bfb..013fe758f5ad 100644 ---- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c -+++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c -@@ -5501,15 +5501,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); - -- /* 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; -@@ -5526,16 +5522,12 @@ static int __maybe_unused qcom_qmp_phy_runtime_suspend(struct device *dev) - static int __maybe_unused qcom_qmp_phy_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; --- -2.35.1 - diff --git a/queue-5.10/series b/queue-5.10/series index 5420c9a1232..9faabadff06 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -441,7 +441,6 @@ kbuild-remove-unneeded-mkdir-for-external-modules_in.patch kbuild-unify-modules-_install-for-in-tree-and-extern.patch phy-qcom-qmp-create-copies-of-qmp-phy-driver.patch kbuild-refactor-single-builds-of-.ko.patch -phy-qcom-qmp-combo-fix-runtime-suspend.patch powerpc-perf-callchain-validate-kernel-stack-pointer.patch powerpc-83xx-mpc832x_rdb-call-platform_device_put-in.patch powerpc-hv-gpci-fix-hv_gpci-event-list.patch diff --git a/queue-5.15/phy-qcom-qmp-combo-fix-runtime-suspend.patch b/queue-5.15/phy-qcom-qmp-combo-fix-runtime-suspend.patch deleted file mode 100644 index c5625506c5c..00000000000 --- a/queue-5.15/phy-qcom-qmp-combo-fix-runtime-suspend.patch +++ /dev/null @@ -1,69 +0,0 @@ -From d17b3a7b0119f7d92788acbe0f3d3b31bd8f892b Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 14 Nov 2022 09:13:45 +0100 -Subject: phy: qcom-qmp-combo: fix runtime suspend - -From: Johan Hovold - -[ Upstream commit c7b98de745cffdceefc077ad5cf9cda032ef8959 ] - -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 -Signed-off-by: Johan Hovold -Link: https://lore.kernel.org/r/20221114081346.5116-6-johan+linaro@kernel.org -Signed-off-by: Vinod Koul -Signed-off-by: Sasha Levin ---- - drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 12 ++---------- - 1 file changed, 2 insertions(+), 10 deletions(-) - -diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c -index c7309e981bfb..013fe758f5ad 100644 ---- a/drivers/phy/qualcomm/phy-qcom-qmp-combo.c -+++ b/drivers/phy/qualcomm/phy-qcom-qmp-combo.c -@@ -5501,15 +5501,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); - -- /* 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; -@@ -5526,16 +5522,12 @@ static int __maybe_unused qcom_qmp_phy_runtime_suspend(struct device *dev) - static int __maybe_unused qcom_qmp_phy_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; --- -2.35.1 - diff --git a/queue-5.15/series b/queue-5.15/series index 61e3abc2cf3..ed2c0e2e6dc 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -555,7 +555,6 @@ cxl-fix-refcount-leak-in-cxl_calc_capp_routing.patch powerpc-xmon-fix-wswitch-unreachable-warning-in-bpt_.patch powerpc-xive-add-missing-iounmap-in-error-path-in-xi.patch phy-qcom-qmp-create-copies-of-qmp-phy-driver.patch -phy-qcom-qmp-combo-fix-runtime-suspend.patch powerpc-perf-callchain-validate-kernel-stack-pointer.patch powerpc-83xx-mpc832x_rdb-call-platform_device_put-in.patch powerpc-hv-gpci-fix-hv_gpci-event-list.patch -- 2.47.3