Merge tag 'iommu-updates-v6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/joro...

[linux-2.6-microblaze.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 7b4d7ae..65731b0 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -2227,7 +2227,7 @@
                          forcing Dual Address Cycle for PCI cards supporting
                          greater than 32-bit addressing.
 
-       iommu.strict=   [ARM64, X86] Configure TLB invalidation behaviour
+       iommu.strict=   [ARM64, X86, S390] Configure TLB invalidation behaviour
                        Format: { "0" | "1" }
                        0 - Lazy mode.
                          Request that DMA unmap operations use deferred
@@ -5694,9 +5694,10 @@
        s390_iommu=     [HW,S390]
                        Set s390 IOTLB flushing mode
                strict
-                       With strict flushing every unmap operation will result in
-                       an IOTLB flush. Default is lazy flushing before reuse,
-                       which is faster.
+                       With strict flushing every unmap operation will result
+                       in an IOTLB flush. Default is lazy flushing before
+                       reuse, which is faster. Deprecated, equivalent to
+                       iommu.strict=1.
 
        s390_iommu_aperture=    [KNL,S390]
                        Specifies the size of the per device DMA address space