Commit 308723e3 authored by John Garry's avatar John Garry Committed by Joerg Roedel
Browse files

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: default avatarJohn Garry <john.garry@huawei.com>
Reviewed-by: default avatarRobin Murphy <robin.murphy@arm.com>
Reviewed-by: default avatarLu 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: default avatarJoerg Roedel <jroedel@suse.de>
parent 02252b3b

drivers/iommu/amd/init.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/iommu/intel/iommu.c

+3 −3
Original line number Diff line number Diff line
@@ -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);

drivers/iommu/iommu.c

+2 −3
Original line number Diff line number Diff line
@@ -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)

include/linux/iommu.h

+1 −1
Original line number Diff line number Diff line
@@ -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,