public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Dave Young <dyoung@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: linux-efi@vger.kernel.org, x86@kernel.org, mjg59@srcf.ucam.org,
	hpa@zytor.com, James.Bottomley@HansenPartnership.com,
	vgoyal@redhat.com, ebiederm@xmission.com, horms@verge.net.au,
	kexec@lists.infradead.org, bp@alien8.de, greg@kroah.com,
	matt@console-pimps.org, toshi.kani@hp.com
Subject: [PATCH v5 11/14] x86: add xloadflags bit for efi runtime support on kexec
Date: Mon,  9 Dec 2013 17:42:24 +0800	[thread overview]
Message-ID: <1386582147-9802-12-git-send-email-dyoung@redhat.com> (raw)
In-Reply-To: <1386582147-9802-1-git-send-email-dyoung@redhat.com>

Old kexec-tools can not load new kernel. The reason is kexec-tools do not fill
efi_info in x86 setup header previously, thus efi failed to initialize.
In new kexec-tools it will by default fill efi_info and pass other efi required
infomation to 2nd kernel so kexec kernel efi initialization can succeed finally.

To prevent from breaking userspace, add a new xloadflags bit so kexec-tools
can check the flag and switch to old logic.

changelog:
Matt: +&& defined(CONFIG_KEXEC)
      improve patch description.
HPA: document the flag.

Signed-off-by: Dave Young <dyoung@redhat.com>
Acked-by: Borislav Petkov <bp@suse.de>
---
 Documentation/x86/boot.txt            | 3 +++
 arch/x86/boot/header.S                | 9 ++++++++-
 arch/x86/include/uapi/asm/bootparam.h | 1 +
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Documentation/x86/boot.txt b/Documentation/x86/boot.txt
index f4f268c..cb81741d 100644
--- a/Documentation/x86/boot.txt
+++ b/Documentation/x86/boot.txt
@@ -608,6 +608,9 @@ Protocol:       2.12+
 	- If 1, the kernel supports the 64-bit EFI handoff entry point
           given at handover_offset + 0x200.
 
+  Bit 4 (read): XLF_EFI_KEXEC
+	- If 1, the kernel supports kexec EFI boot with EFI runtime support.
+
 Field name:	cmdline_size
 Type:		read
 Offset/size:	0x238/4
diff --git a/arch/x86/boot/header.S b/arch/x86/boot/header.S
index 9ec06a1..ec3b8ba 100644
--- a/arch/x86/boot/header.S
+++ b/arch/x86/boot/header.S
@@ -391,7 +391,14 @@ xloadflags:
 #else
 # define XLF23 0
 #endif
-			.word XLF0 | XLF1 | XLF23
+
+#if defined(CONFIG_X86_64) && defined(CONFIG_EFI) && defined(CONFIG_KEXEC)
+# define XLF4 XLF_EFI_KEXEC
+#else
+# define XLF4 0
+#endif
+
+			.word XLF0 | XLF1 | XLF23 | XLF4
 
 cmdline_size:   .long   COMMAND_LINE_SIZE-1     #length of the command line,
                                                 #added with boot protocol
diff --git a/arch/x86/include/uapi/asm/bootparam.h b/arch/x86/include/uapi/asm/bootparam.h
index 64fe421..225b098 100644
--- a/arch/x86/include/uapi/asm/bootparam.h
+++ b/arch/x86/include/uapi/asm/bootparam.h
@@ -24,6 +24,7 @@
 #define XLF_CAN_BE_LOADED_ABOVE_4G	(1<<1)
 #define XLF_EFI_HANDOVER_32		(1<<2)
 #define XLF_EFI_HANDOVER_64		(1<<3)
+#define XLF_EFI_KEXEC			(1<<4)
 
 #ifndef __ASSEMBLY__
 
-- 
1.8.3.1


  parent reply	other threads:[~2013-12-09  9:45 UTC|newest]

