[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v3 02/10] xen/arm: avoid setting XEN_DOMCTL_CDF_iommu when IOMMU off
- To: <xen-devel@xxxxxxxxxxxxxxxxxxxx>, <sstabellini@xxxxxxxxxx>, <julien@xxxxxxx>
- From: Penny Zheng <penny.zheng@xxxxxxx>
- Date: Tue, 16 Nov 2021 06:31:47 +0000
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 40.67.248.234) smtp.rcpttodomain=lists.xenproject.org smtp.mailfrom=arm.com; dmarc=pass (p=none sp=none pct=100) action=none header.from=arm.com; dkim=none (message not signed); arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=LTvbQKFMQheq96sNMPCwR4J14nUtOJ+ZT+GaGaSW1qg=; b=aDmWc7g3hH9yNwH1KG/bmRll0VUA8xLklYTgop0oczxQHtGl0qU7z4XhOjLEBDg5zs3grnWwYpM8ZvUkYzdKKwL7N8BV1MJwUh0wEeKbIeUnaW7RnRdNh2srVT71Vlp8dRvgV1dDv1z6e2BX95Q4HvjGhVfU78QrWR4GU6ENAFAt32TnpJNzP1+4rab2JEgM48VloJrSYWK9zh7c1Iz3K2UEWaxb25H4M8uktj1sJbBaHjJ5NioGGJGfgoBqClF0MSEHPRhQuxD2Kkkb33mZktZ+zED/k20f24gZxIBd4TtvjCyrTDw9IMRyxnwlhFVQ3iC0KiYIrklAFDJBEo1oHg==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iGKCuuoUFe1wZlab21eyz+2dZV8micQoFYPCAz+OcllGIxQ9J+xJe5DYIgqGQs2sg5dkT+u9qG+2HT1EjvkhrxI9b9MaT4xEt5W8nl0P5pgrpvXccAJiZYQ3wke9fCEr0yFxRzP1eSk/QU2Lma0IAC9LXF69JqKOVf4s+1oid1V47Vx4BBTlpZOeegF1tlWeQb4O7HX7redbOKldEs3z6rSpRdQ2ASnG+oAF8Vi2A8m1XoLFARjIwfni7f3ZwRIuP8thfyJkYXk7mGevsx0C5sbwfJIK2ShPOMPBmWUJ/8+pDHOgcDKsYaMn02M7i6fIcPQe+P1DS+jJo0XphlfCYA==
- Cc: <Bertrand.Marquis@xxxxxxx>, <Wei.Chen@xxxxxxx>
- Delivery-date: Tue, 16 Nov 2021 06:32:56 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
- Nodisclaimer: true
From: Stefano Stabellini <stefano.stabellini@xxxxxxxxxx>
This commit avoids setting XEN_DOMCTL_CDF_iommu when the IOMMU is
absent/disabled, otherwise xen will fail later when handling
device assignment.
Signed-off-by: Penny Zheng <penny.zheng@xxxxxxx>
Signed-off-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxx>
---
v3 changes:
- new commit, split from the original "[PATCH v2 2/6] xen/arm: introduce
direct-map for domUs"
---
xen/arch/arm/domain_build.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c
index 664c88ebe4..7a063f62fe 100644
--- a/xen/arch/arm/domain_build.c
+++ b/xen/arch/arm/domain_build.c
@@ -2996,7 +2996,8 @@ void __init create_domUs(void)
panic("Missing property 'cpus' for domain %s\n",
dt_node_name(node));
- if ( dt_find_compatible_node(node, NULL, "multiboot,device-tree") )
+ if ( dt_find_compatible_node(node, NULL, "multiboot,device-tree") &&
+ iommu_enabled )
d_cfg.flags |= XEN_DOMCTL_CDF_iommu;
if ( !dt_property_read_u32(node, "nr_spis", &d_cfg.arch.nr_spis) )
--
2.25.1
|
