Merge branch 'akpm' (patches from Andrew)

[platform/kernel/linux-starfive.git] / Documentation / admin-guide / kernel-parameters.txt

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 7866cc1..a816935 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -1469,6 +1469,12 @@
                        Don't use this when you are not running on the
                        android emulator
 
                        Don't use this when you are not running on the
                        android emulator
 

+       gpio-mockup.gpio_mockup_ranges
+                       [HW] Sets the ranges of gpiochip of for this device.
+                       Format: <start1>,<end1>,<start2>,<end2>...
+       gpio-mockup.gpio_mockup_named_lines
+                       [HW] Let the driver know GPIO lines should be named.
+

        gpt             [EFI] Forces disk with valid GPT signature but
                        invalid Protective MBR to be treated as GPT. If the
                        primary GPT is corrupted, it enables the backup/alternate
        gpt             [EFI] Forces disk with valid GPT signature but
                        invalid Protective MBR to be treated as GPT. If the
                        primary GPT is corrupted, it enables the backup/alternate


@@ -1492,10 +1498,6 @@
                        Format: <unsigned int> such that (rxsize & ~0x1fffc0) == 0.
                        Default: 1024
 
                        Format: <unsigned int> such that (rxsize & ~0x1fffc0) == 0.
                        Default: 1024
 

-       gpio-mockup.gpio_mockup_ranges
-                       [HW] Sets the ranges of gpiochip of for this device.
-                       Format: <start1>,<end1>,<start2>,<end2>...
-

        hardlockup_all_cpu_backtrace=
                        [KNL] Should the hard-lockup detector generate
                        backtraces on all cpus.
        hardlockup_all_cpu_backtrace=
                        [KNL] Should the hard-lockup detector generate
                        backtraces on all cpus.


@@ -1889,13 +1891,6 @@
                        bypassed by not enabling DMAR with this option. In
                        this case, gfx device will use physical address for
                        DMA.
                        bypassed by not enabling DMAR with this option. In
                        this case, gfx device will use physical address for
                        DMA.

-               forcedac [X86-64]
-                       With this option iommu will not optimize to look
-                       for io virtual address below 32-bit forcing dual
-                       address cycle on pci bus for cards supporting greater
-                       than 32-bit addressing. The default is to look
-                       for translation below 32-bit and if not available
-                       then look in the higher range.

                strict [Default Off]
                        With this option on every unmap_single operation will
                        result in a hardware IOTLB flush operation as opposed
                strict [Default Off]
                        With this option on every unmap_single operation will
                        result in a hardware IOTLB flush operation as opposed


@@ -1984,6 +1979,14 @@
                nobypass        [PPC/POWERNV]
                        Disable IOMMU bypass, using IOMMU for PCI devices.
 
                nobypass        [PPC/POWERNV]
                        Disable IOMMU bypass, using IOMMU for PCI devices.
 

+       iommu.forcedac= [ARM64, X86] Control IOVA allocation for PCI devices.
+                       Format: { "0" | "1" }
+                       0 - Try to allocate a 32-bit DMA address first, before
+                         falling back to the full range if needed.
+                       1 - Allocate directly from the full usable range,
+                         forcing Dual Address Cycle for PCI cards supporting
+                         greater than 32-bit addressing.
+

        iommu.strict=   [ARM64] Configure TLB invalidation behaviour
                        Format: { "0" | "1" }
                        0 - Lazy mode.
        iommu.strict=   [ARM64] Configure TLB invalidation behaviour
                        Format: { "0" | "1" }
                        0 - Lazy mode.


@@ -2830,7 +2833,7 @@
                        Note that even when enabled, there are a few cases where
                        the feature is not effective.
 
                        Note that even when enabled, there are a few cases where
                        the feature is not effective.
 

-       memtest=        [KNL,X86,ARM,PPC] Enable memtest
+       memtest=        [KNL,X86,ARM,PPC,RISCV] Enable memtest

                        Format: <integer>
                        default : 0 <disable>
                        Specifies the number of memtest passes to be
                        Format: <integer>
                        default : 0 <disable>
                        Specifies the number of memtest passes to be