From: "H. Peter Anvin" <hpa@zytor.com>
To: Thomas Gleixner <tglx@kernel.org>, Ingo Molnar <mingo@redhat.com>,
Borislav Petkov <bp@alien8.de>,
Dave Hansen <dave.hansen@linux.intel.com>,
Uros Bizjak <ubizjak@gmail.com>, Petr Mladek <pmladek@suse.com>,
Andrew Morton <akpm@linux-foundation.org>,
Kees Cook <kees@kernel.org>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Nathan Chancellor <nathan@kernel.org>,
Kiryl Shutsemau <kas@kernel.org>,
Rick Edgecombe <rick.p.edgecombe@intel.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>,
linux-kernel@vger.kernel.org, linux-coco@lists.linux.dev,
x86@kernel.org
Subject: [PATCH v1 10/14] x86/boot: explicitly put the old command line pointer in header.S
Date: Tue, 20 Jan 2026 11:54:02 -0800 [thread overview]
Message-ID: <20260120195407.1163051-11-hpa@zytor.com> (raw)
In-Reply-To: <20260120195407.1163051-1-hpa@zytor.com>
Put the location for the old command line pointer into header.S. This
not only makes the layout of the header data more explicit, but it
also removes the need for the absolute_pointer() hack in
arch/x86/boot/main.c.
Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
---
| 7 +++++++
arch/x86/boot/main.c | 32 ++++++++++++++++----------------
2 files changed, 23 insertions(+), 16 deletions(-)
--git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
index 2828b25707bb..4eb12443dafa 100644
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
@@ -43,6 +43,13 @@ SYSSEG = 0x1000 /* historical load address >> 4 */
.section ".header", "a"
# "MZ", MS-DOS header
.word IMAGE_DOS_SIGNATURE
+
+ .org 0x20
+ # Used for the command line protocol in boot protocols 2.00-2.01
+ .globl old_cmdline
+old_cmdline:
+ .word 0, 0
+
.org 0x38
#
# Offset to the PE header.
diff --git a/arch/x86/boot/main.c b/arch/x86/boot/main.c
index ad8869aad6db..864da3deab18 100644
--- a/arch/x86/boot/main.c
+++ b/arch/x86/boot/main.c
@@ -22,36 +22,36 @@ char *HEAP = _end;
char *heap_end = _end; /* Default end of heap = no heap */
/*
- * Copy the header into the boot parameter block. Since this
- * screws up the old-style command line protocol, adjust by
- * filling in the new-style command line pointer instead.
+ * Copy the header into the boot parameter block. Since this screws
+ * up the old-style command line protocol (protocol 2.00-2.01), adjust
+ * by filling in the new-style command line pointer instead.
*/
+struct old_cmdline {
+ u16 cl_magic;
+ u16 cl_offset;
+};
+extern const struct old_cmdline old_cmdline;
+
static void copy_boot_params(void)
{
- struct old_cmdline {
- u16 cl_magic;
- u16 cl_offset;
- };
- const struct old_cmdline * const oldcmd = absolute_pointer(OLD_CL_ADDRESS);
-
BUILD_BUG_ON(sizeof(boot_params) != 4096);
memcpy(&boot_params.hdr, &hdr, sizeof(hdr));
- if (!boot_params.hdr.cmd_line_ptr && oldcmd->cl_magic == OLD_CL_MAGIC) {
+ if (!boot_params.hdr.cmd_line_ptr &&
+ old_cmdline.cl_magic == OLD_CL_MAGIC) {
/* Old-style command line protocol */
- u16 cmdline_seg;
+ u32 cmdline_base = 0x90000;
/*
* Figure out if the command line falls in the region
* of memory that an old kernel would have copied up
* to 0x90000...
*/
- if (oldcmd->cl_offset < boot_params.hdr.setup_move_size)
- cmdline_seg = ds();
- else
- cmdline_seg = 0x9000;
+ if (old_cmdline.cl_offset < boot_params.hdr.setup_move_size)
+ cmdline_base = ds() << 4;
- boot_params.hdr.cmd_line_ptr = (cmdline_seg << 4) + oldcmd->cl_offset;
+ boot_params.hdr.cmd_line_ptr =
+ cmdline_base + old_cmdline.cl_offset;
}
}
--
2.52.0
next prev parent reply other threads:[~2026-01-20 19:55 UTC|newest]
Thread overview: 50+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20260119192923.651588-1-hpa@zytor.com>
2026-01-20 19:53 ` [PATCH v1 00/14] x86 boot code cleanups, batch 1 H. Peter Anvin
2026-01-20 19:53 ` [PATCH v1 01/14] x86/realmode: remove I/O port paravirtualization H. Peter Anvin
2026-01-20 21:47 ` David Laight
2026-01-21 12:27 ` Kiryl Shutsemau
2026-01-28 17:01 ` Borislav Petkov
2026-01-20 19:53 ` [PATCH v1 02/14] x86/realmode: make %gs == 0 an invariant H. Peter Anvin
2026-01-20 22:40 ` David Laight
2026-01-20 22:51 ` H. Peter Anvin
2026-01-21 0:47 ` H. Peter Anvin
2026-01-21 10:03 ` Uros Bizjak
2026-01-20 19:53 ` [PATCH v1 03/14] x86/boot: use <linux/compiler.h> H. Peter Anvin
2026-01-21 10:04 ` Uros Bizjak
2026-01-20 19:53 ` [PATCH v1 04/14] x86/boot: modernize the segment structure for the header and setup H. Peter Anvin
2026-01-20 19:53 ` [PATCH v1 05/14] x86/boot: call puts() from within die() H. Peter Anvin
2026-01-21 10:07 ` Uros Bizjak
2026-01-20 19:53 ` [PATCH v1 06/14] x86/boot: add comment barriers for the different headers H. Peter Anvin
2026-01-20 19:53 ` [PATCH v1 07/14] x86/boot: factor out the 16-bit startup code from header.S H. Peter Anvin
2026-01-21 10:08 ` Uros Bizjak
2026-01-20 19:54 ` [PATCH v1 08/14] x86: make CONFIG_EFI_STUB unconditional H. Peter Anvin
2026-01-20 19:54 ` [PATCH v1 09/14] x86/boot: make the relocatable kernel unconditional H. Peter Anvin
2026-01-20 19:54 ` H. Peter Anvin [this message]
2026-01-20 19:54 ` [PATCH v1 11/14] x86/boot: use __seg_fs and __seg_gs in the real-mode boot code H. Peter Anvin
2026-01-21 8:56 ` Uros Bizjak
2026-01-21 9:40 ` Uros Bizjak
2026-01-21 15:13 ` H. Peter Anvin
2026-01-21 16:03 ` Uros Bizjak
2026-01-22 18:57 ` [PATCH v1 08/14] x86: make CONFIG_EFI_STUB unconditional Simon Glass
2026-01-23 0:11 ` H. Peter Anvin
2026-01-26 21:19 ` Simon Glass
2026-01-26 22:20 ` H. Peter Anvin
2026-01-27 1:44 ` Simon Glass
2026-01-27 2:39 ` H. Peter Anvin
2026-01-27 2:54 ` H. Peter Anvin
2026-01-27 3:14 ` Simon Glass
2026-01-27 3:21 ` H. Peter Anvin
2026-01-29 22:13 ` Simon Glass
2026-01-29 22:22 ` H. Peter Anvin
2026-01-21 16:07 ` [PATCH v1 11/14] x86/boot: use __seg_fs and __seg_gs in the real-mode boot code Uros Bizjak
2026-01-20 19:54 ` [PATCH v1 12/14] x86/boot: tweak a20.c for better code generation H. Peter Anvin
2026-01-21 10:10 ` Uros Bizjak
2026-01-21 11:49 ` David Laight
2026-01-24 3:00 ` Maciej W. Rozycki
2026-01-24 4:24 ` H. Peter Anvin
2026-01-24 23:07 ` David Laight
2026-01-24 23:16 ` H. Peter Anvin
2026-01-24 23:40 ` H. Peter Anvin
2026-01-20 19:54 ` [PATCH v1 13/14] x86/boot: simplify x86/boot/cmdline.c by using __seg_fs H. Peter Anvin
2026-01-21 10:11 ` Uros Bizjak
2026-01-20 19:54 ` [PATCH v1 14/14] compiler-gcc: Remove obsolete RELOC_HIDE() macro H. Peter Anvin
2026-01-21 10:18 ` [PATCH v1 00/14] x86 boot code cleanups, batch 1 Uros Bizjak
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=20260120195407.1163051-11-hpa@zytor.com \
--to=hpa@zytor.com \
--cc=akpm@linux-foundation.org \
--cc=bp@alien8.de \
--cc=dave.hansen@linux.intel.com \
--cc=kas@kernel.org \
--cc=kees@kernel.org \
--cc=linux-coco@lists.linux.dev \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=nathan@kernel.org \
--cc=peterz@infradead.org \
--cc=pmladek@suse.com \
--cc=rick.p.edgecombe@intel.com \
--cc=tglx@kernel.org \
--cc=ubizjak@gmail.com \
--cc=x86@kernel.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®