]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.16-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Feb 2022 07:26:46 +0000 (08:26 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 14 Feb 2022 07:26:46 +0000 (08:26 +0100)
added patches:
arm64-dts-imx8mq-fix-lcdif-port-node.patch
docs-abi-testing-aspeed-uart-routing-escape-asterisk.patch
kconfig-fix-missing-fclose-on-error-paths.patch
perf-fix-list-corruption-in-perf_cgroup_switch.patch

queue-5.16/arm64-dts-imx8mq-fix-lcdif-port-node.patch [new file with mode: 0644]
queue-5.16/docs-abi-testing-aspeed-uart-routing-escape-asterisk.patch [new file with mode: 0644]
queue-5.16/kconfig-fix-missing-fclose-on-error-paths.patch [new file with mode: 0644]
queue-5.16/perf-fix-list-corruption-in-perf_cgroup_switch.patch [new file with mode: 0644]
queue-5.16/series

diff --git a/queue-5.16/arm64-dts-imx8mq-fix-lcdif-port-node.patch b/queue-5.16/arm64-dts-imx8mq-fix-lcdif-port-node.patch
new file mode 100644 (file)
index 0000000..7542b7f
--- /dev/null
@@ -0,0 +1,35 @@
+From 91f6d5f181f6629dd74ab71759fe92d3f4eff966 Mon Sep 17 00:00:00 2001
+From: Alexander Stein <alexander.stein@ew.tq-group.com>
+Date: Sat, 29 Jan 2022 14:39:05 +0800
+Subject: arm64: dts: imx8mq: fix lcdif port node
+
+From: Alexander Stein <alexander.stein@ew.tq-group.com>
+
+commit 91f6d5f181f6629dd74ab71759fe92d3f4eff966 upstream.
+
+The port node does not have a unit-address, remove it.
+This fixes the warnings:
+lcd-controller@30320000: 'port' is a required property
+lcd-controller@30320000: 'port@0' does not match any of the regexes:
+'pinctrl-[0-9]+'
+
+Fixes: commit d0081bd02a03 ("arm64: dts: imx8mq: Add NWL MIPI DSI controller")
+Signed-off-by: Alexander Stein <alexander.stein@ew.tq-group.com>
+Reviewed-by: Fabio Estevam <festevam@gmail.com>
+Signed-off-by: Shawn Guo <shawnguo@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm64/boot/dts/freescale/imx8mq.dtsi |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi
++++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
+@@ -526,7 +526,7 @@
+                               assigned-clock-rates = <0>, <0>, <0>, <594000000>;
+                               status = "disabled";
+-                              port@0 {
++                              port {
+                                       lcdif_mipi_dsi: endpoint {
+                                               remote-endpoint = <&mipi_dsi_lcdif_in>;
+                                       };
diff --git a/queue-5.16/docs-abi-testing-aspeed-uart-routing-escape-asterisk.patch b/queue-5.16/docs-abi-testing-aspeed-uart-routing-escape-asterisk.patch
new file mode 100644 (file)
index 0000000..6dd218f
--- /dev/null
@@ -0,0 +1,51 @@
+From 088400521e421a1df7d0128dc0f9246db4ef1c7c Mon Sep 17 00:00:00 2001
+From: Chia-Wei Wang <chiawei_wang@aspeedtech.com>
+Date: Tue, 1 Feb 2022 17:30:27 +1030
+Subject: docs/ABI: testing: aspeed-uart-routing: Escape asterisk
+
+From: Chia-Wei Wang <chiawei_wang@aspeedtech.com>
+
+commit 088400521e421a1df7d0128dc0f9246db4ef1c7c upstream.
+
+Escape asterisk symbols to fix the following warning:
+
+"WARNING: Inline emphasis start-string without end-string"
+
+Fixes: c6807970c3bc ("soc: aspeed: Add UART routing support")
+Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
+Signed-off-by: Chia-Wei Wang <chiawei_wang@aspeedtech.com>
+Signed-off-by: Joel Stanley <joel@jms.id.au>
+Link: https://lore.kernel.org/r/20220124014351.9121-1-chiawei_wang@aspeedtech.com
+Link: https://lore.kernel.org/r/20220201070027.196314-1-joel@jms.id.au'
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ Documentation/ABI/testing/sysfs-driver-aspeed-uart-routing |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/Documentation/ABI/testing/sysfs-driver-aspeed-uart-routing
++++ b/Documentation/ABI/testing/sysfs-driver-aspeed-uart-routing
+@@ -1,4 +1,4 @@
+-What:         /sys/bus/platform/drivers/aspeed-uart-routing/*/uart*
++What:         /sys/bus/platform/drivers/aspeed-uart-routing/\*/uart\*
+ Date:         September 2021
+ Contact:      Oskar Senft <osk@google.com>
+               Chia-Wei Wang <chiawei_wang@aspeedtech.com>
+@@ -9,7 +9,7 @@ Description:   Selects the RX source of th
+               depends on the selected file.
+               e.g.
+-              cat /sys/bus/platform/drivers/aspeed-uart-routing/*.uart_routing/uart1
++              cat /sys/bus/platform/drivers/aspeed-uart-routing/\*.uart_routing/uart1
+               [io1] io2 io3 io4 uart2 uart3 uart4 io6
+               In this case, UART1 gets its input from IO1 (physical serial port 1).
+@@ -17,7 +17,7 @@ Description: Selects the RX source of th
+ Users:                OpenBMC.  Proposed changes should be mailed to
+               openbmc@lists.ozlabs.org
+-What:         /sys/bus/platform/drivers/aspeed-uart-routing/*/io*
++What:         /sys/bus/platform/drivers/aspeed-uart-routing/\*/io\*
+ Date:         September 2021
+ Contact:      Oskar Senft <osk@google.com>
+               Chia-Wei Wang <chiawei_wang@aspeedtech.com>
diff --git a/queue-5.16/kconfig-fix-missing-fclose-on-error-paths.patch b/queue-5.16/kconfig-fix-missing-fclose-on-error-paths.patch
new file mode 100644 (file)
index 0000000..ca69581
--- /dev/null
@@ -0,0 +1,50 @@
+From d23a0c3718222a42430fd56359478a6fc7675070 Mon Sep 17 00:00:00 2001
+From: Masahiro Yamada <masahiroy@kernel.org>
+Date: Tue, 8 Feb 2022 15:26:18 +0900
+Subject: kconfig: fix missing fclose() on error paths
+
+From: Masahiro Yamada <masahiroy@kernel.org>
+
+commit d23a0c3718222a42430fd56359478a6fc7675070 upstream.
+
+The file is not closed when ferror() fails.
+
+Fixes: 00d674cb3536 ("kconfig: refactor conf_write_dep()")
+Fixes: 57ddd07c4560 ("kconfig: refactor conf_write_autoconf()")
+Reported-by: Ryan Cai <ycaibb@gmail.com>
+Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ scripts/kconfig/confdata.c |   12 ++++++------
+ 1 file changed, 6 insertions(+), 6 deletions(-)
+
+--- a/scripts/kconfig/confdata.c
++++ b/scripts/kconfig/confdata.c
+@@ -977,10 +977,10 @@ static int conf_write_autoconf_cmd(const
+       fprintf(out, "\n$(deps_config): ;\n");
+-      if (ferror(out)) /* error check for all fprintf() calls */
+-              return -1;
+-
++      ret = ferror(out); /* error check for all fprintf() calls */
+       fclose(out);
++      if (ret)
++              return -1;
+       if (rename(tmp, name)) {
+               perror("rename");
+@@ -1091,10 +1091,10 @@ static int __conf_write_autoconf(const c
+                       print_symbol(file, sym);
+       /* check possible errors in conf_write_heading() and print_symbol() */
+-      if (ferror(file))
+-              return -1;
+-
++      ret = ferror(file);
+       fclose(file);
++      if (ret)
++              return -1;
+       if (rename(tmp, filename)) {
+               perror("rename");
diff --git a/queue-5.16/perf-fix-list-corruption-in-perf_cgroup_switch.patch b/queue-5.16/perf-fix-list-corruption-in-perf_cgroup_switch.patch
new file mode 100644 (file)
index 0000000..750a380
--- /dev/null
@@ -0,0 +1,52 @@
+From 5f4e5ce638e6a490b976ade4a40017b40abb2da0 Mon Sep 17 00:00:00 2001
+From: Song Liu <song@kernel.org>
+Date: Thu, 3 Feb 2022 16:40:57 -0800
+Subject: perf: Fix list corruption in perf_cgroup_switch()
+
+From: Song Liu <song@kernel.org>
+
+commit 5f4e5ce638e6a490b976ade4a40017b40abb2da0 upstream.
+
+There's list corruption on cgrp_cpuctx_list. This happens on the
+following path:
+
+  perf_cgroup_switch: list_for_each_entry(cgrp_cpuctx_list)
+      cpu_ctx_sched_in
+         ctx_sched_in
+            ctx_pinned_sched_in
+              merge_sched_in
+                  perf_cgroup_event_disable: remove the event from the list
+
+Use list_for_each_entry_safe() to allow removing an entry during
+iteration.
+
+Fixes: 058fe1c0440e ("perf/core: Make cgroup switch visit only cpuctxs with cgroup events")
+Signed-off-by: Song Liu <song@kernel.org>
+Reviewed-by: Rik van Riel <riel@surriel.com>
+Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
+Link: https://lkml.kernel.org/r/20220204004057.2961252-1-song@kernel.org
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ kernel/events/core.c |    4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+--- a/kernel/events/core.c
++++ b/kernel/events/core.c
+@@ -839,7 +839,7 @@ static DEFINE_PER_CPU(struct list_head,
+  */
+ static void perf_cgroup_switch(struct task_struct *task, int mode)
+ {
+-      struct perf_cpu_context *cpuctx;
++      struct perf_cpu_context *cpuctx, *tmp;
+       struct list_head *list;
+       unsigned long flags;
+@@ -850,7 +850,7 @@ static void perf_cgroup_switch(struct ta
+       local_irq_save(flags);
+       list = this_cpu_ptr(&cgrp_cpuctx_list);
+-      list_for_each_entry(cpuctx, list, cgrp_cpuctx_entry) {
++      list_for_each_entry_safe(cpuctx, tmp, list, cgrp_cpuctx_entry) {
+               WARN_ON_ONCE(cpuctx->ctx.nr_cgroups == 0);
+               perf_ctx_lock(cpuctx, cpuctx->task_ctx);
index 5c66a93601dccbf375c222fe66b58e4ac0242206..5005266dcde0cbc2d6ff81b358d00ceb11dacd75 100644 (file)
@@ -196,3 +196,7 @@ makefile.extrawarn-move-wunaligned-access-to-w-1.patch
 scsi-lpfc-remove-nvme-support-if-kernel-has-nvme_fc-disabled.patch
 scsi-lpfc-reduce-log-messages-seen-after-firmware-download.patch
 mips-octeon-fix-missed-ptr-ptr_wd-conversion.patch
+arm64-dts-imx8mq-fix-lcdif-port-node.patch
+perf-fix-list-corruption-in-perf_cgroup_switch.patch
+kconfig-fix-missing-fclose-on-error-paths.patch
+docs-abi-testing-aspeed-uart-routing-escape-asterisk.patch