Commit 29fbda7e authored by Julien Grall's avatar Julien Grall Committed by Ian Campbell

xen/passthrough: arm: release the DT devices assigned to a guest earlier

The toolstack may not have deassigned every device used by a guest.
Therefore we have to go through the device list and remove them before
asking the IOMMU drivers to release memory for this domain.

This can be done by moving the call to the release function when we
relinquish the resources. The IOMMU part will be destroyed later when
the domain is freed.
Signed-off-by: default avatarJulien Grall <>
Signed-off-by: default avatarRobert VanVossen <>
Acked-by: default avatarJan Beulich <>
Acked-by: default avatarIan Campbell <>
parent 4c79d069
......@@ -795,6 +795,10 @@ int domain_relinquish_resources(struct domain *d)
switch ( d->arch.relmem )
case RELMEM_not_started:
ret = iommu_release_dt_devices(d);
if ( ret )
return ret;
d->arch.relmem = RELMEM_xen;
/* Fallthrough */
......@@ -66,7 +66,6 @@ int arch_iommu_domain_init(struct domain *d)
void arch_iommu_domain_destroy(struct domain *d)
int arch_iommu_populate_page_table(struct domain *d)
......@@ -105,7 +105,7 @@ int iommu_dt_domain_init(struct domain *d)
return 0;
void iommu_dt_domain_destroy(struct domain *d)
int iommu_release_dt_devices(struct domain *d)
struct hvm_iommu *hd = domain_hvm_iommu(d);
struct dt_device_node *dev, *_dev;
......@@ -115,7 +115,12 @@ void iommu_dt_domain_destroy(struct domain *d)
rc = iommu_deassign_dt_device(d, dev);
if ( rc )
dprintk(XENLOG_ERR, "Failed to deassign %s in domain %u\n",
dt_node_full_name(dev), d->domain_id);
return rc;
return 0;
......@@ -117,7 +117,7 @@ void iommu_read_msi_from_ire(struct msi_desc *msi_desc, struct msi_msg *msg);
int iommu_assign_dt_device(struct domain *d, struct dt_device_node *dev);
int iommu_deassign_dt_device(struct domain *d, struct dt_device_node *dev);
int iommu_dt_domain_init(struct domain *d);
void iommu_dt_domain_destroy(struct domain *d);
int iommu_release_dt_devices(struct domain *d);
#endif /* HAS_DEVICE_TREE */
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment