Commit 0972ba56 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86-platform-2026-04-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 platform updates from Ingo Molnar:

 - Remove M486/M486SX/ELAN support, first minimal step (Ingo Molnar)

 - Print AGESA string from DMI additional information entry (Yazen
   Ghannam, Mario Limonciello)

 - Improve and fix the DMI code (Mario Limonciello):
     - Correct an indexing error in <linux/dmi.h>
     - Adjust dmi_decode() to use enums <linux/dmi.h>
     - Add pr_fmt() for dmi_scan.c to fix & standardize the log prefixes

* tag 'x86-platform-2026-04-13' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/CPU/AMD: Print AGESA string from DMI additional information entry
  firmware: dmi: Add pr_fmt() for dmi_scan.c
  firmware: dmi: Adjust dmi_decode() to use enums
  firmware: dmi: Correct an indexing error in dmi.h
  x86/cpu: Remove M486/M486SX/ELAN support
parents ac633ba7 bc91133e

arch/x86/Kconfig

+0 −10
Original line number Diff line number Diff line
@@ -448,11 +448,6 @@ config SMP 
	  uniprocessor machines. On a uniprocessor machine, the kernel

	  will run faster if you say N here.



	  Note that if you say Y here and choose architecture "586" or

	  "Pentium" under "Processor family", the kernel will not work on 486

	  architectures. Similarly, multiprocessor kernels for the "PPro"

	  architecture may not work on all Pentium based boards.



	  People using multiprocessor machines who say Y here should also say

	  Y to "Enhanced Real Time Clock Support", below. The "Advanced Power

	  Management" code will be disabled if you say Y here.
@@ -2773,11 +2768,6 @@ menuconfig APM 
	  manpage ("man 8 hdparm") for that), and it doesn't turn off

	  VESA-compliant "green" monitors.



	  This driver does not support the TI 4000M TravelMate and the ACER

	  486/DX4/75 because they don't have compliant BIOSes. Many "green"

	  desktop machines also don't have compliant BIOSes, and this driver

	  may cause those machines to panic during the boot phase.



	  Generally, if you don't have a battery in your machine, there isn't

	  much point in using this driver and you should say N. If you get

	  random kernel OOPSes or reboots that don't seem to be related to

arch/x86/Kconfig.cpu

+10 −34
Original line number Diff line number Diff line
@@ -8,19 +8,18 @@ choice 
	  This is the processor type of your CPU. This information is

	  used for optimizing purposes. In order to compile a kernel

	  that can run on all supported x86 CPU types (albeit not

	  optimally fast), you can specify "486" here.

	  optimally fast), you can specify "586" here.



	  Note that the 386 is no longer supported, this includes

	  Note that the 386 and 486 is no longer supported, this includes

	  AMD/Cyrix/Intel 386DX/DXL/SL/SLC/SX, Cyrix/TI 486DLC/DLC2,

	  UMC 486SX-S and the NexGen Nx586.

	  UMC 486SX-S and the NexGen Nx586, AMD ELAN and all 486 based

	  CPUs.



	  The kernel will not necessarily run on earlier architectures than

	  the one you have chosen, e.g. a Pentium optimized kernel will run on

	  a PPro, but not necessarily on a i486.



	  Here are the settings recommended for greatest speed:

	  - "486" for the AMD/Cyrix/IBM/Intel 486DX/DX2/DX4 or

	    SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or U5S.

	  - "586" for generic Pentium CPUs lacking the TSC

	    (time stamp counter) register.

	  - "Pentium-Classic" for the Intel Pentium.
@@ -46,20 +45,6 @@ choice 
	  See each option's help text for additional details. If you don't know

	  what to do, choose "Pentium-Pro".



config M486SX

	bool "486SX"

	depends on X86_32

	help

	  Select this for an 486-class CPU without an FPU such as

	  AMD/Cyrix/IBM/Intel SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5S.



config M486

	bool "486DX"

	depends on X86_32

	help

	  Select this for an 486-class CPU such as AMD/Cyrix/IBM/Intel

	  486DX/DX2/DX4 and UMC U5D.



config M586

	bool "586/K5/5x86/6x86/6x86MX"

	depends on X86_32
@@ -188,14 +173,6 @@ config MWINCHIP3D 
	  stores for this CPU, which can increase performance of some

	  operations.



config MELAN

	bool "AMD Elan"

	depends on X86_32

	help

	  Select this for an AMD Elan processor.



	  Do not use this option for K6/Athlon/Opteron processors!



config MGEODEGX1

	bool "GeodeGX1"

	depends on X86_32
@@ -292,12 +269,12 @@ config X86_L1_CACHE_SHIFT 
	int

	default "7" if MPENTIUM4

	default "6" if MK7 || MPENTIUMM || MATOM || MVIAC7 || X86_GENERIC || X86_64

	default "4" if MELAN || M486SX || M486 || MGEODEGX1

	default "4" if MGEODEGX1

	default "5" if MWINCHIP3D || MWINCHIPC6 || MCRUSOE || MEFFICEON || MCYRIXIII || MK6 || MPENTIUMIII || MPENTIUMII || M686 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODE_LX



