From: Ian Campbell Subject: [PATCH V2 35/46] xen: arm: p2m: use 64-bit compatible registers. Date: Thu, 14 Feb 2013 16:47:49 +0000 Message-ID: <1360860480-9245-35-git-send-email-ian.campbell@citrix.com> References: <1360860465.20449.472.camel@zakaz.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1360860465.20449.472.camel@zakaz.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: stefano.stabellini@citrix.com, tim@xen.org, Ian Campbell List-Id: xen-devel@lists.xenproject.org Signed-off-by: Ian Campbell Acked-by: Tim Deegan --- xen/arch/arm/p2m.c | 2 +- xen/include/asm-arm/cpregs.h | 1 + 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/p2m.c b/xen/arch/arm/p2m.c index 852f0d8..aaa43ef 100644 --- a/xen/arch/arm/p2m.c +++ b/xen/arch/arm/p2m.c @@ -29,7 +29,7 @@ void p2m_load_VTTBR(struct domain *d) vttbr |= ((uint64_t)p2m->vmid&0xff)<<48; - WRITE_CP64(vttbr, VTTBR); + WRITE_SYSREG64(vttbr, VTTBR_EL2); isb(); /* Ensure update is visible */ } diff --git a/xen/include/asm-arm/cpregs.h b/xen/include/asm-arm/cpregs.h index a374f5c..676c8cf 100644 --- a/xen/include/asm-arm/cpregs.h +++ b/xen/include/asm-arm/cpregs.h @@ -277,6 +277,7 @@ #define VBAR_EL1 VBAR #define VBAR_EL2 HVBAR #define VTCR_EL2 VTCR +#define VTTBR_EL2 VTTBR #endif -- 1.7.2.5