From: Greg Kroah-Hartman Date: Tue, 18 Oct 2022 16:17:21 +0000 (+0200) Subject: drop some 6.0 clk patches X-Git-Tag: v6.0.3~61 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=26f1f8764239fc11d98dea6ed66439706f8fa6b7;p=thirdparty%2Fkernel%2Fstable-queue.git drop some 6.0 clk patches --- diff --git a/queue-6.0/clk-gcc-sc8280xp-keep-pcie-power-domains-always-on.patch b/queue-6.0/clk-gcc-sc8280xp-keep-pcie-power-domains-always-on.patch deleted file mode 100644 index 2adf20c04b9..00000000000 --- a/queue-6.0/clk-gcc-sc8280xp-keep-pcie-power-domains-always-on.patch +++ /dev/null @@ -1,85 +0,0 @@ -From fb1f3ada91a657538c12abc69e16b5ee1bc663e3 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 5 Aug 2022 14:12:49 +0200 -Subject: clk: gcc-sc8280xp: keep PCIe power-domains always-on - -From: Johan Hovold - -[ Upstream commit 12d2a4769380f0dc9ba6f827839869db2b81ef00 ] - -The Qualcomm PCIe driver does not yet implement suspend so to keep the -PCIe power domains always-on for now to avoid crashing during resume. - -Signed-off-by: Johan Hovold -Reviewed-by: Manivannan Sadhasivam -Signed-off-by: Bjorn Andersson -Link: https://lore.kernel.org/r/20220805121250.10347-2-johan+linaro@kernel.org -Stable-dep-of: 5a6d30675d17 ("clk: qcom: gcc-msm8916: use ARRAY_SIZE instead of specifying num_parents") -Signed-off-by: Sasha Levin ---- - drivers/clk/qcom/gcc-sc8280xp.c | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - -diff --git a/drivers/clk/qcom/gcc-sc8280xp.c b/drivers/clk/qcom/gcc-sc8280xp.c -index a2f3ffcc5849..eaeada42e13a 100644 ---- a/drivers/clk/qcom/gcc-sc8280xp.c -+++ b/drivers/clk/qcom/gcc-sc8280xp.c -@@ -6768,6 +6768,10 @@ static struct gdsc pcie_1_tunnel_gdsc = { - .flags = VOTABLE, - }; - -+/* -+ * The Qualcomm PCIe driver does not yet implement suspend so to keep the -+ * PCIe power domains always-on for now. -+ */ - static struct gdsc pcie_2a_gdsc = { - .gdscr = 0x9d004, - .collapse_ctrl = 0x52128, -@@ -6776,7 +6780,7 @@ static struct gdsc pcie_2a_gdsc = { - .name = "pcie_2a_gdsc", - }, - .pwrsts = PWRSTS_OFF_ON, -- .flags = VOTABLE, -+ .flags = VOTABLE | ALWAYS_ON, - }; - - static struct gdsc pcie_2b_gdsc = { -@@ -6787,7 +6791,7 @@ static struct gdsc pcie_2b_gdsc = { - .name = "pcie_2b_gdsc", - }, - .pwrsts = PWRSTS_OFF_ON, -- .flags = VOTABLE, -+ .flags = VOTABLE | ALWAYS_ON, - }; - - static struct gdsc pcie_3a_gdsc = { -@@ -6798,7 +6802,7 @@ static struct gdsc pcie_3a_gdsc = { - .name = "pcie_3a_gdsc", - }, - .pwrsts = PWRSTS_OFF_ON, -- .flags = VOTABLE, -+ .flags = VOTABLE | ALWAYS_ON, - }; - - static struct gdsc pcie_3b_gdsc = { -@@ -6809,7 +6813,7 @@ static struct gdsc pcie_3b_gdsc = { - .name = "pcie_3b_gdsc", - }, - .pwrsts = PWRSTS_OFF_ON, -- .flags = VOTABLE, -+ .flags = VOTABLE | ALWAYS_ON, - }; - - static struct gdsc pcie_4_gdsc = { -@@ -6820,7 +6824,7 @@ static struct gdsc pcie_4_gdsc = { - .name = "pcie_4_gdsc", - }, - .pwrsts = PWRSTS_OFF_ON, -- .flags = VOTABLE, -+ .flags = VOTABLE | ALWAYS_ON, - }; - - static struct gdsc ufs_card_gdsc = { --- -2.35.1 - diff --git a/queue-6.0/clk-move-from-strlcpy-with-unused-retval-to-strscpy.patch b/queue-6.0/clk-move-from-strlcpy-with-unused-retval-to-strscpy.patch deleted file mode 100644 index 894aaeb38ed..00000000000 --- a/queue-6.0/clk-move-from-strlcpy-with-unused-retval-to-strscpy.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 6cc1efb08cfc43014d598fd8dfcd7952dd0b2fce Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 18 Aug 2022 23:00:00 +0200 -Subject: clk: move from strlcpy with unused retval to strscpy - -From: Wolfram Sang - -[ Upstream commit c19edff61210eb846bf8ec44c9f87d1ca9efdfd2 ] - -Follow the advice of the below link and prefer 'strscpy' in this -subsystem. Conversion is 1:1 because the return value is not used. -Generated by a coccinelle script. - -Link: https://lore.kernel.org/r/CAHk-=wgfRnXz0W3D37d01q3JFkr_i_uTL=V6A6G1oUZcprmknw@mail.gmail.com/ -Signed-off-by: Wolfram Sang -Link: https://lore.kernel.org/r/20220818210000.6600-1-wsa+renesas@sang-engineering.com -Signed-off-by: Stephen Boyd -Stable-dep-of: 9c59a01caba2 ("clk: ti: dra7-atl: Fix reference leak in of_dra7_atl_clk_probe") -Signed-off-by: Sasha Levin ---- - drivers/clk/clkdev.c | 2 +- - drivers/clk/mvebu/dove-divider.c | 2 +- - drivers/clk/tegra/clk-bpmp.c | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/drivers/clk/clkdev.c b/drivers/clk/clkdev.c -index 67f601a41023..a4d4bd3f5be5 100644 ---- a/drivers/clk/clkdev.c -+++ b/drivers/clk/clkdev.c -@@ -165,7 +165,7 @@ vclkdev_alloc(struct clk_hw *hw, const char *con_id, const char *dev_fmt, - - cla->cl.clk_hw = hw; - if (con_id) { -- strlcpy(cla->con_id, con_id, sizeof(cla->con_id)); -+ strscpy(cla->con_id, con_id, sizeof(cla->con_id)); - cla->cl.con_id = cla->con_id; - } - -diff --git a/drivers/clk/mvebu/dove-divider.c b/drivers/clk/mvebu/dove-divider.c -index 7e35c891e168..0a90452ee808 100644 ---- a/drivers/clk/mvebu/dove-divider.c -+++ b/drivers/clk/mvebu/dove-divider.c -@@ -170,7 +170,7 @@ static struct clk *clk_register_dove_divider(struct device *dev, - .num_parents = num_parents, - }; - -- strlcpy(name, dc->name, sizeof(name)); -+ strscpy(name, dc->name, sizeof(name)); - - dc->hw.init = &init; - dc->base = base; -diff --git a/drivers/clk/tegra/clk-bpmp.c b/drivers/clk/tegra/clk-bpmp.c -index 3748a39dae7c..d82a71f10c2c 100644 ---- a/drivers/clk/tegra/clk-bpmp.c -+++ b/drivers/clk/tegra/clk-bpmp.c -@@ -349,7 +349,7 @@ static int tegra_bpmp_clk_get_info(struct tegra_bpmp *bpmp, unsigned int id, - if (err < 0) - return err; - -- strlcpy(info->name, response.name, MRQ_CLK_NAME_MAXLEN); -+ strscpy(info->name, response.name, MRQ_CLK_NAME_MAXLEN); - info->num_parents = response.num_parents; - - for (i = 0; i < info->num_parents; i++) --- -2.35.1 - diff --git a/queue-6.0/clk-nomadik-add-missing-of_node_put.patch b/queue-6.0/clk-nomadik-add-missing-of_node_put.patch deleted file mode 100644 index d0fa201bf88..00000000000 --- a/queue-6.0/clk-nomadik-add-missing-of_node_put.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 2a7d1a4282444c9b3d89dee5de053d92e5f3fc40 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Fri, 17 Jun 2022 09:43:08 +0800 -Subject: clk: nomadik: Add missing of_node_put() - -From: Liang He - -[ Upstream commit 28a0b0984e76df8fd64b6850fa56cf5201e6e638 ] - -In nomadik_src_init(), of_find_matching_node() will return a node -pointer with refcount incremented. We should use of_node_put() in -fail path or when it is not used anymore. - -Signed-off-by: Liang He -Link: https://lore.kernel.org/r/20220617014308.4001511-1-windhl@126.com -Reviewed-by: Linus Walleij -Signed-off-by: Stephen Boyd -Stable-dep-of: 89ab396d712f ("clk: meson: Hold reference returned by of_get_parent()") -Signed-off-by: Sasha Levin ---- - drivers/clk/clk-nomadik.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/drivers/clk/clk-nomadik.c b/drivers/clk/clk-nomadik.c -index bad2677e11ae..71fbe687fa7b 100644 ---- a/drivers/clk/clk-nomadik.c -+++ b/drivers/clk/clk-nomadik.c -@@ -99,7 +99,7 @@ static void __init nomadik_src_init(void) - if (!src_base) { - pr_err("%s: must have src parent node with REGS (%pOFn)\n", - __func__, np); -- return; -+ goto out_put; - } - - /* Set all timers to use the 2.4 MHz TIMCLK */ -@@ -132,6 +132,9 @@ static void __init nomadik_src_init(void) - } - writel(val, src_base + SRC_XTALCR); - register_reboot_notifier(&nomadik_clk_reboot_notifier); -+ -+out_put: -+ of_node_put(np); - } - - /** --- -2.35.1 - diff --git a/queue-6.0/series b/queue-6.0/series index bf4a8085491..6d8a1ab40c0 100644 --- a/queue-6.0/series +++ b/queue-6.0/series @@ -470,7 +470,6 @@ iio-magnetometer-yas530-change-data-type-of-hard_off.patch rdma-mlx5-don-t-compare-mkey-tags-in-devx-indirect-m.patch usb-common-usb-conn-gpio-simplify-some-error-message.patch usb-common-debug-check-non-standard-control-requests.patch -clk-nomadik-add-missing-of_node_put.patch clk-meson-hold-reference-returned-by-of_get_parent.patch clk-st-hold-reference-returned-by-of_get_parent.patch clk-oxnas-hold-reference-returned-by-of_get_parent.patch @@ -491,7 +490,6 @@ hid-uclogic-add-missing-suffix-for-digitalizers.patch hid-uclogic-fix-warning-in-uclogic_rdesc_template_ap.patch hsi-omap_ssi-fix-refcount-leak-in-ssi_probe.patch hsi-omap_ssi_port-fix-dma_map_sg-error-check.patch -clk-gcc-sc8280xp-keep-pcie-power-domains-always-on.patch clk-qcom-gcc-sdm660-use-floor-ops-for-sdcc1-clock.patch media-exynos4-is-fimc-is-add-of_node_put-when-breaki.patch media-tm6000-fix-unused-value-in-vidioc_try_fmt_vid_.patch @@ -611,7 +609,6 @@ clk-bcm2835-fix-bcm2835_clock_rate_from_divisor-decl.patch clk-imx8mp-tune-the-order-of-enet_qos_root_clk.patch clk-imx-scu-fix-memleak-on-platform_device_add-fails.patch clk-ti-balance-of_node_get-calls-for-of_find_node_by.patch -clk-move-from-strlcpy-with-unused-retval-to-strscpy.patch clk-ti-dra7-atl-fix-reference-leak-in-of_dra7_atl_cl.patch clk-ast2600-bclk-comes-from-epll.patch mailbox-imx-fix-rst-channel-support.patch