Thread overview: 63+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-12-09  9:42 [PATCH v5 00/14] kexec kernel efi runtime support Dave Young
2013-12-09  9:42 ` [PATCH v5 01/14] x86/mm: sparse warning fix for early_memremap Dave Young
2013-12-09 15:05   ` Borislav Petkov
2013-12-10  2:12     ` Dave Young
2013-12-11 10:20       ` Matt Fleming
2013-12-11 11:12         ` Borislav Petkov
2013-12-12  2:06           ` Dave Young
2013-12-09  9:42 ` [PATCH v5 02/14] efi: use early_memremap and early_memunmap Dave Young
2013-12-11 10:39   ` Matt Fleming
2013-12-11 11:02     ` Leif Lindholm
2013-12-11 11:32       ` Matt Fleming
2013-12-11 15:17         ` Mark Salter
2013-12-13 15:51           ` Leif Lindholm
2013-12-16  1:50             ` Dave Young
2013-12-12  2:04     ` Dave Young
2013-12-11 17:38   ` Borislav Petkov
2013-12-09  9:42 ` [PATCH v5 03/14] efi: remove unused variables in __map_region Dave Young
2013-12-09  9:42 ` [PATCH v5 04/14] efi: add a wrapper function efi_map_region_fixed Dave Young
2013-12-09  9:42 ` [PATCH v5 05/14] efi: reserve boot service fix Dave Young
2013-12-09  9:42 ` [PATCH v5 06/14] efi: cleanup efi_enter_virtual_mode function Dave Young
2013-12-09  9:42 ` [PATCH v5 07/14] efi: export more efi table variable to sysfs Dave Young
2013-12-11 18:32   ` Borislav Petkov
2013-12-12  2:15     ` Dave Young
2013-12-09  9:42 ` [PATCH v5 08/14] efi: export efi runtime memory mapping " Dave Young
2013-12-11 18:55   ` Borislav Petkov
2013-12-12  2:36     ` Dave Young
2013-12-12  7:13       ` Dave Young
2013-12-12 20:36         ` Borislav Petkov
2013-12-13  7:20           ` Dave Young
2013-12-12 20:53       ` Borislav Petkov
2013-12-13  7:26         ` Dave Young
2013-12-13 12:30           ` Matt Fleming
2013-12-16  1:33             ` Dave Young
2013-12-16  3:02               ` Dave Young
2013-12-16  6:02             ` Dave Young
2013-12-09  9:42 ` [PATCH v5 09/14] efi: passing kexec necessary efi data via setup_data Dave Young
2013-12-11 12:13   ` Matt Fleming
2013-12-11 14:05     ` Borislav Petkov
2013-12-12  2:11       ` Dave Young
2013-12-12  2:10     ` Dave Young
2013-12-11 22:20   ` Borislav Petkov
2013-12-12  3:06     ` Dave Young
2013-12-12  6:25       ` Dave Young
2013-12-12  7:17       ` Dave Young
2013-12-12 21:04         ` Borislav Petkov
2013-12-13  7:27           ` Dave Young
2013-12-09  9:42 ` [PATCH v5 10/14] efi: only print saved efi runtime maps instead of all memmap ranges for kexec Dave Young
2013-12-13 16:01   ` Borislav Petkov
2013-12-16  2:00     ` Dave Young
2013-12-16 11:33       ` Borislav Petkov
2013-12-17  6:34         ` Dave Young
2013-12-17 15:58           ` Borislav Petkov
2013-12-18  2:06             ` Dave Young
2013-12-09  9:42 ` Dave Young [this message]
2013-12-09  9:42 ` [PATCH v5 12/14] x86: export x86 boot_params to sysfs Dave Young
2013-12-13 20:04   ` Borislav Petkov
2013-12-09  9:42 ` [PATCH v5 13/14] x86: reserve setup_data ranges late after parsing memmap cmdline Dave Young
2013-12-13 20:04   ` Borislav Petkov
2013-12-09  9:42 ` [PATCH v5 14/14] x86: kdebugfs do not use __va for getting setup_data virt addr Dave Young
2013-12-10 23:25 ` [PATCH v5 00/14] kexec kernel efi runtime support Andrew Morton
2013-12-10 23:32   ` Borislav Petkov
2013-12-10 23:38     ` H. Peter Anvin
2013-12-11 12:37       ` Matt Fleming

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=1386582147-9802-12-git-send-email-dyoung@redhat.com \
    --to=dyoung@redhat.com \
    --cc=James.Bottomley@HansenPartnership.com \
    --cc=bp@alien8.de \
    --cc=ebiederm@xmission.com \
    --cc=greg@kroah.com \
    --cc=horms@verge.net.au \
    --cc=hpa@zytor.com \
    --cc=kexec@lists.infradead.org \
    --cc=linux-efi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=matt@console-pimps.org \
    --cc=mjg59@srcf.ucam.org \
    --cc=toshi.kani@hp.com \
    --cc=vgoyal@redhat.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