git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PCI: Rework ASPM disable code
[pandora-kernel.git]
/
drivers
/
acpi
/
pci_root.c
diff --git
a/drivers/acpi/pci_root.c
b/drivers/acpi/pci_root.c
index
2672c79
..
7aff631
100644
(file)
--- a/
drivers/acpi/pci_root.c
+++ b/
drivers/acpi/pci_root.c
@@
-596,6
+596,13
@@
static int __devinit acpi_pci_root_add(struct acpi_device *device)
if (ACPI_SUCCESS(status)) {
dev_info(root->bus->bridge,
"ACPI _OSC control (0x%02x) granted\n", flags);
if (ACPI_SUCCESS(status)) {
dev_info(root->bus->bridge,
"ACPI _OSC control (0x%02x) granted\n", flags);
+ if (acpi_gbl_FADT.boot_flags & ACPI_FADT_NO_ASPM) {
+ /*
+ * We have ASPM control, but the FADT indicates
+ * that it's unsupported. Clear it.
+ */
+ pcie_clear_aspm(root->bus);
+ }
} else {
dev_info(root->bus->bridge,
"ACPI _OSC request failed (%s), "
} else {
dev_info(root->bus->bridge,
"ACPI _OSC request failed (%s), "