Stephen Hemminger wrote:
@@ -2183,9 +2190,6 @@ static int sky2_poll(struct net_device *
int work_done = 0;
u32 status = sky2_read32(hw, B0_Y2_SP_EISR);
- if (!~status)
- return 0;
-
if (status & Y2_IS_HW_ERR)
sky2_hw_intr(hw);
It's probably better to do "goto end_of_function" than simply return,
but I disagree that this check should be removed.
As long as you are reading values from the hardware, you should include
this 0xffffffff check. It's certainly possible that the controller
could have been unplugged from the time the interrupt handler last ran,
and the time that NAPI poll runs.
@@ -3427,9 +3429,14 @@ static void __devexit sky2_remove(struct
static int sky2_suspend(struct pci_dev *pdev, pm_message_t state)
{
struct sky2_hw *hw = pci_get_drvdata(pdev);
- int i;
+ int i, err;
+ u32 imask;
+
+ pci_save_state(pdev);
- for (i = 0; i < 2; i++) {
+ del_timer_sync(&hw->idle_timer);
It would seem smarter to put the timer removal before pci-save-state.
+ for (i = 0; i < hw->ports; i++) {
struct net_device *dev = hw->dev[i];
if (dev) {
@@ -3441,8 +3448,17 @@ static int sky2_suspend(struct pci_dev *
}
}
- pci_save_state(pdev);
- return sky2_set_power_state(hw, pci_choose_state(pdev, state));
+ imask = sky2_read32(hw, B0_IMSK);
+ sky2_write32(hw, B0_IMSK, 0);
+ synchronize_irq(hw->pdev->irq);
This seems "obviously racy" to me.
+ err = sky2_set_power_state(hw, pci_choose_state(pdev, state));
+ if (err) {
+ sky2_write32(hw, B0_IMSK, imask);
+ sky2_idle_start(hw);
+ }
+
+ return err;
}
static int sky2_resume(struct pci_dev *pdev)
@@ -3460,7 +3476,7 @@ static int sky2_resume(struct pci_dev *p
if (err)
goto out;
- for (i = 0; i < 2; i++) {
+ for (i = 0; i < hw->ports; i++) {
struct net_device *dev = hw->dev[i];
if (dev && netif_running(dev)) {
netif_device_attach(dev);
@@ -3473,7 +3489,10 @@ static int sky2_resume(struct pci_dev *p
}
}
}
-out:
+
+ sky2_idle_start(hw);
+
+ out:
return err;
}
#endif
-
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
