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
ASPM: Fix pcie devices with non-pcie children
[pandora-kernel.git]
/
drivers
/
pci
/
pcie
/
aspm.c
diff --git
a/drivers/pci/pcie/aspm.c
b/drivers/pci/pcie/aspm.c
index
24f049e
..
2275162
100644
(file)
--- a/
drivers/pci/pcie/aspm.c
+++ b/
drivers/pci/pcie/aspm.c
@@
-500,9
+500,6
@@
static int pcie_aspm_sanity_check(struct pci_dev *pdev)
int pos;
u32 reg32;
int pos;
u32 reg32;
- if (aspm_disabled)
- return 0;
-
/*
* Some functions in a slot might not all be PCIe functions,
* very strange. Disable ASPM for the whole slot
/*
* Some functions in a slot might not all be PCIe functions,
* very strange. Disable ASPM for the whole slot
@@
-511,6
+508,16
@@
static int pcie_aspm_sanity_check(struct pci_dev *pdev)
pos = pci_pcie_cap(child);
if (!pos)
return -EINVAL;
pos = pci_pcie_cap(child);
if (!pos)
return -EINVAL;
+
+ /*
+ * If ASPM is disabled then we're not going to change
+ * the BIOS state. It's safe to continue even if it's a
+ * pre-1.1 device
+ */
+
+ if (aspm_disabled)
+ continue;
+
/*
* Disable ASPM for pre-1.1 PCIe device, we follow MS to use
* RBER bit to determine if a function is 1.1 version device
/*
* Disable ASPM for pre-1.1 PCIe device, we follow MS to use
* RBER bit to determine if a function is 1.1 version device