summaryrefslogtreecommitdiffstats
path: root/drivers/iommu
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2021-08-02 17:06:43 +0200
committerJoerg Roedel <jroedel@suse.de>2021-08-02 17:07:39 +0200
commit47a70bea54b7afa983c71fa409785c067f4e865b (patch)
tree40b12698e624b3f6670b413b6dc3ed740748e7c9 /drivers/iommu
parent1d65b90847219e4101dc09ecc1c8178b1d2331b8 (diff)
downloadlinux-47a70bea54b7afa983c71fa409785c067f4e865b.tar.gz
linux-47a70bea54b7afa983c71fa409785c067f4e865b.tar.xz
iommu/amd: Remove stale amd_iommu_unmap_flush usage
Remove the new use of the variable introduced in the AMD driver branch. The variable was removed already in the iommu core branch, causing build errors when the brances are merged. Cc: Nadav Amit <namit@vmware.com> Cc: Zhen Lei <thunder.leizhen@huawei.com> Signed-off-by: Joerg Roedel <jroedel@suse.de> Link: https://lore.kernel.org/r/20210802150643.3634-1-joro@8bytes.org
Diffstat (limited to 'drivers/iommu')
-rw-r--r--drivers/iommu/amd/init.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
index 239556c1f698..bdcf167b4afe 100644
--- a/drivers/iommu/amd/init.c
+++ b/drivers/iommu/amd/init.c
@@ -1850,11 +1850,9 @@ static int __init iommu_init_pci(struct amd_iommu *iommu)
return ret;
if (iommu->cap & (1UL << IOMMU_CAP_NPCACHE)) {
- if (!amd_iommu_unmap_flush)
- pr_info("IOMMU batching is disabled due to virtualization\n");
-
+ pr_info("Using strict mode due to virtualization\n");
+ iommu_set_dma_strict();
amd_iommu_np_cache = true;
- amd_iommu_unmap_flush = true;
}
init_iommu_perf_ctr(iommu);