linux-kernel - [tip: x86/urgent] x86/Kconfig: Transmeta Crusoe is CPU family 5, not 6

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Date: Fri, 09 Feb 2024 15:45:39 -0000
From: "tip-bot2 for Aleksander Mazur" <tip-bot2@...utronix.de>
To: linux-tip-commits@...r.kernel.org
Cc: Aleksander Mazur <deweloper@...pl>, "Borislav Petkov (AMD)" <bp@...en8.de>,
 "H. Peter Anvin" <hpa@...or.com>,  <stable@...nel.org>, x86@...nel.org,
 linux-kernel@...r.kernel.org
Subject:
 [tip: x86/urgent] x86/Kconfig: Transmeta Crusoe is CPU family 5, not 6

The following commit has been merged into the x86/urgent branch of tip:

Commit-ID:     f6a1892585cd19e63c4ef2334e26cd536d5b678d
Gitweb:        https://git.kernel.org/tip/f6a1892585cd19e63c4ef2334e26cd536d5b678d
Author:        Aleksander Mazur <deweloper@...pl>
AuthorDate:    Tue, 23 Jan 2024 14:43:00 +01:00
Committer:     Borislav Petkov (AMD) <bp@...en8.de>
CommitterDate: Fri, 09 Feb 2024 16:28:19 +01:00

x86/Kconfig: Transmeta Crusoe is CPU family 5, not 6

The kernel built with MCRUSOE is unbootable on Transmeta Crusoe.  It shows
the following error message:

  This kernel requires an i686 CPU, but only detected an i586 CPU.
  Unable to boot - please use a kernel appropriate for your CPU.

Remove MCRUSOE from the condition introduced in commit in Fixes, effectively
changing X86_MINIMUM_CPU_FAMILY back to 5 on that machine, which matches the
CPU family given by CPUID.

  [ bp: Massage commit message. ]

Fixes: 25d76ac88821 ("x86/Kconfig: Explicitly enumerate i686-class CPUs in Kconfig")
Signed-off-by: Aleksander Mazur <deweloper@...pl>
Signed-off-by: Borislav Petkov (AMD) <bp@...en8.de>
Acked-by: H. Peter Anvin <hpa@...or.com>
Cc: <stable@...nel.org>
Link: https://lore.kernel.org/r/20240123134309.1117782-1-deweloper@wp.pl
---
 arch/x86/Kconfig.cpu | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu
index b9224cf..2a7279d 100644
--- a/arch/x86/Kconfig.cpu
+++ b/arch/x86/Kconfig.cpu
@@ -379,7 +379,7 @@ config X86_CMOV
 config X86_MINIMUM_CPU_FAMILY
 	int
 	default "64" if X86_64
-	default "6" if X86_32 && (MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MEFFICEON || MATOM || MCRUSOE || MCORE2 || MK7 || MK8)
+	default "6" if X86_32 && (MPENTIUM4 || MPENTIUMM || MPENTIUMIII || MPENTIUMII || M686 || MVIAC3_2 || MVIAC7 || MEFFICEON || MATOM || MCORE2 || MK7 || MK8)
 	default "5" if X86_32 && X86_CMPXCHG64
 	default "4"