config X86_F00F_BUG

	def_bool y

	depends on M586MMX || M586TSC || M586 || M486SX || M486

	depends on M586MMX || M586TSC || M586



config X86_INVD_BUG

	def_bool y
@@ -305,7 +282,7 @@ config X86_INVD_BUG 


config X86_ALIGNMENT_16

	def_bool y

	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MELAN || MK6 || M586MMX || M586TSC || M586 || M486SX || M486 || MVIAC3_2 || MGEODEGX1

	depends on MWINCHIP3D || MWINCHIPC6 || MCYRIXIII || MK6 || M586MMX || M586TSC || M586 || MVIAC3_2 || MGEODEGX1



config X86_INTEL_USERCOPY

	def_bool y
@@ -337,12 +314,11 @@ 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 || MK7)

	default "5" if X86_32 && X86_CX8

	default "4"

	default "5"



config X86_DEBUGCTLMSR

	def_bool y

	depends on !(MK6 || MWINCHIPC6 || MWINCHIP3D || MCYRIXIII || M586MMX || M586TSC || M586 || M486SX || M486) && !UML

	depends on !(MK6 || MWINCHIPC6 || MWINCHIP3D || MCYRIXIII || M586MMX || M586TSC || M586) && !UML



config IA32_FEAT_CTL

	def_bool y
@@ -378,7 +354,7 @@ config CPU_SUP_INTEL 
config CPU_SUP_CYRIX_32

	default y

	bool "Support Cyrix processors" if PROCESSOR_SELECT

	depends on M486SX || M486 || M586 || M586TSC || M586MMX || (EXPERT && !64BIT)

	depends on M586 || M586TSC || M586MMX || (EXPERT && !64BIT)

	help

	  This enables detection, tunings and quirks for Cyrix processors

arch/x86/Makefile_32.cpu

+0 −2
Original line number Diff line number Diff line
@@ -10,8 +10,6 @@ else 
align		:= -falign-functions=0 -falign-jumps=0 -falign-loops=0

endif



cflags-$(CONFIG_M486SX)		+= -march=i486

cflags-$(CONFIG_M486)		+= -march=i486

cflags-$(CONFIG_M586)		+= -march=i586

cflags-$(CONFIG_M586TSC)	+= -march=i586

cflags-$(CONFIG_M586MMX)	+= -march=pentium-mmx

arch/x86/include/asm/vermagic.h

+0 −6
Original line number Diff line number Diff line
@@ -5,10 +5,6 @@ 


#ifdef CONFIG_X86_64

/* X86_64 does not define MODULE_PROC_FAMILY */

#elif defined CONFIG_M486SX

#define MODULE_PROC_FAMILY "486SX "

#elif defined CONFIG_M486

#define MODULE_PROC_FAMILY "486 "

#elif defined CONFIG_M586

#define MODULE_PROC_FAMILY "586 "

#elif defined CONFIG_M586TSC
@@ -31,8 +27,6 @@ 
#define MODULE_PROC_FAMILY "K6 "

#elif defined CONFIG_MK7

#define MODULE_PROC_FAMILY "K7 "

#elif defined CONFIG_MELAN

#define MODULE_PROC_FAMILY "ELAN "

#elif defined CONFIG_MCRUSOE

#define MODULE_PROC_FAMILY "CRUSOE "

#elif defined CONFIG_MEFFICEON

arch/x86/kernel/cpu/amd.c

+49 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

#include <linux/export.h>

#include <linux/bitops.h>

#include <linux/dmi.h>

#include <linux/elf.h>

#include <linux/mm.h>

#include <linux/kvm_types.h>
@@ -1380,3 +1381,51 @@ static __init int print_s5_reset_status_mmio(void) 
	return 0;

}

late_initcall(print_s5_reset_status_mmio);



static void __init dmi_scan_additional(const struct dmi_header *d, void *p)

{

	struct dmi_a_info *info = (struct dmi_a_info *)d;

	void *next, *end;



	if (!IS_ENABLED(CONFIG_DMI))

		return;



	if (info->header.type != DMI_ENTRY_ADDITIONAL ||

	    info->header.length < DMI_A_INFO_MIN_SIZE ||

	    info->count < 1)

		return;



	next = (void *)(info + 1);

	end  = (void *)info + info->header.length;



	do {

		struct dmi_a_info_entry *entry;

		const char *string_ptr;



		entry = (struct dmi_a_info_entry *)next;



		/*

		 * Not much can be done to validate data. At least the entry

		 * length shouldn't be 0.

		 */

		if (!entry->length)

			return;



		string_ptr = dmi_string_nosave(&info->header, entry->str_num);



		/* Sample string: AGESA!V9 StrixKrackanPI-FP8 1.1.0.0c */

		if (!strncmp(string_ptr, "AGESA", 5)) {

			pr_info("AGESA: %s\n", string_ptr);

			break;

		}



		next += entry->length;

	} while (end - next >= DMI_A_INFO_ENT_MIN_SIZE);

}



static __init int print_dmi_agesa(void)

{

	dmi_walk(dmi_scan_additional, NULL);

	return 0;

}

late_initcall(print_dmi_agesa);