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

6.6-stable patches

added patches:
	asoc-sof-sof-pci-dev-fix-community-key-quirk-detection.patch
---

diff --git a/queue-6.6/asoc-sof-sof-pci-dev-fix-community-key-quirk-detection.patch b/queue-6.6/asoc-sof-sof-pci-dev-fix-community-key-quirk-detection.patch
new file mode 100644
index 00000000000..ff9cb6a147e
--- /dev/null
+++ b/queue-6.6/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
+@@ -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.6/series b/queue-6.6/series
index 04afdc03662..e7e38e54f6e 100644
--- a/queue-6.6/series
+++ b/queue-6.6/series
@@ -27,3 +27,4 @@ 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