From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Huth Date: Wed, 20 Apr 2016 10:15:32 +0000 Subject: Re: [kvm-unit-tests PATCH 1/2] powerpc: use well known kernel start address Message-Id: <571756C4.7080704@redhat.com> List-Id: References: <1461086788-3102-1-git-send-email-lvivier@redhat.com> <1461086788-3102-2-git-send-email-lvivier@redhat.com> In-Reply-To: <1461086788-3102-2-git-send-email-lvivier@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: Laurent Vivier , kvm@vger.kernel.org, kvm-ppc@vger.kernel.org Cc: drjones@redhat.com, dgibson@redhat.com, pbonzini@redhat.com On 19.04.2016 19:26, Laurent Vivier wrote: > As we know where QEMU will load the kernel, it seems an useless > pain to try to compute it instead of using the well known value. > > Signed-off-by: Laurent Vivier > --- > powerpc/boot_rom.S | 3 ++- > powerpc/cstart64.S | 6 +++--- > powerpc/spapr.h | 6 ++++++ > 3 files changed, 11 insertions(+), 4 deletions(-) > create mode 100644 powerpc/spapr.h > > diff --git a/powerpc/boot_rom.S b/powerpc/boot_rom.S > index ae2c08d..266d61f 100644 > --- a/powerpc/boot_rom.S > +++ b/powerpc/boot_rom.S > @@ -1,4 +1,5 @@ > -#define SPAPR_KERNEL_LOAD_ADDR 0x400000 > +#include "spapr.h" > + > .text > .globl start > start: > diff --git a/powerpc/cstart64.S b/powerpc/cstart64.S > index ceb6397..c47b67d 100644 > --- a/powerpc/cstart64.S > +++ b/powerpc/cstart64.S > @@ -11,6 +11,8 @@ > #include > #include > > +#include "spapr.h" > + > .section .init > > /* > @@ -25,9 +27,7 @@ start: > * so we just linked at zero. This means the first thing to do is > * to find our stack and toc, and then do a relocate. > */ > - bl 0f > -0: mflr r31 > - subi r31, r31, 0b - start /* QEMU's kernel load address */ > + LOAD_REG_IMMEDIATE(r31, SPAPR_KERNEL_LOAD_ADDR) > ld r1, (p_stack - start)(r31) > ld r2, (p_toc - start)(r31) > add r1, r1, r31 > diff --git a/powerpc/spapr.h b/powerpc/spapr.h > new file mode 100644 > index 0000000..b41aece > --- /dev/null > +++ b/powerpc/spapr.h > @@ -0,0 +1,6 @@ > +#ifndef _ASMPOWERPC_SPAPR_H_ > +#define _ASMPOWERPC_SPAPR_H_ > + > +#define SPAPR_KERNEL_LOAD_ADDR 0x400000 > + > +#endif /* _ASMPOWERPC_SPAPR_H_ */ Should be fine for now (and in case we ever want to run from SLOF instead, for example, we still can rework this again), so: Reviewed-by: Thomas Huth From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Huth Subject: Re: [kvm-unit-tests PATCH 1/2] powerpc: use well known kernel start address Date: Wed, 20 Apr 2016 12:15:32 +0200 Message-ID: <571756C4.7080704@redhat.com> References: <1461086788-3102-1-git-send-email-lvivier@redhat.com> <1461086788-3102-2-git-send-email-lvivier@redhat.com> Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Cc: drjones@redhat.com, dgibson@redhat.com, pbonzini@redhat.com To: Laurent Vivier , kvm@vger.kernel.org, kvm-ppc@vger.kernel.org Return-path: Received: from mx1.redhat.com ([209.132.183.28]:37591 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754149AbcDTKQa (ORCPT ); Wed, 20 Apr 2016 06:16:30 -0400 In-Reply-To: <1461086788-3102-2-git-send-email-lvivier@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: On 19.04.2016 19:26, Laurent Vivier wrote: > As we know where QEMU will load the kernel, it seems an useless > pain to try to compute it instead of using the well known value. > > Signed-off-by: Laurent Vivier > --- > powerpc/boot_rom.S | 3 ++- > powerpc/cstart64.S | 6 +++--- > powerpc/spapr.h | 6 ++++++ > 3 files changed, 11 insertions(+), 4 deletions(-) > create mode 100644 powerpc/spapr.h > > diff --git a/powerpc/boot_rom.S b/powerpc/boot_rom.S > index ae2c08d..266d61f 100644 > --- a/powerpc/boot_rom.S > +++ b/powerpc/boot_rom.S > @@ -1,4 +1,5 @@ > -#define SPAPR_KERNEL_LOAD_ADDR 0x400000 > +#include "spapr.h" > + > .text > .globl start > start: > diff --git a/powerpc/cstart64.S b/powerpc/cstart64.S > index ceb6397..c47b67d 100644 > --- a/powerpc/cstart64.S > +++ b/powerpc/cstart64.S > @@ -11,6 +11,8 @@ > #include > #include > > +#include "spapr.h" > + > .section .init > > /* > @@ -25,9 +27,7 @@ start: > * so we just linked at zero. This means the first thing to do is > * to find our stack and toc, and then do a relocate. > */ > - bl 0f > -0: mflr r31 > - subi r31, r31, 0b - start /* QEMU's kernel load address */ > + LOAD_REG_IMMEDIATE(r31, SPAPR_KERNEL_LOAD_ADDR) > ld r1, (p_stack - start)(r31) > ld r2, (p_toc - start)(r31) > add r1, r1, r31 > diff --git a/powerpc/spapr.h b/powerpc/spapr.h > new file mode 100644 > index 0000000..b41aece > --- /dev/null > +++ b/powerpc/spapr.h > @@ -0,0 +1,6 @@ > +#ifndef _ASMPOWERPC_SPAPR_H_ > +#define _ASMPOWERPC_SPAPR_H_ > + > +#define SPAPR_KERNEL_LOAD_ADDR 0x400000 > + > +#endif /* _ASMPOWERPC_SPAPR_H_ */ Should be fine for now (and in case we ever want to run from SLOF instead, for example, we still can rework this again), so: Reviewed-by: Thomas Huth