| Message ID | 20191024114814.6488-3-daniel.kiper@oracle.com (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | x86/boot: Introduce the kernel_info et consortes | expand |
On 2019-10-24 04:48, Daniel Kiper wrote: > This field contains maximal allowed type for setup_data. > > Now bump the setup_header version in arch/x86/boot/header.S. Please don't bump the protocol revision here, otherwise we would create a very odd pseudo-revision of the protocol: 2.15 without SETUP_INDIRECT support, should patch 3/3 end up getting reverted. (It is possible to detect, of course, but I feel pretty sure in saying that bootloaders won't get it right.) Other than that: Reviewed-by: H. Peter Anvin (Intel) <hpa@zytor.com> -hpa
On Fri, Nov 01, 2019 at 01:55:57PM -0700, H. Peter Anvin wrote: > On 2019-10-24 04:48, Daniel Kiper wrote: > > This field contains maximal allowed type for setup_data. > > > > Now bump the setup_header version in arch/x86/boot/header.S. > > Please don't bump the protocol revision here, otherwise we would create > a very odd pseudo-revision of the protocol: 2.15 without SETUP_INDIRECT > support, should patch 3/3 end up getting reverted. > > (It is possible to detect, of course, but I feel pretty sure in saying > that bootloaders won't get it right.) > > Other than that: > > Reviewed-by: H. Peter Anvin (Intel) <hpa@zytor.com> I have just sent v5. Please take a look. Daniel
diff --git a/Documentation/x86/boot.rst b/Documentation/x86/boot.rst index c60fafda9427..8e523c23ede3 100644 --- a/Documentation/x86/boot.rst +++ b/Documentation/x86/boot.rst @@ -73,7 +73,7 @@ Protocol 2.14: BURNT BY INCORRECT COMMIT ae7e1238e68f2a472a125673ab506d49158c188 (x86/boot: Add ACPI RSDP address to setup_header) DO NOT USE!!! ASSUME SAME AS 2.13. -Protocol 2.15: (Kernel 5.5) Added the kernel_info. +Protocol 2.15: (Kernel 5.5) Added the kernel_info and kernel_info.setup_type_max. ============= ============================================================ .. note:: @@ -981,6 +981,13 @@ Offset/size: 0x0008/4 This field contains the size of the kernel_info including kernel_info.header and kernel_info.kernel_info_var_len_data. +============ ============== +Field name: setup_type_max +Offset/size: 0x0008/4 +============ ============== + + This field contains maximal allowed type for setup_data and setup_indirect structs. + The Image Checksum ================== diff --git a/arch/x86/boot/compressed/kernel_info.S b/arch/x86/boot/compressed/kernel_info.S index 8ea6f6e3feef..f818ee8fba38 100644 --- a/arch/x86/boot/compressed/kernel_info.S +++ b/arch/x86/boot/compressed/kernel_info.S @@ -1,5 +1,7 @@ /* SPDX-License-Identifier: GPL-2.0 */ +#include <asm/bootparam.h> + .section ".rodata.kernel_info", "a" .global kernel_info @@ -12,6 +14,9 @@ kernel_info: /* Size total. */ .long kernel_info_end - kernel_info + /* Maximal allowed type for setup_data and setup_indirect structs. */ + .long SETUP_TYPE_MAX + kernel_info_var_len_data: /* Empty for time being... */ kernel_info_end: diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S index 22dcecaaa898..97d9b6d6c1af 100644 --- a/arch/x86/boot/header.S +++ b/arch/x86/boot/header.S @@ -300,7 +300,7 @@ _start: # Part 2 of the header, from the old setup.S .ascii "HdrS" # header signature - .word 0x020d # header version number (>= 0x0105) + .word 0x020f # header version number (>= 0x0105) # or else old loadlin-1.5 will fail) .globl realmode_swtch realmode_swtch: .word 0, 0 # default_switch, SETUPSEG diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h index a1ebcd7a991c..dbb41128e5a0 100644 --- a/arch/x86/include/uapi/asm/bootparam.h +++ b/arch/x86/include/uapi/asm/bootparam.h @@ -11,6 +11,9 @@ #define SETUP_APPLE_PROPERTIES 5 #define SETUP_JAILHOUSE 6 +/* max(SETUP_*) */ +#define SETUP_TYPE_MAX SETUP_JAILHOUSE + /* ram_size flags */ #define RAMDISK_IMAGE_START_MASK 0x07FF #define RAMDISK_PROMPT_FLAG 0x8000