rpms/kernel
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

kernel-5.11.0-0.rc7.20210210gite0756cfc7d7c.150

Browse Source 
* Wed Feb 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.20210210gite0756cfc7d7c.150]
- Bluetooth: L2CAP: Try harder to accept device not knowing options (Bastien Nocera)
Resolves: rhbz#

Signed-off-by: Justin M. Forbes <jforbes@fedoraproject.org>
This commit is contained in:
Justin M. Forbes 2021-02-10 09:52:14 -06:00
parent dd9f5d552f
commit a60f42e5b8
28 changed files with 135 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.rhelver
View File

@ -12,7 +12,7 @@ RHEL_MINOR = 99
#
# Use this spot to avoid future merge conflicts.
# Do not trim this comment.
RHEL_RELEASE = 149
RHEL_RELEASE = 150
#
# Early y+1 numbering

7
Patchlist.changelog
View File

@ -1,5 +1,8 @@
https://gitlab.com/cki-project/kernel-ark/-/commit/67dabe40324eee91aa9f135391ca7b0eb9a7e069
67dabe40324eee91aa9f135391ca7b0eb9a7e069 Bluetooth: L2CAP: Try harder to accept device not knowing options
https://gitlab.com/cki-project/kernel-ark/-/commit/5bd5db57713dba41e3a6df6538c4c3063aa53fb7
5bd5db57713dba41e3a6df6538c4c3063aa53fb7 Bluetooth: L2CAP: Try harder to accept device not knowing options
https://gitlab.com/cki-project/kernel-ark/-/commit/06219afd635737bfee1a7c676258e66448f133e2
06219afd635737bfee1a7c676258e66448f133e2 ALSA: hda: intel-dsp-config: Add SND_INTEL_BYT_PREFER_SOF Kconfig option
https://gitlab.com/cki-project/kernel-ark/-/commit/035ea4b6c436e53b4c9e388bc65c965f310e216c
035ea4b6c436e53b4c9e388bc65c965f310e216c redhat: remove remaining references of CONFIG_RH_DISABLE_DEPRECATED

1
kernel-aarch64-debug-fedora.config
View File

@ -6432,6 +6432,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
# CONFIG_SND_KIRKWOOD_SOC is not set

1
kernel-aarch64-debug-rhel.config
View File

@ -5131,6 +5131,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
CONFIG_SND_INTEL8X0=m
CONFIG_SND_INTEL8X0M=m
# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
CONFIG_SND_ISIGHT=m
# CONFIG_SND is not set
CONFIG_SND_KORG1212=m

1
kernel-aarch64-fedora.config
View File

@ -6409,6 +6409,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
# CONFIG_SND_KIRKWOOD_SOC is not set

1
kernel-aarch64-rhel.config
View File

@ -5110,6 +5110,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
CONFIG_SND_INTEL8X0=m
CONFIG_SND_INTEL8X0M=m
# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
CONFIG_SND_ISIGHT=m
# CONFIG_SND is not set
CONFIG_SND_KORG1212=m

1
kernel-armv7hl-debug-fedora.config
View File

@ -6591,6 +6591,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m

1
kernel-armv7hl-fedora.config
View File

@ -6569,6 +6569,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m

1
kernel-armv7hl-lpae-debug-fedora.config
View File

@ -6396,6 +6396,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m

1
kernel-armv7hl-lpae-fedora.config
View File

@ -6374,6 +6374,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KIRKWOOD_SOC_ARMADA370_DB=m

1
kernel-i686-debug-fedora.config
View File

@ -5802,6 +5802,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
CONFIG_SND_INTEL8X0=m
CONFIG_SND_INTEL8X0M=m
CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KORG1212=m

1
kernel-i686-fedora.config
View File

@ -5780,6 +5780,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
CONFIG_SND_INTEL8X0=m
CONFIG_SND_INTEL8X0M=m
CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KORG1212=m

1
kernel-ppc64le-debug-fedora.config
View File

@ -5470,6 +5470,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KORG1212=m

1
kernel-ppc64le-debug-rhel.config
View File

@ -4975,6 +4975,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
CONFIG_SND_INTEL8X0=m
CONFIG_SND_INTEL8X0M=m
# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
CONFIG_SND_ISIGHT=m
CONFIG_SND_KORG1212=m
CONFIG_SND_LAYLA20=m

1
kernel-ppc64le-fedora.config
View File

@ -5447,6 +5447,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KORG1212=m

