Sat Jan 7 20:30:44 UTC 202320230107203044

We're going to go ahead and jump to the 6.1.4 kernel, in spite of the fact
that a kernel bisect identified the patch that was preventing 32-bit from
booting here on a Thinkpad X1E:

------
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")
------

The non-SMP non-PAE 32-bit kernel is fine even without the patch revert.
The PAE kernel also works fine with this patch reverted without any need
to revert ffa71f33a820 (the patch that this one is supposed to fix). The
machine's excessive (for 32-bit) amount of physical RAM (64GB) might also
be a factor here considering the PAE kernel works on all the other machines
around here without reverting this patch.
The patch is reverted only on 32-bit. Upstream report still pending.
Enjoy! :-)

a/kernel-generic-6.1.4-x86_64-1.txz:  Upgraded.
a/kernel-huge-6.1.4-x86_64-1.txz:  Upgraded.
a/kernel-modules-6.1.4-x86_64-1.txz:  Upgraded.
a/tree-2.1.0-x86_64-1.txz:  Upgraded.
d/kernel-headers-6.1.4-x86-1.txz:  Upgraded.
k/kernel-source-6.1.4-noarch-1.txz:  Upgraded.
l/gvfs-1.50.3-x86_64-1.txz:  Upgraded.
l/hunspell-1.7.2-x86_64-1.txz:  Upgraded.
l/libnice-0.1.21-x86_64-1.txz:  Upgraded.
n/tin-2.6.2-x86_64-1.txz:  Upgraded.
isolinux/initrd.img:  Rebuilt.
kernels/*:  Upgraded.
usb-and-pxe-installers/usbboot.img:  Rebuilt.

1 files changed, 51 insertions, 9 deletions

diff --git a/source/k/kernel-source.SlackBuild b/source/k/kernel-source.SlackBuild
index 3e5f7c9dd..945b56982 100755
--- a/source/k/kernel-source.SlackBuild
+++ b/source/k/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..."