From: Greg Kroah-Hartman Date: Mon, 6 Nov 2023 12:28:36 +0000 (+0100) Subject: 6.1-stable patches X-Git-Tag: v4.14.329~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=62d7d9c2f3898059fe8ce6162e5bafcf00d78377;p=thirdparty%2Fkernel%2Fstable-queue.git 6.1-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 misc-pci_endpoint_test-add-deviceid-for-j721s2-pcie-ep-device-support.patch --- diff --git a/queue-6.1/alsa-hda-intel-dsp-config-fix-jsl-chromebook-quirk-detection.patch b/queue-6.1/alsa-hda-intel-dsp-config-fix-jsl-chromebook-quirk-detection.patch new file mode 100644 index 00000000000..196578d276f --- /dev/null +++ b/queue-6.1/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.1/asoc-sof-sof-pci-dev-fix-community-key-quirk-detection.patch b/queue-6.1/asoc-sof-sof-pci-dev-fix-community-key-quirk-detection.patch new file mode 100644 index 00000000000..28204eb0628 --- /dev/null +++ b/queue-6.1/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 +@@ -141,6 +141,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.1/misc-pci_endpoint_test-add-deviceid-for-j721s2-pcie-ep-device-support.patch b/queue-6.1/misc-pci_endpoint_test-add-deviceid-for-j721s2-pcie-ep-device-support.patch new file mode 100644 index 00000000000..ea8f748f631 --- /dev/null +++ b/queue-6.1/misc-pci_endpoint_test-add-deviceid-for-j721s2-pcie-ep-device-support.patch @@ -0,0 +1,41 @@ +From 8293703a492ae97c86af27c75b76e6239ec86483 Mon Sep 17 00:00:00 2001 +From: Siddharth Vadapalli +Date: Fri, 20 Oct 2023 17:32:48 +0530 +Subject: misc: pci_endpoint_test: Add deviceID for J721S2 PCIe EP device support + +From: Siddharth Vadapalli + +commit 8293703a492ae97c86af27c75b76e6239ec86483 upstream. + +Add DEVICE_ID for J721S2 and enable support for endpoints configured +with this DEVICE_ID in the pci_endpoint_test driver. + +Signed-off-by: Siddharth Vadapalli +Cc: stable +Reviewed-by: Manivannan Sadhasivam +Link: https://lore.kernel.org/r/20231020120248.3168406-1-s-vadapalli@ti.com +Signed-off-by: Greg Kroah-Hartman +--- + drivers/misc/pci_endpoint_test.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/misc/pci_endpoint_test.c ++++ b/drivers/misc/pci_endpoint_test.c +@@ -71,6 +71,7 @@ + #define PCI_DEVICE_ID_TI_AM654 0xb00c + #define PCI_DEVICE_ID_TI_J7200 0xb00f + #define PCI_DEVICE_ID_TI_AM64 0xb010 ++#define PCI_DEVICE_ID_TI_J721S2 0xb013 + #define PCI_DEVICE_ID_LS1088A 0x80c0 + + #define is_am654_pci_dev(pdev) \ +@@ -1004,6 +1005,9 @@ static const struct pci_device_id pci_en + { PCI_DEVICE(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_AM64), + .driver_data = (kernel_ulong_t)&j721e_data, + }, ++ { PCI_DEVICE(PCI_VENDOR_ID_TI, PCI_DEVICE_ID_TI_J721S2), ++ .driver_data = (kernel_ulong_t)&j721e_data, ++ }, + { } + }; + MODULE_DEVICE_TABLE(pci, pci_endpoint_test_tbl); diff --git a/queue-6.1/series b/queue-6.1/series index c3630c11ff3..8921ef67a7a 100644 --- a/queue-6.1/series +++ b/queue-6.1/series @@ -57,3 +57,6 @@ tty-8250-fix-up-px-803-px-857.patch tty-8250-add-support-for-additional-brainboxes-px-cards.patch tty-8250-add-support-for-intashield-ix-cards.patch tty-8250-add-brainboxes-oxford-semiconductor-based-quirks.patch +misc-pci_endpoint_test-add-deviceid-for-j721s2-pcie-ep-device-support.patch +alsa-hda-intel-dsp-config-fix-jsl-chromebook-quirk-detection.patch +asoc-sof-sof-pci-dev-fix-community-key-quirk-detection.patch