From 2e1ae716837d4ffd4caaf93327a9e8b5a995c410 Mon Sep 17 00:00:00 2001
From: Yijing Wang <wangyijing@huawei.com>
Date: Wed, 30 Jan 2013 09:40:52 +0800
Subject: [PATCH] --- yaml --- r: 358431 b: refs/heads/master c:
 fa2387124b1ac8177f7af33668ec98135fdd147f h: refs/heads/master i:   358429:
 3af71025c43fcd0b4b8a4488bac3850e419cf925   358427:
 a17320bc99925198603ec846041f749d43f2e1a9   358423:
 826a60fd5e59d8d370923b002d757dc03e828e6d   358415:
 9a40faefcf568d4eb54ec2a0b4700907a82cae7c   358399:
 13c6cfdfa75cf1bfd490bdc5a20e4b167ca7ae78 v: v3

---
 [refs]                                    |  2 +-
 trunk/Documentation/kernel-parameters.txt | 15 +++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 13d9910c98b8..d8476b7949b9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8c8803c5968bd82ad3d65e8603c6bcf2d9674d83
+refs/heads/master: fa2387124b1ac8177f7af33668ec98135fdd147f
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
index 69f97a836600..dd80599559a5 100644
--- a/trunk/Documentation/kernel-parameters.txt
+++ b/trunk/Documentation/kernel-parameters.txt
@@ -2227,6 +2227,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.
+		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.