From 81a6b6c62e7cbc4d3173df7f21be16ba62580d5f Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Thu, 12 Aug 2021 08:57:14 -0500 Subject: kernel-5.13.10-100 * Thu Aug 12 2021 Justin M. Forbes [5.13.10-100] - kernel-5.13.10-0 (Justin M. Forbes) - Fix up backport of Dell XPS 9710 quirk (Justin M. Forbes) - ASoC: Intel: sof_sdw_max98373: remove useless inits (Pierre-Louis Bossart) - ASoC: Intel: update sof_pcm512x quirks (Pierre-Louis Bossart) - ASoC: SOF: Intel: Use DMI string to search for adl_mx98373_rt5682 variant (jairaj arava) - ASoC: Intel: sof_sdw: add quirk for Dell XPS 9710 (Pierre-Louis Bossart) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- Patchlist.changelog | 15 +++++ kernel.spec | 35 ++++++++++-- patch-5.13-redhat.patch | 142 +++++++++++++++++++++++++++++++++++++++++++++++- sources | 6 +- 4 files changed, 187 insertions(+), 11 deletions(-) diff --git a/Patchlist.changelog b/Patchlist.changelog index f58f96b29..fd73a2ec1 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,18 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/53c4c6b56f335cb97de78ede2e2f65c5ff90df2c + 53c4c6b56f335cb97de78ede2e2f65c5ff90df2c Fix up backport of Dell XPS 9710 quirk + +https://gitlab.com/cki-project/kernel-ark/-/commit/5b1edaedb12682b832f53893cb9665eafa7f5f5b + 5b1edaedb12682b832f53893cb9665eafa7f5f5b ASoC: Intel: sof_sdw_max98373: remove useless inits + +https://gitlab.com/cki-project/kernel-ark/-/commit/db2bd8b831d66f88d930d067545a2fcc93f5d166 + db2bd8b831d66f88d930d067545a2fcc93f5d166 ASoC: Intel: update sof_pcm512x quirks + +https://gitlab.com/cki-project/kernel-ark/-/commit/8e9c2b31fe9b0ee0a933c3e1944d0694406fda97 + 8e9c2b31fe9b0ee0a933c3e1944d0694406fda97 ASoC: SOF: Intel: Use DMI string to search for adl_mx98373_rt5682 variant + +https://gitlab.com/cki-project/kernel-ark/-/commit/4f3a5553af94326cbf4827c05adab57982bcf66f + 4f3a5553af94326cbf4827c05adab57982bcf66f ASoC: Intel: sof_sdw: add quirk for Dell XPS 9710 + https://gitlab.com/cki-project/kernel-ark/-/commit/be7c50290184920f63b093f429488cbffff13d8e be7c50290184920f63b093f429488cbffff13d8e drm/i915/dp: Use max params for older panels diff --git a/kernel.spec b/kernel.spec index 18a5643f3..a94a486d8 100755 --- a/kernel.spec +++ b/kernel.spec @@ -116,7 +116,7 @@ Summary: The Linux kernel # The kernel tarball/base version %define kversion 5.13 -%define rpmversion 5.13.9 +%define rpmversion 5.13.10 %define stableversion 5.13 %define pkgrelease 100 @@ -646,7 +646,7 @@ BuildRequires: clang # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.13.9.tar.xz +Source0: linux-5.13.10.tar.xz Source1: Makefile.rhelver @@ -1315,8 +1315,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.13.9 -c -mv linux-5.13.9 linux-%{KVERREL} +%setup -q -n kernel-5.13.10 -c +mv linux-5.13.10 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2886,10 +2886,33 @@ fi # # %changelog -* Sun Aug 08 2021 Justin M. Forbes [5.13.9-100] -- kernel-5.13.9-0 (Justin M. Forbes) +* Thu Aug 12 2021 Justin M. Forbes [5.13.10-100] +- kernel-5.13.10-0 (Justin M. Forbes) +- Fix up backport of Dell XPS 9710 quirk (Justin M. Forbes) +- ASoC: Intel: sof_sdw_max98373: remove useless inits (Pierre-Louis Bossart) +- ASoC: Intel: update sof_pcm512x quirks (Pierre-Louis Bossart) +- ASoC: SOF: Intel: Use DMI string to search for adl_mx98373_rt5682 variant (jairaj arava) +- ASoC: Intel: sof_sdw: add quirk for Dell XPS 9710 (Pierre-Louis Bossart) + +* Sun Aug 08 2021 Justin M. Forbes [5.13.9-0] - drm/i915/dp: Use max params for older panels (Kai-Heng Feng) - pinctrl: tigerlake: Fix GPIO mapping for newer version of software (Andy Shevchenko) +- kernel-5.13.8-0 (Justin M. Forbes) +- Re-enable sermouse for x86 (rhbz 1974002) (Justin M. Forbes) +- Revert CRYPTO_ECDH and CRYPTO_ECDA from builtin to module to fix fips (Justin M. Forbes) +- drm/rockchip: remove existing generic drivers to take over the device (Javier Martinez Canillas) +- powerpc/pseries: Fix regression while building external modules (Srikar Dronamraju) +- kernel-5.13.7-0 (Justin M. Forbes) +- kernel-5.13.6-0 (Justin M. Forbes) +- kernel-5.13.5-0 (Justin M. Forbes) +- iwlwifi Add support for ax201 in Samsung Galaxy Book Flex2 Alpha (Justin M. Forbes) +- Revert "usb: renesas-xhci: Fix handling of unknown ROM state" (Justin M. Forbes) +- RHEL configs need this too (Justin M. Forbes) +- kernel-5.13.4-0 (Justin M. Forbes) +- Config update for 5.13.4 (Justin M. Forbes) +- kernel-5.13.3-0 (Justin M. Forbes) +- Don't tag a release as [redhat] (Justin M. Forbes) +- platform/x86: amd-pmc: Fix missing unlock on error in amd_pmc_send_cmd() (Yang Yingliang) * Wed Aug 04 2021 Justin M. Forbes [5.13.8-0] - Re-enable sermouse for x86 (rhbz 1974002) (Justin M. Forbes) diff --git a/patch-5.13-redhat.patch b/patch-5.13-redhat.patch index bd917914d..cb48f05d6 100644 --- a/patch-5.13-redhat.patch +++ b/patch-5.13-redhat.patch @@ -48,6 +48,11 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + + sound/soc/intel/boards/sof_pcm512x.c | 13 +- + sound/soc/intel/boards/sof_rt5682.c | 14 + + sound/soc/intel/boards/sof_sdw.c | 12 + + sound/soc/intel/boards/sof_sdw_max98373.c | 4 +- + sound/soc/sof/sof-pci-dev.c | 9 + tools/testing/selftests/bpf/Makefile | 1 - tools/testing/selftests/bpf/prog_tests/atomics.c | 246 ---------- .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 280 ----------- @@ -68,7 +73,7 @@ tools/testing/selftests/bpf/progs/linked_vars2.c | 55 --- .../selftests/bpf/progs/test_static_linked1.c | 30 -- .../selftests/bpf/progs/test_static_linked2.c | 31 -- - 70 files changed, 907 insertions(+), 2360 deletions(-) + 75 files changed, 955 insertions(+), 2364 deletions(-) diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst index 75a9dd98e76e..3ff3291551f9 100644 @@ -93,7 +98,7 @@ index 75a9dd98e76e..3ff3291551f9 100644 Boot into System Kernel diff --git a/Makefile b/Makefile -index 9d810e13a83f..bbf84537d849 100644 +index 4e9f877f513f..6123e12d63e2 100644 --- a/Makefile +++ b/Makefile @@ -508,6 +508,7 @@ KBUILD_AFLAGS := -D__ASSEMBLY__ -fno-PIE @@ -2318,6 +2323,139 @@ index b38155b2de83..b0a6711b4825 100644 #ifdef CONFIG_PERF_EVENTS int security_perf_event_open(struct perf_event_attr *attr, int type) { +diff --git a/sound/soc/intel/boards/sof_pcm512x.c b/sound/soc/intel/boards/sof_pcm512x.c +index 8620d4f38493..335c212c1961 100644 +--- a/sound/soc/intel/boards/sof_pcm512x.c ++++ b/sound/soc/intel/boards/sof_pcm512x.c +@@ -26,11 +26,16 @@ + + #define SOF_PCM512X_SSP_CODEC(quirk) ((quirk) & GENMASK(3, 0)) + #define SOF_PCM512X_SSP_CODEC_MASK (GENMASK(3, 0)) ++#define SOF_PCM512X_ENABLE_SSP_CAPTURE BIT(4) ++#define SOF_PCM512X_ENABLE_DMIC BIT(5) + + #define IDISP_CODEC_MASK 0x4 + + /* Default: SSP5 */ +-static unsigned long sof_pcm512x_quirk = SOF_PCM512X_SSP_CODEC(5); ++static unsigned long sof_pcm512x_quirk = ++ SOF_PCM512X_SSP_CODEC(5) | ++ SOF_PCM512X_ENABLE_SSP_CAPTURE | ++ SOF_PCM512X_ENABLE_DMIC; + + static bool is_legacy_cpu; + +@@ -245,8 +250,9 @@ static struct snd_soc_dai_link *sof_card_dai_links_create(struct device *dev, + links[id].dpcm_playback = 1; + /* + * capture only supported with specific versions of the Hifiberry DAC+ +- * links[id].dpcm_capture = 1; + */ ++ if (sof_pcm512x_quirk & SOF_PCM512X_ENABLE_SSP_CAPTURE) ++ links[id].dpcm_capture = 1; + links[id].no_pcm = 1; + links[id].cpus = &cpus[id]; + links[id].num_cpus = 1; +@@ -381,6 +387,9 @@ static int sof_audio_probe(struct platform_device *pdev) + + ssp_codec = sof_pcm512x_quirk & SOF_PCM512X_SSP_CODEC_MASK; + ++ if (!(sof_pcm512x_quirk & SOF_PCM512X_ENABLE_DMIC)) ++ dmic_be_num = 0; ++ + /* compute number of dai links */ + sof_audio_card_pcm512x.num_links = 1 + dmic_be_num + hdmi_num; + +diff --git a/sound/soc/intel/boards/sof_rt5682.c b/sound/soc/intel/boards/sof_rt5682.c +index 78262c659983..f4b25ae7fd5a 100644 +--- a/sound/soc/intel/boards/sof_rt5682.c ++++ b/sound/soc/intel/boards/sof_rt5682.c +@@ -155,6 +155,20 @@ static const struct dmi_system_id sof_rt5682_quirk_table[] = { + SOF_RT5682_SSP_AMP(2) | + SOF_RT5682_NUM_HDMIDEV(4)), + }, ++ { ++ .callback = sof_rt5682_quirk_cb, ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "Alder Lake Client Platform"), ++ DMI_MATCH(DMI_OEM_STRING, "AUDIO-ADL_MAX98373_ALC5682I_I2S"), ++ }, ++ .driver_data = (void *)(SOF_RT5682_MCLK_EN | ++ SOF_RT5682_SSP_CODEC(0) | ++ SOF_SPEAKER_AMP_PRESENT | ++ SOF_MAX98373_SPEAKER_AMP_PRESENT | ++ SOF_RT5682_SSP_AMP(2) | ++ SOF_RT5682_NUM_HDMIDEV(4)), ++ }, + {} + }; + +diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c +index 3ca7e1ab48ab..3635d8002ecf 100644 +--- a/sound/soc/intel/boards/sof_sdw.c ++++ b/sound/soc/intel/boards/sof_sdw.c +@@ -128,6 +128,18 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { + SOF_RT711_JD_SRC_JD2 | + SOF_RT715_DAI_ID_FIX), + }, ++ { ++ /* Dell XPS 9710 */ ++ .callback = sof_sdw_quirk_cb, ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc"), ++ DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A5D") ++ }, ++ .driver_data = (void *)(SOF_SDW_TGL_HDMI | ++ SOF_RT711_JD_SRC_JD2 | ++ SOF_RT715_DAI_ID_FIX | ++ SOF_SDW_FOUR_SPK), ++ }, + { + .callback = sof_sdw_quirk_cb, + .matches = { +diff --git a/sound/soc/intel/boards/sof_sdw_max98373.c b/sound/soc/intel/boards/sof_sdw_max98373.c +index 25daef910aee..25f9065b627c 100644 +--- a/sound/soc/intel/boards/sof_sdw_max98373.c ++++ b/sound/soc/intel/boards/sof_sdw_max98373.c +@@ -90,7 +90,7 @@ static int mx8373_enable_spk_pin(struct snd_pcm_substream *substream, bool enabl + + static int mx8373_sdw_prepare(struct snd_pcm_substream *substream) + { +- int ret = 0; ++ int ret; + + /* according to soc_pcm_prepare dai link prepare is called first */ + ret = sdw_prepare(substream); +@@ -102,7 +102,7 @@ static int mx8373_sdw_prepare(struct snd_pcm_substream *substream) + + static int mx8373_sdw_hw_free(struct snd_pcm_substream *substream) + { +- int ret = 0; ++ int ret; + + /* according to soc_pcm_hw_free dai link free is called first */ + ret = sdw_hw_free(substream); +diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c +index 3489dc1b48f6..2bdf3cf37422 100644 +--- a/sound/soc/sof/sof-pci-dev.c ++++ b/sound/soc/sof/sof-pci-dev.c +@@ -50,6 +50,15 @@ static const struct dmi_system_id sof_tplg_table[] = { + }, + .driver_data = "sof-tgl-rt5682-ssp0-max98373-ssp2.tplg", + }, ++ { ++ .callback = sof_tplg_cb, ++ .matches = { ++ DMI_MATCH(DMI_SYS_VENDOR, "Intel Corporation"), ++ DMI_MATCH(DMI_PRODUCT_NAME, "Alder Lake Client Platform"), ++ DMI_MATCH(DMI_OEM_STRING, "AUDIO-ADL_MAX98373_ALC5682I_I2S"), ++ }, ++ .driver_data = "sof-adl-rt5682-ssp0-max98373-ssp2.tplg", ++ }, + {} + }; + diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index 511259c2c6c5..bd2ca0032883 100644 --- a/tools/testing/selftests/bpf/Makefile diff --git a/sources b/sources index 4759a208a..6125d9ead 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-5.13.9.tar.xz) = 87e2b8fa77f8e9c29faedacabce0772370a6a52b94085d83c07a1455e33b189f851a31c08f23e3ad15f9bc330562571321bbda332adeeedfdc298d5887a7210c -SHA512 (kernel-abi-whitelists-5.13.9-100.tar.bz2) = 7bdd16a661cdb48175f73522d87c5ebbf9aed4614290772676f676a7489854e248852b786a85bed4fd7974113b08cb14d7bc573f66999b3225bfc68ea62895ad -SHA512 (kernel-kabi-dw-5.13.9-100.tar.bz2) = 73c09a232931dedef6fdf31ec23381c48d1736f561f1445116e1d60b4dcbae411453892bf64a2dd67652dc513d203f6b60b4fd188d72e49b456ebcef28e330c1 +SHA512 (linux-5.13.10.tar.xz) = 54dff92c44f689996568b1a0e73489592340dda4ca1e4ec2113ecce53d09ac92db39db033641ee57268d893091bfc839fc7ba6df05f8adee53604fbc4423833f +SHA512 (kernel-abi-whitelists-5.13.10-100.tar.bz2) = 5aa6f7f57854b072d9826229c3ef449b6018d7cda3b6676cf53b9899145480dba4807202856f4a493558afbbffbc9124479d1b59116f635d6c912c24e64d30c5 +SHA512 (kernel-kabi-dw-5.13.10-100.tar.bz2) = 3b629d300a3a346f29d9de17e89b1b4cf30d968e26071e8cdb84f0c7c6ce8a80a25f3665ddd0e844afe4bfc08ece86c93b3044c83494c2b4d1b5505105973164 -- cgit