sky2: simplify list element error

[safe/jmp/linux-2.6] / drivers / net / sky2.c

diff --git a/drivers/net/sky2.c b/drivers/net/sky2.c
index 6788a91..58d3521 100644 (file)
--- a/drivers/net/sky2.c
+++ b/drivers/net/sky2.c
@@ -50,7 +50,7 @@
 #include "sky2.h"
 
 #define DRV_NAME               "sky2"
-#define DRV_VERSION            "1.23"
+#define DRV_VERSION            "1.24"
 #define PFX                    DRV_NAME " "
 
 /*
@@ -984,12 +984,12 @@ static void sky2_qset(struct sky2_hw *hw, u16 q)
  * hardware and driver list elements
  */
 static void sky2_prefetch_init(struct sky2_hw *hw, u32 qaddr,
-                                     u64 addr, u32 last)
+                              dma_addr_t addr, u32 last)
 {
        sky2_write32(hw, Y2_QADDR(qaddr, PREF_UNIT_CTRL), PREF_UNIT_RST_SET);
        sky2_write32(hw, Y2_QADDR(qaddr, PREF_UNIT_CTRL), PREF_UNIT_RST_CLR);
-       sky2_write32(hw, Y2_QADDR(qaddr, PREF_UNIT_ADDR_HI), addr >> 32);
-       sky2_write32(hw, Y2_QADDR(qaddr, PREF_UNIT_ADDR_LO), (u32) addr);
+       sky2_write32(hw, Y2_QADDR(qaddr, PREF_UNIT_ADDR_HI), upper_32_bits(addr));
+       sky2_write32(hw, Y2_QADDR(qaddr, PREF_UNIT_ADDR_LO), lower_32_bits(addr));
        sky2_write16(hw, Y2_QADDR(qaddr, PREF_UNIT_LAST_IDX), last);
        sky2_write32(hw, Y2_QADDR(qaddr, PREF_UNIT_CTRL), PREF_UNIT_OP_ON);
 
@@ -1016,6 +1016,7 @@ static void tx_init(struct sky2_port *sky2)
        le = get_tx_le(sky2, &sky2->tx_prod);
        le->addr = 0;
        le->opcode = OP_ADDR64 | HW_OWNER;
+       sky2->tx_last_upper = 0;
 }
 
 static inline struct tx_ring_info *tx_le_re(struct sky2_port *sky2,
@@ -1057,7 +1058,7 @@ static void sky2_rx_add(struct sky2_port *sky2,  u8 op,
        }
 
        le = sky2_next_rx(sky2);
-       le->addr = cpu_to_le32((u32) map);
+       le->addr = cpu_to_le32(lower_32_bits(map));
        le->length = cpu_to_le16(len);
        le->opcode = op | HW_OWNER;
 }
@@ -1496,8 +1497,6 @@ static int sky2_up(struct net_device *dev)
        sky2_set_vlan_mode(hw, port, sky2->vlgrp != NULL);
 #endif
 
-       sky2->restarting = 0;
-
        err = sky2_rx_start(sky2);
        if (err)
                goto err_out;
@@ -1508,9 +1507,6 @@ static int sky2_up(struct net_device *dev)
        sky2_write32(hw, B0_IMSK, imask);
        sky2_read32(hw, B0_IMSK);
 
-       /* wake queue incase we are restarting */
-       netif_wake_queue(dev);
-
        if (netif_msg_ifup(sky2))
                printk(KERN_INFO PFX "%s: enabling interface\n", dev->name);
 
@@ -1545,8 +1541,6 @@ static inline int tx_dist(unsigned tail, unsigned head)
 /* Number of list elements available for next tx */
 static inline int tx_avail(const struct sky2_port *sky2)
 {
-       if (unlikely(sky2->restarting))
-               return 0;
        return sky2->tx_pending - tx_dist(sky2->tx_cons, sky2->tx_prod);
 }
 
@@ -1580,8 +1574,9 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
        struct sky2_tx_le *le = NULL;
        struct tx_ring_info *re;
        unsigned i, len;
-       u16 slot;
        dma_addr_t mapping;
+       u32 upper;
+       u16 slot;
        u16 mss;
        u8 ctrl;
 
@@ -1600,9 +1595,11 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
                       dev->name, slot, skb->len);
 
        /* Send high bits if needed */
-       if (sizeof(dma_addr_t) > sizeof(u32)) {
+       upper = upper_32_bits(mapping);
+       if (upper != sky2->tx_last_upper) {
                le = get_tx_le(sky2, &slot);
-               le->addr = cpu_to_le32(upper_32_bits(mapping));
+               le->addr = cpu_to_le32(upper);
+               sky2->tx_last_upper = upper;
                le->opcode = OP_ADDR64 | HW_OWNER;
        }
 
@@ -1669,7 +1666,7 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
        }
 
        le = get_tx_le(sky2, &slot);
-       le->addr = cpu_to_le32((u32) mapping);
+       le->addr = cpu_to_le32(lower_32_bits(mapping));
        le->length = cpu_to_le16(len);
        le->ctrl = ctrl;
        le->opcode = mss ? (OP_LARGESEND | HW_OWNER) : (OP_PACKET | HW_OWNER);
