[net-2.6 PATCH][RESEND] igb: remove ASPM L0s workaround

[net-2.6 PATCH][RESEND] igb: remove ASPM L0s workaround

[Jeff Kirsher]

From: Alexander Duyck <alexander.h.duyck@intel.com>

The L0s workaround should be moved into a pci quirk and so it is not
necessary in the driver.  This update removes the L0s workaround from the
igb driver.

This was the second half of the PCI quirk patch with Matthew Wilcox did not
pick up when he picked up the quirk patch.

Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---

 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 78558f8..1adc7d2 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -1126,11 +1126,10 @@ static int __devinit igb_probe(struct pci_dev *pdev,
 	struct net_device *netdev;
 	struct igb_adapter *adapter;
 	struct e1000_hw *hw;
-	struct pci_dev *us_dev;
 	const struct e1000_info *ei = igb_info_tbl[ent->driver_data];
 	unsigned long mmio_start, mmio_len;
-	int err, pci_using_dac, pos;
-	u16 eeprom_data = 0, state = 0;
+	int err, pci_using_dac;
+	u16 eeprom_data = 0;
 	u16 eeprom_apme_mask = IGB_EEPROM_APME;
 	u32 part_num;
 
@@ -1156,27 +1155,6 @@ static int __devinit igb_probe(struct pci_dev *pdev,
 		}
 	}
 
-	/* 82575 requires that the pci-e link partner disable the L0s state */
-	switch (pdev->device) {
-	case E1000_DEV_ID_82575EB_COPPER:
-	case E1000_DEV_ID_82575EB_FIBER_SERDES:
-	case E1000_DEV_ID_82575GB_QUAD_COPPER:
-		us_dev = pdev->bus->self;
-		pos = pci_find_capability(us_dev, PCI_CAP_ID_EXP);
-		if (pos) {
-			pci_read_config_word(us_dev, pos + PCI_EXP_LNKCTL,
-			                     &state);
-			state &= ~PCIE_LINK_STATE_L0S;
-			pci_write_config_word(us_dev, pos + PCI_EXP_LNKCTL,
-			                      state);
-			dev_info(&pdev->dev,
-				 "Disabling ASPM L0s upstream switch port %s\n",
-				 pci_name(us_dev));
-		}
-	default:
-		break;
-	}
-
 	err = pci_request_selected_regions(pdev, pci_select_bars(pdev,
 	                                   IORESOURCE_MEM),
 	                                   igb_driver_name);

Re: [net-2.6 PATCH][RESEND] igb: remove ASPM L0s workaround

[David Miller]

From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 13 Mar 2009 23:35:34 -0700

> From: Alexander Duyck <alexander.h.duyck@intel.com>
> 
> The L0s workaround should be moved into a pci quirk and so it is not
> necessary in the driver.  This update removes the L0s workaround from the
> igb driver.
> 
> This was the second half of the PCI quirk patch with Matthew Wilcox did not
> pick up when he picked up the quirk patch.
> 
> Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>

Doesn't apply to net-2.6:

davem@sunset:~/src/GIT/net-2.6$ apply "Alexander Duyck" "alexander.h.duyck@intel.com" diff msg
error: patch failed: drivers/net/igb/igb_main.c:1126
error: drivers/net/igb/igb_main.c: patch does not apply
davem@sunset:~/src/GIT/net-2.6$ 

And in fact if I try to apply it to net-next-2.6, that does
work.

Re: [net-2.6 PATCH][RESEND] igb: remove ASPM L0s workaround

[Jeff Kirsher]

On Sat, Mar 14, 2009 at 12:54 PM, David Miller <davem@davemloft.net> wrote:
> From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> Date: Fri, 13 Mar 2009 23:35:34 -0700
>
>> From: Alexander Duyck <alexander.h.duyck@intel.com>
>>
>> The L0s workaround should be moved into a pci quirk and so it is not
>> necessary in the driver.  This update removes the L0s workaround from the
>> igb driver.
>>
>> This was the second half of the PCI quirk patch with Matthew Wilcox did not
>> pick up when he picked up the quirk patch.
>>
>> Signed-off-by: Alexander Duyck <alexander.h.duyck@intel.com>
>> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
>
> Doesn't apply to net-2.6:
>
> davem@sunset:~/src/GIT/net-2.6$ apply "Alexander Duyck" "alexander.h.duyck@intel.com" diff msg
> error: patch failed: drivers/net/igb/igb_main.c:1126
> error: drivers/net/igb/igb_main.c: patch does not apply
> davem@sunset:~/src/GIT/net-2.6$
>
> And in fact if I try to apply it to net-next-2.6, that does
> work.
> --

My bad, I will re-spin the patch with your net-2.6 tree.

-- 
Cheers,
Jeff