From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752622Ab3KNByj (ORCPT ); Wed, 13 Nov 2013 20:54:39 -0500 Received: from mx1.redhat.com ([209.132.183.28]:27689 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751170Ab3KNByd (ORCPT ); Wed, 13 Nov 2013 20:54:33 -0500 Date: Thu, 14 Nov 2013 09:53:46 +0800 From: Dave Young To: Matt Fleming Cc: linux-kernel@vger.kernel.org, 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 Subject: Re: [patch 7/7 v2] x86: add xloadflags bit for efi runtime support on kexec Message-ID: <20131114015346.GF4081@dhcp-16-126.nay.redhat.com> References: <20131105082007.872550445@dhcp-16-126.nay.redhat.com> <20131105082719.416282009@dhcp-16-126.nay.redhat.com> <20131113155037.GE17248@console-pimps.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20131113155037.GE17248@console-pimps.org> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 11/13/13 at 03:50pm, Matt Fleming wrote: > On Tue, 05 Nov, at 04:20:14PM, dyoung@redhat.com wrote: > > Old kexec-tools can not load new kernel. The reason is previously kexec-tools > > do not fill efi_info in x86 setup header thus efi init fail and switch > > to noefi boot. 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 will success finally. > > > > To prevent from breaking userspace, add a new xloadflags bit so kexec-tools > > will check the flag and switch to old logic. > > > > Signed-off-by: Dave Young > > --- > > arch/x86/boot/header.S | 9 ++++++++- > > arch/x86/include/uapi/asm/bootparam.h | 1 + > > 2 files changed, 9 insertions(+), 1 deletion(-) > > > > --- linux-2.6.orig/arch/x86/boot/header.S > > +++ linux-2.6/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) ? Will add above. > > > +# define XLF4 XLF_EFI_KEXEC > > +#else > > +# define XLF4 0 > > +#endif > > + > > -- > Matt Fleming, Intel Open Source Technology Center