From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: Re: [PATCH for-xen-4.5 v4 04/18] x86/boot: use constant in head.S instead of hardcoded value Date: Fri, 17 Oct 2014 16:00:57 +0100 Message-ID: <54412F29.5010600@citrix.com> References: <1413555132-22138-1-git-send-email-daniel.kiper@oracle.com> <1413555132-22138-5-git-send-email-daniel.kiper@oracle.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Xf91w-0007WV-3N for xen-devel@lists.xenproject.org; Fri, 17 Oct 2014 15:01:24 +0000 In-Reply-To: <1413555132-22138-5-git-send-email-daniel.kiper@oracle.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Daniel Kiper , xen-devel@lists.xenproject.org Cc: jgross@suse.com, keir@xen.org, ian.campbell@citrix.com, stefano.stabellini@eu.citrix.com, ross.philipson@citrix.com, roy.franz@linaro.org, ning.sun@intel.com, jbeulich@suse.com, qiaowei.ren@intel.com, richard.l.maliszewski@intel.com, gang.wei@intel.com, fu.wei@linaro.org List-Id: xen-devel@lists.xenproject.org On 17/10/14 15:11, Daniel Kiper wrote: > ..to access multiboot.mem_lower data. > > Signed-off-by: Daniel Kiper Fine, but... > --- > xen/arch/x86/boot/head.S | 2 +- > xen/arch/x86/x86_64/asm-offsets.c | 3 +++ > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S > index cd43952..0bdbc65 100644 > --- a/xen/arch/x86/boot/head.S > +++ b/xen/arch/x86/boot/head.S > @@ -101,7 +101,7 @@ __start: > */ > testb $MBI_MEMLIMITS,(%ebx) > jz 2f /* not available? BDA value will be fine */ > - mov 4(%ebx),%edx > + mov MBI_mem_lower(%ebx),%edx > cmp $0x100,%edx /* is the multiboot value too small? */ > jb 2f /* if so, do not use it */ > shl $10-4,%edx > diff --git a/xen/arch/x86/x86_64/asm-offsets.c b/xen/arch/x86/x86_64/asm-offsets.c > index 3994f4d..2de9cad 100644 > --- a/xen/arch/x86/x86_64/asm-offsets.c > +++ b/xen/arch/x86/x86_64/asm-offsets.c > @@ -163,6 +163,9 @@ void __dummy__(void) > OFFSET(CPUINFO_features, struct cpuinfo_x86, x86_capability); > BLANK(); > > + OFFSET(MBI_mem_lower, multiboot_info_t, mem_lower); > + BLANK(); > + > OFFSET(MB_flags, multiboot_info_t, flags); > OFFSET(MB_cmdline, multiboot_info_t, cmdline); These are derived from the same struct, so should be declared together, and have consistent naming. ~Andrew