From: Greg Kroah-Hartman Date: Mon, 6 Nov 2023 12:28:57 +0000 (+0100) Subject: 6.5-stable patches X-Git-Tag: v4.14.329~4 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=097a668f2317e269e65301aa87b545771d34a816;p=thirdparty%2Fkernel%2Fstable-queue.git 6.5-stable patches added patches: alsa-hda-intel-dsp-config-fix-jsl-chromebook-quirk-detection.patch asoc-sof-sof-pci-dev-fix-community-key-quirk-detection.patch serial-core-fix-runtime-pm-handling-for-pending-tx.patch --- diff --git a/queue-6.5/alsa-hda-intel-dsp-config-fix-jsl-chromebook-quirk-detection.patch b/queue-6.5/alsa-hda-intel-dsp-config-fix-jsl-chromebook-quirk-detection.patch new file mode 100644 index 00000000000..196578d276f --- /dev/null +++ b/queue-6.5/alsa-hda-intel-dsp-config-fix-jsl-chromebook-quirk-detection.patch @@ -0,0 +1,41 @@ +From 7c05b44e1a50d9cbfc4f731dddc436a24ddc129a Mon Sep 17 00:00:00 2001 +From: Mark Hasemeyer +Date: Wed, 18 Oct 2023 17:59:31 -0600 +Subject: ALSA: hda: intel-dsp-config: Fix JSL Chromebook quirk detection + +From: Mark Hasemeyer + +commit 7c05b44e1a50d9cbfc4f731dddc436a24ddc129a upstream. + +Some Jasperlake Chromebooks overwrite the system vendor DMI value to the +name of the OEM that manufactured the device. This breaks Chromebook +quirk detection as it expects the system vendor to be "Google". + +Add another quirk detection entry that looks for "Google" in the BIOS +version. + +Cc: stable@vger.kernel.org +Signed-off-by: Mark Hasemeyer +Reviewed-by: Pierre-Louis Bossart +Link: https://lore.kernel.org/r/20231018235944.1860717-1-markhas@chromium.org +Signed-off-by: Takashi Iwai +Signed-off-by: Greg Kroah-Hartman +--- + sound/hda/intel-dsp-config.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/sound/hda/intel-dsp-config.c ++++ b/sound/hda/intel-dsp-config.c +@@ -343,6 +343,12 @@ static const struct config_entry config_ + DMI_MATCH(DMI_SYS_VENDOR, "Google"), + } + }, ++ { ++ .ident = "Google firmware", ++ .matches = { ++ DMI_MATCH(DMI_BIOS_VERSION, "Google"), ++ } ++ }, + {} + } + }, diff --git a/queue-6.5/asoc-sof-sof-pci-dev-fix-community-key-quirk-detection.patch b/queue-6.5/asoc-sof-sof-pci-dev-fix-community-key-quirk-detection.patch new file mode 100644 index 00000000000..ff9cb6a147e --- /dev/null +++ b/queue-6.5/asoc-sof-sof-pci-dev-fix-community-key-quirk-detection.patch @@ -0,0 +1,42 @@ +From 7dd692217b861a8292ff8ac2c9d4458538fd6b96 Mon Sep 17 00:00:00 2001 +From: Mark Hasemeyer +Date: Fri, 20 Oct 2023 14:59:53 -0600 +Subject: ASoC: SOF: sof-pci-dev: Fix community key quirk detection + +From: Mark Hasemeyer + +commit 7dd692217b861a8292ff8ac2c9d4458538fd6b96 upstream. + +Some Chromebooks do not populate the product family DMI value resulting +in firmware load failures. + +Add another quirk detection entry that looks for "Google" in the BIOS +version. Theoretically, PRODUCT_FAMILY could be replaced with +BIOS_VERSION, but it is left as a quirk to be conservative. + +Cc: stable@vger.kernel.org +Signed-off-by: Mark Hasemeyer +Acked-by: Curtis Malainey +Link: https://lore.kernel.org/r/20231020145953.v1.1.Iaf5702dc3f8af0fd2f81a22ba2da1a5e15b3604c@changeid +Signed-off-by: Mark Brown +Signed-off-by: Greg Kroah-Hartman +--- + sound/soc/sof/sof-pci-dev.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/sound/soc/sof/sof-pci-dev.c ++++ b/sound/soc/sof/sof-pci-dev.c +@@ -145,6 +145,13 @@ static const struct dmi_system_id commun + DMI_MATCH(DMI_PRODUCT_FAMILY, "Google"), + } + }, ++ { ++ .ident = "Google firmware", ++ .callback = chromebook_use_community_key, ++ .matches = { ++ DMI_MATCH(DMI_BIOS_VERSION, "Google"), ++ } ++ }, + {}, + }; + diff --git a/queue-6.5/serial-core-fix-runtime-pm-handling-for-pending-tx.patch b/queue-6.5/serial-core-fix-runtime-pm-handling-for-pending-tx.patch new file mode 100644 index 00000000000..d3848fbcec3 --- /dev/null +++ b/queue-6.5/serial-core-fix-runtime-pm-handling-for-pending-tx.patch @@ -0,0 +1,43 @@ +From 6f699743aebf07538e506a46c5965eb8bdd2c716 Mon Sep 17 00:00:00 2001 +From: Tony Lindgren +Date: Mon, 23 Oct 2023 10:48:54 +0300 +Subject: serial: core: Fix runtime PM handling for pending tx + +From: Tony Lindgren + +commit 6f699743aebf07538e506a46c5965eb8bdd2c716 upstream. + +Richard reported that a serial port may end up sometimes with tx data +pending in the buffer for long periods of time. + +Turns out we bail out early on any errors from pm_runtime_get(), +including -EINPROGRESS. To fix the issue, we need to ignore -EINPROGRESS +as we only care about the runtime PM usage count at this point. We check +for an active runtime PM state later on for tx. + +Fixes: 84a9582fd203 ("serial: core: Start managing serial controllers to enable runtime PM") +Cc: stable +Reported-by: Richard Purdie +Cc: Bruce Ashfield +Cc: Mikko Rapeli +Cc: Paul Gortmaker +Cc: Randy MacLeod +Signed-off-by: Tony Lindgren +Tested-by: Richard Purdie +Link: https://lore.kernel.org/r/20231023074856.61896-1-tony@atomide.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/tty/serial/serial_core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/tty/serial/serial_core.c ++++ b/drivers/tty/serial/serial_core.c +@@ -147,7 +147,7 @@ static void __uart_start(struct tty_stru + + /* Increment the runtime PM usage count for the active check below */ + err = pm_runtime_get(&port_dev->dev); +- if (err < 0) { ++ if (err < 0 && err != -EINPROGRESS) { + pm_runtime_put_noidle(&port_dev->dev); + return; + } diff --git a/queue-6.5/series b/queue-6.5/series index fa431d94bfe..aa37157e981 100644 --- a/queue-6.5/series +++ b/queue-6.5/series @@ -83,3 +83,6 @@ tty-8250-add-support-for-intashield-ix-cards.patch tty-8250-add-brainboxes-oxford-semiconductor-based-quirks.patch dt-bindings-serial-rs485-add-rs485-rts-active-high.patch misc-pci_endpoint_test-add-deviceid-for-j721s2-pcie-ep-device-support.patch +serial-core-fix-runtime-pm-handling-for-pending-tx.patch +alsa-hda-intel-dsp-config-fix-jsl-chromebook-quirk-detection.patch +asoc-sof-sof-pci-dev-fix-community-key-quirk-detection.patch