From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: [PATCH V2 29/40] arm: Upgrade guest barriers to Outer-Shareable. Enable Protected Table Walk. Date: Tue, 26 Jun 2012 10:29:53 +0000 Message-ID: <1340706604-1313-29-git-send-email-ian.campbell@citrix.com> References: <1340706574.3832.57.camel@zakaz.uk.xensource.com> <1340706604-1313-1-git-send-email-ian.campbell@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1340706604-1313-1-git-send-email-ian.campbell@citrix.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: Ian Campbell List-Id: xen-devel@lists.xenproject.org Upgrading barriers is conservative and may not be necessary. Protected Table Walk traps stage 1 page tables which refer to device memory (per stage 2) using a non-device mapping. This generally indicates a guest error but trapping it as a fault for now helps us know if something odd is going on. Signed-off-by: Ian Campbell Acked-by: Tim Deegan --- xen/arch/arm/domain_build.c | 2 +- xen/include/asm-arm/processor.h | 4 ++++ 2 files changed, 5 insertions(+), 1 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 1b19e54..a9e7f43 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -333,7 +333,7 @@ int construct_dom0(struct domain *d) WRITE_CP32(SCTLR_BASE, SCTLR); - WRITE_CP32(HCR_AMO|HCR_IMO|HCR_VM, HCR); + WRITE_CP32(HCR_PTW|HCR_BSU_OUTER|HCR_AMO|HCR_IMO|HCR_VM, HCR); isb(); local_abort_enable(); diff --git a/xen/include/asm-arm/processor.h b/xen/include/asm-arm/processor.h index 81924a4..9b3c9dd 100644 --- a/xen/include/asm-arm/processor.h +++ b/xen/include/asm-arm/processor.h @@ -76,6 +76,10 @@ #define HCR_TWI (1<<13) #define HCR_DC (1<<12) #define HCR_BSU_MASK (3<<10) +#define HCR_BSU_NONE (0<<10) +#define HCR_BSU_INNER (1<<10) +#define HCR_BSU_OUTER (2<<10) +#define HCR_BSU_FULL (3<<10) #define HCR_FB (1<<9) #define HCR_VA (1<<8) #define HCR_VI (1<<7) -- 1.7.9.1