diff options
Diffstat (limited to 'testing/source')
9 files changed, 115 insertions, 15 deletions
diff --git a/testing/source/linux-6.1.x/kernel-configs/config-generic-6.1.2 b/testing/source/linux-6.1.x/kernel-configs/config-generic-6.1.3 index effff454d..47f38d2be 100644 --- a/testing/source/linux-6.1.x/kernel-configs/config-generic-6.1.2 +++ b/testing/source/linux-6.1.x/kernel-configs/config-generic-6.1.3 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.2 Kernel Configuration +# Linux/x86 6.1.3 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y diff --git a/testing/source/linux-6.1.x/kernel-configs/config-generic-6.1.2.x64 b/testing/source/linux-6.1.x/kernel-configs/config-generic-6.1.3.x64 index 7f5e2ee82..94febd70e 100644 --- a/testing/source/linux-6.1.x/kernel-configs/config-generic-6.1.2.x64 +++ b/testing/source/linux-6.1.x/kernel-configs/config-generic-6.1.3.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.2 Kernel Configuration +# Linux/x86 6.1.3 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y diff --git a/testing/source/linux-6.1.x/kernel-configs/config-generic-smp-6.1.2-smp b/testing/source/linux-6.1.x/kernel-configs/config-generic-smp-6.1.3-smp index a54006a18..b8d660c97 100644 --- a/testing/source/linux-6.1.x/kernel-configs/config-generic-smp-6.1.2-smp +++ b/testing/source/linux-6.1.x/kernel-configs/config-generic-smp-6.1.3-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.2 Kernel Configuration +# Linux/x86 6.1.3 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y diff --git a/testing/source/linux-6.1.x/kernel-configs/config-huge-6.1.2 b/testing/source/linux-6.1.x/kernel-configs/config-huge-6.1.3 index b872e3b20..265f0a8e7 100644 --- a/testing/source/linux-6.1.x/kernel-configs/config-huge-6.1.2 +++ b/testing/source/linux-6.1.x/kernel-configs/config-huge-6.1.3 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.2 Kernel Configuration +# Linux/x86 6.1.3 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y diff --git a/testing/source/linux-6.1.x/kernel-configs/config-huge-6.1.2.x64 b/testing/source/linux-6.1.x/kernel-configs/config-huge-6.1.3.x64 index 08cc9a9ee..35c4ed068 100644 --- a/testing/source/linux-6.1.x/kernel-configs/config-huge-6.1.2.x64 +++ b/testing/source/linux-6.1.x/kernel-configs/config-huge-6.1.3.x64 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.2 Kernel Configuration +# Linux/x86 6.1.3 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y diff --git a/testing/source/linux-6.1.x/kernel-configs/config-huge-smp-6.1.2-smp b/testing/source/linux-6.1.x/kernel-configs/config-huge-smp-6.1.3-smp index 9351434cc..99b727f47 100644 --- a/testing/source/linux-6.1.x/kernel-configs/config-huge-smp-6.1.2-smp +++ b/testing/source/linux-6.1.x/kernel-configs/config-huge-smp-6.1.3-smp @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/x86 6.1.2 Kernel Configuration +# Linux/x86 6.1.3 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.2.0" CONFIG_CC_IS_GCC=y diff --git a/testing/source/linux-6.1.x/kernel-source.SlackBuild b/testing/source/linux-6.1.x/kernel-source.SlackBuild index 3e5f7c9dd..945b56982 100755 --- a/testing/source/linux-6.1.x/kernel-source.SlackBuild +++ b/testing/source/linux-6.1.x/kernel-source.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2018, 2020, 2021 Patrick J. Volkerding, Sebeka, Minnesota, USA +# Copyright 2018, 2020, 2021, 2023 Patrick J. Volkerding, Sebeka, Minnesota, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -46,6 +46,54 @@ if [ -z "$ARCH" ]; then esac fi +# This function will revert or apply patches that are present here. +# Directories that are currently supported: +# patches-revert-${VERSION} (revert patches from this directory if kernel version matches) +# patches-revert-${ARCH} (revert patches from this directory if $ARCH matches) +# patches-${VERSION} (apply patches from this directory if kernel version matches) +# patches-${ARCH} (apply patches from this directory if $ARCH matches) +# All the applied/reverted patches will be copied to the root of the kernel source tree. +apply_patches() { + # First do patches-revert: + if [ -d $CWD/patches-revert-${VERSION} ]; then + if [ "$1" = "VERBOSE" ]; then + echo "Reverting kernel patches in $CWD/patches-revert-${VERSION} and copying patches to $PKG/usr/src/linux-${VERSION}..." + zcat $CWD/patches-revert-${VERSION}/*.gz | patch -p1 -R --backup --suffix=.orig || exit 1 + else + zcat $CWD/patches-revert-${VERSION}/*.gz | patch -p1 -R --backup --suffix=.orig 1> /dev/null 2> /dev/null || exit 1 + fi + cp -a $CWD/patches-revert-${VERSION}/*.gz . + fi + if [ -d $CWD/patches-revert-${ARCH} ]; then + if [ "$1" = "VERBOSE" ]; then + echo "Reverting kernel patches in $CWD/patches-revert-${ARCH} and copying patches to $PKG/usr/src/linux-${VERSION}..." + zcat $CWD/patches-revert-${ARCH}/*.gz | patch -p1 -R --backup --suffix=.orig || exit 1 + else + zcat $CWD/patches-revert-${ARCH}/*.gz | patch -p1 -R --backup --suffix=.orig 1> /dev/null 2> /dev/null || exit 1 + fi + cp -a $CWD/patches-revert-${ARCH}/*.gz . + fi + # Then apply patches: + if [ -d $CWD/patches-${VERSION} ]; then + if [ "$1" = "VERBOSE" ]; then + echo "Applying kernel patches in $CWD/patches-${VERSION} and copying patches to $PKG/usr/src/linux-${VERSION}..." + zcat $CWD/patches-${VERSION}/*.gz | patch -p1 --backup --suffix=.orig || exit 1 + else + zcat $CWD/patches-${VERSION}/*.gz | patch -p1 --backup --suffix=.orig 1> /dev/null 2> /dev/null || exit 1 + fi + cp -a $CWD/patches-${VERSION}/*.gz . + fi + if [ -d $CWD/patches-${ARCH} ]; then + if [ "$1" = "VERBOSE" ]; then + echo "Applying kernel patches in $CWD/patches-${ARCH} and copying patches to $PKG/usr/src/linux-${VERSION}..." + zcat $CWD/patches-${ARCH}/*.gz | patch -p1 --backup --suffix=.orig || exit 1 + else + zcat $CWD/patches-${ARCH}/*.gz | patch -p1 --backup --suffix=.orig 1> /dev/null 2> /dev/null || exit 1 + fi + cp -a $CWD/patches-${ARCH}/*.gz . + fi +} + # Kernel extraversion, such as "-smp" on 32-bit. There's usually no need to set # this unless you're using something unusual. We use it to find which .config # file to use, but we'll then use whatever CONFIG_LOCALVERSION is set to @@ -99,9 +147,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then cd $TEMPDIR tar xf $CWD/linux-${VERSION}.tar.?z || exit 1 cd linux* - if [ -d $CWD/patches-${VERSION} ]; then - zcat $CWD/patches-${VERSION}/*.gz | patch -p1 --backup --suffix=.orig 1> /dev/null 2> /dev/null || exit 1 - fi + apply_patches PACKAGE_VERSION=$(grep "^VERSION = " Makefile | rev | cut -f 1 -d ' ' | rev).$(grep "^PATCHLEVEL = " Makefile | rev | cut -f 1 -d ' ' | rev).$(grep "^SUBLEVEL = " Makefile | rev | cut -f 1 -d ' ' | rev)$(grep "^EXTRAVERSION = " Makefile | rev | cut -f 1 -d ' ' | rev) cd $CWD rm -rf $TEMPDIR @@ -121,11 +167,7 @@ echo "Untarring $CWD/linux-${VERSION}.tar.?z in $PKG/usr/src..." echo "Making /usr/src/linux symlink..." ln -sf linux-* linux cd linux-* - if [ -d $CWD/patches-${VERSION} ]; then - echo "Applying kernel patches in $CWD/patches-${VERSION} and copying patches to $PKG/usr/src/linux-${VERSION}..." - zcat $CWD/patches-${VERSION}/*.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 - cp -a $CWD/patches-${VERSION}/*.gz . - fi + apply_patches VERBOSE echo "Copying $CWD/kernel-configs/${KERNEL_CONFIG} to .config..." cp -a $CWD/kernel-configs/${KERNEL_CONFIG} .config echo "Fixing permissions/ownership..." diff --git a/testing/source/linux-6.1.x/patches-revert-i686/0001-x86-ioremap-Fix-page-aligned-size-calculation-in-__i.patch b/testing/source/linux-6.1.x/patches-revert-i686/0001-x86-ioremap-Fix-page-aligned-size-calculation-in-__i.patch new file mode 100644 index 000000000..c8767a252 --- /dev/null +++ b/testing/source/linux-6.1.x/patches-revert-i686/0001-x86-ioremap-Fix-page-aligned-size-calculation-in-__i.patch @@ -0,0 +1,53 @@ +From 2e479b3b82c49bfb9422274c0a9c155a41caecb7 Mon Sep 17 00:00:00 2001 +From: Michael Kelley <mikelley@microsoft.com> +Date: Wed, 16 Nov 2022 10:41:24 -0800 +Subject: [PATCH] x86/ioremap: Fix page aligned size calculation in + __ioremap_caller() + +commit 4dbd6a3e90e03130973688fd79e19425f720d999 upstream. + +Current code re-calculates the size after aligning the starting and +ending physical addresses on a page boundary. But the re-calculation +also embeds the masking of high order bits that exceed the size of +the physical address space (via PHYSICAL_PAGE_MASK). If the masking +removes any high order bits, the size calculation results in a huge +value that is likely to immediately fail. + +Fix this by re-calculating the page-aligned size first. Then mask any +high order bits using PHYSICAL_PAGE_MASK. + +Fixes: ffa71f33a820 ("x86, ioremap: Fix incorrect physical address handling in PAE mode") +Signed-off-by: Michael Kelley <mikelley@microsoft.com> +Signed-off-by: Borislav Petkov <bp@suse.de> +Acked-by: Dave Hansen <dave.hansen@linux.intel.com> +Cc: <stable@kernel.org> +Link: https://lore.kernel.org/r/1668624097-14884-2-git-send-email-mikelley@microsoft.com +Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> +--- + arch/x86/mm/ioremap.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c +index 1ad0228f8ceb..19058d746695 100644 +--- a/arch/x86/mm/ioremap.c ++++ b/arch/x86/mm/ioremap.c +@@ -216,9 +216,15 @@ __ioremap_caller(resource_size_t phys_addr, unsigned long size, + * Mappings have to be page-aligned + */ + offset = phys_addr & ~PAGE_MASK; +- phys_addr &= PHYSICAL_PAGE_MASK; ++ phys_addr &= PAGE_MASK; + size = PAGE_ALIGN(last_addr+1) - phys_addr; + ++ /* ++ * Mask out any bits not part of the actual physical ++ * address, like memory encryption bits. ++ */ ++ phys_addr &= PHYSICAL_PAGE_MASK; ++ + retval = memtype_reserve(phys_addr, (u64)phys_addr + size, + pcm, &new_pcm); + if (retval) { +-- +2.39.0 + diff --git a/testing/source/linux-6.1.x/patches-revert-i686/README b/testing/source/linux-6.1.x/patches-revert-i686/README new file mode 100644 index 000000000..de85ec00a --- /dev/null +++ b/testing/source/linux-6.1.x/patches-revert-i686/README @@ -0,0 +1,5 @@ +We need to revert this patch which causes boot failure with 32-bit PAE on +*some* machines, such as: LENOVO 20QV000GUS Intel i7-9850H + +Non-PAE is not affected, but we'll let this get reverted there too since +it's not part of the code path anyway. |