From: Daniel Kiper <daniel.kiper@oracle.com> To: linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org, xen-devel@lists.xenproject.org Cc: ard.biesheuvel@linaro.org, boris.ostrovsky@oracle.com, bp@alien8.de, corbet@lwn.net, dave.hansen@linux.intel.com, luto@kernel.org, peterz@infradead.org, eric.snowberg@oracle.com, hpa@zytor.com, jgross@suse.com, kanth.ghatraju@oracle.com, konrad.wilk@oracle.com, mingo@redhat.com, rdunlap@infradead.org, ross.philipson@oracle.com, tglx@linutronix.de Subject: [PATCH v5 2/3] x86/boot: Introduce the kernel_info.setup_type_max Date: Mon, 4 Nov 2019 16:13:53 +0100 [thread overview] Message-ID: <20191104151354.28145-3-daniel.kiper@oracle.com> (raw) In-Reply-To: <20191104151354.28145-1-daniel.kiper@oracle.com> This field contains maximal allowed type for setup_data. This patch does not bump setup_header version in arch/x86/boot/header.S because it will be followed by additional changes coming into the Linux/x86 boot protocol. Suggested-by: H. Peter Anvin (Intel) <hpa@zytor.com> Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Reviewed-by: Ross Philipson <ross.philipson@oracle.com> Reviewed-by: H. Peter Anvin (Intel) <hpa@zytor.com> --- v5 - suggestions/fixes: - move incorrect references to the setup_indirect to the patch introducing it, - do not bump setup_header version in arch/x86/boot/header.S (suggested by H. Peter Anvin). --- Documentation/x86/boot.rst | 9 ++++++++- arch/x86/boot/compressed/kernel_info.S | 5 +++++ arch/x86/include/uapi/asm/bootparam.h | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Documentation/x86/boot.rst b/Documentation/x86/boot.rst index c60fafda9427..1dad6eee8a5c 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. + The Image Checksum ================== diff --git a/arch/x86/boot/compressed/kernel_info.S b/arch/x86/boot/compressed/kernel_info.S index 8ea6f6e3feef..018dacbd753e 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. */ + .long SETUP_TYPE_MAX + kernel_info_var_len_data: /* Empty for time being... */ kernel_info_end: 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 -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: Daniel Kiper <daniel.kiper@oracle.com> To: linux-efi@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org, xen-devel@lists.xenproject.org Cc: jgross@suse.com, eric.snowberg@oracle.com, ard.biesheuvel@linaro.org, konrad.wilk@oracle.com, corbet@lwn.net, peterz@infradead.org, ross.philipson@oracle.com, dave.hansen@linux.intel.com, mingo@redhat.com, bp@alien8.de, rdunlap@infradead.org, luto@kernel.org, hpa@zytor.com, kanth.ghatraju@oracle.com, boris.ostrovsky@oracle.com, tglx@linutronix.de Subject: [Xen-devel] [PATCH v5 2/3] x86/boot: Introduce the kernel_info.setup_type_max Date: Mon, 4 Nov 2019 16:13:53 +0100 [thread overview] Message-ID: <20191104151354.28145-3-daniel.kiper@oracle.com> (raw) In-Reply-To: <20191104151354.28145-1-daniel.kiper@oracle.com> This field contains maximal allowed type for setup_data. This patch does not bump setup_header version in arch/x86/boot/header.S because it will be followed by additional changes coming into the Linux/x86 boot protocol. Suggested-by: H. Peter Anvin (Intel) <hpa@zytor.com> Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com> Reviewed-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> Reviewed-by: Ross Philipson <ross.philipson@oracle.com> Reviewed-by: H. Peter Anvin (Intel) <hpa@zytor.com> --- v5 - suggestions/fixes: - move incorrect references to the setup_indirect to the patch introducing it, - do not bump setup_header version in arch/x86/boot/header.S (suggested by H. Peter Anvin). --- Documentation/x86/boot.rst | 9 ++++++++- arch/x86/boot/compressed/kernel_info.S | 5 +++++ arch/x86/include/uapi/asm/bootparam.h | 3 +++ 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Documentation/x86/boot.rst b/Documentation/x86/boot.rst index c60fafda9427..1dad6eee8a5c 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. + The Image Checksum ================== diff --git a/arch/x86/boot/compressed/kernel_info.S b/arch/x86/boot/compressed/kernel_info.S index 8ea6f6e3feef..018dacbd753e 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. */ + .long SETUP_TYPE_MAX + kernel_info_var_len_data: /* Empty for time being... */ kernel_info_end: 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 -- 2.11.0 _______________________________________________ Xen-devel mailing list Xen-devel@lists.xenproject.org https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2019-11-04 15:16 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-11-04 15:13 [PATCH v5 0/3] x86/boot: Introduce the kernel_info et consortes Daniel Kiper 2019-11-04 15:13 ` [Xen-devel] " Daniel Kiper 2019-11-04 15:13 ` [PATCH v5 1/3] x86/boot: Introduce the kernel_info Daniel Kiper 2019-11-04 15:13 ` [Xen-devel] " Daniel Kiper 2019-11-04 15:13 ` Daniel Kiper [this message] 2019-11-04 15:13 ` [Xen-devel] [PATCH v5 2/3] x86/boot: Introduce the kernel_info.setup_type_max Daniel Kiper 2019-11-08 10:09 ` Borislav Petkov 2019-11-08 10:09 ` [Xen-devel] " Borislav Petkov 2019-11-08 10:47 ` Daniel Kiper 2019-11-08 10:47 ` [Xen-devel] " Daniel Kiper 2019-11-08 11:07 ` Borislav Petkov 2019-11-08 11:07 ` [Xen-devel] " Borislav Petkov 2019-11-08 12:52 ` Daniel Kiper 2019-11-08 12:52 ` [Xen-devel] " Daniel Kiper 2019-11-08 13:03 ` Borislav Petkov 2019-11-08 13:03 ` [Xen-devel] " Borislav Petkov 2019-11-08 13:39 ` Daniel Kiper 2019-11-08 13:39 ` [Xen-devel] " Daniel Kiper 2019-11-04 15:13 ` [PATCH v5 3/3] x86/boot: Introduce the setup_indirect Daniel Kiper 2019-11-04 15:13 ` [Xen-devel] " Daniel Kiper 2019-11-08 11:33 ` Borislav Petkov 2019-11-08 11:33 ` [Xen-devel] " Borislav Petkov 2019-11-05 21:40 ` [PATCH v5 0/3] x86/boot: Introduce the kernel_info et consortes H. Peter Anvin 2019-11-05 21:40 ` [Xen-devel] " H. Peter Anvin 2019-11-06 17:03 ` Borislav Petkov 2019-11-06 17:03 ` [Xen-devel] " Borislav Petkov 2019-11-06 17:56 ` hpa 2019-11-06 17:56 ` [Xen-devel] " hpa 2019-11-06 19:43 ` Borislav Petkov 2019-11-06 19:43 ` [Xen-devel] " Borislav Petkov 2019-11-07 11:31 ` Daniel Kiper 2019-11-07 11:31 ` [Xen-devel] " Daniel Kiper
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20191104151354.28145-3-daniel.kiper@oracle.com \ --to=daniel.kiper@oracle.com \ --cc=ard.biesheuvel@linaro.org \ --cc=boris.ostrovsky@oracle.com \ --cc=bp@alien8.de \ --cc=corbet@lwn.net \ --cc=dave.hansen@linux.intel.com \ --cc=eric.snowberg@oracle.com \ --cc=hpa@zytor.com \ --cc=jgross@suse.com \ --cc=kanth.ghatraju@oracle.com \ --cc=konrad.wilk@oracle.com \ --cc=linux-efi@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=luto@kernel.org \ --cc=mingo@redhat.com \ --cc=peterz@infradead.org \ --cc=rdunlap@infradead.org \ --cc=ross.philipson@oracle.com \ --cc=tglx@linutronix.de \ --cc=x86@kernel.org \ --cc=xen-devel@lists.xenproject.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.