From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Mon, 6 Nov 2023 12:28:04 +0000 (+0100)
Subject: 5.10-stable patches
X-Git-Tag: v4.14.329~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ac892e0dadb6b80d2289f3d4e4be3e5be30fe4bb;p=thirdparty%2Fkernel%2Fstable-queue.git

5.10-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
---

diff --git a/queue-5.10/alsa-hda-intel-dsp-config-fix-jsl-chromebook-quirk-detection.patch b/queue-5.10/alsa-hda-intel-dsp-config-fix-jsl-chromebook-quirk-detection.patch
new file mode 100644
index 00000000000..36744f2f896
--- /dev/null
+++ b/queue-5.10/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 <markhas@chromium.org>
+Date: Wed, 18 Oct 2023 17:59:31 -0600
+Subject: ALSA: hda: intel-dsp-config: Fix JSL Chromebook quirk detection
+
+From: Mark Hasemeyer <markhas@chromium.org>
+
+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 <markhas@chromium.org>
+Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
+Link: https://lore.kernel.org/r/20231018235944.1860717-1-markhas@chromium.org
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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
+@@ -329,6 +329,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-5.10/asoc-sof-sof-pci-dev-fix-community-key-quirk-detection.patch b/queue-5.10/asoc-sof-sof-pci-dev-fix-community-key-quirk-detection.patch
new file mode 100644
index 00000000000..7782d2a6749
--- /dev/null
+++ b/queue-5.10/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 <markhas@chromium.org>
+Date: Fri, 20 Oct 2023 14:59:53 -0600
+Subject: ASoC: SOF: sof-pci-dev: Fix community key quirk detection
+
+From: Mark Hasemeyer <markhas@chromium.org>
+
+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 <markhas@chromium.org>
+Acked-by: Curtis Malainey <cujomalainey@chromium.org>
+Link: https://lore.kernel.org/r/20231020145953.v1.1.Iaf5702dc3f8af0fd2f81a22ba2da1a5e15b3604c@changeid
+Signed-off-by: Mark Brown <broonie@kernel.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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
+@@ -78,6 +78,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-5.10/series b/queue-5.10/series
index 674090413db..da4477e351f 100644
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -92,4 +92,6 @@ tty-8250-remove-uc-257-and-uc-431.patch
 tty-8250-add-support-for-additional-brainboxes-uc-cards.patch
 tty-8250-add-support-for-brainboxes-up-cards.patch
 tty-8250-add-support-for-intashield-is-100.patch
+alsa-hda-intel-dsp-config-fix-jsl-chromebook-quirk-detection.patch
+asoc-sof-sof-pci-dev-fix-community-key-quirk-detection.patch
 tty-8250-add-support-for-intashield-ix-cards.patch