Merge tag 'x86-urgent-2025-12-06' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip (cc3ee4ba) · Commits · git / linux-net

Documentation/arch/x86/boot.rst

+24 −24

Original line number	Diff line number	Diff line
		@@ -416,7 +416,7 @@ Offset/size: 0x210/1
		Protocol: 2.00+
		============ ==================

		If your boot loader has an assigned id (see table below), enter
		If your boot loader has an assigned ID (see table below), enter
		0xTV here, where T is an identifier for the boot loader and V is
		a version number. Otherwise, enter 0xFF here.

		@@ -431,31 +431,31 @@ Protocol: 2.00+
		ext_loader_type <- 0x05
		ext_loader_ver <- 0x23

		Assigned boot loader ids (hexadecimal):
		Assigned boot loader IDs:

		== =======================================
		0 LILO
		0x0 LILO
		(0x00 reserved for pre-2.00 bootloader)
		1 Loadlin
		2 bootsect-loader
		0x1 Loadlin
		0x2 bootsect-loader
		(0x20, all other values reserved)
		3 Syslinux
		4 Etherboot/gPXE/iPXE
		5 ELILO
		7 GRUB
		8 U-Boot
		9 Xen
		A Gujin
		B Qemu
		C Arcturus Networks uCbootloader
		D kexec-tools
		E Extended (see ext_loader_type)
		F Special (0xFF = undefined)
		10 Reserved
		11 Minimal Linux Bootloader
		0x3 Syslinux
		0x4 Etherboot/gPXE/iPXE
		0x5 ELILO
		0x7 GRUB
		0x8 U-Boot
		0x9 Xen
		0xA Gujin
		0xB Qemu
		0xC Arcturus Networks uCbootloader
		0xD kexec-tools
		0xE Extended (see ext_loader_type)
		0xF Special (0xFF = undefined)
		0x10 Reserved
		0x11 Minimal Linux Bootloader
		<http://sebastian-plotz.blogspot.de>
		12 OVMF UEFI virtualization stack
		13 barebox
		0x12 OVMF UEFI virtualization stack
		0x13 barebox
		== =======================================

		Please contact <hpa@zytor.com> if you need a bootloader ID value assigned.

arch/x86/include/asm/x86_init.h

+16 −12

Original line number	Diff line number	Diff line
		@@ -79,7 +79,7 @@ struct x86_init_paging {

		/**
		* struct x86_init_timers - platform specific timer setup
		* @setup_perpcu_clockev: set up the per cpu clock event device for the
		* @setup_percpu_clockev: set up the per cpu clock event device for the
		* boot cpu
		* @timer_init: initialize the platform timer (default PIT/HPET)
		* @wallclock_init: init the wallclock device
		@@ -132,7 +132,7 @@ struct x86_hyper_init {

		/**
		* struct x86_init_acpi - x86 ACPI init functions
		* @set_root_poitner: set RSDP address
		* @set_root_pointer: set RSDP address
		* @get_root_pointer: get RSDP address
		* @reduced_hw_early_init: hardware reduced platform early init
		*/
		@@ -145,14 +145,14 @@ struct x86_init_acpi {
		/**
		* struct x86_guest - Functions used by misc guest incarnations like SEV, TDX, etc.
		*
		* @enc_status_change_prepare Notify HV before the encryption status of a range is changed
		* @enc_status_change_finish Notify HV after the encryption status of a range is changed
		* @enc_tlb_flush_required Returns true if a TLB flush is needed before changing page encryption status
		* @enc_cache_flush_required Returns true if a cache flush is needed before changing page encryption status
		* @enc_kexec_begin Begin the two-step process of converting shared memory back
		* @enc_status_change_prepare: Notify HV before the encryption status of a range is changed
		* @enc_status_change_finish: Notify HV after the encryption status of a range is changed
		* @enc_tlb_flush_required: Returns true if a TLB flush is needed before changing page encryption status
		* @enc_cache_flush_required: Returns true if a cache flush is needed before changing page encryption status
		* @enc_kexec_begin: Begin the two-step process of converting shared memory back
		* to private. It stops the new conversions from being started
		* and waits in-flight conversions to finish, if possible.
		* @enc_kexec_finish Finish the two-step process of converting shared memory to
		* @enc_kexec_finish: Finish the two-step process of converting shared memory to
		* private. All memory is private after the call when
		* the function returns.
		* It is called on only one CPU while the others are shut down
		@@ -229,7 +229,7 @@ struct x86_legacy_devices {
		* given platform/subarch.
		* @X86_LEGACY_I8042_FIRMWARE_ABSENT: firmware reports that the controller
		* is absent.
		* @X86_LEGACY_i8042_EXPECTED_PRESENT: the controller is likely to be
		* @X86_LEGACY_I8042_EXPECTED_PRESENT: the controller is likely to be
		* present, the i8042 driver should probe for controller existence.
		*/
		enum x86_legacy_i8042_state {
		@@ -244,6 +244,8 @@ enum x86_legacy_i8042_state {
		* @i8042: indicated if we expect the device to have i8042 controller
		* present.
		* @rtc: this device has a CMOS real-time clock present
		* @warm_reset: 1 if platform allows warm reset, else 0
		* @no_vga: 1 if (FADT.boot_flags & ACPI_FADT_NO_VGA) is set, else 0
		* @reserve_bios_regions: boot code will search for the EBDA address and the
		* start of the 640k - 1M BIOS region. If false, the platform must
		* ensure that its memory map correctly reserves sub-1MB regions as needed.
		@@ -290,9 +292,10 @@ struct x86_hyper_runtime {
		* @calibrate_tsc: calibrate TSC, if different from CPU
		* @get_wallclock: get time from HW clock like RTC etc.
		* @set_wallclock: set time back to HW clock
		* @is_untracked_pat_range exclude from PAT logic
		* @nmi_init enable NMI on cpus
		* @get_nmi_reason get the reason an NMI was received
		* @iommu_shutdown: set by an IOMMU driver for shutdown if necessary
		* @is_untracked_pat_range: exclude from PAT logic
		* @nmi_init: enable NMI on cpus
		* @get_nmi_reason: get the reason an NMI was received
		* @save_sched_clock_state: save state for sched_clock() on suspend
		* @restore_sched_clock_state: restore state for sched_clock() on resume
		* @apic_post_init: adjust apic if needed
		@@ -307,6 +310,7 @@ struct x86_hyper_runtime {
		* @realmode_reserve: reserve memory for realmode trampoline
		* @realmode_init: initialize realmode trampoline
		* @hyper: x86 hypervisor specific runtime callbacks
		* @guest: guest incarnations callbacks
		*/
		struct x86_platform_ops {
		unsigned long (*calibrate_cpu)(void);