1
kernel-ppc64le-rhel.config
View File

@ -4958,6 +4958,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
CONFIG_SND_INTEL8X0=m
CONFIG_SND_INTEL8X0M=m
# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
CONFIG_SND_ISIGHT=m
CONFIG_SND_KORG1212=m
CONFIG_SND_LAYLA20=m

1
kernel-s390x-debug-fedora.config
View File

@ -5413,6 +5413,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KORG1212=m

1
kernel-s390x-debug-rhel.config
View File

@ -4919,6 +4919,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
CONFIG_SND_INTEL8X0=m
CONFIG_SND_INTEL8X0M=m
# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
CONFIG_SND_ISIGHT=m
CONFIG_SND_KORG1212=m
CONFIG_SND_LAYLA20=m

1
kernel-s390x-fedora.config
View File

@ -5390,6 +5390,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
# CONFIG_SND_INTEL8X0 is not set
# CONFIG_SND_INTEL8X0M is not set
CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KORG1212=m

1
kernel-s390x-rhel.config
View File

@ -4902,6 +4902,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
CONFIG_SND_INTEL8X0=m
CONFIG_SND_INTEL8X0M=m
# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
CONFIG_SND_ISIGHT=m
CONFIG_SND_KORG1212=m
CONFIG_SND_LAYLA20=m

1
kernel-s390x-zfcpdump-rhel.config
View File

@ -4931,6 +4931,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
CONFIG_SND_INTEL8X0=m
CONFIG_SND_INTEL8X0M=m
# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
CONFIG_SND_ISIGHT=m
CONFIG_SND_KORG1212=m
CONFIG_SND_LAYLA20=m

1
kernel-x86_64-debug-fedora.config
View File

@ -5846,6 +5846,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
CONFIG_SND_INTEL8X0=m
CONFIG_SND_INTEL8X0M=m
CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KORG1212=m

1
kernel-x86_64-debug-rhel.config
View File

@ -5127,6 +5127,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
CONFIG_SND_INTEL8X0=m
CONFIG_SND_INTEL8X0M=m
# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
CONFIG_SND_ISIGHT=m
CONFIG_SND_KORG1212=m
CONFIG_SND_LAYLA20=m

1
kernel-x86_64-fedora.config
View File

@ -5824,6 +5824,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
CONFIG_SND_INTEL8X0=m
CONFIG_SND_INTEL8X0M=m
CONFIG_SND_INTEL_BYT_PREFER_SOF=y
CONFIG_SND_ISIGHT=m
CONFIG_SND_JACK=y
CONFIG_SND_KORG1212=m

1
kernel-x86_64-rhel.config
View File

@ -5107,6 +5107,7 @@ CONFIG_SND_INDIGOIOX=m
CONFIG_SND_INDIGO=m
CONFIG_SND_INTEL8X0=m
CONFIG_SND_INTEL8X0M=m
# CONFIG_SND_INTEL_BYT_PREFER_SOF is not set
CONFIG_SND_ISIGHT=m
CONFIG_SND_KORG1212=m
CONFIG_SND_LAYLA20=m

34
kernel.spec
View File

