Store the result of finding a "multiboot,device-tree" node. This will simplity adding hardware domain checks.
Signed-off-by: Jason Andryuk <jason.andr...@amd.com> Reviewed-by: Stefano Stabellini <sstabell...@kernel.org> --- v4: Add Stefano R-b v3: New Could be squashed into the next patch, but this helps make the next one cleaner. --- xen/arch/arm/dom0less-build.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/xen/arch/arm/dom0less-build.c b/xen/arch/arm/dom0less-build.c index 188ef40b52..50d2d3e4e4 100644 --- a/xen/arch/arm/dom0less-build.c +++ b/xen/arch/arm/dom0less-build.c @@ -1033,6 +1033,7 @@ void __init create_domUs(void) .grant_opts = XEN_DOMCTL_GRANT_version(opt_gnttab_max_version), }; unsigned int flags = 0U; + bool has_dtb = false; uint32_t val; int rc; @@ -1067,9 +1068,10 @@ void __init create_domUs(void) !strcmp(dom0less_iommu, "enabled") ) iommu = true; - if ( iommu_enabled && - (iommu || dt_find_compatible_node(node, NULL, - "multiboot,device-tree")) ) + if ( dt_find_compatible_node(node, NULL, "multiboot,device-tree") ) + has_dtb = true; + + if ( iommu_enabled && (iommu || has_dtb) ) d_cfg.flags |= XEN_DOMCTL_CDF_iommu; if ( !dt_property_read_u32(node, "nr_spis", &d_cfg.arch.nr_spis) ) -- 2.49.0