From: Peng Fan <van.freenix@gmail.com>
To: xen-devel@lists.xen.org, julien.grall@arm.com, sstabellini@kernel.org
Cc: van.freenix@gmail.com
Subject: [PATCH V3 2/2] xen/arm: mm: clean up code in setup_pagetables
Date: Thu, 12 May 2016 19:48:48 +0800 [thread overview]
Message-ID: <1463053728-3624-2-git-send-email-van.freenix@gmail.com> (raw)
In-Reply-To: <1463053728-3624-1-git-send-email-van.freenix@gmail.com>
The base of address for the relocated xen needs to be mapped
at the same virtual address (BOOT_RELOC_VIRT_START) in both
the boot and runtime page tables. So we can merge the two pieces
of code into on code block
Also no need to use write_pte when mapping BOOT_RELOC_VIRT_START
in xen_second, because CPU0 is using boot page tables.
Signed-off-by: Peng Fan <van.freenix@gmail.com>
Cc: Stefano Stabellini <sstabellini@kernel.org>
Cc: Julien Grall <julien.grall@arm.com>
---
V3:
Refine the commit log.
V2:
Follow Julien's comments:
split the V1 patch into two patches, this patch is the code movement part.
xen/arch/arm/mm.c | 10 ++++------
1 file changed, 4 insertions(+), 6 deletions(-)
diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c
index addd699..0a4f845 100644
--- a/xen/arch/arm/mm.c
+++ b/xen/arch/arm/mm.c
@@ -443,11 +443,6 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr)
lpae_t pte, *p;
int i;
- /* Map the destination in the boot misc area. */
- dest_va = BOOT_RELOC_VIRT_START;
- pte = mfn_to_xen_entry(xen_paddr >> PAGE_SHIFT, WRITEALLOC);
- write_pte(xen_second + second_table_offset(dest_va), pte);
-
/* Calculate virt-to-phys offset for the new location */
phys_offset = xen_paddr - (unsigned long) _start;
@@ -494,9 +489,12 @@ void __init setup_pagetables(unsigned long boot_phys_offset, paddr_t xen_paddr)
pte = boot_second[second_table_offset(BOOT_FDT_VIRT_START)];
xen_second[second_table_offset(BOOT_FDT_VIRT_START)] = pte;
- /* Map the destination in the boot misc area. */
+ /* ... Boot Misc area for xen relocation */
dest_va = BOOT_RELOC_VIRT_START;
pte = mfn_to_xen_entry(xen_paddr >> PAGE_SHIFT, WRITEALLOC);
+ /* Map the destination in xen_second. */
+ xen_second[second_table_offset(dest_va)] = pte;
+ /* Map the destination in boot_second. */
write_pte(boot_second + second_table_offset(dest_va), pte);
flush_xen_data_tlb_range_va_local(dest_va, SECOND_SIZE);
#ifdef CONFIG_ARM_64
--
2.6.2
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
next prev parent reply other threads:[~2016-05-12 11:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-12 11:48 [PATCH V3 1/2] xen/arm: mm: remove unnecessary tlb flush in setup_pagetables Peng Fan
2016-05-12 11:48 ` Peng Fan [this message]
2016-05-16 9:22 ` [PATCH V3 2/2] xen/arm: mm: clean up code " Julien Grall
2016-05-16 10:23 ` Stefano Stabellini
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=1463053728-3624-2-git-send-email-van.freenix@gmail.com \
--to=van.freenix@gmail.com \
--cc=julien.grall@arm.com \
--cc=sstabellini@kernel.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.