- Update Xen patches to 3.3-rc5 and c/s 1157.

[linux-flexiantxendom0-3.2.10.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index fc5b6ba..7d084eb 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -874,6 +874,24 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
        gpt             [EFI] Forces disk with valid GPT signature but
                        invalid Protective MBR to be treated as GPT.
 
+       guestdev=       [PCI,ACPI,XEN]
+                       Format: {<device path>|<sbdf>}][,{<device path>|<sbdf>}[,...]]
+                       Format of device path: <hid>[:<uid>]-<dev>.<func>[-<dev>.<func>[,...]][+iomul]
+                       Format of sbdf: [<segment>:]<bus>:<dev>.<func>[+iomul]
+                       Specifies PCI device for guest domain.
+                       If PCI-PCI bridge is specified, all PCI devices
+                       behind PCI-PCI bridge are reserved.
+                       +iomul means that this PCI function will share
+                       IO ports with other +iomul functions under same
+                       switch. NOTE: if +iomul is specfied, all the functions
+                       of the device will share IO ports.
+
+       guestiomuldev=  [PCI,ACPI,XEN]
+                       Format: [sbd][,<sbd>][,...]
+                       Format of sbdf: [<segment>:]<bus>:<dev>
+                       Note: function shouldn't be specified.
+                       Specifies PCI device for IO port multiplexing driver.
+
        hashdist=       [KNL,NUMA] Large hashes allocated during boot
                        are distributed across NUMA nodes.  Defaults on
                        for 64-bit NUMA, off otherwise.
@@ -2114,6 +2132,13 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                realloc         reallocate PCI resources if allocations done by BIOS
                                are erroneous.
 
+       pci_reserve=    [PCI]
+                       Format: [<sbdf>[+IO<size>][+MEM<size>]][,<sbdf>...]
+                       Format of sbdf: [<segment>:]<bus>:<dev>.<func>
+                       Specifies the least reserved io size or memory size
+                       which is assigned to PCI bridge even when no child
+                       pci device exists. This is useful with PCI hotplug.
+
        pcie_aspm=      [PCIE] Forcibly enable or disable PCIe Active State Power
                        Management.
                off     Disable ASPM.
@@ -2289,6 +2314,10 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
                        Run specified binary instead of /init from the ramdisk,
                        used for early userspace startup. See initrd.
 
+       reassign_resources      [PCI,ACPI,XEN]
+                       Use guestdev= parameter to reassign device's
+                       resources, or specify =all here.
+
        reboot=         [BUGS=X86-32,BUGS=ARM,BUGS=IA-64] Rebooting mode
                        Format: <reboot_mode>[,<reboot_mode2>[,...]]
                        See arch/*/kernel/reboot.c or arch/*/kernel/process.c