[Xen-changelog] [xen-unstable] arm: Upgrade guest barriers to Outer-Shareable. Enable Protected Table Walk.

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1341309147 -3600
# Node ID 94984e45e189479c2bc7abb703044d2a5c9bf965
# Parent  a9d004e63315936a7e3dec2afc6f48361d24573e
arm: Upgrade guest barriers to Outer-Shareable. Enable Protected Table Walk.

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 <ian.campbell@xxxxxxxxxx>
Acked-by: Tim Deegan <tim@xxxxxxx>
Committed-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---


diff -r a9d004e63315 -r 94984e45e189 xen/arch/arm/domain_build.c
--- a/xen/arch/arm/domain_build.c       Tue Jul 03 10:52:26 2012 +0100
+++ b/xen/arch/arm/domain_build.c       Tue Jul 03 10:52:27 2012 +0100
@@ -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 -r a9d004e63315 -r 94984e45e189 xen/include/asm-arm/processor.h
--- a/xen/include/asm-arm/processor.h   Tue Jul 03 10:52:26 2012 +0100
+++ b/xen/include/asm-arm/processor.h   Tue Jul 03 10:52:27 2012 +0100
@@ -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)

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog