diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index 49792dd590..74fc554364 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1119,25 +1119,10 @@ static int __init write_properties(struct domain *d, struct kernel_info *kinfo, const struct dt_property *prop, *status = NULL; int res = 0; int had_dom0_bootargs = 0; - struct dt_device_node *iommu_node; if ( kinfo->cmdline && kinfo->cmdline[0] ) bootargs = &kinfo->cmdline[0]; - /* - * We always skip the IOMMU device when creating DT for hwdom if there is - * an appropriate driver for it in Xen (device_get_class(iommu_node) - * returns DEVICE_IOMMU). - * We should also skip the IOMMU specific properties of the master device - * behind that IOMMU in order to avoid exposing an half complete IOMMU - * bindings to hwdom. - * Use "iommu_node" as an indicator of the master device which properties - * should be skipped. - */ - iommu_node = dt_parse_phandle(node, "iommus", 0); - if ( iommu_node && device_get_class(iommu_node) != DEVICE_IOMMU ) - iommu_node = NULL; - dt_for_each_property_node (node, prop) { const void *prop_data = prop->value; @@ -1195,19 +1180,6 @@ static int __init write_properties(struct domain *d, struct kernel_info *kinfo, continue; } - if ( iommu_node ) - { - /* Don't expose IOMMU specific properties to hwdom */ - if ( dt_property_name_is_equal(prop, "iommus") ) - continue; - - if ( dt_property_name_is_equal(prop, "iommu-map") ) - continue; - - if ( dt_property_name_is_equal(prop, "iommu-map-mask") ) - continue; - } - res = fdt_property(kinfo->fdt, prop->name, prop_data, prop_len); if ( res ) @@ -2372,16 +2344,6 @@ static int __init handle_node(struct domain *d, struct kernel_info *kinfo, return 0; } - /* - * Even if the IOMMU device is not used by Xen, it should not be - * passthrough to DOM0 - */ - if ( device_get_class(node) == DEVICE_IOMMU ) - { - dt_dprintk(" IOMMU, skip it\n"); - return 0; - } - /* * The vGIC does not support routing hardware PPIs to guest. So * we need to skip any node using PPIs.