6.1-stable patches

added patches:
	asoc-sof-sof-audio-prepare_widgets-check-swidget-for-null-on-sink-failure.patch
	platform-x86-amd-pmc-add-config_serio-dependency.patch

diff --git a/queue-6.1/asoc-sof-sof-audio-prepare_widgets-check-swidget-for-null-on-sink-failure.patch b/queue-6.1/asoc-sof-sof-audio-prepare_widgets-check-swidget-for-null-on-sink-failure.patch
new file mode 100644 (file)
index 0000000..f93ab43
--- /dev/null
+++ b/queue-6.1/asoc-sof-sof-audio-prepare_widgets-check-swidget-for-null-on-sink-failure.patch
@@ -0,0 +1,41 @@
+From fb4293600cc651cfe4d48ec489f1d175adf6e2f8 Mon Sep 17 00:00:00 2001
+From: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
+Date: Fri, 20 Jan 2023 12:21:25 +0200
+Subject: ASoC: SOF: sof-audio: prepare_widgets: Check swidget for NULL on sink failure
+
+From: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
+
+commit fb4293600cc651cfe4d48ec489f1d175adf6e2f8 upstream.
+
+If the swidget is NULL we skip the preparing of the widget and jump to
+handle the sink path of the widget.
+If the prepare fails in this case we would undo the prepare but the swidget
+is NULL (we skipped the prepare for the widget).
+
+To avoid NULL pointer dereference in this case we must check swidget
+against NULL pointer once again.
+
+Fixes: 0ad84b11f2f8 ("ASoC: SOF: sof-audio: skip prepare/unprepare if swidget is NULL")
+Reported-by: kernel test robot <lkp@intel.com>
+Reported-by: Dan Carpenter <error27@gmail.com>
+Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
+Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
+Link: https://lore.kernel.org/r/20230120102125.30653-1-peter.ujfalusi@linux.intel.com
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/soc/sof/sof-audio.c |    3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/sound/soc/sof/sof-audio.c
++++ b/sound/soc/sof/sof-audio.c
+@@ -327,7 +327,8 @@ sink_prepare:
+                       p->walking = false;
+                       if (ret < 0) {
+                               /* unprepare the source widget */
+-                              if (widget_ops[widget->id].ipc_unprepare && swidget->prepared) {
++                              if (widget_ops[widget->id].ipc_unprepare &&
++                                  swidget && swidget->prepared) {
+                                       widget_ops[widget->id].ipc_unprepare(swidget);
+                                       swidget->prepared = false;
+                               }

diff --git a/queue-6.1/platform-x86-amd-pmc-add-config_serio-dependency.patch b/queue-6.1/platform-x86-amd-pmc-add-config_serio-dependency.patch
new file mode 100644 (file)
index 0000000..1e81fbf
--- /dev/null
+++ b/queue-6.1/platform-x86-amd-pmc-add-config_serio-dependency.patch
@@ -0,0 +1,37 @@
+From abce209d18fd26e865b2406cc68819289db973f9 Mon Sep 17 00:00:00 2001
+From: Arnd Bergmann <arnd@arndb.de>
+Date: Fri, 27 Jan 2023 10:39:44 +0100
+Subject: platform/x86/amd: pmc: add CONFIG_SERIO dependency
+
+From: Arnd Bergmann <arnd@arndb.de>
+
+commit abce209d18fd26e865b2406cc68819289db973f9 upstream.
+
+Using the serio subsystem now requires the code to be reachable:
+
+x86_64-linux-ld: drivers/platform/x86/amd/pmc.o: in function `amd_pmc_suspend_handler':
+pmc.c:(.text+0x86c): undefined reference to `serio_bus'
+
+Add the usual dependency: as other users of serio use 'select'
+rather than 'depends on', use the same here.
+
+Fixes: 8e60615e8932 ("platform/x86/amd: pmc: Disable IRQ1 wakeup for RN/CZN")
+Signed-off-by: Arnd Bergmann <arnd@arndb.de>
+Link: https://lore.kernel.org/r/20230127093950.2368575-1-arnd@kernel.org
+Reviewed-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Hans de Goede <hdegoede@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/platform/x86/amd/Kconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/platform/x86/amd/Kconfig
++++ b/drivers/platform/x86/amd/Kconfig
+@@ -8,6 +8,7 @@ source "drivers/platform/x86/amd/pmf/Kco
+ config AMD_PMC
+       tristate "AMD SoC PMC driver"
+       depends on ACPI && PCI && RTC_CLASS
++      select SERIO
+       help
+         The driver provides support for AMD Power Management Controller
+         primarily responsible for S2Idle transactions that are driven from

diff --git a/queue-6.1/series b/queue-6.1/series
index b600a84c751d88823ce0e6ab46acb115921f7555..ba929e1d1e28a9722ef882454024e3f89740dc4d 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -191,3 +191,5 @@ nvmem-core-fix-return-value.patch
 phy-qcom-qmp-combo-fix-runtime-suspend.patch
 serial-8250_dma-fix-dma-rx-completion-race.patch
 serial-8250_dma-fix-dma-rx-rearm-race.patch
+platform-x86-amd-pmc-add-config_serio-dependency.patch
+asoc-sof-sof-audio-prepare_widgets-check-swidget-for-null-on-sink-failure.patch