diff options
| author | Helge Deller <deller@gmx.de> | 2023-11-10 16:13:15 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-11-28 16:46:35 +0000 |
| commit | 22733ddf8276098d4babaf49cd28306d0f6939e8 (patch) | |
| tree | e9b17ef6606540700cbc56a5b9a01e9745598024 /arch | |
| parent | ed77f887e21d59bf50b274f249c4db1ac0192bd5 (diff) | |
| download | linux-22733ddf8276098d4babaf49cd28306d0f6939e8.tar.gz linux-22733ddf8276098d4babaf49cd28306d0f6939e8.tar.bz2 linux-22733ddf8276098d4babaf49cd28306d0f6939e8.zip | |
parisc: Prevent booting 64-bit kernels on PA1.x machines
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@gmx.de>
Fixes: 591d2108f3abc ("parisc: Add runtime check to prevent PA2.0 kernels on PA1.x machines")
Cc: <stable@vger.kernel.org> # v6.0+
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/parisc/kernel/head.S | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/parisc/kernel/head.S b/arch/parisc/kernel/head.S index 92bc2fa7e692..efa078b3aa45 100644 --- a/arch/parisc/kernel/head.S +++ b/arch/parisc/kernel/head.S @@ -69,9 +69,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 |