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>,
Andrew Morton <akpm@linux-foundation.org>,
linux-kernel@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>,
Matt Fleming <matt.fleming@intel.com>
Subject: [PATCH v6 03/27] x86, boot: move verify_cpu.S and no_longmode after 0x200
Date: Thu, 13 Dec 2012 14:01:57 -0800 [thread overview]
Message-ID: <1355436141-8668-4-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1355436141-8668-1-git-send-email-yinghai@kernel.org>
We are short of space before 0x200 that is entry for startup_64.
According to hpa, we can not change startup_64 to other offset and
that become ABI now.
We could move function verify_cpu and no_longmode down, because one is
used via call and another will not return.
So could avoid extra code of jmp back and forth if we would move other
lines.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Matt Fleming <matt.fleming@intel.com>
---
arch/x86/boot/compressed/head_64.S | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S
index 2c4b171..fb984c0 100644
--- a/arch/x86/boot/compressed/head_64.S
+++ b/arch/x86/boot/compressed/head_64.S
@@ -176,14 +176,6 @@ ENTRY(startup_32)
lret
ENDPROC(startup_32)
-no_longmode:
- /* This isn't an x86-64 CPU so hang */
-1:
- hlt
- jmp 1b
-
-#include "../../kernel/verify_cpu.S"
-
/*
* Be careful here startup_64 needs to be at a predictable
* address so I can export it in an ELF header. Bootloaders
@@ -349,6 +341,15 @@ relocated:
*/
jmp *%rbp
+ .code32
+no_longmode:
+ /* This isn't an x86-64 CPU so hang */
+1:
+ hlt
+ jmp 1b
+
+#include "../../kernel/verify_cpu.S"
+
.data
gdt:
.word gdt_end - gdt
--
1.7.10.4
next prev parent reply other threads:[~2012-12-13 22:09 UTC|newest]
Thread overview: 66+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-13 22:01 [PATCH v6 00/27] x86, boot, 64bit: Add support for loading ramdisk and bzImage above 4G Yinghai Lu
2012-12-13 22:01 ` [PATCH v6 01/27] x86, mm: Fix page table early allocation offset checking Yinghai Lu
2012-12-14 10:53 ` Borislav Petkov
2012-12-19 3:30 ` Yinghai Lu
2012-12-19 17:16 ` Borislav Petkov
2012-12-13 22:01 ` [PATCH v6 02/27] x86, mm: make pgd next calculation consistent with pud/pmd Yinghai Lu
2012-12-14 14:34 ` Borislav Petkov
2012-12-19 3:37 ` Yinghai Lu
2012-12-19 20:48 ` Borislav Petkov
2012-12-19 21:55 ` Yinghai Lu
2012-12-13 22:01 ` Yinghai Lu [this message]
2012-12-15 17:06 ` [PATCH v6 03/27] x86, boot: move verify_cpu.S and no_longmode after 0x200 Borislav Petkov
2012-12-19 3:44 ` Yinghai Lu
2012-12-19 20:57 ` Borislav Petkov
2012-12-19 21:58 ` Yinghai Lu
2012-12-19 22:04 ` Borislav Petkov
2012-12-22 2:24 ` Konrad Rzeszutek Wilk
2012-12-13 22:01 ` [PATCH v6 04/27] x86, boot: Move lldt/ltr out of 64bit code section Yinghai Lu
2012-12-15 17:28 ` Borislav Petkov
2012-12-19 3:53 ` Yinghai Lu
2012-12-13 22:01 ` [PATCH v6 05/27] x86, 64bit: clear ident mapping when kernel is above 512G Yinghai Lu
2012-12-16 17:49 ` Borislav Petkov
2012-12-16 18:04 ` Yinghai Lu
2012-12-19 3:57 ` Yinghai Lu
2012-12-13 22:02 ` [PATCH v6 06/27] x86, 64bit: Set extra ident mapping for whole kernel range Yinghai Lu
2012-12-13 22:02 ` [PATCH v6 07/27] x86: Merge early_reserve_initrd for 32bit and 64bit Yinghai Lu
2012-12-13 22:02 ` [PATCH v6 08/27] x86: add get_ramdisk_image/size() Yinghai Lu
2012-12-13 22:02 ` [PATCH v6 09/27] x86, boot: add get_cmd_line_ptr() Yinghai Lu
2012-12-13 22:02 ` [PATCH v6 10/27] x86, boot: move checking of cmd_line_ptr out of common path Yinghai Lu
2012-12-13 22:02 ` [PATCH v6 11/27] x86, boot: update cmd_line_ptr to unsigned long Yinghai Lu
2012-12-13 22:02 ` [PATCH v6 12/27] x86: use io_remap to access real_mode_data Yinghai Lu
2012-12-13 22:02 ` [PATCH v6 13/27] x86: use rsi/rdi to pass realmode_data pointer Yinghai Lu
2012-12-13 22:02 ` [PATCH v6 14/27] x86, kexec: remove 1024G limitation for kexec buffer on 64bit Yinghai Lu
2012-12-13 22:02 ` [PATCH v6 15/27] x86, kexec: set ident mapping for kernel that is above max_pfn Yinghai Lu
2012-12-13 22:02 ` [PATCH v6 16/27] x86, kexec: Merge ident_mapping_init and init_level4_page Yinghai Lu
2012-12-13 22:02 ` [PATCH v6 17/27] x86, kexec: only set ident mapping for ram Yinghai Lu
2012-12-13 22:02 ` [PATCH v6 18/27] x86, boot: add fields to support load bzImage and ramdisk above 4G Yinghai Lu
2012-12-13 22:54 ` H. Peter Anvin
2012-12-13 23:28 ` Yinghai Lu
2012-12-13 23:38 ` H. Peter Anvin
2012-12-13 22:02 ` [PATCH v6 19/27] x86, boot: update comments about entries for 64bit image Yinghai Lu
2012-12-13 23:27 ` H. Peter Anvin
2012-12-14 0:13 ` Yinghai Lu
2012-12-14 0:38 ` H. Peter Anvin
2012-12-14 0:44 ` Yinghai Lu
2012-12-14 0:51 ` H. Peter Anvin
2012-12-14 0:51 ` Yinghai Lu
2012-12-14 0:54 ` H. Peter Anvin
2012-12-14 1:00 ` Yinghai Lu
2012-12-14 1:04 ` H. Peter Anvin
2012-12-14 2:15 ` Yinghai Lu
2012-12-13 22:02 ` [PATCH v6 20/27] x86, 64bit: Print init kernel lowmap correctly Yinghai Lu
2012-12-13 22:02 ` [PATCH v6 21/27] x86, boot: Not need to check setup_header version Yinghai Lu
2012-12-13 22:02 ` [PATCH v6 22/27] mm: Add alloc_bootmem_low_pages_nopanic() Yinghai Lu
2012-12-13 22:02 ` [PATCH v6 23/27] x86: Don't panic if can not alloc buffer for swiotlb Yinghai Lu
2012-12-22 2:21 ` Konrad Rzeszutek Wilk
2012-12-13 22:02 ` [PATCH v6 24/27] x86: Add swiotlb force off support Yinghai Lu
2012-12-22 2:18 ` Konrad Rzeszutek Wilk
2012-12-22 5:00 ` Yinghai Lu
2012-12-23 5:00 ` H. Peter Anvin
2012-12-13 22:02 ` [PATCH v6 25/27] x86, kdump: remove crashkernel range find limit for 64bit Yinghai Lu
2012-12-13 22:02 ` [PATCH v6 26/27] x86: add Crash kernel low reservation Yinghai Lu
2012-12-13 22:02 ` [PATCH v6 27/27] x86: Merge early kernel reserve for 32bit and 64bit Yinghai Lu
2012-12-13 23:47 ` [PATCH v6 00/27] x86, boot, 64bit: Add support for loading ramdisk and bzImage above 4G H. Peter Anvin
2012-12-14 0:00 ` Yinghai Lu
2012-12-21 22:38 ` Konrad Rzeszutek Wilk
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=1355436141-8668-4-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=ebiederm@xmission.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=matt.fleming@intel.com \
--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).