From: Yinghai Lu <yinghai@kernel.org>
To: Simon Horman <horms@verge.net.au>,
"H. Peter Anvin" <hpa@zytor.com>, Vivek Goyal <vgoyal@redhat.com>,
Haren Myneni <hbabu@us.ibm.com>,
"Eric W. Biederman" <ebiederm@xmission.com>
Cc: Yinghai Lu <yinghai@kernel.org>, kexec@lists.infradead.org
Subject: [PATCH v7 4/7] kexec, x86: put ramdisk/cmd_line above 4G for 64bit bzImage
Date: Thu, 24 Jan 2013 12:44:21 -0800 [thread overview]
Message-ID: <1359060264-10671-5-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1359060264-10671-1-git-send-email-yinghai@kernel.org>
We could put ramdisk/cmdline above for bzImage on 64bit for protocol 2.12.
-v2: change ext_... handling to way that eric like.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
kexec/arch/i386/x86-linux-setup.c | 25 +++++++++++++++++++++----
1 file changed, 21 insertions(+), 4 deletions(-)
diff --git a/kexec/arch/i386/x86-linux-setup.c b/kexec/arch/i386/x86-linux-setup.c
index b7ab8ea..eb8b794 100644
--- a/kexec/arch/i386/x86-linux-setup.c
+++ b/kexec/arch/i386/x86-linux-setup.c
@@ -64,7 +64,11 @@ void setup_linux_bootloader_parameters(
/* Find the maximum initial ramdisk address */
initrd_addr_max = DEFAULT_INITRD_ADDR_MAX;
if (real_mode->protocol_version >= 0x0203) {
- initrd_addr_max = real_mode->initrd_addr_max;
+ if (real_mode->protocol_version >= 0x020c &&
+ real_mode->xloadflags & (1<<0)) /* CAN_BE_LOADED_ABOVE_4G */
+ initrd_addr_max = ULONG_MAX;
+ else
+ initrd_addr_max = real_mode->initrd_addr_max;
dbgprintf("initrd_addr_max is 0x%lx\n", initrd_addr_max);
}
@@ -81,8 +85,16 @@ void setup_linux_bootloader_parameters(
}
/* Ramdisk address and size */
- real_mode->initrd_start = initrd_base;
- real_mode->initrd_size = initrd_size;
+ real_mode->initrd_start = initrd_base & 0xffffffffUL;
+ real_mode->initrd_size = initrd_size & 0xffffffffUL;
+
+ if (real_mode->protocol_version >= 0x020c &&
+ (initrd_base & 0xffffffffUL) != initrd_base)
+ real_mode->ext_ramdisk_image = initrd_base >> 32;
+
+ if (real_mode->protocol_version >= 0x020c &&
+ (initrd_size & 0xffffffffUL) != initrd_size)
+ real_mode->ext_ramdisk_size = initrd_size >> 32;
/* The location of the command line */
/* if (real_mode_base == 0x90000) { */
@@ -91,7 +103,12 @@ void setup_linux_bootloader_parameters(
/* setup_move_size */
/* } */
if (real_mode->protocol_version >= 0x0202) {
- real_mode->cmd_line_ptr = real_mode_base + cmdline_offset;
+ unsigned long cmd_line_ptr = real_mode_base + cmdline_offset;
+
+ real_mode->cmd_line_ptr = cmd_line_ptr & 0xffffffffUL;
+ if ((real_mode->protocol_version >= 0x020c) &&
+ ((cmd_line_ptr & 0xffffffffUL) != cmd_line_ptr))
+ real_mode->ext_cmd_line_ptr = cmd_line_ptr >> 32;
}
/* Fill in the command line */
--
1.7.10.4
_______________________________________________
kexec mailing list
kexec@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/kexec
next prev parent reply other threads:[~2013-01-24 20:44 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-01-24 20:44 [PATCH v7 0/7] kexec: put bzImage and ramdisk above 4G for x86 64bit Yinghai Lu
2013-01-24 20:44 ` [PATCH v7 1/7] kexec, x86: add boot header member for version 2.12 Yinghai Lu
2013-01-24 20:44 ` [PATCH v7 2/7] kexec, x86: clean boot_params area for entry-32bit path Yinghai Lu
2013-01-24 20:44 ` [PATCH v7 3/7] kexec, x86: Fix bzImage real-mode booting Yinghai Lu
2013-01-24 20:44 ` Yinghai Lu [this message]
2013-01-24 20:44 ` [PATCH v7 5/7] kexec, x86: set booloader id in setup_header Yinghai Lu
2013-01-24 20:44 ` [PATCH v7 6/7] kexec, x86_64: Load bzImage64 above 4G Yinghai Lu
2013-01-24 20:44 ` [PATCH v7 7/7] kexec, x86: handle Crash low kernel range Yinghai Lu
2013-01-25 9:08 ` [PATCH v7 0/7] kexec: put bzImage and ramdisk above 4G for x86 64bit Simon Horman
2013-01-25 15:48 ` Yinghai Lu
2013-01-28 0:49 ` Simon Horman
2013-01-28 2:39 ` Yinghai Lu
2013-02-22 4:12 ` Yinghai Lu
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=1359060264-10671-5-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=ebiederm@xmission.com \
--cc=hbabu@us.ibm.com \
--cc=horms@verge.net.au \
--cc=hpa@zytor.com \
--cc=kexec@lists.infradead.org \
--cc=vgoyal@redhat.com \
/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