From 409dc517efcd723196b6ff8ec186d4dab06ff6c5 Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Wed, 10 Jun 2026 10:43:40 -0600 Subject: [PATCH] kernel-7.1.0-0.rc7.260610gacb7500801e9.49 * Wed Jun 10 2026 Fedora Kernel Team [7.1.0-0.rc7.acb7500801e9.49] - automotive: enable HUGETLBFS to workaround build error (Scott Weaver) Resolves: Signed-off-by: Justin M. Forbes --- Makefile.rhelver | 2 +- Patchlist.changelog | 12 + kernel-aarch64-16k-debug-fedora.config | 1 + kernel-aarch64-16k-fedora.config | 1 + kernel-aarch64-64k-debug-rhel.config | 3 +- kernel-aarch64-64k-rhel.config | 3 +- kernel-aarch64-debug-fedora.config | 1 + kernel-aarch64-debug-rhel.config | 3 +- kernel-aarch64-fedora.config | 1 + kernel-aarch64-rhel.config | 3 +- kernel-aarch64-rt-64k-debug-fedora.config | 1 + kernel-aarch64-rt-64k-debug-rhel.config | 3 +- kernel-aarch64-rt-64k-fedora.config | 1 + kernel-aarch64-rt-64k-rhel.config | 3 +- kernel-aarch64-rt-debug-fedora.config | 1 + kernel-aarch64-rt-debug-rhel.config | 3 +- kernel-aarch64-rt-fedora.config | 1 + kernel-aarch64-rt-rhel.config | 3 +- kernel-ppc64le-debug-rhel.config | 2 +- kernel-ppc64le-rhel.config | 2 +- kernel-riscv64-debug-rhel.config | 2 +- kernel-riscv64-rhel.config | 2 +- kernel-s390x-debug-rhel.config | 2 +- kernel-s390x-rhel.config | 2 +- kernel-s390x-zfcpdump-rhel.config | 2 +- kernel-x86_64-debug-rhel.config | 2 +- kernel-x86_64-rhel.config | 2 +- kernel-x86_64-rt-debug-rhel.config | 2 +- kernel-x86_64-rt-rhel.config | 2 +- kernel.changelog | 12 +- kernel.spec | 28 ++- patch-7.1-redhat.patch | 260 +++++++++++++++++++++- sources | 6 +- 33 files changed, 337 insertions(+), 37 deletions(-) diff --git a/Makefile.rhelver b/Makefile.rhelver index 72310dfa2..3f1096328 100644 --- a/Makefile.rhelver +++ b/Makefile.rhelver @@ -12,7 +12,7 @@ RHEL_MINOR = 99 # # Use this spot to avoid future merge conflicts. # Do not trim this comment. -RHEL_RELEASE = 47 +RHEL_RELEASE = 49 # # RHEL_REBASE_NUM diff --git a/Patchlist.changelog b/Patchlist.changelog index 3351e3146..3e4841590 100644 --- a/Patchlist.changelog +++ b/Patchlist.changelog @@ -1,3 +1,15 @@ +https://gitlab.com/cki-project/kernel-ark/-/commit/e895446310260f236279d7c6603a4a340289bf33 + e895446310260f236279d7c6603a4a340289bf33 arm64: errata: Mitigate TLBI errata on NVIDIA Olympus CPU + +https://gitlab.com/cki-project/kernel-ark/-/commit/f66e02fbe7d638be53c69ec77d6f64833a77758c + f66e02fbe7d638be53c69ec77d6f64833a77758c arm64: errata: Mitigate TLBI errata on various Arm CPUs + +https://gitlab.com/cki-project/kernel-ark/-/commit/faa62aa39b9b552af2b482693ab0704c4436ae76 + faa62aa39b9b552af2b482693ab0704c4436ae76 arm64: cputype: Add C1-Premium definitions + +https://gitlab.com/cki-project/kernel-ark/-/commit/64ef92559bc4acaec0a9b106570507b4ce509ce0 + 64ef92559bc4acaec0a9b106570507b4ce509ce0 arm64: cputype: Add C1-Ultra definitions + https://gitlab.com/cki-project/kernel-ark/-/commit/49dc112a24f8c571d32554e8a1dfdc74c0140b42 49dc112a24f8c571d32554e8a1dfdc74c0140b42 redhat: rh_flags: mark !CONFIG_RHEL_DIFFERENCES stubs as static inline diff --git a/kernel-aarch64-16k-debug-fedora.config b/kernel-aarch64-16k-debug-fedora.config index c1c05a24e..96bffb80f 100644 --- a/kernel-aarch64-16k-debug-fedora.config +++ b/kernel-aarch64-16k-debug-fedora.config @@ -482,6 +482,7 @@ CONFIG_ARM64_ERRATUM_2658417=y CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_3117295=y CONFIG_ARM64_ERRATUM_3194386=y +CONFIG_ARM64_ERRATUM_4118414=y CONFIG_ARM64_ERRATUM_4193714=y CONFIG_ARM64_ERRATUM_4311569=y CONFIG_ARM64_ERRATUM_819472=y diff --git a/kernel-aarch64-16k-fedora.config b/kernel-aarch64-16k-fedora.config index 8d6a67ec7..339161980 100644 --- a/kernel-aarch64-16k-fedora.config +++ b/kernel-aarch64-16k-fedora.config @@ -482,6 +482,7 @@ CONFIG_ARM64_ERRATUM_2658417=y CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_3117295=y CONFIG_ARM64_ERRATUM_3194386=y +CONFIG_ARM64_ERRATUM_4118414=y CONFIG_ARM64_ERRATUM_4193714=y CONFIG_ARM64_ERRATUM_4311569=y CONFIG_ARM64_ERRATUM_819472=y diff --git a/kernel-aarch64-64k-debug-rhel.config b/kernel-aarch64-64k-debug-rhel.config index badda2a55..19f885816 100644 --- a/kernel-aarch64-64k-debug-rhel.config +++ b/kernel-aarch64-64k-debug-rhel.config @@ -398,6 +398,7 @@ CONFIG_ARM64_ERRATUM_2658417=y CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_3117295=y CONFIG_ARM64_ERRATUM_3194386=y +CONFIG_ARM64_ERRATUM_4118414=y CONFIG_ARM64_ERRATUM_4193714=y CONFIG_ARM64_ERRATUM_4311569=y CONFIG_ARM64_ERRATUM_819472=y @@ -4232,7 +4233,7 @@ CONFIG_MMC_VUB300=m CONFIG_MMIOTRACE=y CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y -CONFIG_MODPROBE_PATH="/usr/bin/modprobe" +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_ALL is not set diff --git a/kernel-aarch64-64k-rhel.config b/kernel-aarch64-64k-rhel.config index 4cebf1d58..a31562410 100644 --- a/kernel-aarch64-64k-rhel.config +++ b/kernel-aarch64-64k-rhel.config @@ -398,6 +398,7 @@ CONFIG_ARM64_ERRATUM_2658417=y CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_3117295=y CONFIG_ARM64_ERRATUM_3194386=y +CONFIG_ARM64_ERRATUM_4118414=y CONFIG_ARM64_ERRATUM_4193714=y CONFIG_ARM64_ERRATUM_4311569=y CONFIG_ARM64_ERRATUM_819472=y @@ -4209,7 +4210,7 @@ CONFIG_MMC_VUB300=m # CONFIG_MMIOTRACE is not set CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y -CONFIG_MODPROBE_PATH="/usr/bin/modprobe" +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_ALL is not set diff --git a/kernel-aarch64-debug-fedora.config b/kernel-aarch64-debug-fedora.config index a9b55b334..e91ec37e0 100644 --- a/kernel-aarch64-debug-fedora.config +++ b/kernel-aarch64-debug-fedora.config @@ -482,6 +482,7 @@ CONFIG_ARM64_ERRATUM_2658417=y CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_3117295=y CONFIG_ARM64_ERRATUM_3194386=y +CONFIG_ARM64_ERRATUM_4118414=y CONFIG_ARM64_ERRATUM_4193714=y CONFIG_ARM64_ERRATUM_4311569=y CONFIG_ARM64_ERRATUM_819472=y diff --git a/kernel-aarch64-debug-rhel.config b/kernel-aarch64-debug-rhel.config index 2e82cd876..faea6fffd 100644 --- a/kernel-aarch64-debug-rhel.config +++ b/kernel-aarch64-debug-rhel.config @@ -398,6 +398,7 @@ CONFIG_ARM64_ERRATUM_2658417=y CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_3117295=y CONFIG_ARM64_ERRATUM_3194386=y +CONFIG_ARM64_ERRATUM_4118414=y CONFIG_ARM64_ERRATUM_4193714=y CONFIG_ARM64_ERRATUM_4311569=y CONFIG_ARM64_ERRATUM_819472=y @@ -4230,7 +4231,7 @@ CONFIG_MMC_VUB300=m CONFIG_MMIOTRACE=y CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y -CONFIG_MODPROBE_PATH="/usr/bin/modprobe" +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_ALL is not set diff --git a/kernel-aarch64-fedora.config b/kernel-aarch64-fedora.config index d6518e193..9a2a966d5 100644 --- a/kernel-aarch64-fedora.config +++ b/kernel-aarch64-fedora.config @@ -482,6 +482,7 @@ CONFIG_ARM64_ERRATUM_2658417=y CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_3117295=y CONFIG_ARM64_ERRATUM_3194386=y +CONFIG_ARM64_ERRATUM_4118414=y CONFIG_ARM64_ERRATUM_4193714=y CONFIG_ARM64_ERRATUM_4311569=y CONFIG_ARM64_ERRATUM_819472=y diff --git a/kernel-aarch64-rhel.config b/kernel-aarch64-rhel.config index 374ce3878..63163a921 100644 --- a/kernel-aarch64-rhel.config +++ b/kernel-aarch64-rhel.config @@ -398,6 +398,7 @@ CONFIG_ARM64_ERRATUM_2658417=y CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_3117295=y CONFIG_ARM64_ERRATUM_3194386=y +CONFIG_ARM64_ERRATUM_4118414=y CONFIG_ARM64_ERRATUM_4193714=y CONFIG_ARM64_ERRATUM_4311569=y CONFIG_ARM64_ERRATUM_819472=y @@ -4207,7 +4208,7 @@ CONFIG_MMC_VUB300=m # CONFIG_MMIOTRACE is not set CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y -CONFIG_MODPROBE_PATH="/usr/bin/modprobe" +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_ALL is not set diff --git a/kernel-aarch64-rt-64k-debug-fedora.config b/kernel-aarch64-rt-64k-debug-fedora.config index 0818f8d33..f89a8895d 100644 --- a/kernel-aarch64-rt-64k-debug-fedora.config +++ b/kernel-aarch64-rt-64k-debug-fedora.config @@ -483,6 +483,7 @@ CONFIG_ARM64_ERRATUM_2658417=y CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_3117295=y CONFIG_ARM64_ERRATUM_3194386=y +CONFIG_ARM64_ERRATUM_4118414=y CONFIG_ARM64_ERRATUM_4193714=y CONFIG_ARM64_ERRATUM_4311569=y CONFIG_ARM64_ERRATUM_819472=y diff --git a/kernel-aarch64-rt-64k-debug-rhel.config b/kernel-aarch64-rt-64k-debug-rhel.config index 86887ed48..5cf92845e 100644 --- a/kernel-aarch64-rt-64k-debug-rhel.config +++ b/kernel-aarch64-rt-64k-debug-rhel.config @@ -399,6 +399,7 @@ CONFIG_ARM64_ERRATUM_2658417=y CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_3117295=y CONFIG_ARM64_ERRATUM_3194386=y +CONFIG_ARM64_ERRATUM_4118414=y CONFIG_ARM64_ERRATUM_4193714=y CONFIG_ARM64_ERRATUM_4311569=y CONFIG_ARM64_ERRATUM_819472=y @@ -4274,7 +4275,7 @@ CONFIG_MMC_VUB300=m CONFIG_MMIOTRACE=y CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y -CONFIG_MODPROBE_PATH="/usr/bin/modprobe" +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_ALL is not set diff --git a/kernel-aarch64-rt-64k-fedora.config b/kernel-aarch64-rt-64k-fedora.config index 120a9a813..b381df783 100644 --- a/kernel-aarch64-rt-64k-fedora.config +++ b/kernel-aarch64-rt-64k-fedora.config @@ -483,6 +483,7 @@ CONFIG_ARM64_ERRATUM_2658417=y CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_3117295=y CONFIG_ARM64_ERRATUM_3194386=y +CONFIG_ARM64_ERRATUM_4118414=y CONFIG_ARM64_ERRATUM_4193714=y CONFIG_ARM64_ERRATUM_4311569=y CONFIG_ARM64_ERRATUM_819472=y diff --git a/kernel-aarch64-rt-64k-rhel.config b/kernel-aarch64-rt-64k-rhel.config index 853e139de..290b788d7 100644 --- a/kernel-aarch64-rt-64k-rhel.config +++ b/kernel-aarch64-rt-64k-rhel.config @@ -399,6 +399,7 @@ CONFIG_ARM64_ERRATUM_2658417=y CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_3117295=y CONFIG_ARM64_ERRATUM_3194386=y +CONFIG_ARM64_ERRATUM_4118414=y CONFIG_ARM64_ERRATUM_4193714=y CONFIG_ARM64_ERRATUM_4311569=y CONFIG_ARM64_ERRATUM_819472=y @@ -4251,7 +4252,7 @@ CONFIG_MMC_VUB300=m # CONFIG_MMIOTRACE is not set CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y -CONFIG_MODPROBE_PATH="/usr/bin/modprobe" +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_ALL is not set diff --git a/kernel-aarch64-rt-debug-fedora.config b/kernel-aarch64-rt-debug-fedora.config index f49ae595f..443eac7cb 100644 --- a/kernel-aarch64-rt-debug-fedora.config +++ b/kernel-aarch64-rt-debug-fedora.config @@ -482,6 +482,7 @@ CONFIG_ARM64_ERRATUM_2658417=y CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_3117295=y CONFIG_ARM64_ERRATUM_3194386=y +CONFIG_ARM64_ERRATUM_4118414=y CONFIG_ARM64_ERRATUM_4193714=y CONFIG_ARM64_ERRATUM_4311569=y CONFIG_ARM64_ERRATUM_819472=y diff --git a/kernel-aarch64-rt-debug-rhel.config b/kernel-aarch64-rt-debug-rhel.config index a1525c254..e3e22db48 100644 --- a/kernel-aarch64-rt-debug-rhel.config +++ b/kernel-aarch64-rt-debug-rhel.config @@ -398,6 +398,7 @@ CONFIG_ARM64_ERRATUM_2658417=y CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_3117295=y CONFIG_ARM64_ERRATUM_3194386=y +CONFIG_ARM64_ERRATUM_4118414=y CONFIG_ARM64_ERRATUM_4193714=y CONFIG_ARM64_ERRATUM_4311569=y CONFIG_ARM64_ERRATUM_819472=y @@ -4271,7 +4272,7 @@ CONFIG_MMC_VUB300=m CONFIG_MMIOTRACE=y CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y -CONFIG_MODPROBE_PATH="/usr/bin/modprobe" +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_ALL is not set diff --git a/kernel-aarch64-rt-fedora.config b/kernel-aarch64-rt-fedora.config index 9919057ce..5c26ee60d 100644 --- a/kernel-aarch64-rt-fedora.config +++ b/kernel-aarch64-rt-fedora.config @@ -482,6 +482,7 @@ CONFIG_ARM64_ERRATUM_2658417=y CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_3117295=y CONFIG_ARM64_ERRATUM_3194386=y +CONFIG_ARM64_ERRATUM_4118414=y CONFIG_ARM64_ERRATUM_4193714=y CONFIG_ARM64_ERRATUM_4311569=y CONFIG_ARM64_ERRATUM_819472=y diff --git a/kernel-aarch64-rt-rhel.config b/kernel-aarch64-rt-rhel.config index 48f95ba95..b8c95ba64 100644 --- a/kernel-aarch64-rt-rhel.config +++ b/kernel-aarch64-rt-rhel.config @@ -398,6 +398,7 @@ CONFIG_ARM64_ERRATUM_2658417=y CONFIG_ARM64_ERRATUM_2966298=y CONFIG_ARM64_ERRATUM_3117295=y CONFIG_ARM64_ERRATUM_3194386=y +CONFIG_ARM64_ERRATUM_4118414=y CONFIG_ARM64_ERRATUM_4193714=y CONFIG_ARM64_ERRATUM_4311569=y CONFIG_ARM64_ERRATUM_819472=y @@ -4248,7 +4249,7 @@ CONFIG_MMC_VUB300=m # CONFIG_MMIOTRACE is not set CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y -CONFIG_MODPROBE_PATH="/usr/bin/modprobe" +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_ALL is not set diff --git a/kernel-ppc64le-debug-rhel.config b/kernel-ppc64le-debug-rhel.config index ccc46e8a3..b98ebbc77 100644 --- a/kernel-ppc64le-debug-rhel.config +++ b/kernel-ppc64le-debug-rhel.config @@ -3826,7 +3826,7 @@ CONFIG_MMC_VUB300=m CONFIG_MMIOTRACE=y CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y -CONFIG_MODPROBE_PATH="/usr/bin/modprobe" +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_ALL is not set diff --git a/kernel-ppc64le-rhel.config b/kernel-ppc64le-rhel.config index ae13bffeb..515b675e4 100644 --- a/kernel-ppc64le-rhel.config +++ b/kernel-ppc64le-rhel.config @@ -3804,7 +3804,7 @@ CONFIG_MMC_VUB300=m # CONFIG_MMIOTRACE is not set CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y -CONFIG_MODPROBE_PATH="/usr/bin/modprobe" +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_ALL is not set diff --git a/kernel-riscv64-debug-rhel.config b/kernel-riscv64-debug-rhel.config index 027247282..306777d47 100644 --- a/kernel-riscv64-debug-rhel.config +++ b/kernel-riscv64-debug-rhel.config @@ -3829,7 +3829,7 @@ CONFIG_MMC_VUB300=m CONFIG_MMIOTRACE=y CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y -CONFIG_MODPROBE_PATH="/usr/bin/modprobe" +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_ALL is not set diff --git a/kernel-riscv64-rhel.config b/kernel-riscv64-rhel.config index 0efeeae19..9f2dad6b7 100644 --- a/kernel-riscv64-rhel.config +++ b/kernel-riscv64-rhel.config @@ -3807,7 +3807,7 @@ CONFIG_MMC_VUB300=m # CONFIG_MMIOTRACE is not set CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y -CONFIG_MODPROBE_PATH="/usr/bin/modprobe" +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_ALL is not set diff --git a/kernel-s390x-debug-rhel.config b/kernel-s390x-debug-rhel.config index b754411d7..1eaa5b6eb 100644 --- a/kernel-s390x-debug-rhel.config +++ b/kernel-s390x-debug-rhel.config @@ -3811,7 +3811,7 @@ CONFIG_MMC_VUB300=m CONFIG_MMIOTRACE=y CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y -CONFIG_MODPROBE_PATH="/usr/bin/modprobe" +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_ALL is not set diff --git a/kernel-s390x-rhel.config b/kernel-s390x-rhel.config index b2e5b1842..a050898a8 100644 --- a/kernel-s390x-rhel.config +++ b/kernel-s390x-rhel.config @@ -3789,7 +3789,7 @@ CONFIG_MMC_VUB300=m # CONFIG_MMIOTRACE is not set CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y -CONFIG_MODPROBE_PATH="/usr/bin/modprobe" +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_ALL is not set diff --git a/kernel-s390x-zfcpdump-rhel.config b/kernel-s390x-zfcpdump-rhel.config index a74a8f9d9..c9d5fe94d 100644 --- a/kernel-s390x-zfcpdump-rhel.config +++ b/kernel-s390x-zfcpdump-rhel.config @@ -3798,7 +3798,7 @@ CONFIG_MMC_VUB300=m # CONFIG_MMIOTRACE is not set CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y -CONFIG_MODPROBE_PATH="/usr/bin/modprobe" +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_ALL is not set diff --git a/kernel-x86_64-debug-rhel.config b/kernel-x86_64-debug-rhel.config index ef006d210..3144ed4f7 100644 --- a/kernel-x86_64-debug-rhel.config +++ b/kernel-x86_64-debug-rhel.config @@ -4069,7 +4069,7 @@ CONFIG_MMC_VUB300=m CONFIG_MMIOTRACE=y CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y -CONFIG_MODPROBE_PATH="/usr/bin/modprobe" +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_ALL is not set diff --git a/kernel-x86_64-rhel.config b/kernel-x86_64-rhel.config index a4d02cb8d..98148a75c 100644 --- a/kernel-x86_64-rhel.config +++ b/kernel-x86_64-rhel.config @@ -4047,7 +4047,7 @@ CONFIG_MMC_VUB300=m # CONFIG_MMIOTRACE_TEST is not set CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y -CONFIG_MODPROBE_PATH="/usr/bin/modprobe" +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_ALL is not set diff --git a/kernel-x86_64-rt-debug-rhel.config b/kernel-x86_64-rt-debug-rhel.config index f58a91d90..877a5b872 100644 --- a/kernel-x86_64-rt-debug-rhel.config +++ b/kernel-x86_64-rt-debug-rhel.config @@ -4110,7 +4110,7 @@ CONFIG_MMC_VUB300=m CONFIG_MMIOTRACE=y CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y -CONFIG_MODPROBE_PATH="/usr/bin/modprobe" +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_ALL is not set diff --git a/kernel-x86_64-rt-rhel.config b/kernel-x86_64-rt-rhel.config index 8e5cc087e..47dc3505f 100644 --- a/kernel-x86_64-rt-rhel.config +++ b/kernel-x86_64-rt-rhel.config @@ -4088,7 +4088,7 @@ CONFIG_MMC_VUB300=m # CONFIG_MMIOTRACE_TEST is not set CONFIG_MMU=y CONFIG_MODIFY_LDT_SYSCALL=y -CONFIG_MODPROBE_PATH="/usr/bin/modprobe" +CONFIG_MODPROBE_PATH="/sbin/modprobe" # CONFIG_MODULE_ALLOW_BTF_MISMATCH is not set # CONFIG_MODULE_ALLOW_MISSING_NAMESPACE_IMPORTS is not set # CONFIG_MODULE_COMPRESS_ALL is not set diff --git a/kernel.changelog b/kernel.changelog index 43806a206..f11b8b4f9 100644 --- a/kernel.changelog +++ b/kernel.changelog @@ -1,6 +1,14 @@ -* Mon Jun 08 2026 Fedora Kernel Team [7.1.0-0.rc7.47] +* Wed Jun 10 2026 Fedora Kernel Team [7.1.0-0.rc7.acb7500801e9.49] - automotive: enable HUGETLBFS to workaround build error (Scott Weaver) -- disable selftests by default for now (Thorsten Leemhuis) +Resolves: + +* Wed Jun 10 2026 Fedora Kernel Team [7.1.0-0.rc7.acb7500801e9.48] +- Linux v7.1.0-0.rc7.acb7500801e9 +Resolves: + +* Tue Jun 09 2026 Fedora Kernel Team [7.1.0-0.rc7.2d3090a8aeb5.47] +- redhat: CONFIG_MODPROBE_PATH: use upstream default (Scott Weaver) +- Linux v7.1.0-0.rc7.2d3090a8aeb5 Resolves: * Mon Jun 08 2026 Fedora Kernel Team [7.1.0-0.rc7.46] diff --git a/kernel.spec b/kernel.spec index 79fed84a4..de9b8f3ee 100644 --- a/kernel.spec +++ b/kernel.spec @@ -190,13 +190,13 @@ Summary: The Linux kernel %define specrpmversion 7.1.0 %define specversion 7.1.0 %define patchversion 7.1 -%define pkgrelease 0.rc7.47 +%define pkgrelease 0.rc7.260610gacb7500801e9.49 %define kversion 7 -%define tarfile_release 7.1-rc7 +%define tarfile_release 7.1-rc7-56-gacb7500801e9 # This is needed to do merge window version magic %define patchlevel 1 # This allows pkg_release to have configurable %%{?dist} tag -%define specrelease 0.rc7.47%{?buildid}%{?dist} +%define specrelease 0.rc7.260610gacb7500801e9.49%{?buildid}%{?dist} # This defines the kabi tarball version %define kabiversion 7.1.0 @@ -284,9 +284,8 @@ Summary: The Linux kernel %define with_debuginfo %{?_without_debuginfo: 0} %{?!_without_debuginfo: 1} # kernel-abi-stablelists %define with_kernel_abi_stablelists %{?_without_kernel_abi_stablelists: 0} %{?!_without_kernel_abi_stablelists: 1} -# internal samples and selftests -- disabled by default for now due to build -# error in -next since 20260401 and mainline since 20260415 -%define with_selftests %{?_with_selftests: 1} %{?!_with_selftests: 0} +# internal samples and selftests +%define with_selftests %{?_without_selftests: 0} %{?!_without_selftests: 1} # # Additional options for user-friendly one-off kernel building: # @@ -4847,9 +4846,22 @@ fi\ # # %changelog -* Mon Jun 08 2026 Fedora Kernel Team [7.1.0-0.rc7.47] +* Wed Jun 10 2026 Justin M. Forbes [7.1.0-0.rc7.260610gacb7500801e9.49] +- New config setting for ARM64 Erratum (Justin M. Forbes) +- arm64: errata: Mitigate TLBI errata on NVIDIA Olympus CPU (Shanker Donthineni) +- arm64: errata: Mitigate TLBI errata on various Arm CPUs (Mark Rutland) +- arm64: cputype: Add C1-Premium definitions (Mark Rutland) +- arm64: cputype: Add C1-Ultra definitions (Mark Rutland) + +* Wed Jun 10 2026 Fedora Kernel Team [7.1.0-0.rc7.acb7500801e9.49] - automotive: enable HUGETLBFS to workaround build error (Scott Weaver) -- disable selftests by default for now (Thorsten Leemhuis) + +* Wed Jun 10 2026 Fedora Kernel Team [7.1.0-0.rc7.acb7500801e9.48] +- Linux v7.1.0-0.rc7.acb7500801e9 + +* Tue Jun 09 2026 Fedora Kernel Team [7.1.0-0.rc7.2d3090a8aeb5.47] +- redhat: CONFIG_MODPROBE_PATH: use upstream default (Scott Weaver) +- Linux v7.1.0-0.rc7.2d3090a8aeb5 * Mon Jun 08 2026 Fedora Kernel Team [7.1.0-0.rc7.46] - Linux v7.1.0-0.rc7 diff --git a/patch-7.1-redhat.patch b/patch-7.1-redhat.patch index caae3a281..4ea739e1e 100644 --- a/patch-7.1-redhat.patch +++ b/patch-7.1-redhat.patch @@ -1,10 +1,13 @@ Documentation/admin-guide/kernel-parameters.txt | 23 + Documentation/admin-guide/rh-waived-items.rst | 29 ++ + Documentation/arch/arm64/silicon-errata.rst | 44 ++ Kconfig | 2 + Kconfig.redhat | 31 ++ Makefile | 38 +- arch/arm/Kconfig | 4 +- - arch/arm64/Kconfig | 2 +- + arch/arm64/Kconfig | 39 +- + arch/arm64/include/asm/cputype.h | 4 + + arch/arm64/kernel/cpu_errata.c | 33 +- arch/arm64/kernel/setup.c | 27 + arch/s390/include/asm/ipl.h | 1 + arch/s390/kernel/ipl.c | 5 + @@ -79,7 +82,7 @@ tools/testing/selftests/bpf/DENYLIST.rhel | 76 +++ tools/testing/selftests/bpf/Makefile | 2 +- tools/testing/selftests/bpf/prog_tests/ksyms_btf.c | 31 -- - 81 files changed, 2900 insertions(+), 243 deletions(-) + 84 files changed, 3016 insertions(+), 245 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 97007f4f69d4..e4c6ab54589f 100644 @@ -157,6 +160,134 @@ index 000000000000..7471c891419c +List of Red Hat Waived Items +============================ + +diff --git a/Documentation/arch/arm64/silicon-errata.rst b/Documentation/arch/arm64/silicon-errata.rst +index 211119ce7adc..ad09bbb10da8 100644 +--- a/Documentation/arch/arm64/silicon-errata.rst ++++ b/Documentation/arch/arm64/silicon-errata.rst +@@ -128,16 +128,28 @@ stable kernels. + +----------------+-----------------+-----------------+-----------------------------+ + | ARM | Cortex-A76 | #3324349 | ARM64_ERRATUM_3194386 | + +----------------+-----------------+-----------------+-----------------------------+ ++| ARM | Cortex-A76 | #4193800 | ARM64_ERRATUM_4118414 | +++----------------+-----------------+-----------------+-----------------------------+ ++| ARM | Cortex-A76AE | #4193801 | ARM64_ERRATUM_4118414 | +++----------------+-----------------+-----------------+-----------------------------+ + | ARM | Cortex-A77 | #1491015 | N/A | + +----------------+-----------------+-----------------+-----------------------------+ + | ARM | Cortex-A77 | #1508412 | ARM64_ERRATUM_1508412 | + +----------------+-----------------+-----------------+-----------------------------+ + | ARM | Cortex-A77 | #3324348 | ARM64_ERRATUM_3194386 | + +----------------+-----------------+-----------------+-----------------------------+ ++| ARM | Cortex-A77 | #4193798 | ARM64_ERRATUM_4118414 | +++----------------+-----------------+-----------------+-----------------------------+ + | ARM | Cortex-A78 | #3324344 | ARM64_ERRATUM_3194386 | + +----------------+-----------------+-----------------+-----------------------------+ ++| ARM | Cortex-A78 | #4193791 | ARM64_ERRATUM_4118414 | +++----------------+-----------------+-----------------+-----------------------------+ ++| ARM | Cortex-A78AE | #4193793 | ARM64_ERRATUM_4118414 | +++----------------+-----------------+-----------------+-----------------------------+ + | ARM | Cortex-A78C | #3324346,3324347| ARM64_ERRATUM_3194386 | + +----------------+-----------------+-----------------+-----------------------------+ ++| ARM | Cortex-A78C | #4193794 | ARM64_ERRATUM_4118414 | +++----------------+-----------------+-----------------+-----------------------------+ + | ARM | Cortex-A710 | #2119858 | ARM64_ERRATUM_2119858 | + +----------------+-----------------+-----------------+-----------------------------+ + | ARM | Cortex-A710 | #2054223 | ARM64_ERRATUM_2054223 | +@@ -146,6 +158,8 @@ stable kernels. + +----------------+-----------------+-----------------+-----------------------------+ + | ARM | Cortex-A710 | #3324338 | ARM64_ERRATUM_3194386 | + +----------------+-----------------+-----------------+-----------------------------+ ++| ARM | Cortex-A710 | #4193788 | ARM64_ERRATUM_4118414 | +++----------------+-----------------+-----------------+-----------------------------+ + | ARM | Cortex-A715 | #2645198 | ARM64_ERRATUM_2645198 | + +----------------+-----------------+-----------------+-----------------------------+ + | ARM | Cortex-A715 | #3456084 | ARM64_ERRATUM_3194386 | +@@ -158,20 +172,32 @@ stable kernels. + +----------------+-----------------+-----------------+-----------------------------+ + | ARM | Cortex-X1 | #3324344 | ARM64_ERRATUM_3194386 | + +----------------+-----------------+-----------------+-----------------------------+ ++| ARM | Cortex-X1 | #4193791 | ARM64_ERRATUM_4118414 | +++----------------+-----------------+-----------------+-----------------------------+ + | ARM | Cortex-X1C | #3324346 | ARM64_ERRATUM_3194386 | + +----------------+-----------------+-----------------+-----------------------------+ ++| ARM | Cortex-X1C | #4193792 | ARM64_ERRATUM_4118414 | +++----------------+-----------------+-----------------+-----------------------------+ + | ARM | Cortex-X2 | #2119858 | ARM64_ERRATUM_2119858 | + +----------------+-----------------+-----------------+-----------------------------+ + | ARM | Cortex-X2 | #2224489 | ARM64_ERRATUM_2224489 | + +----------------+-----------------+-----------------+-----------------------------+ + | ARM | Cortex-X2 | #3324338 | ARM64_ERRATUM_3194386 | + +----------------+-----------------+-----------------+-----------------------------+ ++| ARM | Cortex-X2 | #4193788 | ARM64_ERRATUM_4118414 | +++----------------+-----------------+-----------------+-----------------------------+ + | ARM | Cortex-X3 | #3324335 | ARM64_ERRATUM_3194386 | + +----------------+-----------------+-----------------+-----------------------------+ ++| ARM | Cortex-X3 | #4193786 | ARM64_ERRATUM_4118414 | +++----------------+-----------------+-----------------+-----------------------------+ + | ARM | Cortex-X4 | #3194386 | ARM64_ERRATUM_3194386 | + +----------------+-----------------+-----------------+-----------------------------+ ++| ARM | Cortex-X4 | #4118414 | ARM64_ERRATUM_4118414 | +++----------------+-----------------+-----------------+-----------------------------+ + | ARM | Cortex-X925 | #3324334 | ARM64_ERRATUM_3194386 | + +----------------+-----------------+-----------------+-----------------------------+ ++| ARM | Cortex-X925 | #4193781 | ARM64_ERRATUM_4118414 | +++----------------+-----------------+-----------------+-----------------------------+ + | ARM | Neoverse-N1 | #1188873,1418040| ARM64_ERRATUM_1418040 | + +----------------+-----------------+-----------------+-----------------------------+ + | ARM | Neoverse-N1 | #1349291 | N/A | +@@ -182,6 +208,8 @@ stable kernels. + +----------------+-----------------+-----------------+-----------------------------+ + | ARM | Neoverse-N1 | #3324349 | ARM64_ERRATUM_3194386 | + +----------------+-----------------+-----------------+-----------------------------+ ++| ARM | Neoverse-N1 | #4193800 | ARM64_ERRATUM_4118414 | +++----------------+-----------------+-----------------+-----------------------------+ + | ARM | Neoverse-N2 | #2139208 | ARM64_ERRATUM_2139208 | + +----------------+-----------------+-----------------+-----------------------------+ + | ARM | Neoverse-N2 | #2067961 | ARM64_ERRATUM_2067961 | +@@ -190,20 +218,34 @@ stable kernels. + +----------------+-----------------+-----------------+-----------------------------+ + | ARM | Neoverse-N2 | #3324339 | ARM64_ERRATUM_3194386 | + +----------------+-----------------+-----------------+-----------------------------+ ++| ARM | Neoverse-N2 | #4193789 | ARM64_ERRATUM_4118414 | +++----------------+-----------------+-----------------+-----------------------------+ + | ARM | Neoverse-N3 | #3456111 | ARM64_ERRATUM_3194386 | + +----------------+-----------------+-----------------+-----------------------------+ + | ARM | Neoverse-V1 | #1619801 | N/A | + +----------------+-----------------+-----------------+-----------------------------+ + | ARM | Neoverse-V1 | #3324341 | ARM64_ERRATUM_3194386 | + +----------------+-----------------+-----------------+-----------------------------+ ++| ARM | Neoverse-V1 | #4193790 | ARM64_ERRATUM_4118414 | +++----------------+-----------------+-----------------+-----------------------------+ + | ARM | Neoverse-V2 | #3324336 | ARM64_ERRATUM_3194386 | + +----------------+-----------------+-----------------+-----------------------------+ ++| ARM | Neoverse-V2 | #4193787 | ARM64_ERRATUM_4118414 | +++----------------+-----------------+-----------------+-----------------------------+ + | ARM | Neoverse-V3 | #3312417 | ARM64_ERRATUM_3194386 | + +----------------+-----------------+-----------------+-----------------------------+ ++| ARM | Neoverse-V3 | #4193784 | ARM64_ERRATUM_4118414 | +++----------------+-----------------+-----------------+-----------------------------+ + | ARM | Neoverse-V3AE | #3312417 | ARM64_ERRATUM_3194386 | + +----------------+-----------------+-----------------+-----------------------------+ ++| ARM | Neoverse-V3AE | #4193784 | ARM64_ERRATUM_4118414 | +++----------------+-----------------+-----------------+-----------------------------+ ++| ARM | C1-Premium | #4193780 | ARM64_ERRATUM_4118414 | +++----------------+-----------------+-----------------+-----------------------------+ + | ARM | C1-Pro | #4193714 | ARM64_ERRATUM_4193714 | + +----------------+-----------------+-----------------+-----------------------------+ ++| ARM | C1-Ultra | #4193780 | ARM64_ERRATUM_4118414 | +++----------------+-----------------+-----------------+-----------------------------+ + | ARM | MMU-500 | #841119,826419 | ARM_SMMU_MMU_500_CPRE_ERRATA| + | | | #562869,1047329 | | + +----------------+-----------------+-----------------+-----------------------------+ +@@ -256,6 +298,8 @@ stable kernels. + +----------------+-----------------+-----------------+-----------------------------+ + | NVIDIA | Carmel Core | N/A | NVIDIA_CARMEL_CNP_ERRATUM | + +----------------+-----------------+-----------------+-----------------------------+ ++| NVIDIA | Olympus core | T410-OLY-1029 | ARM64_ERRATUM_4118414 | +++----------------+-----------------+-----------------+-----------------------------+ + | NVIDIA | T241 GICv3/4.x | T241-FABRIC-4 | N/A | + +----------------+-----------------+-----------------+-----------------------------+ + | NVIDIA | T241 MPAM | T241-MPAM-1 | N/A | diff --git a/Kconfig b/Kconfig index 307e581144de..11e93e479ce4 100644 --- a/Kconfig @@ -291,10 +422,54 @@ index 73e6647bea46..32b90d43664c 100644 The VM uses one page of physical memory for each page table. For systems with a lot of processes, this can use a lot of diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig -index fe60738e5943..f12139095d7c 100644 +index fe60738e5943..29f28155a033 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig -@@ -1432,7 +1432,7 @@ endchoice +@@ -1154,6 +1154,43 @@ config ARM64_ERRATUM_4193714 + + If unsure, say Y. + ++config ARM64_ERRATUM_4118414 ++ bool "Cortex-*/Neoverse-*/C1-*/Olympus: Completion of affected memory accesses might not be guaranteed by completion of a TLBI" ++ default y ++ select ARM64_WORKAROUND_REPEAT_TLBI ++ help ++ This option adds a workaround for the following errata: ++ ++ * ARM C1-Premium erratum 4193780 ++ * ARM C1-Ultra erratum 4193780 ++ * ARM Cortex-A76 erratum 4193800 ++ * ARM Cortex-A76AE erratum 4193801 ++ * ARM Cortex-A77 erratum 4193798 ++ * ARM Cortex-A78 erratum 4193791 ++ * ARM Cortex-A78AE erratum 4193793 ++ * ARM Cortex-A78C erratum 4193794 ++ * ARM Cortex-A710 erratum 4193788 ++ * ARM Cortex-X1 erratum 4193791 ++ * ARM Cortex-X1C erratum 4193792 ++ * ARM Cortex-X2 erratum 4193788 ++ * ARM Cortex-X3 erratum 4193786 ++ * ARM Cortex-X4 erratum 4118414 ++ * ARM Cortex-X925 erratum 4193781 ++ * ARM Neoverse-N1 erratum 4193800 ++ * ARM Neoverse-N2 erratum 4193789 ++ * ARM Neoverse-V1 erratum 4193790 ++ * ARM Neoverse-V2 erratum 4193787 ++ * ARM Neoverse-V3 erratum 4193784 ++ * ARM Neoverse-V3AE erratum 4193784 ++ * NVIDIA Olympus erratum T410-OLY-1029 ++ ++ On affected cores, some memory accesses might not be completed by ++ broadcast TLB invalidation. ++ ++ This issue is also known as CVE-2025-10263. ++ ++ If unsure, say Y. ++ + config CAVIUM_ERRATUM_22375 + bool "Cavium erratum 22375, 24313" + default y +@@ -1432,7 +1469,7 @@ endchoice config ARM64_FORCE_52BIT bool "Force 52-bit virtual addresses for userspace" @@ -303,6 +478,83 @@ index fe60738e5943..f12139095d7c 100644 help For systems with 52-bit userspace VAs enabled, the kernel will attempt to maintain compatibility with older software by providing 48-bit VAs +diff --git a/arch/arm64/include/asm/cputype.h b/arch/arm64/include/asm/cputype.h +index 7b518e81dd15..1b9f0cda1336 100644 +--- a/arch/arm64/include/asm/cputype.h ++++ b/arch/arm64/include/asm/cputype.h +@@ -97,8 +97,10 @@ + #define ARM_CPU_PART_CORTEX_X925 0xD85 + #define ARM_CPU_PART_CORTEX_A725 0xD87 + #define ARM_CPU_PART_CORTEX_A720AE 0xD89 ++#define ARM_CPU_PART_C1_ULTRA 0xD8C + #define ARM_CPU_PART_NEOVERSE_N3 0xD8E + #define ARM_CPU_PART_C1_PRO 0xD8B ++#define ARM_CPU_PART_C1_PREMIUM 0xD90 + + #define APM_CPU_PART_XGENE 0x000 + #define APM_CPU_VAR_POTENZA 0x00 +@@ -189,8 +191,10 @@ + #define MIDR_CORTEX_X925 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_X925) + #define MIDR_CORTEX_A725 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A725) + #define MIDR_CORTEX_A720AE MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A720AE) ++#define MIDR_C1_ULTRA MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_C1_ULTRA) + #define MIDR_NEOVERSE_N3 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_N3) + #define MIDR_C1_PRO MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_C1_PRO) ++#define MIDR_C1_PREMIUM MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_C1_PREMIUM) + #define MIDR_THUNDERX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX) + #define MIDR_THUNDERX_81XX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX_81XX) + #define MIDR_THUNDERX_83XX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX_83XX) +diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c +index 5377e4c2eba2..d597896b0f7f 100644 +--- a/arch/arm64/kernel/cpu_errata.c ++++ b/arch/arm64/kernel/cpu_errata.c +@@ -340,7 +340,36 @@ static const struct arm64_cpu_capabilities arm64_repeat_tlbi_list[] = { + ERRATA_MIDR_RANGE(MIDR_CORTEX_A510, 0, 0, 1, 1), + }, + #endif +- {}, ++#ifdef CONFIG_ARM64_ERRATUM_4118414 ++ { ++ ERRATA_MIDR_RANGE_LIST(((const struct midr_range[]) { ++ MIDR_ALL_VERSIONS(MIDR_C1_PREMIUM), ++ MIDR_ALL_VERSIONS(MIDR_C1_ULTRA), ++ MIDR_ALL_VERSIONS(MIDR_CORTEX_A76), ++ MIDR_ALL_VERSIONS(MIDR_CORTEX_A76AE), ++ MIDR_ALL_VERSIONS(MIDR_CORTEX_A77), ++ MIDR_ALL_VERSIONS(MIDR_CORTEX_A78), ++ MIDR_ALL_VERSIONS(MIDR_CORTEX_A78AE), ++ MIDR_ALL_VERSIONS(MIDR_CORTEX_A78C), ++ MIDR_ALL_VERSIONS(MIDR_CORTEX_A710), ++ MIDR_ALL_VERSIONS(MIDR_CORTEX_X1), ++ MIDR_ALL_VERSIONS(MIDR_CORTEX_X1C), ++ MIDR_ALL_VERSIONS(MIDR_CORTEX_X2), ++ MIDR_ALL_VERSIONS(MIDR_CORTEX_X3), ++ MIDR_ALL_VERSIONS(MIDR_CORTEX_X4), ++ MIDR_ALL_VERSIONS(MIDR_CORTEX_X925), ++ MIDR_ALL_VERSIONS(MIDR_NEOVERSE_N1), ++ MIDR_ALL_VERSIONS(MIDR_NEOVERSE_N2), ++ MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V1), ++ MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V2), ++ MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V3), ++ MIDR_ALL_VERSIONS(MIDR_NEOVERSE_V3AE), ++ MIDR_ALL_VERSIONS(MIDR_NVIDIA_OLYMPUS), ++ {} ++ })), ++ }, ++#endif ++ {} + }; + #endif + +@@ -693,7 +722,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = { + #endif + #ifdef CONFIG_ARM64_WORKAROUND_REPEAT_TLBI + { +- .desc = "Qualcomm erratum 1009, or ARM erratum 1286807, 2441009", ++ .desc = "Broken broadcast TLBI completion", + .capability = ARM64_WORKAROUND_REPEAT_TLBI, + .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM, + .matches = cpucap_multi_entry_cap_matches, diff --git a/arch/arm64/kernel/setup.c b/arch/arm64/kernel/setup.c index 23c05dc7a8f2..d7b7b2f39e16 100644 --- a/arch/arm64/kernel/setup.c diff --git a/sources b/sources index a9c189488..65ef37f7b 100644 --- a/sources +++ b/sources @@ -1,3 +1,3 @@ -SHA512 (linux-7.1-rc7.tar.xz) = e3e5d1bb5f06c4945250546a88a8485df36126ba098939d70789825a84e048c7bf109b72293335620ae961be7cf375c8b1c413e74af1702301cddbede9dbab62 -SHA512 (kernel-abi-stablelists-7.1.0.tar.xz) = 6d131866115b733632cc924225484bd6e3e72d954536a29350d4fc61d02af2023f106b7feac770bb95f2e1eff01bcba019ac5e52461821f93c2056479b707626 -SHA512 (kernel-kabi-dw-7.1.0.tar.xz) = 0627ec3b2e1c1aa99a526d345e03d9a41e3c0a0bbaea3dda49de6a9f1c186dcc51b2c56b7a76abca0b96026916fbce494763a52298cebaec946209d614646138 +SHA512 (linux-7.1-rc7-56-gacb7500801e9.tar.xz) = 097b794758de3dfa35b4f2b31a905f14d28e3e7b07f98022eefa815abb26a0ea13943f8c20381c0b58122da554d2197fdea4822122a46032d730c8f2f22d9c19 +SHA512 (kernel-abi-stablelists-7.1.0.tar.xz) = a631b362ba790ba4a36cd0605feb107926a9b78de84c2b3b9c5638796dc9870d394817fb2f08484d72bb4bf395f4fbaca83f92e864c14943634dfb39dbb17131 +SHA512 (kernel-kabi-dw-7.1.0.tar.xz) = 6b30fbb0b629e79bc65407b3c6f00885b3e324c21eaf56af129bf4e4a022c65bc0e7ea909ca04d9ad0be08e06af6a6d5331e1e9953957040a63c14c582218e35