iommu: Remove mode argument from iommu_set_dma_strict()

We only ever now set strict mode enabled in iommu_set_dma_strict(), so
just remove the argument.

Signed-off-by: John Garry <john.garry@huawei.com>
Reviewed-by: Robin Murphy <robin.murphy@arm.com>
Reviewed-by: Lu Baolu <baolu.lu@linux.intel.com>
Link: https://lore.kernel.org/r/1626088340-5838-7-git-send-email-john.garry@huawei.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/drivers/iommu/amd/init.c b/drivers/iommu/amd/init.c
index 1e641cb6dddc9ce9238c76053d0559012d954de3..6e12a615117bdd32e24ce3121394d06815d210c9 100644 (file)
--- a/drivers/iommu/amd/init.c
+++ b/drivers/iommu/amd/init.c
@@ -3099,7 +3099,7 @@ static int __init parse_amd_iommu_options(char *str)
        for (; *str; ++str) {
                if (strncmp(str, "fullflush", 9) == 0) {
                        pr_warn("amd_iommu=fullflush deprecated; use iommu.strict=1 instead\n");
-                       iommu_set_dma_strict(true);
+                       iommu_set_dma_strict();
                }
                if (strncmp(str, "force_enable", 12) == 0)
                        amd_iommu_force_enable = true;

diff --git a/drivers/iommu/intel/iommu.c b/drivers/iommu/intel/iommu.c
index 6fd004a1a66d42ad81d7b2051ae07440b5197556..da9afa730df1e7d19a0d4a6348bc294dc5a13541 100644 (file)
--- a/drivers/iommu/intel/iommu.c
+++ b/drivers/iommu/intel/iommu.c
@@ -454,7 +454,7 @@ static int __init intel_iommu_setup(char *str)
                        iommu_dma_forcedac = true;
                } else if (!strncmp(str, "strict", 6)) {
                        pr_warn("intel_iommu=strict deprecated; use iommu.strict=1 instead\n");
-                       iommu_set_dma_strict(true);
+                       iommu_set_dma_strict();
                } else if (!strncmp(str, "sp_off", 6)) {
                        pr_info("Disable supported super page\n");
                        intel_iommu_superpage = 0;
@@ -4394,7 +4394,7 @@ int __init intel_iommu_init(void)
                 */
                if (cap_caching_mode(iommu->cap)) {
                        pr_info_once("IOMMU batching disallowed due to virtualization\n");
-                       iommu_set_dma_strict(true);
+                       iommu_set_dma_strict();
                }
                iommu_device_sysfs_add(&iommu->iommu, NULL,
                                       intel_iommu_groups,
@@ -5712,7 +5712,7 @@ static void quirk_calpella_no_shadow_gtt(struct pci_dev *dev)
        } else if (dmar_map_gfx) {
                /* we have to ensure the gfx device is idle before we flush */
                pci_info(dev, "Disabling batched IOTLB flush on Ironlake\n");
-               iommu_set_dma_strict(true);
+               iommu_set_dma_strict();
        }
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0040, quirk_calpella_no_shadow_gtt);

diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c
index bd9ccce387c56f4255eb597f9d252895dbbcb936..eeea5e5c4d102919608efcbe9a22ebb4db278b78 100644 (file)
--- a/drivers/iommu/iommu.c
+++ b/drivers/iommu/iommu.c
@@ -350,10 +350,9 @@ static int __init iommu_dma_setup(char *str)
 }
 early_param("iommu.strict", iommu_dma_setup);
 
-void iommu_set_dma_strict(bool strict)
+void iommu_set_dma_strict(void)
 {
-       if (strict || !(iommu_cmd_line & IOMMU_CMD_LINE_STRICT))
-               iommu_dma_strict = strict;
+       iommu_dma_strict = true;
 }
 
 bool iommu_get_dma_strict(struct iommu_domain *domain)

diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index d7989d4a740499870a7f87e3fe8af22e2eee69ff..4997c78e2670fbe7293157b95f4d8e42f6710e04 100644 (file)
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -485,7 +485,7 @@ int iommu_enable_nesting(struct iommu_domain *domain);
 int iommu_set_pgtable_quirks(struct iommu_domain *domain,
                unsigned long quirks);
 
-void iommu_set_dma_strict(bool val);
+void iommu_set_dma_strict(void);
 bool iommu_get_dma_strict(struct iommu_domain *domain);
 
 extern int report_iommu_fault(struct iommu_domain *domain, struct device *dev,