From mboxrd@z Thu Jan 1 00:00:00 1970 From: vijay.kilari@gmail.com Subject: [PATCH v2 2/3] xen/arm: update page table walk to handle 4 level page table Date: Tue, 27 May 2014 12:16:45 +0530 Message-ID: <1401173206-4634-3-git-send-email-vijay.kilari@gmail.com> References: <1401173206-4634-1-git-send-email-vijay.kilari@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1401173206-4634-1-git-send-email-vijay.kilari@gmail.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@citrix.com, julien.grall@linaro.org, stefano.stabellini@eu.citrix.com, stefano.stabellini@citrix.com, xen-devel@lists.xen.org Cc: Prasun.Kapoor@caviumnetworks.com, Vijaya Kumar K , vijay.kilari@gmail.com List-Id: xen-devel@lists.xenproject.org From: Vijaya Kumar K ARM64 supports 4-level page tables. Update page table walk function to handle 4 levels Signed-off-by: Vijaya Kumar K --- xen/arch/arm/mm.c | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/xen/arch/arm/mm.c b/xen/arch/arm/mm.c index 04e3182..ef3c53e 100644 --- a/xen/arch/arm/mm.c +++ b/xen/arch/arm/mm.c @@ -162,13 +162,25 @@ static inline void check_memory_layout_alignment_constraints(void) { #endif } -void dump_pt_walk(lpae_t *first, paddr_t addr) +void dump_pt_walk(lpae_t *root, paddr_t addr) { lpae_t *second = NULL, *third = NULL; + lpae_t *first = NULL; +#ifdef CONFIG_ARM_64 + if ( zeroeth_table_offset(addr) >= LPAE_ENTRIES ) + return; + printk("0TH[0x%x] = 0x%"PRIpaddr"\n", zeroeth_table_offset(addr), + root[zeroeth_table_offset(addr)].bits); + if ( !root[zeroeth_table_offset(addr)].walk.valid ) + goto done; + + first = map_domain_page(root[zeroeth_table_offset(addr)].walk.base); +#else + first = root; if ( first_table_offset(addr) >= LPAE_ENTRIES ) return; - +#endif printk("1ST[0x%x] = 0x%"PRIpaddr"\n", first_table_offset(addr), first[first_table_offset(addr)].bits); if ( !first[first_table_offset(addr)].walk.valid || @@ -189,6 +201,9 @@ void dump_pt_walk(lpae_t *first, paddr_t addr) done: if (third) unmap_domain_page(third); if (second) unmap_domain_page(second); +#ifdef CONFIG_ARM_64 + if ( first ) unmap_domain_page(first); +#endif } -- 1.7.9.5