From: David S. Miller <davem@davemloft.net>
Date: Tue, 27 Apr 2010 19:49:13 +0000 (-0700)
Subject: Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
X-Git-Tag: v2.6.35-rc1~473^2~377
X-Git-Url: http://ftp.safe.ca/?p=safe%2Fjmp%2Flinux-2.6;a=commitdiff_plain;h=e1703b36c358dde24ececba4fd609ecd91433ba3

Merge branch 'master' of /linux/kernel/git/davem/net-2.6

Conflicts:
	drivers/net/e100.c
	drivers/net/e1000e/netdev.c
---

e1703b36c358dde24ececba4fd609ecd91433ba3
diff --cc drivers/net/e100.c
index 3e8d000,7910803..ef97bfc
--- a/drivers/net/e100.c
+++ b/drivers/net/e100.c
@@@ -2278,10 -2264,15 +2279,15 @@@ static void e100_tx_timeout_task(struc
  	struct nic *nic = container_of(work, struct nic, tx_timeout_task);
  	struct net_device *netdev = nic->netdev;
  
 -	DPRINTK(TX_ERR, DEBUG, "scb.status=0x%02X\n",
 -		ioread8(&nic->csr->scb.status));
 +	netif_printk(nic, tx_err, KERN_DEBUG, nic->netdev,
 +		     "scb.status=0x%02X\n", ioread8(&nic->csr->scb.status));
- 	e100_down(netdev_priv(netdev));
- 	e100_up(netdev_priv(netdev));
+ 
+ 	rtnl_lock();
+ 	if (netif_running(netdev)) {
+ 		e100_down(netdev_priv(netdev));
+ 		e100_up(netdev_priv(netdev));
+ 	}
+ 	rtnl_unlock();
  }
  
  static int e100_loopback_test(struct nic *nic, enum loopback loopback_mode)
diff --cc drivers/net/e1000e/netdev.c
index 5f70c43,fb8fc7d..2476f8c
--- a/drivers/net/e1000e/netdev.c
+++ b/drivers/net/e1000e/netdev.c
@@@ -4634,46 -4613,79 +4642,60 @@@ static void e1000_complete_shutdown(str
  	}
  }
  
- static void e1000e_disable_l1aspm(struct pci_dev *pdev)
+ #ifdef CONFIG_PCIEASPM
+ static void __e1000e_disable_aspm(struct pci_dev *pdev, u16 state)
+ {
+ 	pci_disable_link_state(pdev, state);
+ }
+ #else
+ static void __e1000e_disable_aspm(struct pci_dev *pdev, u16 state)
  {
  	int pos;
- 	u16 val;
+ 	u16 reg16;
  
  	/*
- 	 * 82573 workaround - disable L1 ASPM on mobile chipsets
- 	 *
- 	 * L1 ASPM on various mobile (ich7) chipsets do not behave properly
- 	 * resulting in lost data or garbage information on the pci-e link
- 	 * level. This could result in (false) bad EEPROM checksum errors,
- 	 * long ping times (up to 2s) or even a system freeze/hang.
- 	 *
- 	 * Unfortunately this feature saves about 1W power consumption when
- 	 * active.
+ 	 * Both device and parent should have the same ASPM setting.
+ 	 * Disable ASPM in downstream component first and then upstream.
  	 */
- 	pos = pci_find_capability(pdev, PCI_CAP_ID_EXP);
- 	pci_read_config_word(pdev, pos + PCI_EXP_LNKCTL, &val);
- 	if (val & 0x2) {
- 		dev_warn(&pdev->dev, "Disabling L1 ASPM\n");
- 		val &= ~0x2;
- 		pci_write_config_word(pdev, pos + PCI_EXP_LNKCTL, val);
- 	}
+ 	pos = pci_pcie_cap(pdev);
+ 	pci_read_config_word(pdev, pos + PCI_EXP_LNKCTL, &reg16);
+ 	reg16 &= ~state;
+ 	pci_write_config_word(pdev, pos + PCI_EXP_LNKCTL, reg16);
+ 
+ 	pos = pci_pcie_cap(pdev->bus->self);
+ 	pci_read_config_word(pdev->bus->self, pos + PCI_EXP_LNKCTL, &reg16);
+ 	reg16 &= ~state;
+ 	pci_write_config_word(pdev->bus->self, pos + PCI_EXP_LNKCTL, reg16);
+ }
+ #endif
+ void e1000e_disable_aspm(struct pci_dev *pdev, u16 state)
+ {
+ 	dev_info(&pdev->dev, "Disabling ASPM %s %s\n",
+ 		 (state & PCIE_LINK_STATE_L0S) ? "L0s" : "",
+ 		 (state & PCIE_LINK_STATE_L1) ? "L1" : "");
+ 
+ 	__e1000e_disable_aspm(pdev, state);
  }
  
 -#ifdef CONFIG_PM
 -static int e1000_suspend(struct pci_dev *pdev, pm_message_t state)
 +#ifdef CONFIG_PM_OPS
 +static bool e1000e_pm_ready(struct e1000_adapter *adapter)
  {
 -	int retval;
 -	bool wake;
 -
 -	retval = __e1000_shutdown(pdev, &wake);
 -	if (!retval)
 -		e1000_complete_shutdown(pdev, true, wake);
 -
 -	return retval;
 +	return !!adapter->tx_ring->buffer_info;
  }
  
 -static int e1000_resume(struct pci_dev *pdev)
 +static int __e1000_resume(struct pci_dev *pdev)
  {
  	struct net_device *netdev = pci_get_drvdata(pdev);
  	struct e1000_adapter *adapter = netdev_priv(netdev);
  	struct e1000_hw *hw = &adapter->hw;
  	u32 err;
  
- 	e1000e_disable_l1aspm(pdev);
+ 	pci_set_power_state(pdev, PCI_D0);
+ 	pci_restore_state(pdev);
+ 	pci_save_state(pdev);
+ 	if (adapter->flags2 & FLAG2_DISABLE_ASPM_L1)
+ 		e1000e_disable_aspm(pdev, PCIE_LINK_STATE_L1);
  
 -	err = pci_enable_device_mem(pdev);
 -	if (err) {
 -		dev_err(&pdev->dev,
 -			"Cannot enable PCI device from suspend\n");
 -		return err;
 -	}
 -
 -	pci_set_master(pdev);
 -
 -	pci_enable_wake(pdev, PCI_D3hot, 0);
 -	pci_enable_wake(pdev, PCI_D3cold, 0);
 -
  	e1000e_set_interrupt_capability(adapter);
  	if (netif_running(netdev)) {
  		err = e1000_request_irq(adapter);