@ -64,7 +64,7 @@ Summary: The Linux kernel
# For a stable, released kernel, released_kernel should be 1.
%global released_kernel 0
%global distro_build 0.rc7.149
%global distro_build 0.rc7.20210210gite0756cfc7d7c.150
%if 0%{?fedora}
%define secure_boot_arch x86_64
@ -105,13 +105,13 @@ Summary: The Linux kernel
%endif
%define rpmversion 5.11.0
%define pkgrelease 0.rc7.149
%define pkgrelease 0.rc7.20210210gite0756cfc7d7c.150
# This is needed to do merge window version magic
%define patchlevel 11
# allow pkg_release to have configurable %%{?dist} tag
%define specrelease 0.rc7.149%{?buildid}%{?dist}
%define specrelease 0.rc7.20210210gite0756cfc7d7c.150%{?buildid}%{?dist}
%define pkg_release %{specrelease}
@ -201,7 +201,7 @@ Summary: The Linux kernel
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
# and 0 for rawhide (all kernels are debug kernels).
# See also 'make debug' and 'make release'.
%define debugbuildsenabled 1
%define debugbuildsenabled 0
# The kernel tarball/base version
%define kversion 5.11
@ -396,6 +396,7 @@ Summary: The Linux kernel
%define hdrarch s390
%define all_arch_configs kernel-%{version}-s390x.config
%define kernel_image arch/s390/boot/bzImage
%define vmlinux_decompressor arch/s390/boot/compressed/vmlinux
%endif
%ifarch %{arm}
@ -601,7 +602,7 @@ BuildRequires: asciidoc
# exact git commit you can run
#
# xzcat -qq ${TARBALL} | git get-tar-commit-id
Source0: linux-5.11-rc7.tar.xz
Source0: linux-20210210gite0756cfc7d7c.tar.xz
Source1: Makefile.rhelver
@ -1249,8 +1250,8 @@ ApplyOptionalPatch()
fi
}
%setup -q -n kernel-5.11-rc7 -c
mv linux-5.11-rc7 linux-%{KVERREL}
%setup -q -n kernel-20210210gite0756cfc7d7c -c
mv linux-20210210gite0756cfc7d7c linux-%{KVERREL}
cd linux-%{KVERREL}
cp -a %{SOURCE1} .
@ -1811,6 +1812,16 @@ BuildKernel() {
#
mkdir -p $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer
cp vmlinux $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer
if [ -n "%{vmlinux_decompressor}" ]; then
eu-readelf -n %{vmlinux_decompressor} | grep "Build ID" | awk '{print $NF}' > vmlinux.decompressor.id
# Without build-id the build will fail. But for s390 the build-id
# wasn't added before 5.11. In case it is missing prefer not
# packaging the debuginfo over a build failure.
if [ -s vmlinux.decompressor.id ]; then
cp vmlinux.decompressor.id $RPM_BUILD_ROOT/lib/modules/$KernelVer/build/vmlinux.decompressor.id
cp %{vmlinux_decompressor} $RPM_BUILD_ROOT%{debuginfodir}/lib/modules/$KernelVer/vmlinux.decompressor
fi
fi
%endif
find $RPM_BUILD_ROOT/lib/modules/$KernelVer -name "*.ko" -type f >modnames
@ -2751,9 +2762,16 @@ fi
#
#
%changelog
* Mon Feb 08 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.149]
* Wed Feb 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.20210210gite0756cfc7d7c.150]
- Bluetooth: L2CAP: Try harder to accept device not knowing options (Bastien Nocera)
* Wed Feb 10 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.20210210gite0756cfc7d7c.149]
- Fix trailing white space in redhat/configs/fedora/generic/CONFIG_SND_INTEL_BYT_PREFER_SOF (Justin M. Forbes)
- Add a redhat/rebase-notes.txt file (Hans de Goede)
- Turn on SND_INTEL_BYT_PREFER_SOF for Fedora (Hans de Goede)
- ALSA: hda: intel-dsp-config: Add SND_INTEL_BYT_PREFER_SOF Kconfig option (Hans de Goede) [1924101]
- CI: Drop MR ID from the name variable (Veronika Kabatova)
* Mon Feb 08 2021 Fedora Kernel Team <kernel-team@fedoraproject.org> [5.11.0-0.rc7.148]
- redhat: add DUP and kpatch certificates to system trusted keys for RHEL build (Herton R. Krzesinski)

78
patch-5.11.0-redhat.patch
View File

