From: Greg Kroah-Hartman Date: Mon, 17 Oct 2022 11:51:04 +0000 (+0200) Subject: 5.19-stable patches X-Git-Tag: v5.4.219~6 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=199733c21d38c8b43cdad7b9e23a4844798ca50d;p=thirdparty%2Fkernel%2Fstable-queue.git 5.19-stable patches added patches: clk-fix-pointer-casting-to-prevent-oops-in-devm_clk_release.patch phy-qcom-qmp-fix-msm8996-pcie-phy-support.patch --- diff --git a/queue-5.19/clk-fix-pointer-casting-to-prevent-oops-in-devm_clk_release.patch b/queue-5.19/clk-fix-pointer-casting-to-prevent-oops-in-devm_clk_release.patch new file mode 100644 index 00000000000..744ee3e8e52 --- /dev/null +++ b/queue-5.19/clk-fix-pointer-casting-to-prevent-oops-in-devm_clk_release.patch @@ -0,0 +1,39 @@ +From 8b3d743fc9e2542822826890b482afabf0e7522a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= +Date: Mon, 20 Jun 2022 19:18:15 +0200 +Subject: clk: Fix pointer casting to prevent oops in devm_clk_release() +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Uwe Kleine-König + +commit 8b3d743fc9e2542822826890b482afabf0e7522a upstream. + +The release function is called with a pointer to the memory returned by +devres_alloc(). I was confused about that by the code before the +generalization that used a struct clk **ptr. + +Reported-by: Marek Szyprowski +Fixes: abae8e57e49a ("clk: generalize devm_clk_get() a bit") +Signed-off-by: Uwe Kleine-König +Link: https://lore.kernel.org/r/20220620171815.114212-1-u.kleine-koenig@pengutronix.de +Tested-by: Marek Szyprowski +Tested-by: Linux Kernel Functional Testing +Signed-off-by: Stephen Boyd +Signed-off-by: Greg Kroah-Hartman +--- + drivers/clk/clk-devres.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/clk/clk-devres.c ++++ b/drivers/clk/clk-devres.c +@@ -11,7 +11,7 @@ struct devm_clk_state { + + static void devm_clk_release(struct device *dev, void *res) + { +- struct devm_clk_state *state = *(struct devm_clk_state **)res; ++ struct devm_clk_state *state = res; + + if (state->exit) + state->exit(state->clk); 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 new file mode 100644 index 00000000000..abad6c79b74 --- /dev/null +++ b/queue-5.19/phy-qcom-qmp-fix-msm8996-pcie-phy-support.patch @@ -0,0 +1,34 @@ +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/series b/queue-5.19/series index 9bb8f24225f..4cfff2ebe58 100644 --- a/queue-5.19/series +++ b/queue-5.19/series @@ -834,3 +834,5 @@ 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