@@ -1688,15 +1685,16 @@ static int sky2_xmit_frame(struct sk_buff *skb, struct net_device *dev)
                if (pci_dma_mapping_error(hw->pdev, mapping))
                        goto mapping_unwind;
 
-               if (sizeof(dma_addr_t) > sizeof(u32)) {
+               upper = upper_32_bits(mapping);
+               if (upper != sky2->tx_last_upper) {
                        le = get_tx_le(sky2, &slot);
-                       le->addr = cpu_to_le32(upper_32_bits(mapping));
-                       le->ctrl = 0;
+                       le->addr = cpu_to_le32(upper);
+                       sky2->tx_last_upper = upper;
                        le->opcode = OP_ADDR64 | HW_OWNER;
                }
 
                le = get_tx_le(sky2, &slot);
-               le->addr = cpu_to_le32((u32) mapping);
+               le->addr = cpu_to_le32(lower_32_bits(mapping));
                le->length = cpu_to_le16(frag->size);
                le->ctrl = ctrl;
                le->opcode = OP_BUFFER | HW_OWNER;
@@ -1850,10 +1848,6 @@ static int sky2_down(struct net_device *dev)
        if (netif_msg_ifdown(sky2))
                printk(KERN_INFO PFX "%s: disabling interface\n", dev->name);
 
-       /* explicitly shut off tx incase we're restarting */
-       sky2->restarting = 1;
-       netif_tx_disable(dev);
-
        /* Force flow control off */
        sky2_write8(hw, SK_REG(port, GMAC_CTRL), GMC_PAUSE_OFF);
 
@@ -2382,7 +2376,7 @@ static inline void sky2_tx_done(struct net_device *dev, u16 last)
 {
        struct sky2_port *sky2 = netdev_priv(dev);
 
-       if (likely(netif_running(dev) && !sky2->restarting))
+       if (netif_running(dev))
                sky2_tx_complete(sky2, last);
 }
 
@@ -2667,19 +2661,15 @@ static void sky2_mac_intr(struct sky2_hw *hw, unsigned port)
 }
 
 /* This should never happen it is a bug. */
-static void sky2_le_error(struct sky2_hw *hw, unsigned port,
-                         u16 q, unsigned ring_size)
+static void sky2_le_error(struct sky2_hw *hw, unsigned port, u16 q)
 {
        struct net_device *dev = hw->dev[port];
-       struct sky2_port *sky2 = netdev_priv(dev);
-       unsigned idx;
-       const u64 *le = (q == Q_R1 || q == Q_R2)
-               ? (u64 *) sky2->rx_le : (u64 *) sky2->tx_le;
+       u16 idx = sky2_read16(hw, Y2_QADDR(q, PREF_UNIT_GET_IDX));
 
-       idx = sky2_read16(hw, Y2_QADDR(q, PREF_UNIT_GET_IDX));
-       printk(KERN_ERR PFX "%s: descriptor error q=%#x get=%u [%llx] put=%u\n",
-              dev->name, (unsigned) q, idx, (unsigned long long) le[idx],
-              (unsigned) sky2_read16(hw, Y2_QADDR(q, PREF_UNIT_PUT_IDX)));
+       dev_err(&hw->pdev->dev, PFX
+               "%s: descriptor error q=%#x get=%u put=%u\n",
+               dev->name, (unsigned) q, (unsigned) idx,
+               (unsigned) sky2_read16(hw, Y2_QADDR(q, PREF_UNIT_PUT_IDX)));
 
        sky2_write32(hw, Q_ADDR(q, Q_CSR), BMU_CLR_IRQ_CHK);
 }
@@ -2765,16 +2755,16 @@ static void sky2_err_intr(struct sky2_hw *hw, u32 status)
                sky2_mac_intr(hw, 1);
 
        if (status & Y2_IS_CHK_RX1)
-               sky2_le_error(hw, 0, Q_R1, RX_LE_SIZE);
+               sky2_le_error(hw, 0, Q_R1);
 
        if (status & Y2_IS_CHK_RX2)
-               sky2_le_error(hw, 1, Q_R2, RX_LE_SIZE);
+               sky2_le_error(hw, 1, Q_R2);
 
        if (status & Y2_IS_CHK_TXA1)
-               sky2_le_error(hw, 0, Q_XA1, TX_RING_SIZE);
+               sky2_le_error(hw, 0, Q_XA1);
 
        if (status & Y2_IS_CHK_TXA2)
-               sky2_le_error(hw, 1, Q_XA2, TX_RING_SIZE);
+               sky2_le_error(hw, 1, Q_XA2);
 }
 
 static int sky2_poll(struct napi_struct *napi, int work_limit)
@@ -4327,7 +4317,6 @@ static __devinit struct net_device *sky2_init_netdev(struct sky2_hw *hw,
        spin_lock_init(&sky2->phy_lock);
        sky2->tx_pending = TX_DEF_PENDING;
        sky2->rx_pending = RX_DEF_PENDING;
-       sky2->restarting = 0;
 
        hw->dev[port] = dev;