Commit 1d479f16 authored by John Garry's avatar John Garry Committed by Joerg Roedel

iommu: Deprecate Intel and AMD cmdline methods to enable strict mode

Now that the x86 drivers support iommu.strict, deprecate the custom
methods.
Signed-off-by: default avatarJohn Garry <john.garry@huawei.com>
Acked-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-2-git-send-email-john.garry@huawei.comSigned-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent 80803531
...@@ -290,10 +290,7 @@ ...@@ -290,10 +290,7 @@
amd_iommu= [HW,X86-64] amd_iommu= [HW,X86-64]
Pass parameters to the AMD IOMMU driver in the system. Pass parameters to the AMD IOMMU driver in the system.
Possible values are: Possible values are:
fullflush - enable flushing of IO/TLB entries when fullflush - Deprecated, equivalent to iommu.strict=1
they are unmapped. Otherwise they are
flushed before they will be reused, which
is a lot of faster
off - do not initialize any AMD IOMMU found in off - do not initialize any AMD IOMMU found in
the system the system
force_isolation - Force device isolation for all force_isolation - Force device isolation for all
...@@ -1944,9 +1941,7 @@ ...@@ -1944,9 +1941,7 @@
this case, gfx device will use physical address for this case, gfx device will use physical address for
DMA. DMA.
strict [Default Off] strict [Default Off]
With this option on every unmap_single operation will Deprecated, equivalent to iommu.strict=1.
result in a hardware IOTLB flush operation as opposed
to batching them for performance.
sp_off [Default Off] sp_off [Default Off]
By default, super page will be supported if Intel IOMMU By default, super page will be supported if Intel IOMMU
has the capability. With this option, super page will has the capability. With this option, super page will
......
...@@ -3098,8 +3098,10 @@ static int __init parse_amd_iommu_intr(char *str) ...@@ -3098,8 +3098,10 @@ static int __init parse_amd_iommu_intr(char *str)
static int __init parse_amd_iommu_options(char *str) 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");
amd_iommu_unmap_flush = true; amd_iommu_unmap_flush = true;
}
if (strncmp(str, "force_enable", 12) == 0) if (strncmp(str, "force_enable", 12) == 0)
amd_iommu_force_enable = true; amd_iommu_force_enable = true;
if (strncmp(str, "off", 3) == 0) if (strncmp(str, "off", 3) == 0)
......
...@@ -454,6 +454,7 @@ static int __init intel_iommu_setup(char *str) ...@@ -454,6 +454,7 @@ static int __init intel_iommu_setup(char *str)
pr_warn("intel_iommu=forcedac deprecated; use iommu.forcedac instead\n"); pr_warn("intel_iommu=forcedac deprecated; use iommu.forcedac instead\n");
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_info("Disable batched IOTLB flush\n"); pr_info("Disable batched IOTLB flush\n");
intel_iommu_strict = 1; intel_iommu_strict = 1;
} else if (!strncmp(str, "sp_off", 6)) { } else if (!strncmp(str, "sp_off", 6)) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment