From: Julien Grall <julien.grall@linaro.org>
To: Ian Campbell <ian.campbell@citrix.com>
Cc: stefano.stabellini@eu.citrix.com, tim@xen.org,
andre.przywara@linaro.org, xen-devel@lists.xen.org
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 [thread overview]
Message-ID: <52331059.2090207@linaro.org> (raw)
In-Reply-To: <1379072437-28099-7-git-send-email-ian.campbell@citrix.com>
On 09/13/2013 12:40 PM, Ian Campbell wrote:
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Julien Grall <julien.grall@linaro.org>
> ---
> 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 <COMMON>
> @@ -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
next prev parent reply other threads:[~2013-09-13 13:17 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-13 11:40 [PATCH v2 0/9] xen: arm: memory mangement fixes / improvements Ian Campbell
2013-09-13 11:40 ` [PATCH v2 1/9] xen/arm: ensure the xenheap is 32MB aligned Ian Campbell
2013-09-13 11:40 ` [PATCH v2 2/9] xen/arm: DOMHEAP_SECOND_PAGES is arm32 specific Ian Campbell
2013-09-13 12:55 ` Julien Grall
2013-09-13 11:40 ` [PATCH v2 3/9] xen/arm: Reserve FDT via early module mechanism Ian Campbell
2013-09-13 13:04 ` Julien Grall
2013-09-13 13:08 ` Ian Campbell
2013-09-13 11:40 ` [PATCH v2 4/9] xen/arm: do not relocate Xen outside of visible RAM Ian Campbell
2013-09-13 13:06 ` Julien Grall
2013-09-13 11:40 ` [PATCH v2 5/9] xen/arm: cope with modules outside of "visible" RAM Ian Campbell
2013-09-13 13:08 ` Julien Grall
2013-09-13 11:40 ` [PATCH v2 6/9] xen/arm: Support dtb /memreserve/ regions Ian Campbell
2013-09-13 11:40 ` [PATCH v2 7/9] xen/arm: rename boot misc region to boot reloc now it has a single purpose Ian Campbell
2013-09-13 13:17 ` Julien Grall [this message]
2013-09-13 11:40 ` [PATCH v2 8/9] xen/arm: print the location of the Xen heap on 32 bit Ian Campbell
2013-09-13 13:20 ` Julien Grall
2013-09-13 11:40 ` [PATCH v2 9/9] xen: support RAM at addresses 0 and 4096 Ian Campbell
2013-09-13 11:48 ` Keir Fraser
2013-09-13 11:57 ` Jan Beulich
2013-09-13 12:23 ` Ian Campbell
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=52331059.2090207@linaro.org \
--to=julien.grall@linaro.org \
--cc=andre.przywara@linaro.org \
--cc=ian.campbell@citrix.com \
--cc=stefano.stabellini@eu.citrix.com \
--cc=tim@xen.org \
--cc=xen-devel@lists.xen.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.