iommu/vt-d: Don't pre-allocate domain ids for si_domain
There is no reason for this special handling of the si_domain. The per-iommu domain-id can be allocated on-demand like for any other domain. So remove the pre-allocation code. Signed-off-by: Joerg Roedel <jroedel@suse.de>
This commit is contained in:
parent
a1ddcbe930
commit
0dc7971594
|
@ -2558,37 +2558,18 @@ static int md_domain_init(struct dmar_domain *domain, int guest_width);
|
||||||
|
|
||||||
static int __init si_domain_init(int hw)
|
static int __init si_domain_init(int hw)
|
||||||
{
|
{
|
||||||
struct dmar_drhd_unit *drhd;
|
|
||||||
struct intel_iommu *iommu;
|
|
||||||
int nid, ret = 0;
|
int nid, ret = 0;
|
||||||
bool first = true;
|
|
||||||
|
|
||||||
si_domain = alloc_domain(DOMAIN_FLAG_STATIC_IDENTITY);
|
si_domain = alloc_domain(DOMAIN_FLAG_STATIC_IDENTITY);
|
||||||
if (!si_domain)
|
if (!si_domain)
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
|
|
||||||
for_each_active_iommu(iommu, drhd) {
|
|
||||||
ret = iommu_attach_domain(si_domain, iommu);
|
|
||||||
if (ret < 0) {
|
|
||||||
domain_exit(si_domain);
|
|
||||||
return -EFAULT;
|
|
||||||
} else if (first) {
|
|
||||||
si_domain->id = ret;
|
|
||||||
first = false;
|
|
||||||
} else if (si_domain->id != ret) {
|
|
||||||
domain_exit(si_domain);
|
|
||||||
return -EFAULT;
|
|
||||||
}
|
|
||||||
domain_attach_iommu(si_domain, iommu);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (md_domain_init(si_domain, DEFAULT_DOMAIN_ADDRESS_WIDTH)) {
|
if (md_domain_init(si_domain, DEFAULT_DOMAIN_ADDRESS_WIDTH)) {
|
||||||
domain_exit(si_domain);
|
domain_exit(si_domain);
|
||||||
return -EFAULT;
|
return -EFAULT;
|
||||||
}
|
}
|
||||||
|
|
||||||
pr_debug("Identity mapping domain is domain %d\n",
|
pr_debug("Identity mapping domain allocated\n");
|
||||||
si_domain->id);
|
|
||||||
|
|
||||||
if (hw)
|
if (hw)
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -4197,13 +4178,6 @@ static int intel_iommu_add(struct dmar_drhd_unit *dmaru)
|
||||||
iommu->flush.flush_iotlb(iommu, 0, 0, 0, DMA_TLB_GLOBAL_FLUSH);
|
iommu->flush.flush_iotlb(iommu, 0, 0, 0, DMA_TLB_GLOBAL_FLUSH);
|
||||||
iommu_enable_translation(iommu);
|
iommu_enable_translation(iommu);
|
||||||
|
|
||||||
if (si_domain) {
|
|
||||||
ret = iommu_attach_domain(si_domain, iommu);
|
|
||||||
if (ret < 0 || si_domain->id != ret)
|
|
||||||
goto disable_iommu;
|
|
||||||
domain_attach_iommu(si_domain, iommu);
|
|
||||||
}
|
|
||||||
|
|
||||||
iommu_disable_protect_mem_regions(iommu);
|
iommu_disable_protect_mem_regions(iommu);
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue