From 7d3a3ade9cfb3e84887f7ce5ff62451653e0db86 Mon Sep 17 00:00:00 2001 From: Albert Xu <19632674+1582130940@users.noreply.github.com> Date: Tue, 1 Nov 2022 21:24:57 +0800 Subject: [PATCH] kernel: Drop mark apcs_alias0_core_clk as critical (#10349) * Upstream has introduced this change https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/drivers/clk/qcom/apss-ipq6018.c?h=v5.15.76&id=8e556f5573684b3d4126a4fea88141ee56a407ab --- ...q6018-mark-apcs_alias0_core_clk-as-c.patch | 36 ------------------- ...q6018-mark-apcs_alias0_core_clk-as-c.patch | 31 ---------------- 2 files changed, 67 deletions(-) delete mode 100644 target/linux/ipq60xx/patches-5.15/0103-clk-qcom-apss-ipq6018-mark-apcs_alias0_core_clk-as-c.patch delete mode 100644 target/linux/ipq807x/patches-5.15/0103-clk-qcom-apss-ipq6018-mark-apcs_alias0_core_clk-as-c.patch diff --git a/target/linux/ipq60xx/patches-5.15/0103-clk-qcom-apss-ipq6018-mark-apcs_alias0_core_clk-as-c.patch b/target/linux/ipq60xx/patches-5.15/0103-clk-qcom-apss-ipq6018-mark-apcs_alias0_core_clk-as-c.patch deleted file mode 100644 index 9fb3cd41f..000000000 --- a/target/linux/ipq60xx/patches-5.15/0103-clk-qcom-apss-ipq6018-mark-apcs_alias0_core_clk-as-c.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 4f9fcc72d6b5d64f8591f179f222154139eb1c72 Mon Sep 17 00:00:00 2001 -From: Robert Marko -Date: Sat, 9 Jul 2022 00:26:54 +0200 -Subject: [PATCH 103/137] clk: qcom: apss-ipq6018: mark apcs_alias0_core_clk as - critical - -While fixing up the driver I noticed that my IPQ8074 board was hanging -after CPUFreq switched the frequency during boot, WDT would eventually -reset it. - -So mark apcs_alias0_core_clk as critical since its the clock feeding the -CPU cluster and must never be disabled. - -Fixes: 5e77b4ef1b19 ("clk: qcom: Add ipq6018 apss clock controller") -Signed-off-by: Robert Marko -Reviewed-by: Dmitry Baryshkov ---- - drivers/clk/qcom/apss-ipq6018.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/drivers/clk/qcom/apss-ipq6018.c b/drivers/clk/qcom/apss-ipq6018.c -index be952d417ded..f2f502e2d5a4 100644 ---- a/drivers/clk/qcom/apss-ipq6018.c -+++ b/drivers/clk/qcom/apss-ipq6018.c -@@ -56,7 +56,7 @@ static struct clk_branch apcs_alias0_core_clk = { - .parent_hws = (const struct clk_hw *[]){ - &apcs_alias0_clk_src.clkr.hw }, - .num_parents = 1, -- .flags = CLK_SET_RATE_PARENT, -+ .flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, - .ops = &clk_branch2_ops, - }, - }, --- -2.37.2 - diff --git a/target/linux/ipq807x/patches-5.15/0103-clk-qcom-apss-ipq6018-mark-apcs_alias0_core_clk-as-c.patch b/target/linux/ipq807x/patches-5.15/0103-clk-qcom-apss-ipq6018-mark-apcs_alias0_core_clk-as-c.patch deleted file mode 100644 index 9753993c2..000000000 --- a/target/linux/ipq807x/patches-5.15/0103-clk-qcom-apss-ipq6018-mark-apcs_alias0_core_clk-as-c.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 4f9fcc72d6b5d64f8591f179f222154139eb1c72 Mon Sep 17 00:00:00 2001 -From: Robert Marko -Date: Sat, 9 Jul 2022 00:26:54 +0200 -Subject: [PATCH 103/137] clk: qcom: apss-ipq6018: mark apcs_alias0_core_clk as - critical - -While fixing up the driver I noticed that my IPQ8074 board was hanging -after CPUFreq switched the frequency during boot, WDT would eventually -reset it. - -So mark apcs_alias0_core_clk as critical since its the clock feeding the -CPU cluster and must never be disabled. - -Fixes: 5e77b4ef1b19 ("clk: qcom: Add ipq6018 apss clock controller") -Signed-off-by: Robert Marko -Reviewed-by: Dmitry Baryshkov ---- - drivers/clk/qcom/apss-ipq6018.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/clk/qcom/apss-ipq6018.c -+++ b/drivers/clk/qcom/apss-ipq6018.c -@@ -56,7 +56,7 @@ static struct clk_branch apcs_alias0_cor - .parent_hws = (const struct clk_hw *[]){ - &apcs_alias0_clk_src.clkr.hw }, - .num_parents = 1, -- .flags = CLK_SET_RATE_PARENT, -+ .flags = CLK_SET_RATE_PARENT | CLK_IS_CRITICAL, - .ops = &clk_branch2_ops, - }, - },