From: Greg Kroah-Hartman Date: Thu, 12 Sep 2024 07:35:08 +0000 (+0200) Subject: drop clk patch from 6.1 and 5.15 X-Git-Tag: v4.19.322~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=458a4bfa4ad2ed03fc355941ca6967c4266896ec;p=thirdparty%2Fkernel%2Fstable-queue.git drop clk patch from 6.1 and 5.15 --- diff --git a/queue-5.15/clk-qcom-clk-alpha-pll-fix-zonda-set_rate-failure-when-pll-is-disabled.patch b/queue-5.15/clk-qcom-clk-alpha-pll-fix-zonda-set_rate-failure-when-pll-is-disabled.patch deleted file mode 100644 index 958b1c9117d..00000000000 --- a/queue-5.15/clk-qcom-clk-alpha-pll-fix-zonda-set_rate-failure-when-pll-is-disabled.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 85e8ee59dfde1a7b847fbed0778391392cd985cb Mon Sep 17 00:00:00 2001 -From: Satya Priya Kakitapalli -Date: Wed, 31 Jul 2024 11:59:11 +0530 -Subject: clk: qcom: clk-alpha-pll: Fix zonda set_rate failure when PLL is disabled - -From: Satya Priya Kakitapalli - -commit 85e8ee59dfde1a7b847fbed0778391392cd985cb upstream. - -Currently, clk_zonda_pll_set_rate polls for the PLL to lock even if the -PLL is disabled. However, if the PLL is disabled then LOCK_DET will -never assert and we'll return an error. There is no reason to poll -LOCK_DET if the PLL is already disabled, so skip polling in this case. - -Fixes: f21b6bfecc27 ("clk: qcom: clk-alpha-pll: add support for zonda pll") -Cc: stable@vger.kernel.org -Signed-off-by: Satya Priya Kakitapalli -Reviewed-by: Dmitry Baryshkov -Link: https://lore.kernel.org/r/20240731062916.2680823-4-quic_skakitap@quicinc.com -Signed-off-by: Bjorn Andersson -Signed-off-by: Greg Kroah-Hartman ---- - drivers/clk/qcom/clk-alpha-pll.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/clk/qcom/clk-alpha-pll.c -+++ b/drivers/clk/qcom/clk-alpha-pll.c -@@ -1932,6 +1932,9 @@ static int clk_zonda_pll_set_rate(struct - regmap_write(pll->clkr.regmap, PLL_ALPHA_VAL(pll), a); - regmap_write(pll->clkr.regmap, PLL_L_VAL(pll), l); - -+ if (!clk_hw_is_enabled(hw)) -+ return 0; -+ - /* Wait before polling for the frequency latch */ - udelay(5); - diff --git a/queue-5.15/series b/queue-5.15/series index 5d23b35200e..713d22b04a7 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -79,7 +79,6 @@ fuse-update-stats-for-pages-in-dropped-aux-writeback-list.patch fuse-use-unsigned-type-for-getxattr-listxattr-size-truncation.patch clk-qcom-clk-alpha-pll-fix-the-pll-post-div-mask.patch clk-qcom-clk-alpha-pll-fix-the-trion-pll-postdiv-set-rate-api.patch -clk-qcom-clk-alpha-pll-fix-zonda-set_rate-failure-when-pll-is-disabled.patch can-mcp251x-fix-deadlock-if-an-interrupt-occurs-during-mcp251x_open.patch tracing-avoid-possible-softlockup-in-tracing_iter_reset.patch ila-call-nf_unregister_net_hooks-sooner.patch diff --git a/queue-6.1/clk-qcom-clk-alpha-pll-fix-zonda-set_rate-failure-when-pll-is-disabled.patch b/queue-6.1/clk-qcom-clk-alpha-pll-fix-zonda-set_rate-failure-when-pll-is-disabled.patch deleted file mode 100644 index feed5f281a0..00000000000 --- a/queue-6.1/clk-qcom-clk-alpha-pll-fix-zonda-set_rate-failure-when-pll-is-disabled.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 85e8ee59dfde1a7b847fbed0778391392cd985cb Mon Sep 17 00:00:00 2001 -From: Satya Priya Kakitapalli -Date: Wed, 31 Jul 2024 11:59:11 +0530 -Subject: clk: qcom: clk-alpha-pll: Fix zonda set_rate failure when PLL is disabled - -From: Satya Priya Kakitapalli - -commit 85e8ee59dfde1a7b847fbed0778391392cd985cb upstream. - -Currently, clk_zonda_pll_set_rate polls for the PLL to lock even if the -PLL is disabled. However, if the PLL is disabled then LOCK_DET will -never assert and we'll return an error. There is no reason to poll -LOCK_DET if the PLL is already disabled, so skip polling in this case. - -Fixes: f21b6bfecc27 ("clk: qcom: clk-alpha-pll: add support for zonda pll") -Cc: stable@vger.kernel.org -Signed-off-by: Satya Priya Kakitapalli -Reviewed-by: Dmitry Baryshkov -Link: https://lore.kernel.org/r/20240731062916.2680823-4-quic_skakitap@quicinc.com -Signed-off-by: Bjorn Andersson -Signed-off-by: Greg Kroah-Hartman ---- - drivers/clk/qcom/clk-alpha-pll.c | 3 +++ - 1 file changed, 3 insertions(+) - ---- a/drivers/clk/qcom/clk-alpha-pll.c -+++ b/drivers/clk/qcom/clk-alpha-pll.c -@@ -2005,6 +2005,9 @@ static int clk_zonda_pll_set_rate(struct - regmap_write(pll->clkr.regmap, PLL_ALPHA_VAL(pll), a); - regmap_write(pll->clkr.regmap, PLL_L_VAL(pll), l); - -+ if (!clk_hw_is_enabled(hw)) -+ return 0; -+ - /* Wait before polling for the frequency latch */ - udelay(5); - diff --git a/queue-6.1/series b/queue-6.1/series index a9f49c12cd0..84e54818d31 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -25,7 +25,6 @@ fuse-update-stats-for-pages-in-dropped-aux-writeback-list.patch fuse-use-unsigned-type-for-getxattr-listxattr-size-truncation.patch clk-qcom-clk-alpha-pll-fix-the-pll-post-div-mask.patch clk-qcom-clk-alpha-pll-fix-the-trion-pll-postdiv-set-rate-api.patch -clk-qcom-clk-alpha-pll-fix-zonda-set_rate-failure-when-pll-is-disabled.patch can-mcp251x-fix-deadlock-if-an-interrupt-occurs-during-mcp251x_open.patch spi-rockchip-resolve-unbalanced-runtime-pm-system-pm-handling.patch tracing-avoid-possible-softlockup-in-tracing_iter_reset.patch