From: Sasha Levin Date: Mon, 4 Dec 2023 19:50:59 +0000 (-0500) Subject: Drop asoc-sof-sof-pci-dev-don-t-use-the-community-key-on-.patch-15789 X-Git-Tag: v4.14.332~23^2~9 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0c293335aabc0f86d713d648ed78f80447a8cd33;p=thirdparty%2Fkernel%2Fstable-queue.git Drop asoc-sof-sof-pci-dev-don-t-use-the-community-key-on-.patch-15789 Signed-off-by: Sasha Levin --- diff --git a/queue-5.15/asoc-sof-sof-pci-dev-don-t-use-the-community-key-on-.patch-15789 b/queue-5.15/asoc-sof-sof-pci-dev-don-t-use-the-community-key-on-.patch-15789 deleted file mode 100644 index e4a3fcdb8cc..00000000000 --- a/queue-5.15/asoc-sof-sof-pci-dev-don-t-use-the-community-key-on-.patch-15789 +++ /dev/null @@ -1,99 +0,0 @@ -From 3409972a3909f24c0fbb41356193bfeb5f8308a4 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Thu, 21 Apr 2022 11:33:55 -0500 -Subject: ASoC: SOF: sof-pci-dev: don't use the community key on APL - Chromebooks - -From: Pierre-Louis Bossart - -[ Upstream commit d81e4ba5ef1c1033b6c720b22fc99feeb71e71a0 ] - -As suggested by MrChromebox, the SOF driver can be used with the SOF -firmware binary signed with the production key. This patch adds an -additional check for the ApolloLake SoC before modifying the default -firmware path. - -Note that ApolloLake Chromebooks officially ship with the Skylake -driver, so to use SOF the users have to explicitly opt-in with -'options intel-dspcfg dsp_driver=3'. There is no plan to change the -default selection. - -Signed-off-by: Pierre-Louis Bossart -Reviewed-by: Bard Liao -Reviewed-by: Ranjani Sridharan -Link: https://lore.kernel.org/r/20220421163358.319489-2-pierre-louis.bossart@linux.intel.com -Signed-off-by: Mark Brown -Stable-dep-of: 7dd692217b86 ("ASoC: SOF: sof-pci-dev: Fix community key quirk detection") -Signed-off-by: Sasha Levin ---- - sound/soc/sof/sof-pci-dev.c | 24 +++++++++++++++++++++++- - 1 file changed, 23 insertions(+), 1 deletion(-) - -diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c -index 6b103118cfd1b..9f0732461a611 100644 ---- a/sound/soc/sof/sof-pci-dev.c -+++ b/sound/soc/sof/sof-pci-dev.c -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -36,6 +37,7 @@ module_param_named(sof_pci_debug, sof_pci_debug, int, 0444); - MODULE_PARM_DESC(sof_pci_debug, "SOF PCI debug options (0x0 all off)"); - - static const char *sof_dmi_override_tplg_name; -+static bool sof_dmi_use_community_key; - - #define SOF_PCI_DISABLE_PM_RUNTIME BIT(0) - -@@ -66,15 +68,35 @@ static const struct dmi_system_id sof_tplg_table[] = { - {} - }; - -+/* all Up boards use the community key */ -+static int up_use_community_key(const struct dmi_system_id *id) -+{ -+ sof_dmi_use_community_key = true; -+ return 1; -+} -+ -+/* -+ * For ApolloLake Chromebooks we want to force the use of the Intel production key. -+ * All newer platforms use the community key -+ */ -+static int chromebook_use_community_key(const struct dmi_system_id *id) -+{ -+ if (!soc_intel_is_apl()) -+ sof_dmi_use_community_key = true; -+ return 1; -+} -+ - static const struct dmi_system_id community_key_platforms[] = { - { - .ident = "Up boards", -+ .callback = up_use_community_key, - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "AAEON"), - } - }, - { - .ident = "Google Chromebooks", -+ .callback = chromebook_use_community_key, - .matches = { - DMI_MATCH(DMI_PRODUCT_FAMILY, "Google"), - } -@@ -167,7 +189,7 @@ int sof_pci_probe(struct pci_dev *pci, const struct pci_device_id *pci_id) - "Module parameter used, changed fw path to %s\n", - sof_pdata->fw_filename_prefix); - -- } else if (dmi_check_system(community_key_platforms)) { -+ } else if (dmi_check_system(community_key_platforms) && sof_dmi_use_community_key) { - sof_pdata->fw_filename_prefix = - devm_kasprintf(dev, GFP_KERNEL, "%s/%s", - sof_pdata->desc->default_fw_path, --- -2.42.0 - diff --git a/queue-5.15/series b/queue-5.15/series index 2166e3e4636..993a82141dd 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -62,7 +62,6 @@ cpufreq-imx6q-don-t-disable-792-mhz-opp-unnecessaril.patch iommu-vt-d-omit-devtlb-invalidation-requests-when-te.patch iommu-vt-d-make-context-clearing-consistent-with-con.patch smb3-fix-touch-h-of-symlink.patch-27885 -asoc-sof-sof-pci-dev-don-t-use-the-community-key-on-.patch-15789 asoc-sof-sof-pci-dev-fix-community-key-quirk-detecti.patch-6356 fbdev-stifb-make-the-sti-next-font-pointer-a-32-bit-.patch-17578 fs-add-ctime-accessors-infrastructure.patch-279