Merge branch 'pci/switchtec'

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

diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt
index a84a83f8881e08bf0d0d598bb01814be0ec18647..c74027c55f4706cec7e75444d609126b9656abbe 100644 (file)
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@ -3492,8 +3492,15 @@
                hpiosize=nn[KMG]        The fixed amount of bus space which is
                                reserved for hotplug bridge's IO window.
                                Default size is 256 bytes.
+               hpmmiosize=nn[KMG]      The fixed amount of bus space which is
+                               reserved for hotplug bridge's MMIO window.
+                               Default size is 2 megabytes.
+               hpmmioprefsize=nn[KMG]  The fixed amount of bus space which is
+                               reserved for hotplug bridge's MMIO_PREF window.
+                               Default size is 2 megabytes.
                hpmemsize=nn[KMG]       The fixed amount of bus space which is
-                               reserved for hotplug bridge's memory window.
+                               reserved for hotplug bridge's MMIO and
+                               MMIO_PREF window.
                                Default size is 2 megabytes.
                hpbussize=nn    The minimum amount of additional bus numbers
                                reserved for buses below a hotplug bridge.
@@ -3540,6 +3547,8 @@
                        even if the platform doesn't give the OS permission to
                        use them.  This may cause conflicts if the platform
                        also tries to use these services.
+               dpc-native      Use native PCIe service for DPC only.  May
+                               cause conflicts if firmware uses AER or DPC.
                compat  Disable native PCIe services (PME, AER, DPC, PCIe
                        hotplug).