Merge tag 'hyperv-next-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/hyper...

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

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index 782e9072407b94f6f39d4135c5adc361b622d45b..254d8a369f328c82313d6cbcb8d235f543994ce8 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -860,6 +860,10 @@
        disable_radix   [PPC]
                        Disable RADIX MMU mode on POWER9
 
+       disable_tlbie   [PPC]
+                       Disable TLBIE instruction. Currently does not work
+                       with KVM, with HASH MMU, or with coherent accelerators.
+
        disable_cpu_apicid= [X86,APIC,SMP]
                        Format: <int>
                        The number of initial APIC ID for the
@@ -3461,12 +3465,13 @@
                                specify the device is described above.
                                If <order of align> is not specified,
                                PAGE_SIZE is used as alignment.
-                               PCI-PCI bridge can be specified, if resource
+                               A PCI-PCI bridge can be specified if resource
                                windows need to be expanded.
                                To specify the alignment for several
                                instances of a device, the PCI vendor,
                                device, subvendor, and subdevice may be
-                               specified, e.g., 4096@pci:8086:9c22:103c:198f
+                               specified, e.g., 12@pci:8086:9c22:103c:198f
+                               for 4096-byte alignment.
                ecrc=           Enable/disable PCIe ECRC (transaction layer
                                end-to-end CRC checking).
                                bios: Use BIOS/firmware settings. This is the
@@ -4641,6 +4646,11 @@
                        /sys/power/pm_test). Only available when CONFIG_PM_DEBUG
                        is set. Default value is 5.
 
+       svm=            [PPC]
+                       Format: { on | off | y | n | 1 | 0 }
+                       This parameter controls use of the Protected
+                       Execution Facility on pSeries.
+
        swapaccount=[0|1]
                        [KNL] Enable accounting of swap in memory resource
                        controller if no parameter or 1 is given or disable
@@ -5326,3 +5336,22 @@
                        A hex value specifying bitmask with supplemental xhci
                        host controller quirks. Meaning of each bit can be
                        consulted in header drivers/usb/host/xhci.h.
+
+       xmon            [PPC]
+                       Format: { early | on | rw | ro | off }
+                       Controls if xmon debugger is enabled. Default is off.
+                       Passing only "xmon" is equivalent to "xmon=early".
+                       early   Call xmon as early as possible on boot; xmon
+                               debugger is called from setup_arch().
+                       on      xmon debugger hooks will be installed so xmon
+                               is only called on a kernel crash. Default mode,
+                               i.e. either "ro" or "rw" mode, is controlled
+                               with CONFIG_XMON_DEFAULT_RO_MODE.
+                       rw      xmon debugger hooks will be installed so xmon
+                               is called only on a kernel crash, mode is write,
+                               meaning SPR registers, memory and, other data
+                               can be written using xmon commands.
+                       ro      same as "rw" option above but SPR registers,
+                               memory, and other data can't be written using
+                               xmon commands.
+                       off     xmon is disabled.