diff options
| -rw-r--r-- | SOURCES/Patchlist.changelog | 3 | ||||
| -rw-r--r-- | SOURCES/patch-5.14-redhat.patch | 52 | ||||
| -rwxr-xr-x | SPECS/kernel.spec | 15 |
3 files changed, 63 insertions, 7 deletions
diff --git a/SOURCES/Patchlist.changelog b/SOURCES/Patchlist.changelog index c29ea4c..d63fe36 100644 --- a/SOURCES/Patchlist.changelog +++ b/SOURCES/Patchlist.changelog @@ -1,3 +1,6 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/7669a9b770057fa6a97e4fc23225e72ddba8719d + 7669a9b770057fa6a97e4fc23225e72ddba8719d ASoC: Intel: sof_sdw: add quirk for Dell XPS 9710 + https://gitlab.com/cki-project/kernel-ark/-/commit/32568097ff5803d25ac5e233583903c1c4666711 32568097ff5803d25ac5e233583903c1c4666711 e100e: Fix packet loss issues seen on Intel network controller diff --git a/SOURCES/patch-5.14-redhat.patch b/SOURCES/patch-5.14-redhat.patch index 9907a16..c9982dc 100644 --- a/SOURCES/patch-5.14-redhat.patch +++ b/SOURCES/patch-5.14-redhat.patch @@ -42,6 +42,7 @@ security/lockdown/Kconfig | 13 + security/lockdown/lockdown.c | 1 + security/security.c | 6 + + sound/soc/intel/boards/sof_sdw.c | 12 + tools/testing/selftests/bpf/Makefile | 1 - .../selftests/bpf/prog_tests/linked_funcs.c | 42 -- .../testing/selftests/bpf/prog_tests/linked_maps.c | 30 -- @@ -55,7 +56,7 @@ tools/testing/selftests/bpf/progs/linked_maps2.c | 76 --- tools/testing/selftests/bpf/progs/linked_vars1.c | 54 -- tools/testing/selftests/bpf/progs/linked_vars2.c | 55 --- - 57 files changed, 709 insertions(+), 1510 deletions(-) + 58 files changed, 721 insertions(+), 1510 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 2fb7012c3246..47718b4f2f75 100644 @@ -1810,6 +1811,29 @@ index 9ffa9e9c5c55..36484cc9842d 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_sdw.c b/sound/soc/intel/boards/sof_sdw.c +index cb3afc4519cf..6a12f9817e0b 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 | ++ RT711_JD2 | ++ SOF_RT715_DAI_ID_FIX | ++ SOF_SDW_FOUR_SPK), ++ }, + { + .callback = sof_sdw_quirk_cb, + .matches = { diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index 93f1f124ef89..70905889a07b 100644 --- a/tools/testing/selftests/bpf/Makefile @@ -3198,3 +3222,29 @@ index e4f5bd388a3c..000000000000 -} - -char LICENSE[] SEC("license") = "GPL"; +From 53c4c6b56f335cb97de78ede2e2f65c5ff90df2c Mon Sep 17 00:00:00 2001 +From: "Justin M. Forbes" <jforbes@fedoraproject.org> +Date: Tue, 10 Aug 2021 13:34:24 -0500 +Subject: [PATCH] Fix up backport of Dell XPS 9710 quirk + +Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org> +--- + sound/soc/intel/boards/sof_sdw.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c +index c78a98be343d..3635d8002ecf 100644 +--- a/sound/soc/intel/boards/sof_sdw.c ++++ b/sound/soc/intel/boards/sof_sdw.c +@@ -136,7 +136,7 @@ static const struct dmi_system_id sof_sdw_quirk_table[] = { + DMI_EXACT_MATCH(DMI_PRODUCT_SKU, "0A5D") + }, + .driver_data = (void *)(SOF_SDW_TGL_HDMI | +- RT711_JD2 | ++ SOF_RT711_JD_SRC_JD2 | + SOF_RT715_DAI_ID_FIX | + SOF_SDW_FOUR_SPK), + }, +-- +2.31.1 + diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 2811737..defd5f0 100755 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -123,7 +123,7 @@ Summary: The Linux kernel # The kernel tarball/base version %define kversion 5.14 -%define rpmversion 5.14.12 +%define rpmversion 5.14.13 %define patchversion 5.14 %define pkgrelease 301 @@ -672,7 +672,7 @@ BuildRequires: lld # exact git commit you can run # # xzcat -qq ${TARBALL} | git get-tar-commit-id -Source0: linux-5.14.12.tar.xz +Source0: linux-5.14.13.tar.xz Source1: Makefile.rhelver @@ -1366,8 +1366,8 @@ ApplyOptionalPatch() fi } -%setup -q -n kernel-5.14.12 -c -mv linux-5.14.12 linux-%{KVERREL} +%setup -q -n kernel-5.14.13 -c +mv linux-5.14.13 linux-%{KVERREL} cd linux-%{KVERREL} cp -a %{SOURCE1} . @@ -2974,8 +2974,11 @@ fi # # %changelog -* Wed Oct 20 2021 Jan Drögehoff <sentrycraft123@gmail.com> - 5.14.12-301.fsync -- Linux v5.14.12 futex2 zen openrgb +* Wed Oct 20 2021 Jan Drögehoff <sentrycraft123@gmail.com> - 5.14.13-301.fsync +- Linux v5.14.13 futex2 zen openrgb + +* Sun Oct 17 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.13-0] +- ASoC: Intel: sof_sdw: add quirk for Dell XPS 9710 (Pierre-Louis Bossart) * Wed Oct 13 2021 Justin M. Forbes <jforbes@fedoraproject.org> [5.14.12-0] - Linux v5.14.12 |