From 471268ced0e2f6c94cf1471f92558a267ad7a07b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Wed, 19 Oct 2022 10:15:42 +0200 Subject: [PATCH] missed some qcom-qmp patches for 5.19 --- ...com-qmp-fix-msm8996-pcie-phy-support.patch | 34 -------------- ...e-fix-resource-mapping-for-sdm845-qh.patch | 44 ------------------- queue-5.19/series | 2 - 3 files changed, 80 deletions(-) delete mode 100644 queue-5.19/phy-qcom-qmp-fix-msm8996-pcie-phy-support.patch delete mode 100644 queue-5.19/phy-qcom-qmp-pcie-fix-resource-mapping-for-sdm845-qh.patch diff --git a/queue-5.19/phy-qcom-qmp-fix-msm8996-pcie-phy-support.patch b/queue-5.19/phy-qcom-qmp-fix-msm8996-pcie-phy-support.patch deleted file mode 100644 index abad6c79b74..00000000000 --- a/queue-5.19/phy-qcom-qmp-fix-msm8996-pcie-phy-support.patch +++ /dev/null @@ -1,34 +0,0 @@ -From fbbf71f3740939c44dfb5411e2daf3bf0d8e8f41 Mon Sep 17 00:00:00 2001 -From: Dmitry Baryshkov -Date: Fri, 10 Jun 2022 21:55:41 +0300 -Subject: phy: qcom-qmp: fix msm8996 PCIe PHY support - -From: Dmitry Baryshkov - -commit fbbf71f3740939c44dfb5411e2daf3bf0d8e8f41 upstream. - -Replace init/exit ops with power_on/power_off which should be used for -the PCIe PHYs to fix PHY initialization. - -Fixes: f575ac2d64e7 ("phy: qcom-qmp-pcie-msm8996: drop support for non-PCIe PHY types") -Signed-off-by: Dmitry Baryshkov -Link: https://lore.kernel.org/r/20220610185542.3662484-2-dmitry.baryshkov@linaro.org -Signed-off-by: Vinod Koul -Signed-off-by: Greg Kroah-Hartman ---- - drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - ---- a/drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c -+++ b/drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c -@@ -867,8 +867,8 @@ static int phy_pipe_clk_register(struct - } - - static const struct phy_ops qcom_qmp_phy_pcie_msm8996_ops = { -- .init = qcom_qmp_phy_pcie_msm8996_enable, -- .exit = qcom_qmp_phy_pcie_msm8996_disable, -+ .power_on = qcom_qmp_phy_pcie_msm8996_enable, -+ .power_off = qcom_qmp_phy_pcie_msm8996_disable, - .set_mode = qcom_qmp_phy_pcie_msm8996_set_mode, - .owner = THIS_MODULE, - }; diff --git a/queue-5.19/phy-qcom-qmp-pcie-fix-resource-mapping-for-sdm845-qh.patch b/queue-5.19/phy-qcom-qmp-pcie-fix-resource-mapping-for-sdm845-qh.patch deleted file mode 100644 index f823afd430f..00000000000 --- a/queue-5.19/phy-qcom-qmp-pcie-fix-resource-mapping-for-sdm845-qh.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 29e2136a16b8e2c58a0e414c1a6345e3419b5fd4 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Mon, 26 Sep 2022 20:25:14 +0300 -Subject: phy: qcom-qmp-pcie: fix resource mapping for SDM845 QHP PHY - -From: Dmitry Baryshkov - -[ 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 -Reviewed-by: Johan Hovold -Link: https://lore.kernel.org/r/20220926172514.880776-1-dmitry.baryshkov@linaro.org -Signed-off-by: Vinod Koul -Signed-off-by: Sasha Levin ---- - drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c -index 7073af57345b..154712af5410 100644 ---- a/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c -+++ b/drivers/phy/qualcomm/phy-qcom-qmp-pcie.c -@@ -5928,7 +5928,10 @@ int qcom_qmp_phy_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); - --- -2.35.1 - diff --git a/queue-5.19/series b/queue-5.19/series index f179998b701..b5142f6bd22 100644 --- a/queue-5.19/series +++ b/queue-5.19/series @@ -505,7 +505,6 @@ clk-mediatek-mt8183-mfgcfg-propagate-rate-changes-to.patch clk-mediatek-clk-mt8195-mfg-reparent-mfg_bg3d-and-pr.patch clk-mediatek-fix-unregister-function-in-mtk_clk_regi.patch clk-mediatek-migrate-remaining-clk_unregister_-to-cl.patch -phy-qcom-qmp-pcie-fix-resource-mapping-for-sdm845-qh.patch fs-don-t-randomize-struct-kiocb-fields.patch dmaengine-ioat-stop-mod_timer-from-resurrecting-dele.patch usb-mtu3-fix-failed-runtime-suspend-in-host-only-mod.patch @@ -771,7 +770,6 @@ revert-net-ieee802154-reject-zero-sized-raw_sendmsg.patch net-ieee802154-don-t-warn-zero-sized-raw_sendmsg.patch powerpc-64s-interrupt-fix-lost-interrupts-when-returning-to-soft-masked-context.patch drm-amd-display-fix-build-breakage-with-config_debug_fs-n.patch -phy-qcom-qmp-fix-msm8996-pcie-phy-support.patch clk-fix-pointer-casting-to-prevent-oops-in-devm_clk_release.patch kbuild-add-skip_encoding_btf_enum64-option-to-pahole.patch kconfig.debug-simplify-the-dependency-of-debug_info_dwarf4-5.patch -- 2.47.3