This is a note to let you know that I've just added the patch titled
parisc: Prevent booting 64-bit kernels on PA1.x machines
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
parisc-prevent-booting-64-bit-kernels-on-pa1.x-machines.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From a406b8b424fa01f244c1aab02ba186258448c36b Mon Sep 17 00:00:00 2001
From: Helge Deller <deller@xxxxxx>
Date: Fri, 10 Nov 2023 16:13:15 +0100
Subject: parisc: Prevent booting 64-bit kernels on PA1.x machines
From: Helge Deller <deller@xxxxxx>
commit a406b8b424fa01f244c1aab02ba186258448c36b upstream.
Bail out early with error message when trying to boot a 64-bit kernel on
32-bit machines. This fixes the previous commit to include the check for
true 64-bit kernels as well.
Signed-off-by: Helge Deller <deller@xxxxxx>
Fixes: 591d2108f3abc ("parisc: Add runtime check to prevent PA2.0 kernels on PA1.x machines")
Cc: <stable@xxxxxxxxxxxxxxx> # v6.0+
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/parisc/kernel/head.S | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
--- a/arch/parisc/kernel/head.S
+++ b/arch/parisc/kernel/head.S
@@ -70,9 +70,8 @@ $bss_loop:
stw,ma %arg2,4(%r1)
stw,ma %arg3,4(%r1)
-#if !defined(CONFIG_64BIT) && defined(CONFIG_PA20)
- /* This 32-bit kernel was compiled for PA2.0 CPUs. Check current CPU
- * and halt kernel if we detect a PA1.x CPU. */
+#if defined(CONFIG_PA20)
+ /* check for 64-bit capable CPU as required by current kernel */
ldi 32,%r10
mtctl %r10,%cr11
.level 2.0
Patches currently in stable-queue which might be from deller@xxxxxx are
queue-6.1/parisc-power-fix-power-soft-off-when-running-on-qemu.patch
queue-6.1/parisc-power-add-power-soft-off-when-running-on-qemu.patch
queue-6.1/parisc-pgtable-do-not-drop-upper-5-address-bits-of-physical-address.patch
queue-6.1/parisc-pdc-add-width-field-to-struct-pdc_model.patch
queue-6.1/parisc-prevent-booting-64-bit-kernels-on-pa1.x-machines.patch
