From: Joerg Roedel <jroedel@suse.de>
Date: Mon, 2 Aug 2021 15:06:43 +0000 (+0200)
Subject: iommu/amd: Remove stale amd_iommu_unmap_flush usage
X-Git-Tag: v5.15~301^2~5^5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=47a70bea54b7afa983c71fa409785c067f4e865b;p=platform%2Fkernel%2Flinux-starfive.git

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
---

diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
index 239556c..bdcf167 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);