diff options
Diffstat (limited to 'drivers/net/igb')
-rw-r--r-- | drivers/net/igb/igb_main.c | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c index 7124f59fb99f..7c4481b994ab 100644 --- a/drivers/net/igb/igb_main.c +++ b/drivers/net/igb/igb_main.c | |||
@@ -1128,11 +1128,10 @@ static int __devinit igb_probe(struct pci_dev *pdev, | |||
1128 | struct net_device *netdev; | 1128 | struct net_device *netdev; |
1129 | struct igb_adapter *adapter; | 1129 | struct igb_adapter *adapter; |
1130 | struct e1000_hw *hw; | 1130 | struct e1000_hw *hw; |
1131 | struct pci_dev *us_dev; | ||
1132 | const struct e1000_info *ei = igb_info_tbl[ent->driver_data]; | 1131 | const struct e1000_info *ei = igb_info_tbl[ent->driver_data]; |
1133 | unsigned long mmio_start, mmio_len; | 1132 | unsigned long mmio_start, mmio_len; |
1134 | int err, pci_using_dac, pos; | 1133 | int err, pci_using_dac; |
1135 | u16 eeprom_data = 0, state = 0; | 1134 | u16 eeprom_data = 0; |
1136 | u16 eeprom_apme_mask = IGB_EEPROM_APME; | 1135 | u16 eeprom_apme_mask = IGB_EEPROM_APME; |
1137 | u32 part_num; | 1136 | u32 part_num; |
1138 | 1137 | ||
@@ -1158,27 +1157,6 @@ static int __devinit igb_probe(struct pci_dev *pdev, | |||
1158 | } | 1157 | } |
1159 | } | 1158 | } |
1160 | 1159 | ||
1161 | /* 82575 requires that the pci-e link partner disable the L0s state */ | ||
1162 | switch (pdev->device) { | ||
1163 | case E1000_DEV_ID_82575EB_COPPER: | ||
1164 | case E1000_DEV_ID_82575EB_FIBER_SERDES: | ||
1165 | case E1000_DEV_ID_82575GB_QUAD_COPPER: | ||
1166 | us_dev = pdev->bus->self; | ||
1167 | pos = pci_find_capability(us_dev, PCI_CAP_ID_EXP); | ||
1168 | if (pos) { | ||
1169 | pci_read_config_word(us_dev, pos + PCI_EXP_LNKCTL, | ||
1170 | &state); | ||
1171 | state &= ~PCIE_LINK_STATE_L0S; | ||
1172 | pci_write_config_word(us_dev, pos + PCI_EXP_LNKCTL, | ||
1173 | state); | ||
1174 | dev_info(&pdev->dev, | ||
1175 | "Disabling ASPM L0s upstream switch port %s\n", | ||
1176 | pci_name(us_dev)); | ||
1177 | } | ||
1178 | default: | ||
1179 | break; | ||
1180 | } | ||
1181 | |||
1182 | err = pci_request_selected_regions(pdev, pci_select_bars(pdev, | 1160 | err = pci_request_selected_regions(pdev, pci_select_bars(pdev, |
1183 | IORESOURCE_MEM), | 1161 | IORESOURCE_MEM), |
1184 | igb_driver_name); | 1162 | igb_driver_name); |