lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PCI ASPM: cleanup pcie_aspm_sanity_check

Browse Source 
Minor cleanup for pcie_aspm_sanity_check().

Acked-by: Shaohua Li <shaohua.li@intel.com>
Signed-off-by: Kenji Kaneshige <kaneshige.kenji@jp.fujitsu.com>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
This commit is contained in:
Kenji Kaneshige
2009-05-13 12:23:09 +09:00
committed by Jesse Barnes
parent efdf828881
commit 3647584d9e
1 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
drivers/pci/pcie/aspm.c
View File

@@ -552,27 +552,24 @@ static void free_link_state(struct pcie_link_state *link)
static int pcie_aspm_sanity_check(struct pci_dev *pdev) static int pcie_aspm_sanity_check(struct pci_dev *pdev)
{ {
struct pci_dev *child_dev; struct pci_dev *child;
int child_pos; int pos;
u32 reg32; u32 reg32;
/* /*
* Some functions in a slot might not all be PCIE functions, very * Some functions in a slot might not all be PCIE functions,
* strange. Disable ASPM for the whole slot * very strange. Disable ASPM for the whole slot
*/ */
list_for_each_entry(child_dev, &pdev->subordinate->devices, bus_list) { list_for_each_entry(child, &pdev->subordinate->devices, bus_list) {
child_pos = pci_find_capability(child_dev, PCI_CAP_ID_EXP); pos = pci_find_capability(child, PCI_CAP_ID_EXP);
if (!child_pos) if (!pos)
return -EINVAL; return -EINVAL;
/* /*
* Disable ASPM for pre-1.1 PCIe device, we follow MS to use * 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 * RBER bit to determine if a function is 1.1 version device
*/ */
pci_read_config_dword(child_dev, child_pos + PCI_EXP_DEVCAP, pci_read_config_dword(child, pos + PCI_EXP_DEVCAP, &reg32);
&reg32);
if (!(reg32 & PCI_EXP_DEVCAP_RBER) && !aspm_force) { if (!(reg32 & PCI_EXP_DEVCAP_RBER) && !aspm_force) {
dev_printk(KERN_INFO, &child_dev->dev, "disabling ASPM" dev_printk(KERN_INFO, &child->dev, "disabling ASPM"
" on pre-1.1 PCIe device. You can enable it" " on pre-1.1 PCIe device. You can enable it"
" with 'pcie_aspm=force'\n"); " with 'pcie_aspm=force'\n");
return -EINVAL; return -EINVAL;