From: Yinghai Lu <yinghai@kernel.org>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
"H. Peter Anvin" <hpa@zytor.com>
Cc: "Eric W. Biederman" <ebiederm@xmission.com>,
linux-kernel@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH v3 10/12] x86: use io_remap to access real_mode_data
Date: Tue, 20 Nov 2012 23:16:08 -0800 [thread overview]
Message-ID: <1353482170-10160-11-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1353482170-10160-1-git-send-email-yinghai@kernel.org>
When 64bit bootloader put real mode data above 4g, We can not
access real mode data directly.
because in arch/x86/kernel/head_64.S, only set ident mapping
for 0-1g, and kernel code/data/bss.
So need to move early_ioremap_init() calling from setup_arch
to x86_64_start_kernel.
Also use rsi/rdi instead of esi/edi.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
arch/x86/kernel/head64.c | 17 ++++++++++++++---
arch/x86/kernel/head_64.S | 4 ++--
arch/x86/kernel/setup.c | 2 ++
3 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/arch/x86/kernel/head64.c b/arch/x86/kernel/head64.c
index 3ac6cad..735cd47 100644
--- a/arch/x86/kernel/head64.c
+++ b/arch/x86/kernel/head64.c
@@ -52,12 +52,21 @@ static void __init copy_bootdata(char *real_mode_data)
{
char * command_line;
unsigned long cmd_line_ptr;
+ char *p;
- memcpy(&boot_params, real_mode_data, sizeof boot_params);
+ /*
+ * for 64bit bootload path, those data could be above 4G,
+ * and we do set ident mapping for them in head_64.S.
+ * So need to ioremap to access them.
+ */
+ p = early_memremap((unsigned long)real_mode_data, sizeof(boot_params));
+ memcpy(&boot_params, p, sizeof(boot_params));
+ early_iounmap(p, sizeof(boot_params));
cmd_line_ptr = get_cmd_line_ptr();
if (cmd_line_ptr) {
- command_line = __va(cmd_line_ptr);
+ command_line = early_memremap(cmd_line_ptr, COMMAND_LINE_SIZE);
memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
+ early_iounmap(command_line, COMMAND_LINE_SIZE);
}
}
@@ -104,7 +113,9 @@ void __init x86_64_start_kernel(char * real_mode_data)
void __init x86_64_start_reservations(char *real_mode_data)
{
- copy_bootdata(__va(real_mode_data));
+ early_ioremap_init();
+
+ copy_bootdata(real_mode_data);
memblock_reserve(__pa_symbol(&_text),
__pa_symbol(&__bss_stop) - __pa_symbol(&_text));
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S
index 32fa9d0..14c5de2 100644
--- a/arch/x86/kernel/head_64.S
+++ b/arch/x86/kernel/head_64.S
@@ -262,9 +262,9 @@ ENTRY(secondary_startup_64)
movl initial_gs+4(%rip),%edx
wrmsr
- /* esi is pointer to real mode structure with interesting info.
+ /* rsi is pointer to real mode structure with interesting info.
pass it to C */
- movl %esi, %edi
+ movq %rsi, %rdi
/* Finally jump to run C code and to be on real kernel address
* Since we are running on identity-mapped space we have to jump
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index 194e151..573fa7d7 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -718,7 +718,9 @@ void __init setup_arch(char **cmdline_p)
early_trap_init();
early_cpu_init();
+#ifdef CONFIG_X86_32
early_ioremap_init();
+#endif
setup_olpc_ofw_pgd();
--
1.7.7
next prev parent reply other threads:[~2012-11-21 7:17 UTC|newest]
Thread overview: 57+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-11-21 7:15 [PATCH v3 00/12] x86, boot, 64bit: Add support for loading ramdisk and bzImage high Yinghai Lu
2012-11-21 7:15 ` [PATCH v3 01/12] x86, boot: move verify_cpu.S after 0x200 Yinghai Lu
2012-11-21 17:23 ` H. Peter Anvin
2012-11-21 19:45 ` Yinghai Lu
2012-11-21 19:50 ` H. Peter Anvin
2012-11-21 20:15 ` Yinghai Lu
2012-11-22 5:48 ` Eric W. Biederman
[not found] ` <3178cb29-0e9e-44d2-b21f-45c53f38980a@email.android.com>
2012-11-22 11:27 ` Eric W. Biederman
2012-11-24 7:00 ` Yinghai Lu
2012-11-21 7:16 ` [PATCH v3 02/12] x86, boot: Move lldt/ltr out of 64bit code section Yinghai Lu
2012-11-21 7:16 ` [PATCH v3 03/12] x86, 64bit: set extra ident page table for whole kernel range Yinghai Lu
2012-11-21 7:16 ` [PATCH v3 04/12] x86, 64bit: add support for loading kernel above 512G Yinghai Lu
2012-11-21 7:16 ` [PATCH v3 05/12] x86: Merge early_reserve_initrd for 32bit and 64bit Yinghai Lu
2012-11-21 7:40 ` Pekka Enberg
2012-11-21 7:16 ` [PATCH v3 06/12] x86: add get_ramdisk_image/size Yinghai Lu
2012-11-21 7:16 ` [PATCH v3 07/12] x86, boot: add get_cmd_line_ptr() Yinghai Lu
2012-11-21 7:16 ` [PATCH v3 08/12] x86, boot: Don't check if cmd_line_ptr is accessible in misc/decompressor() Yinghai Lu
2012-11-21 17:21 ` H. Peter Anvin
2012-11-21 19:18 ` Yinghai Lu
2012-11-21 7:16 ` [PATCH v3 09/12] x86, boot: update cmd_line_ptr to unsigned long Yinghai Lu
2012-11-21 7:16 ` Yinghai Lu [this message]
2012-11-21 7:16 ` [PATCH v3 11/12] x86, boot: add fields to support load bzImage and ramdisk high Yinghai Lu
2012-11-21 17:17 ` H. Peter Anvin
2012-11-21 18:59 ` Yinghai Lu
2012-11-21 19:18 ` H. Peter Anvin
2012-11-22 5:56 ` Yinghai Lu
[not found] ` <a1ca794a-09d4-4d36-8c8c-67100cb3696e@email.android.com>
2012-11-22 6:47 ` Yinghai Lu
2012-11-22 6:58 ` Yinghai Lu
2012-11-22 15:59 ` H. Peter Anvin
2012-11-22 18:28 ` Yinghai Lu
2012-11-22 18:37 ` H. Peter Anvin
2012-11-22 18:50 ` Yinghai Lu
2012-11-22 18:51 ` H. Peter Anvin
2012-11-22 20:18 ` Yinghai Lu
2012-11-22 20:20 ` H. Peter Anvin
2012-11-22 20:29 ` Yinghai Lu
2012-11-22 20:50 ` H. Peter Anvin
2012-11-22 21:02 ` H. Peter Anvin
2012-11-22 22:13 ` Yinghai Lu
2012-11-24 12:37 ` Eric W. Biederman
2012-11-24 17:32 ` H. Peter Anvin
[not found] ` <CAE9FiQV0Q0fi7TrNjihdsUt0ueT4LLON4o+JEmX6ry9S6AU-ug@mail.gmail.com>
2012-11-24 18:24 ` H. Peter Anvin
2012-11-24 19:50 ` H. Peter Anvin
2012-11-24 21:30 ` Yinghai Lu
2012-11-24 21:38 ` H. Peter Anvin
2012-11-24 22:18 ` Yinghai Lu
2012-11-24 22:32 ` H. Peter Anvin
2012-11-24 23:24 ` Yinghai Lu
2012-11-24 23:50 ` Eric W. Biederman
2012-11-25 0:04 ` H. Peter Anvin
2012-11-25 0:11 ` Yinghai Lu
2012-11-25 5:50 ` Yinghai Lu
2012-11-25 5:52 ` H. Peter Anvin
2012-11-25 6:09 ` Yinghai Lu
2012-11-25 0:04 ` Yinghai Lu
2012-11-25 0:06 ` H. Peter Anvin
2012-11-21 7:16 ` [PATCH v3 12/12] x86: remove 1024g limitation for kexec buffer on 64bit 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=1353482170-10160-11-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=ebiederm@xmission.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).