Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/netdev-2.6: (42 commits)
  r8169: extraneous Cmd{Tx/Rx}Enb write
  forcedeth: modified comment header
  NetXen: Reducing ring sizes for IOMMU issue.
  NetXen: Fix for PPC machines.
  NetXen: work queue fixes.
  NetXen: Link status message correction for quad port cards.
  NetXen: Multiple adapter fix.
  NetXen: Using correct CHECKSUM flag.
  NetXen: driver reload fix for newer firmware.
  NetXen: Adding new device ids.
  PHY probe not working properly for ibm_emac (PPC4xx)
  ep93xx: some minor cleanups to the ep93xx eth driver
  sky2: phy power down needs PCI config write enabled
  sky2: power management/MSI workaround
  sky2: dual port NAPI problem
  via-velocity uses INET interfaces
  e1000: Do not truncate TSO TCP header with 82544 workaround
  myri10ge: handle failures in suspend and resume
  myri10ge: no need to save MSI and PCIe state in the driver
  myri10ge: make msi configurable at runtime through sysfs
  ...

1 files changed, 34 insertions, 1 deletions

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index fb1d2c30c1bb..a6601e8d423c 100644
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -569,8 +569,8 @@ static void sky2_phy_power(struct sky2_hw *hw, unsigned port, int onoff)
         if (hw->chip_id == CHIP_ID_YUKON_XL && hw->chip_rev > 1)
                 onoff = !onoff;
 
+        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_ON);
         reg1 = sky2_pci_read32(hw, PCI_DEV_REG1);
-
         if (onoff)
                 /* Turn off phy power saving */
                 reg1 &= ~phy_power[port];
@@ -579,6 +579,7 @@ static void sky2_phy_power(struct sky2_hw *hw, unsigned port, int onoff)
 
         sky2_pci_write32(hw, PCI_DEV_REG1, reg1);
         sky2_pci_read32(hw, PCI_DEV_REG1);
+        sky2_write8(hw, B2_TST_CTRL1, TST_CFG_WRITE_OFF);
         udelay(100);
 }
 
@@ -1511,6 +1512,13 @@ static int sky2_down(struct net_device *dev)
         imask &= ~portirq_msk[port];
         sky2_write32(hw, B0_IMSK, imask);
 
+        /*
+         * Both ports share the NAPI poll on port 0, so if necessary undo the
+         * the disable that is done in dev_close.
+         */
+        if (sky2->port == 0 && hw->ports > 1)
+                netif_poll_enable(dev);
+
         sky2_gmac_reset(hw, port);
 
         /* Stop transmitter */
@@ -3631,6 +3639,29 @@ static int sky2_resume(struct pci_dev *pdev)
 out:
         return err;
 }
+
+/* BIOS resume runs after device (it's a bug in PM)
+ * as a temporary workaround on suspend/resume leave MSI disabled
+ */
+static int sky2_suspend_late(struct pci_dev *pdev, pm_message_t state)
+{
+        struct sky2_hw *hw = pci_get_drvdata(pdev);
+
+        free_irq(pdev->irq, hw);
+        if (hw->msi) {
+                pci_disable_msi(pdev);
+                hw->msi = 0;
+        }
+        return 0;
+}
+
+static int sky2_resume_early(struct pci_dev *pdev)
+{
+        struct sky2_hw *hw = pci_get_drvdata(pdev);
+        struct net_device *dev = hw->dev[0];
+
+        return request_irq(pdev->irq, sky2_intr, IRQF_SHARED, dev->name, hw);
+}
 #endif
 
 static struct pci_driver sky2_driver = {
@@ -3641,6 +3672,8 @@ static struct pci_driver sky2_driver = {
 #ifdef CONFIG_PM
         .suspend = sky2_suspend,
         .resume = sky2_resume,
+        .suspend_late = sky2_suspend_late,
+        .resume_early = sky2_resume_early,
 #endif
 };