rpms/kernel/F-13 pci-pm-do-not-use-native-pcie-pme-by-default.patch, NONE, 1.1 kernel.spec, 1.2095, 1.2096 pci-acpi-disable-aspm-if-no-osc.patch, 1.1, 1.2 linux-2.6-defaults-pciehp.patch, 1.1, NONE
Chuck Ebbert
cebbert at fedoraproject.org
Wed Jul 14 20:42:43 UTC 2010
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv6279
Modified Files:
kernel.spec pci-acpi-disable-aspm-if-no-osc.patch
Added Files:
pci-pm-do-not-use-native-pcie-pme-by-default.patch
Removed Files:
linux-2.6-defaults-pciehp.patch
Log Message:
pci-pm-do-not-use-native-pcie-pme-by-default.patch:
fix PCIe hotplug interrupts firing continuously. (#613412)
Update pci-acpi-disable-aspm-if-no-osc.patch so it works
with the above patch.
Drop linux-2.6-defaults-pciehp.patch: pciehp_passive mode
does not exist anymore.
pci-pm-do-not-use-native-pcie-pme-by-default.patch:
Documentation/kernel-parameters.txt | 4 +++-
drivers/pci/pcie/pme/pcie_pme.c | 19 +++++++++++++------
2 files changed, 16 insertions(+), 7 deletions(-)
--- NEW FILE pci-pm-do-not-use-native-pcie-pme-by-default.patch ---
From: Rafael J. Wysocki <rjw at sisk.pl>
Date: Fri, 18 Jun 2010 15:04:22 +0000 (+0200)
Subject: PCI/PM: Do not use native PCIe PME by default
X-Git-Tag: v2.6.35-rc4~60^2
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=b27759f880018b0cd43543dc94c921341b64b5ec
PCI/PM: Do not use native PCIe PME by default
Commit c7f486567c1d0acd2e4166c47069835b9f75e77b
(PCI PM: PCIe PME root port service driver) causes the native PCIe
PME signaling to be used by default, if the BIOS allows the kernel to
control the standard configuration registers of PCIe root ports.
However, the native PCIe PME is coupled to the native PCIe hotplug
and calling pcie_pme_acpi_setup() makes some BIOSes expect that
the native PCIe hotplug will be used as well. That, in turn, causes
problems to appear on systems where the PCIe hotplug driver is not
loaded. The usual symptom, as reported by Jaroslav Kameník and
others, is that the ACPI GPE associated with PCIe hotplug keeps
firing continuously causing kacpid to take substantial percentage
of CPU time.
To work around this issue, change the default so that the native
PCIe PME signaling is only used if directly requested with the help
of the pcie_pme= command line switch.
Fixes https://bugzilla.kernel.org/show_bug.cgi?id=15924 , which is
a listed regression from 2.6.33.
Signed-off-by: Rafael J. Wysocki <rjw at sisk.pl>
Reported-by: Jaroslav Kameník <jaroslav at kamenik.cz>
Tested-by: Antoni Grzymala <antekgrzymala at gmail.com>
Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
---
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 1808f11..82d6aeb 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2048,7 +2048,9 @@ and is between 256 and 4096 characters. It is defined in the file
WARNING: Forcing ASPM on may cause system lockups.
pcie_pme= [PCIE,PM] Native PCIe PME signaling options:
- off Do not use native PCIe PME signaling.
+ Format: {auto|force}[,nomsi]
+ auto Use native PCIe PME signaling if the BIOS allows the
+ kernel to control PCIe config registers of root ports.
force Use native PCIe PME signaling even if the BIOS refuses
to allow the kernel to control the relevant PCIe config
registers.
diff --git a/drivers/pci/pcie/pme/pcie_pme.c b/drivers/pci/pcie/pme/pcie_pme.c
index aac285a..d672a0a 100644
--- a/drivers/pci/pcie/pme/pcie_pme.c
+++ b/drivers/pci/pcie/pme/pcie_pme.c
@@ -34,7 +34,7 @@
* being registered. Consequently, the interrupt-based PCIe PME signaling will
* not be used by any PCIe root ports in that case.
*/
-static bool pcie_pme_disabled;
+static bool pcie_pme_disabled = true;
/*
* The PCI Express Base Specification 2.0, Section 6.1.8, states the following:
@@ -64,12 +64,19 @@ bool pcie_pme_msi_disabled;
static int __init pcie_pme_setup(char *str)
{
- if (!strcmp(str, "off"))
- pcie_pme_disabled = true;
- else if (!strcmp(str, "force"))
+ if (!strncmp(str, "auto", 4))
+ pcie_pme_disabled = false;
+ else if (!strncmp(str, "force", 5))
pcie_pme_force_enable = true;
- else if (!strcmp(str, "nomsi"))
- pcie_pme_msi_disabled = true;
+
+ str = strchr(str, ',');
+ if (str) {
+ str++;
+ str += strspn(str, " \t");
+ if (*str && !strcmp(str, "nomsi"))
+ pcie_pme_msi_disabled = true;
+ }
+
return 1;
}
__setup("pcie_pme=", pcie_pme_setup);
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/kernel.spec,v
retrieving revision 1.2095
retrieving revision 1.2096
diff -u -p -r1.2095 -r1.2096
--- kernel.spec 13 Jul 2010 05:20:53 -0000 1.2095
+++ kernel.spec 14 Jul 2010 20:42:41 -0000 1.2096
@@ -634,6 +634,7 @@ Patch380: linux-2.6-defaults-pci_no_msi.
Patch383: linux-2.6-defaults-aspm.patch
Patch384: pci-acpi-disable-aspm-if-no-osc.patch
Patch385: pci-aspm-dont-enable-too-early.patch
+Patch386: pci-pm-do-not-use-native-pcie-pme-by-default.patch
Patch390: linux-2.6-defaults-acpi-video.patch
Patch391: linux-2.6-acpi-video-dos.patch
@@ -1249,6 +1250,8 @@ ApplyPatch linux-2.6-defaults-aspm.patch
ApplyPatch pci-acpi-disable-aspm-if-no-osc.patch
# allow drivers to disable aspm at load time
ApplyPatch pci-aspm-dont-enable-too-early.patch
+# stop PCIe hotplug interrupt storm (#613412)
+ApplyPatch pci-pm-do-not-use-native-pcie-pme-by-default.patch
#
# SCSI Bits.
@@ -2023,7 +2026,15 @@ fi
%changelog
-* Tue Jul 13 2010 Ben Skeggs <bskeggs at redhat.com>
+* Wed Jul 14 2010 Chuck Ebbert <cebbert at redhat.com> 2.6.34.1-12
+- pci-pm-do-not-use-native-pcie-pme-by-default.patch:
+ fix PCIe hotplug interrupts firing continuously. (#613412)
+- Update pci-acpi-disable-aspm-if-no-osc.patch so it works
+ with the above patch.
+- Drop linux-2.6-defaults-pciehp.patch: pciehp_passive mode
+ does not exist anymore.
+
+* Tue Jul 13 2010 Ben Skeggs <bskeggs at redhat.com> 2.6.34.1-11
- nouveau: bring back patches lost from 2.6.34 update + add some more to
fix at least rhbz#532711 and rhbz#593046
- remove patches relating to nouveau that are now unused
pci-acpi-disable-aspm-if-no-osc.patch:
pci_root.c | 9 +++++++++
1 file changed, 9 insertions(+)
Index: pci-acpi-disable-aspm-if-no-osc.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-13/pci-acpi-disable-aspm-if-no-osc.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- pci-acpi-disable-aspm-if-no-osc.patch 9 Jul 2010 09:09:25 -0000 1.1
+++ pci-acpi-disable-aspm-if-no-osc.patch 14 Jul 2010 20:42:42 -0000 1.2
@@ -1,7 +1,5 @@
From: Matthew Garrett <mjg at redhat.com>
-Date: Tue, 22 Jun 2010 15:25:43 +0000 (-0400)
Subject: ACPI: Disable ASPM if the platform won't provide _OSC control for PCIe
-X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fjbarnes%2Fpci-2.6.git;a=commitdiff_plain;h=cca74426129c3d33cc606a41539a827d194ba4be
ACPI: Disable ASPM if the platform won't provide _OSC control for PCIe
@@ -23,9 +21,7 @@ to vendors being surprised when ASPM get
OSs refuse to do so. So, for now, let's just disable ASPM if the _OSC
method doesn't exist or refuses to hand over PCIe capability control.
-Acked-by: Rafael J. Wysocki <rjw at sisk.pl>
Signed-off-by: Matthew Garrett <mjg at redhat.com>
-Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
---
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
@@ -45,9 +41,9 @@ index 4eac593..1f67057 100644
acpi_pci_osc_support(root, flags);
+ status = acpi_pci_osc_control_set(root->device->handle,
-+ OSC_PCI_EXPRESS_CAP_STRUCTURE_CONTROL);
++ 0);
+
-+ if (ACPI_FAILURE(status)) {
++ if (status == AE_NOT_EXIST) {
+ printk(KERN_INFO "Unable to assume PCIe control: Disabling ASPM\n");
+ pcie_no_aspm();
+ }
--- linux-2.6-defaults-pciehp.patch DELETED ---
More information about the scm-commits
mailing list