Commit 8e3391cf authored by Lu Baolu's avatar Lu Baolu Committed by Joerg Roedel

iommu/vt-d: Loose requirement for flush queue initializaton

Currently if flush queue initialization fails, we return error
or enforce the system-wide strict mode. These are unnecessary
because we always check the existence of a flush queue before
queuing any iova's for lazy flushing. Printing a informational
message is enough.
Signed-off-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 10f8008f
...@@ -1854,15 +1854,15 @@ static int domain_init(struct dmar_domain *domain, struct intel_iommu *iommu, ...@@ -1854,15 +1854,15 @@ static int domain_init(struct dmar_domain *domain, struct intel_iommu *iommu,
{ {
int adjust_width, agaw; int adjust_width, agaw;
unsigned long sagaw; unsigned long sagaw;
int err; int ret;
init_iova_domain(&domain->iovad, VTD_PAGE_SIZE, IOVA_START_PFN); init_iova_domain(&domain->iovad, VTD_PAGE_SIZE, IOVA_START_PFN);
if (!intel_iommu_strict) { if (!intel_iommu_strict) {
err = init_iova_flush_queue(&domain->iovad, ret = init_iova_flush_queue(&domain->iovad,
iommu_flush_iova, iova_entry_free); iommu_flush_iova, iova_entry_free);
if (err) if (ret)
return err; pr_info("iova flush queue initialization failed\n");
} }
domain_reserve_special_ranges(domain); domain_reserve_special_ranges(domain);
...@@ -5222,10 +5222,8 @@ static struct iommu_domain *intel_iommu_domain_alloc(unsigned type) ...@@ -5222,10 +5222,8 @@ static struct iommu_domain *intel_iommu_domain_alloc(unsigned type)
ret = init_iova_flush_queue(&dmar_domain->iovad, ret = init_iova_flush_queue(&dmar_domain->iovad,
iommu_flush_iova, iommu_flush_iova,
iova_entry_free); iova_entry_free);
if (ret) { if (ret)
pr_warn("iova flush queue initialization failed\n"); pr_info("iova flush queue initialization failed\n");
intel_iommu_strict = 1;
}
} }
domain_update_iommu_cap(dmar_domain); domain_update_iommu_cap(dmar_domain);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment