Merge tag 'for-linus-6.1-rc1-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...

[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 1bda9cf..a465d52 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -321,6 +321,8 @@
                        force_enable - Force enable the IOMMU on platforms known
                                       to be buggy with IOMMU enabled. Use this
                                       option with care.
+                       pgtbl_v1     - Use v1 page table for DMA-API (Default).
+                       pgtbl_v2     - Use v2 page table for DMA-API.
 
        amd_iommu_dump= [HW,X86-64]
                        Enable AMD IOMMU driver option to dump the ACPI table
@@ -966,10 +968,6 @@
 
        debugpat        [X86] Enable PAT debugging
 
-       decnet.addr=    [HW,NET]
-                       Format: <area>[,<node>]
-                       See also Documentation/networking/decnet.rst.
-
        default_hugepagesz=
                        [HW] The size of the default HugeTLB page. This is
                        the size represented by the legacy /proc/ hugepages
@@ -1471,6 +1469,14 @@
                        Permit 'security.evm' to be updated regardless of
                        current integrity status.
 
+       early_page_ext [KNL] Enforces page_ext initialization to earlier
+                       stages so cover more early boot allocations.
+                       Please note that as side effect some optimizations
+                       might be disabled to achieve that (e.g. parallelized
+                       memory initialization is disabled) so the boot process
+                       might take longer, especially on systems with a lot of
+                       memory. Available with CONFIG_PAGE_EXTENSION=y.
+
        failslab=
        fail_usercopy=
        fail_page_alloc=
@@ -2436,6 +2442,12 @@
                        0: force disabled
                        1: force enabled
 
+       kunit.enable=   [KUNIT] Enable executing KUnit tests. Requires
+                       CONFIG_KUNIT to be set to be fully enabled. The
+                       default value can be overridden via
+                       KUNIT_DEFAULT_ENABLED.
+                       Default is 1 (enabled)
+
        kvm.ignore_msrs=[KVM] Ignore guest accesses to unhandled MSRs.
                        Default is 0 (don't ignore, but inject #GP)
 
@@ -3207,6 +3219,7 @@
                                               spectre_v2_user=off [X86]
                                               spec_store_bypass_disable=off [X86,PPC]
                                               ssbd=force-off [ARM64]
+                                              nospectre_bhb [ARM64]
                                               l1tf=off [X86]
                                               mds=off [X86]
                                               tsx_async_abort=off [X86]
@@ -3613,7 +3626,7 @@
 
        nohugeiomap     [KNL,X86,PPC,ARM64] Disable kernel huge I/O mappings.
 
-       nohugevmalloc   [PPC] Disable kernel huge vmalloc mappings.
+       nohugevmalloc   [KNL,X86,PPC,ARM64] Disable kernel huge vmalloc mappings.
 
        nosmt           [KNL,S390] Disable symmetric multithreading (SMT).
                        Equivalent to smt=1.
@@ -3626,11 +3639,15 @@
                        (bounds check bypass). With this option data leaks are
                        possible in the system.
 
-       nospectre_v2    [X86,PPC_FSL_BOOK3E,ARM64] Disable all mitigations for
+       nospectre_v2    [X86,PPC_E500,ARM64] Disable all mitigations for
                        the Spectre variant 2 (indirect branch prediction)
                        vulnerability. System may allow data leaks with this
                        option.
 
+       nospectre_bhb   [ARM64] Disable all mitigations for Spectre-BHB (branch
+                       history injection) vulnerability. System may allow data leaks
+                       with this option.
+
        nospec_store_bypass_disable
                        [HW] Disable all mitigations for the Speculative Store Bypass vulnerability
 
@@ -3741,9 +3758,9 @@
                        [X86,PV_OPS] Disable paravirtualized VMware scheduler
                        clock and use the default one.
 
-       no-steal-acc    [X86,PV_OPS,ARM64] Disable paravirtualized steal time
-                       accounting. steal time is computed, but won't
-                       influence scheduler behaviour
+       no-steal-acc    [X86,PV_OPS,ARM64,PPC/PSERIES] Disable paravirtualized
+                       steal time accounting. steal time is computed, but
+                       won't influence scheduler behaviour
 
        nolapic         [X86-32,APIC] Do not enable or use the local APIC.
 
@@ -3805,6 +3822,10 @@
 
        nox2apic        [X86-64,APIC] Do not enable x2APIC mode.
 
+                       NOTE: this parameter will be ignored on systems with the
+                       LEGACY_XAPIC_DISABLED bit set in the
+                       IA32_XAPIC_DISABLE_STATUS MSR.
+
        nps_mtm_hs_ctr= [KNL,ARC]
                        This parameter sets the maximum duration, in
                        cycles, each HW thread of the CTOP can run
@@ -6028,12 +6049,6 @@
                        This parameter controls use of the Protected
                        Execution Facility on pSeries.
 
-       swapaccount=    [KNL]
-                       Format: [0|1]
-                       Enable accounting of swap in memory resource
-                       controller if no parameter or 1 is given or disable
-                       it if 0 is given (See Documentation/admin-guide/cgroup-v1/memory.rst)
-
        swiotlb=        [ARM,IA-64,PPC,MIPS,X86]
                        Format: { <int> [,<int>] | force | noforce }
                        <int> -- Number of I/O TLB slabs