From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH v3 05/15] xen: arm: precalculate VTTBR_EL2 for a domain when setting up its p2m Date: Fri, 19 Jul 2013 12:44:34 +0100 Message-ID: <1374234284-6304-5-git-send-email-ian.campbell@citrix.com> References: <1374234267.13645.54.camel@kazak.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1374234267.13645.54.camel@kazak.uk.xensource.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: xen-devel@lists.xen.org Cc: julien.grall@citrix.com, tim@xen.org, Ian Campbell , stefano.stabellini@eu.citrix.com List-Id: xen-devel@lists.xenproject.org Mostly just to help with upcoming vcpu_show_registers changes. Signed-off-by: Ian Campbell Acked-by: Stefano Stabellini --- xen/arch/arm/p2m.c | 16 +++++++++------- xen/include/asm-arm/domain.h | 3 +++ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 9fc5534..307c6d4 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -23,13 +23,10 @@ void dump_p2m_lookup(struct domain *d, paddr_t addr) void p2m_load_VTTBR(struct domain *d) { - struct p2m_domain *p2m = &d->arch.p2m; - paddr_t maddr = page_to_maddr(p2m->first_level); - uint64_t vttbr = maddr; - - vttbr |= ((uint64_t)p2m->vmid&0xff)<<48; - - WRITE_SYSREG64(vttbr, VTTBR_EL2); + if ( is_idle_domain(d) ) + return; + BUG_ON(!d->arch.vttbr); + WRITE_SYSREG64(d->arch.vttbr, VTTBR_EL2); isb(); /* Ensure update is visible */ } @@ -301,6 +298,9 @@ int p2m_alloc_table(struct domain *d) p2m->first_level = page; + d->arch.vttbr = page_to_maddr(p2m->first_level) + | ((uint64_t)p2m->vmid&0xff)<<48; + spin_unlock(&p2m->lock); return 0; @@ -332,6 +332,8 @@ int p2m_init(struct domain *d) /* Zero is reserved */ p2m->vmid = d->domain_id + 1; + d->arch.vttbr = 0; + p2m->first_level = NULL; return 0; diff --git a/xen/include/asm-arm/domain.h b/xen/include/asm-arm/domain.h index 339b6e6..31a2d66 100644 --- a/xen/include/asm-arm/domain.h +++ b/xen/include/asm-arm/domain.h @@ -62,7 +62,10 @@ struct arch_domain enum domain_type type; #endif + /* Virtual MMU */ struct p2m_domain p2m; + uint64_t vttbr; + struct hvm_domain hvm_domain; xen_pfn_t *grant_table_gpfn; -- 1.7.2.5