[PATCH] sky2: rework of NAPI and IRQ management

Redo the interupt handling of sky2 driver based on the IRQ mangement
documentation. All interrupts are handled by the device0 NAPI poll
routine.

Don't need to adjust interrupt mask in IRQ context, done only when
changing device under RTNL. Therefore don't need hwlock anymore.

Signed-off-by: Stephen Hemminger <shemminger@osdl.org>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 4 insertions, 11 deletions

diff --git a/drivers/net/sky2.h b/drivers/net/sky2.h
index 2a23f3ad6d9f..db362b69b0bb 100644
--- a/drivers/net/sky2.h
+++ b/drivers/net/sky2.h
@@ -278,13 +278,9 @@ enum {
         Y2_IS_CHK_TXS1  = 1<<1,         /* Descriptor error TXS 1 */
         Y2_IS_CHK_TXA1  = 1<<0,         /* Descriptor error TXA 1 */
 
-        Y2_IS_BASE      = Y2_IS_HW_ERR | Y2_IS_STAT_BMU |
-                          Y2_IS_POLL_CHK | Y2_IS_TWSI_RDY |
-                          Y2_IS_IRQ_SW | Y2_IS_TIMINT,
-        Y2_IS_PORT_1    = Y2_IS_IRQ_PHY1 | Y2_IS_IRQ_MAC1 |
-                          Y2_IS_CHK_RX1 | Y2_IS_CHK_TXA1 | Y2_IS_CHK_TXS1,
-        Y2_IS_PORT_2    = Y2_IS_IRQ_PHY2 | Y2_IS_IRQ_MAC2 |
-                          Y2_IS_CHK_RX2 | Y2_IS_CHK_TXA2 | Y2_IS_CHK_TXS2,
+        Y2_IS_BASE      = Y2_IS_HW_ERR | Y2_IS_STAT_BMU,
+        Y2_IS_PORT_1    = Y2_IS_IRQ_PHY1 | Y2_IS_IRQ_MAC1,
+        Y2_IS_PORT_2    = Y2_IS_IRQ_PHY2 | Y2_IS_IRQ_MAC2,
 };
 
 /*      B2_IRQM_HWE_MSK 32 bit  IRQ Moderation HW Error Mask */
@@ -1832,6 +1828,7 @@ struct sky2_port {
         struct net_device    *netdev;
         unsigned             port;
         u32                  msg_enable;
+        spinlock_t           phy_lock;
 
         spinlock_t           tx_lock  ____cacheline_aligned_in_smp;
         struct tx_ring_info  *tx_ring;
@@ -1866,16 +1863,12 @@ struct sky2_port {
 
         struct net_device_stats net_stats;
 
-        struct work_struct   phy_task;
-        struct semaphore     phy_sema;
 };
 
 struct sky2_hw {
         void __iomem         *regs;
         struct pci_dev       *pdev;
         struct net_device    *dev[2];
-        spinlock_t           hw_lock;
-        u32                  intr_mask;
 
         int                  pm_cap;
         u8                   chip_id;