Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[pandora-kernel.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 4c5b3f9..e567af3 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -564,6 +564,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        UART at the specified I/O port or MMIO address,
                        switching to the matching ttyS device later.  The
                        options are the same as for ttyS, above.
                        UART at the specified I/O port or MMIO address,
                        switching to the matching ttyS device later.  The
                        options are the same as for ttyS, above.

+               hvc<n>  Use the hypervisor console device <n>. This is for
+                       both Xen and PowerPC hypervisors.

 
                 If the device connected to the port is not a TTY but a braille
                 device, prepend "brl," before the device type, for instance
 
                 If the device connected to the port is not a TTY but a braille
                 device, prepend "brl," before the device type, for instance


@@ -594,6 +596,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        is selected automatically. Check
                        Documentation/kdump/kdump.txt for further details.
 
                        is selected automatically. Check
                        Documentation/kdump/kdump.txt for further details.
 

+       crashkernel_low=size[KMG]
+                       [KNL, x86] parts under 4G.
+

        crashkernel=range1:size1[,range2:size2,...][@offset]
                        [KNL] Same as above, but depends on the memory
                        in the running system. The syntax of range is
        crashkernel=range1:size1[,range2:size2,...][@offset]
                        [KNL] Same as above, but depends on the memory
                        in the running system. The syntax of range is


@@ -754,6 +759,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
 
        earlyprintk=    [X86,SH,BLACKFIN]
                        earlyprintk=vga
 
        earlyprintk=    [X86,SH,BLACKFIN]
                        earlyprintk=vga

+                       earlyprintk=xen

                        earlyprintk=serial[,ttySn[,baudrate]]
                        earlyprintk=ttySn[,baudrate]
                        earlyprintk=dbgp[debugController#]
                        earlyprintk=serial[,ttySn[,baudrate]]
                        earlyprintk=ttySn[,baudrate]
                        earlyprintk=dbgp[debugController#]


@@ -771,6 +777,8 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        The VGA output is eventually overwritten by the real
                        console.
 
                        The VGA output is eventually overwritten by the real
                        console.
 

+                       The xen output can only be used by Xen PV guests.
+

        ekgdboc=        [X86,KGDB] Allow early kernel console debugging
                        ekgdboc=kbd
 
        ekgdboc=        [X86,KGDB] Allow early kernel console debugging
                        ekgdboc=kbd
 


@@ -1637,6 +1645,42 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        that the amount of memory usable for all allocations
                        is not too small.
 
                        that the amount of memory usable for all allocations
                        is not too small.
 

+       movablemem_map=acpi
+                       [KNL,X86,IA-64,PPC] This parameter is similar to
+                       memmap except it specifies the memory map of
+                       ZONE_MOVABLE.
+                       This option inform the kernel to use Hot Pluggable bit
+                       in flags from SRAT from ACPI BIOS to determine which
+                       memory devices could be hotplugged. The corresponding
+                       memory ranges will be set as ZONE_MOVABLE.
+                       NOTE: Whatever node the kernel resides in will always
+                             be un-hotpluggable.
+
+       movablemem_map=nn[KMG]@ss[KMG]
+                       [KNL,X86,IA-64,PPC] This parameter is similar to
+                       memmap except it specifies the memory map of
+                       ZONE_MOVABLE.
+                       If user specifies memory ranges, the info in SRAT will
+                       be ingored. And it works like the following:
+                       - If more ranges are all within one node, then from
+                         lowest ss to the end of the node will be ZONE_MOVABLE.
+                       - If a range is within a node, then from ss to the end
+                         of the node will be ZONE_MOVABLE.
+                       - If a range covers two or more nodes, then from ss to
+                         the end of the 1st node will be ZONE_MOVABLE, and all
+                         the rest nodes will only have ZONE_MOVABLE.
+                       If memmap is specified at the same time, the
+                       movablemem_map will be limited within the memmap
+                       areas. If kernelcore or movablecore is also specified,
+                       movablemem_map will have higher priority to be
+                       satisfied. So the administrator should be careful that
+                       the amount of movablemem_map areas are not too large.
+                       Otherwise kernel won't have enough memory to start.
+                       NOTE: We don't stop users specifying the node the
+                             kernel resides in as hotpluggable so that this
+                             option can be used as a workaround of firmware
+                              bugs.
+

        MTD_Partition=  [MTD]
                        Format: <name>,<region-number>,<size>,<offset>
 
        MTD_Partition=  [MTD]
                        Format: <name>,<region-number>,<size>,<offset>
 


@@ -2223,6 +2267,21 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                                This sorting is done to get a device
                                order compatible with older (<= 2.4) kernels.
                nobfsort        Don't sort PCI devices into breadth-first order.
                                This sorting is done to get a device
                                order compatible with older (<= 2.4) kernels.
                nobfsort        Don't sort PCI devices into breadth-first order.

+               pcie_bus_tune_off       Disable PCIe MPS (Max Payload Size)
+                               tuning and use the BIOS-configured MPS defaults.
+               pcie_bus_safe   Set every device's MPS to the largest value
+                               supported by all devices below the root complex.
+               pcie_bus_perf   Set device MPS to the largest allowable MPS
+                               based on its parent bus. Also set MRRS (Max
+                               Read Request Size) to the largest supported
+                               value (no larger than the MPS that the device
+                               or bus can support) for best performance.
+               pcie_bus_peer2peer      Set every device's MPS to 128B, which
+                               every device is guaranteed to support. This
+                               configuration allows peer-to-peer DMA between
+                               any pair of devices, possibly at the cost of
+                               reduced performance.  This also guarantees
+                               that hot-added devices will work.

                cbiosize=nn[KMG]        The fixed amount of bus space which is
                                reserved for the CardBus bridge's IO window.
                                The default value is 256 bytes.
                cbiosize=nn[KMG]        The fixed amount of bus space which is
                                reserved for the CardBus bridge's IO window.
                                The default value is 256 bytes.


@@ -2244,6 +2303,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                                the default.
                                off: Turn ECRC off
                                on: Turn ECRC on.
                                the default.
                                off: Turn ECRC off
                                on: Turn ECRC on.

+               hpiosize=nn[KMG]        The fixed amount of bus space which is
+                               reserved for hotplug bridge's IO window.
+                               Default size is 256 bytes.
+               hpmemsize=nn[KMG]       The fixed amount of bus space which is
+                               reserved for hotplug bridge's memory window.
+                               Default size is 2 megabytes.

                realloc=        Enable/disable reallocating PCI bridge resources
                                if allocations done by BIOS are too small to
                                accommodate resources required by all child
                realloc=        Enable/disable reallocating PCI bridge resources
                                if allocations done by BIOS are too small to
                                accommodate resources required by all child