diff mbox

[Xen-devel,v2] xen/arm: Blacklist the memory mapped timer (armv7-timer-mem)

Message ID 1421258443-15333-1-git-send-email-julien.grall@linaro.org
State Accepted, archived
Headers show

Commit Message

Julien Grall Jan. 14, 2015, 6 p.m. UTC 
Some platform (such as the VFP Base AEMv8 model) has a memory mapped
timer. We don't want DOM0 use this timer rather than the generic ARM
timer. So blacklist it for all platforms.

Signed-off-by: Julien Grall <julien.grall@linaro.org>

---
    This patch is candidate to backport for Xen 4.5 and Xen 4.4.

    It may not apply correctly for Xen 4.4.

    Changes in v2:
        - Add a comment in the code to explain why we need to blacklist
        memory mapped timer
---
 xen/arch/arm/domain_build.c | 2 ++
 1 file changed, 2 insertions(+)
diff mbox

Patch

diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index bf8dc78..d5959b5 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -1047,6 +1047,8 @@  static int handle_node(struct domain *d, struct kernel_info *kinfo,
         DT_MATCH_COMPATIBLE("arm,psci"),
         DT_MATCH_PATH("/cpus"),
         DT_MATCH_TYPE("memory"),
+        /* The memory mapped timer is not supported by Xen. */
+        DT_MATCH_COMPATIBLE("arm,armv7-timer-mem"),
         { /* sentinel */ },
     };
     static const struct dt_device_match gic_matches[] __initconst =