From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: Re: [PATCH v2 7/9] xen/arm: rename boot misc region to boot reloc now it has a single purpose Date: Fri, 13 Sep 2013 14:17:13 +0100 Message-ID: <52331059.2090207@linaro.org> References: <1379072409.19256.40.camel@kazak.uk.xensource.com> <1379072437-28099-7-git-send-email-ian.campbell@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1379072437-28099-7-git-send-email-ian.campbell@citrix.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: Ian Campbell Cc: stefano.stabellini@eu.citrix.com, tim@xen.org, andre.przywara@linaro.org, xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org On 09/13/2013 12:40 PM, Ian Campbell wrote: > Signed-off-by: Ian Campbell Acked-by: Julien Grall > --- > xen/arch/arm/mm.c | 4 ++-- > xen/include/asm-arm/config.h | 7 ++----- > 2 files changed, 4 insertions(+), 7 deletions(-) > > diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c > index 86e3207..06670e0 100644 > --- a/xen/arch/arm/mm.c > +++ b/xen/arch/arm/mm.c > @@ -128,7 +128,7 @@ static inline void check_memory_layout_alignment_constraints(void) { > /* 2MB aligned regions */ > BUILD_BUG_ON(XEN_VIRT_START & ~SECOND_MASK); > BUILD_BUG_ON(FIXMAP_ADDR(0) & ~SECOND_MASK); > - BUILD_BUG_ON(BOOT_MISC_VIRT_START & ~SECOND_MASK); > + BUILD_BUG_ON(BOOT_RELOC_VIRT_START & ~SECOND_MASK); > /* 1GB aligned regions */ > BUILD_BUG_ON(XENHEAP_VIRT_START & ~FIRST_MASK); > #ifdef CONFIG_DOMAIN_PAGE > @@ -377,7 +377,7 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr) > int i; > > /* Map the destination in the boot misc area. */ > - dest_va = BOOT_MISC_VIRT_START; > + dest_va = BOOT_RELOC_VIRT_START; > pte = mfn_to_xen_entry(xen_paddr >> PAGE_SHIFT); > write_pte(xen_second + second_table_offset(dest_va), pte); > flush_xen_data_tlb_range_va(dest_va, SECOND_SIZE); > diff --git a/xen/include/asm-arm/config.h b/xen/include/asm-arm/config.h > index efeb952..9e395c2 100644 > --- a/xen/include/asm-arm/config.h > +++ b/xen/include/asm-arm/config.h > @@ -81,10 +81,7 @@ > * 2M - 4M Xen text, data, bss > * 4M - 6M Fixmap: special-purpose 4K mapping slots > * 6M - 8M Early boot mapping of FDT > - * 8M - 10M Early boot misc (see below) > - * > - * The early boot misc area is used: > - * - in setup_pagetables() when relocating Xen. > + * 8M - 10M Early relocation address (used when relocating Xen) > * > * ARM32 layout: > * 0 - 8M > @@ -117,7 +114,7 @@ > #define XEN_VIRT_START _AT(vaddr_t,0x00200000) > #define FIXMAP_ADDR(n) (_AT(vaddr_t,0x00400000) + (n) * PAGE_SIZE) > #define BOOT_FDT_VIRT_START _AT(vaddr_t,0x00600000) > -#define BOOT_MISC_VIRT_START _AT(vaddr_t,0x00800000) > +#define BOOT_RELOC_VIRT_START _AT(vaddr_t,0x00800000) > > #define HYPERVISOR_VIRT_START XEN_VIRT_START > > -- Julien Grall