xen/arm: Blacklist the memory mapped timer (armv7-timer-mem)
authorJulien Grall <julien.grall@linaro.org>
Wed, 14 Jan 2015 18:00:43 +0000 (18:00 +0000)
committerIan Campbell <ian.campbell@citrix.com>
Thu, 15 Jan 2015 13:49:17 +0000 (13:49 +0000)
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>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
xen/arch/arm/domain_build.c

index c33a73c63eceeec4980d4cbf19e571e2ed178e9e..c2dcb4937f5d89366ef8cdf2577b423537416356 100644 (file)
@@ -1031,6 +1031,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 =