From 3d1fab806c165096b3fedc78ecb5650b945e21a6 Mon Sep 17 00:00:00 2001 From: Julien Grall Date: Wed, 1 Apr 2015 17:21:38 +0100 Subject: [PATCH] xen/arm: Map disabled device in DOM0 The check to avoid mapping disabled devices in DOM0 was added in anticipation of the device passthrough. But, a brand new property will be added later to mark device which will be passthrough. Also, remove the memory type check as we already skipped them earlier in the function via skip_matches. Furthermore, some platform (such as the OMAP) may try to poke device even if the property "status" is set to "disabled". Signed-off-by: Julien Grall Acked-by: Stefano Stabellini Acked-by: Ian Campbell Cc: Andrii Tseglytskyi --- xen/arch/arm/domain_build.c | 19 +++---------------- xen/arch/arm/platforms/omap5.c | 12 ------------ 2 files changed, 3 insertions(+), 28 deletions(-) diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index ab4ad65205..31b32df345 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1085,22 +1085,9 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, return 0; } - /* - * Some device doesn't need to be mapped in Xen: - * - Memory: the guest will see a different view of memory. It will - * be allocated later. - * - Disabled device: Linux is able to cope with status="disabled" - * property. Therefore these device doesn't need to be mapped. This - * solution can be use later for pass through. - */ - if ( !dt_device_type_is_equal(node, "memory") && - dt_device_is_available(node) ) - { - res = map_device(d, node); - - if ( res ) - return res; - } + res = map_device(d, node); + if ( res) + return res; /* * The property "name" is used to have a different name on older FDT diff --git a/xen/arch/arm/platforms/omap5.c b/xen/arch/arm/platforms/omap5.c index 9d6e5042d9..e7bf30d7fd 100644 --- a/xen/arch/arm/platforms/omap5.c +++ b/xen/arch/arm/platforms/omap5.c @@ -155,17 +155,6 @@ static const char * const dra7_dt_compat[] __initconst = NULL }; -static const struct dt_device_match dra7_blacklist_dev[] __initconst = -{ - /* OMAP Linux kernel handles devices with status "disabled" in a - * weird manner - tries to reset them. While their memory ranges - * are not mapped, this leads to data aborts, so skip these devices - * from DT for dom0. - */ - DT_MATCH_NOT_AVAILABLE(), - { /* sentinel */ }, -}; - PLATFORM_START(omap5, "TI OMAP5") .compatible = omap5_dt_compat, .init_time = omap5_init_time, @@ -185,7 +174,6 @@ PLATFORM_START(dra7, "TI DRA7") .dom0_gnttab_start = 0x4b000000, .dom0_gnttab_size = 0x20000, - .blacklist_dev = dra7_blacklist_dev, PLATFORM_END /* -- 2.39.5