提交 308723e3 编写于 作者: J John Garry 提交者: Joerg Roedel

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: NJohn Garry <john.garry@huawei.com>
Reviewed-by: NRobin Murphy <robin.murphy@arm.com>
Reviewed-by: NLu Baolu <baolu.lu@linux.intel.com>
Link: https://lore.kernel.org/r/1626088340-5838-7-git-send-email-john.garry@huawei.comSigned-off-by: NJoerg Roedel <jroedel@suse.de>
上级 02252b3b
...@@ -3099,7 +3099,7 @@ static int __init parse_amd_iommu_options(char *str) ...@@ -3099,7 +3099,7 @@ static int __init parse_amd_iommu_options(char *str)
for (; *str; ++str) { for (; *str; ++str) {
if (strncmp(str, "fullflush", 9) == 0) { if (strncmp(str, "fullflush", 9) == 0) {
pr_warn("amd_iommu=fullflush deprecated; use iommu.strict=1 instead\n"); 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) if (strncmp(str, "force_enable", 12) == 0)
amd_iommu_force_enable = true; amd_iommu_force_enable = true;
......
...@@ -454,7 +454,7 @@ static int __init intel_iommu_setup(char *str) ...@@ -454,7 +454,7 @@ static int __init intel_iommu_setup(char *str)
iommu_dma_forcedac = true; iommu_dma_forcedac = true;
} else if (!strncmp(str, "strict", 6)) { } else if (!strncmp(str, "strict", 6)) {
pr_warn("intel_iommu=strict deprecated; use iommu.strict=1 instead\n"); 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)) { } else if (!strncmp(str, "sp_off", 6)) {
pr_info("Disable supported super page\n"); pr_info("Disable supported super page\n");
intel_iommu_superpage = 0; intel_iommu_superpage = 0;
...@@ -4394,7 +4394,7 @@ int __init intel_iommu_init(void) ...@@ -4394,7 +4394,7 @@ int __init intel_iommu_init(void)
*/ */
if (cap_caching_mode(iommu->cap)) { if (cap_caching_mode(iommu->cap)) {
pr_info_once("IOMMU batching disallowed due to virtualization\n"); 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, iommu_device_sysfs_add(&iommu->iommu, NULL,
intel_iommu_groups, intel_iommu_groups,
...@@ -5712,7 +5712,7 @@ static void quirk_calpella_no_shadow_gtt(struct pci_dev *dev) ...@@ -5712,7 +5712,7 @@ static void quirk_calpella_no_shadow_gtt(struct pci_dev *dev)
} else if (dmar_map_gfx) { } else if (dmar_map_gfx) {
/* we have to ensure the gfx device is idle before we flush */ /* we have to ensure the gfx device is idle before we flush */
pci_info(dev, "Disabling batched IOTLB flush on Ironlake\n"); 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); DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_INTEL, 0x0040, quirk_calpella_no_shadow_gtt);
......
...@@ -350,10 +350,9 @@ static int __init iommu_dma_setup(char *str) ...@@ -350,10 +350,9 @@ static int __init iommu_dma_setup(char *str)
} }
early_param("iommu.strict", iommu_dma_setup); 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 = true;
iommu_dma_strict = strict;
} }
bool iommu_get_dma_strict(struct iommu_domain *domain) bool iommu_get_dma_strict(struct iommu_domain *domain)
......
...@@ -485,7 +485,7 @@ int iommu_enable_nesting(struct iommu_domain *domain); ...@@ -485,7 +485,7 @@ int iommu_enable_nesting(struct iommu_domain *domain);
int iommu_set_pgtable_quirks(struct iommu_domain *domain, int iommu_set_pgtable_quirks(struct iommu_domain *domain,
unsigned long quirks); 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); bool iommu_get_dma_strict(struct iommu_domain *domain);
extern int report_iommu_fault(struct iommu_domain *domain, struct device *dev, extern int report_iommu_fault(struct iommu_domain *domain, struct device *dev,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册