@ -69,7 +69,9 @@
security/lockdown/Kconfig | 13 +
security/lockdown/lockdown.c | 1 +
security/security.c | 6 +
71 files changed, 1580 insertions(+), 188 deletions(-)
sound/hda/Kconfig | 14 +
sound/hda/intel-dsp-config.c | 29 +-
73 files changed, 1606 insertions(+), 205 deletions(-)
diff --git a/Documentation/admin-guide/kdump/kdump.rst b/Documentation/admin-guide/kdump/kdump.rst
index 75a9dd98e76e..3ff3291551f9 100644
@ -3088,3 +3090,77 @@ index 7b09cfbae94f..e1c7bda4de13 100644
#ifdef CONFIG_PERF_EVENTS
int security_perf_event_open(struct perf_event_attr *attr, int type)
{
diff --git a/sound/hda/Kconfig b/sound/hda/Kconfig
index 3bc9224d5e4f..9ed5cfa3c18c 100644
--- a/sound/hda/Kconfig
+++ b/sound/hda/Kconfig
@@ -46,3 +46,17 @@ config SND_INTEL_DSP_CONFIG
select SND_INTEL_NHLT if ACPI
# this config should be selected only for Intel DSP platforms.
# A fallback is provided so that the code compiles in all cases.
+
+config SND_INTEL_BYT_PREFER_SOF
+ bool "Prefer SOF driver over SST on BY/CHT platforms"
+ depends on SND_SST_ATOM_HIFI2_PLATFORM_ACPI && SND_SOC_SOF_BAYTRAIL
+ default n
+ help
+ The kernel has 2 drivers for the Low Power Engine audio-block on
+ Bay- and Cherry-Trail SoCs. The old SST driver and the new SOF
+ driver. If both drivers are enabled then the kernel will default
+ to using the old SST driver, unless told otherwise through the
+ snd_intel_dspcfg.dsp_driver module-parameter.
+
+ Set this option to Y to make the kernel default to the new SOF
+ driver instead.
diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c
index c45686172517..68bb977c6a37 100644
--- a/sound/hda/intel-dsp-config.c
+++ b/sound/hda/intel-dsp-config.c
@@ -452,35 +452,30 @@ int snd_intel_dsp_driver_probe(struct pci_dev *pci)
}
EXPORT_SYMBOL_GPL(snd_intel_dsp_driver_probe);
+/* Should we default to SOF or SST for BYT/CHT ? */
+#if IS_ENABLED(CONFIG_SND_INTEL_BYT_PREFER_SOF) || \
+ !IS_ENABLED(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI)
+#define FLAG_SST_OR_SOF_BYT FLAG_SOF
+#else
+#define FLAG_SST_OR_SOF_BYT FLAG_SST
+#endif
+
/*
* configuration table
* - the order of similar ACPI ID entries is important!
* - the first successful match will win
*/
static const struct config_entry acpi_config_table[] = {
+#if IS_ENABLED(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI) || \
+ IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
/* BayTrail */
-#if IS_ENABLED(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI)
- {
- .flags = FLAG_SST,
- .acpi_hid = "80860F28",
- },
-#endif
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
{
- .flags = FLAG_SOF,
+ .flags = FLAG_SST_OR_SOF_BYT,
.acpi_hid = "80860F28",
},
-#endif
/* CherryTrail */
-#if IS_ENABLED(CONFIG_SND_SST_ATOM_HIFI2_PLATFORM_ACPI)
- {
- .flags = FLAG_SST,
- .acpi_hid = "808622A8",
- },
-#endif
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_BAYTRAIL)
{
- .flags = FLAG_SOF,
+ .flags = FLAG_SST_OR_SOF_BYT,
.acpi_hid = "808622A8",
},
#endif

6
sources
View File

@ -1,3 +1,3 @@
SHA512 (linux-5.11-rc7.tar.xz) = b1f2faf38d81866d4d0d5e3448fa009a6615ec1a7e3d15fd241b2353547205406c16cea0ff031c3da3c83012a912a16dcee891bf0c01be00512a3cbcd7835e62
SHA512 (kernel-abi-whitelists-5.11.0-0.rc7.149.tar.bz2) = a22d8336949f3fa16131bde38542300c29da85d76d8154530b1268c483fb73a705b57991c855454f7b0d550e40b7e251d17dea7428eaaa7156ad1ebd9279a7eb
SHA512 (kernel-kabi-dw-5.11.0-0.rc7.149.tar.bz2) = 204c8dddb1a844520af822ac9eb737803099035d0692fc78fa21dc7c5d0ec6d3a1d0dd134a80cb50580287dbf69b3124c6016e7a4875831eb6b63a6be443ac88
SHA512 (linux-20210210gite0756cfc7d7c.tar.xz) = fa89f72e7175f26ea2f3e0439bf1488ba813ccebadbf4218f063316bcbd1333a442f1ef4ec102fac8dd434dcd4f7b15748a0ab5c0165d734caa9bbed0fad0b85
SHA512 (kernel-abi-whitelists-5.11.0-0.rc7.20210210gite0756cfc7d7c.150.tar.bz2) = c53c44ca06406839629d1b26e561762ae3c1a73bf1122c41482817f2a631245ae01e43323e512d384006e14f5f1ee663a0092911933f293224bf958e7c6176c6
SHA512 (kernel-kabi-dw-5.11.0-0.rc7.20210210gite0756cfc7d7c.150.tar.bz2) = 54ea3805dd27d830da8843606c31abf2958359d6c02b348fc2b672444799a239c43103257e080a4e10034211122779fb5096875542697be138f72d8759f9f3f1