Skip to content

Commit 1d479f1

Browse files
John Garryjoergroedel
authored andcommitted
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: John Garry <[email protected]> Acked-by: Robin Murphy <[email protected]> Reviewed-by: Lu Baolu <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Joerg Roedel <[email protected]>
1 parent 8080353 commit 1d479f1

File tree

3 files changed

+6
-8
lines changed

3 files changed

+6
-8
lines changed

Documentation/admin-guide/kernel-parameters.txt

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -290,10 +290,7 @@
290290
amd_iommu= [HW,X86-64]
291291
Pass parameters to the AMD IOMMU driver in the system.
292292
Possible values are:
293-
fullflush - enable flushing of IO/TLB entries when
294-
they are unmapped. Otherwise they are
295-
flushed before they will be reused, which
296-
is a lot of faster
293+
fullflush - Deprecated, equivalent to iommu.strict=1
297294
off - do not initialize any AMD IOMMU found in
298295
the system
299296
force_isolation - Force device isolation for all
@@ -1944,9 +1941,7 @@
19441941
this case, gfx device will use physical address for
19451942
DMA.
19461943
strict [Default Off]
1947-
With this option on every unmap_single operation will
1948-
result in a hardware IOTLB flush operation as opposed
1949-
to batching them for performance.
1944+
Deprecated, equivalent to iommu.strict=1.
19501945
sp_off [Default Off]
19511946
By default, super page will be supported if Intel IOMMU
19521947
has the capability. With this option, super page will

drivers/iommu/amd/init.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3098,8 +3098,10 @@ static int __init parse_amd_iommu_intr(char *str)
30983098
static int __init parse_amd_iommu_options(char *str)
30993099
{
31003100
for (; *str; ++str) {
3101-
if (strncmp(str, "fullflush", 9) == 0)
3101+
if (strncmp(str, "fullflush", 9) == 0) {
3102+
pr_warn("amd_iommu=fullflush deprecated; use iommu.strict=1 instead\n");
31023103
amd_iommu_unmap_flush = true;
3104+
}
31033105
if (strncmp(str, "force_enable", 12) == 0)
31043106
amd_iommu_force_enable = true;
31053107
if (strncmp(str, "off", 3) == 0)

drivers/iommu/intel/iommu.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,7 @@ static int __init intel_iommu_setup(char *str)
454454
pr_warn("intel_iommu=forcedac deprecated; use iommu.forcedac instead\n");
455455
iommu_dma_forcedac = true;
456456
} else if (!strncmp(str, "strict", 6)) {
457+
pr_warn("intel_iommu=strict deprecated; use iommu.strict=1 instead\n");
457458
pr_info("Disable batched IOTLB flush\n");
458459
intel_iommu_strict = 1;
459460
} else if (!strncmp(str, "sp_off", 6)) {

0 commit comments

Comments
 (0)