3.0-stable patches

added patches:
	pci-allow-pcie_aspm-force-even-when-fadt-indicates-it-is-unsupported.patch

diff --git a/queue-3.0/pci-allow-pcie_aspm-force-even-when-fadt-indicates-it-is-unsupported.patch b/queue-3.0/pci-allow-pcie_aspm-force-even-when-fadt-indicates-it-is-unsupported.patch
new file mode 100644 (file)
index 0000000..1c90bec
--- /dev/null
+++ b/queue-3.0/pci-allow-pcie_aspm-force-even-when-fadt-indicates-it-is-unsupported.patch
@@ -0,0 +1,38 @@
+From 9e16721498b0c3d3ebfa0b503c63d35c0a4c0642 Mon Sep 17 00:00:00 2001
+From: Colin Ian King <colin.king@canonical.com>
+Date: Tue, 27 Nov 2012 14:09:40 +0000
+Subject: PCI: Allow pcie_aspm=force even when FADT indicates it is unsupported
+
+From: Colin Ian King <colin.king@canonical.com>
+
+commit 9e16721498b0c3d3ebfa0b503c63d35c0a4c0642 upstream.
+
+Right now using pcie_aspm=force will not enable ASPM if the FADT indicates
+ASPM is unsupported.  However, the semantics of force should probably allow
+for this, especially as they did before 3c076351c4 ("PCI: Rework ASPM
+disable code")
+
+This patch just skips the clearing of any ASPM setup that the firmware has
+carried out on this bus if pcie_aspm=force is being used.
+
+Reference: http://bugs.launchpad.net/bugs/962038
+Signed-off-by: Colin Ian King <colin.king@canonical.com>
+Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/pci/pcie/aspm.c |    3 +++
+ 1 file changed, 3 insertions(+)
+
+--- a/drivers/pci/pcie/aspm.c
++++ b/drivers/pci/pcie/aspm.c
+@@ -790,6 +790,9 @@ void pcie_clear_aspm(struct pci_bus *bus
+ {
+       struct pci_dev *child;
+ 
++      if (aspm_force)
++              return;
++
+       /*
+        * Clear any ASPM setup that the firmware has carried out on this bus
+        */

diff --git a/queue-3.0/series b/queue-3.0/series
index f70b411f06d9f7429bdc472a211339a1f8c93c0c..86157ee3565196f403f2134bc445d0f100930b77 100644 (file)
--- a/queue-3.0/series
+++ b/queue-3.0/series
@@ -1,2 +1,3 @@
 drm-i915-invalidate-the-relocation-presumed_offsets-along-the-slow-path.patch
 ftrace-be-first-to-run-code-modification-on-modules.patch
+pci-allow-pcie_aspm-force-even-when-fadt-indicates-it-is-unsupported.patch