projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
[realview] update to kernel 3.0
[openwrt.git] / target / linux / ar71xx / files / drivers / net / ag71xx / ag71xx_main.c
diff --git a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
index 065f603..ed9e7b9 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -1,7 +1,7 @@
 /*
  *  Atheros AR71xx built-in ethernet mac driver
  *
 /*
  *  Atheros AR71xx built-in ethernet mac driver
  *
- *  Copyright (C) 2008 Gabor Juhos <juhosg@openwrt.org>
+ *  Copyright (C) 2008-2010 Gabor Juhos <juhosg@openwrt.org>
  *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
  *
  *  Based on Atheros' AG7100 driver
  *  Copyright (C) 2008 Imre Kaloz <kaloz@openwrt.org>
  *
  *  Based on Atheros' AG7100 driver
@@ -13,6 +13,36 @@
 
 #include "ag71xx.h"
 
 
 #include "ag71xx.h"
 
+#define AG71XX_DEFAULT_MSG_ENABLE      \
+       (NETIF_MSG_DRV                  \
+       | NETIF_MSG_PROBE               \
+       | NETIF_MSG_LINK                \
+       | NETIF_MSG_TIMER               \
+       | NETIF_MSG_IFDOWN              \
+       | NETIF_MSG_IFUP                \
+       | NETIF_MSG_RX_ERR              \
+       | NETIF_MSG_TX_ERR)
+
+static int ag71xx_msg_level = -1;
+
+module_param_named(msg_level, ag71xx_msg_level, int, 0);
+MODULE_PARM_DESC(msg_level, "Message level (-1=defaults,0=none,...,16=all)");
+
+static void ag71xx_dump_dma_regs(struct ag71xx *ag)
+{
+       DBG("%s: dma_tx_ctrl=%08x, dma_tx_desc=%08x, dma_tx_status=%08x\n",
+               ag->dev->name,
+               ag71xx_rr(ag, AG71XX_REG_TX_CTRL),
+               ag71xx_rr(ag, AG71XX_REG_TX_DESC),
+               ag71xx_rr(ag, AG71XX_REG_TX_STATUS));
+
+       DBG("%s: dma_rx_ctrl=%08x, dma_rx_desc=%08x, dma_rx_status=%08x\n",
+               ag->dev->name,
+               ag71xx_rr(ag, AG71XX_REG_RX_CTRL),
+               ag71xx_rr(ag, AG71XX_REG_RX_DESC),
+               ag71xx_rr(ag, AG71XX_REG_RX_STATUS));
+}
+
 static void ag71xx_dump_regs(struct ag71xx *ag)
 {
        DBG("%s: mac_cfg1=%08x, mac_cfg2=%08x, ipg=%08x, hdx=%08x, mfl=%08x\n",
 static void ag71xx_dump_regs(struct ag71xx *ag)
 {
        DBG("%s: mac_cfg1=%08x, mac_cfg2=%08x, ipg=%08x, hdx=%08x, mfl=%08x\n",
@@ -22,16 +52,6 @@ static void ag71xx_dump_regs(struct ag71xx *ag)
                ag71xx_rr(ag, AG71XX_REG_MAC_IPG),
                ag71xx_rr(ag, AG71XX_REG_MAC_HDX),
                ag71xx_rr(ag, AG71XX_REG_MAC_MFL));
                ag71xx_rr(ag, AG71XX_REG_MAC_IPG),
                ag71xx_rr(ag, AG71XX_REG_MAC_HDX),
                ag71xx_rr(ag, AG71XX_REG_MAC_MFL));
-       DBG("%s: mii_cfg=%08x, mii_cmd=%08x, mii_addr=%08x\n",
-               ag->dev->name,
-               ag71xx_rr(ag, AG71XX_REG_MII_CFG),
-               ag71xx_rr(ag, AG71XX_REG_MII_CMD),
-               ag71xx_rr(ag, AG71XX_REG_MII_ADDR));
-       DBG("%s: mii_ctrl=%08x, mii_status=%08x, mii_ind=%08x\n",
-               ag->dev->name,
-               ag71xx_rr(ag, AG71XX_REG_MII_CTRL),
-               ag71xx_rr(ag, AG71XX_REG_MII_STATUS),
-               ag71xx_rr(ag, AG71XX_REG_MII_IND));
        DBG("%s: mac_ifctl=%08x, mac_addr1=%08x, mac_addr2=%08x\n",
                ag->dev->name,
                ag71xx_rr(ag, AG71XX_REG_MAC_IFCTL),
        DBG("%s: mac_ifctl=%08x, mac_addr1=%08x, mac_addr2=%08x\n",
                ag->dev->name,
                ag71xx_rr(ag, AG71XX_REG_MAC_IFCTL),
@@ -42,42 +62,68 @@ static void ag71xx_dump_regs(struct ag71xx *ag)
                ag71xx_rr(ag, AG71XX_REG_FIFO_CFG0),
                ag71xx_rr(ag, AG71XX_REG_FIFO_CFG1),
                ag71xx_rr(ag, AG71XX_REG_FIFO_CFG2));
                ag71xx_rr(ag, AG71XX_REG_FIFO_CFG0),
                ag71xx_rr(ag, AG71XX_REG_FIFO_CFG1),
                ag71xx_rr(ag, AG71XX_REG_FIFO_CFG2));
-       DBG("%s: fifo_cfg3=%08x, fifo_cfg3=%08x, fifo_cfg5=%08x\n",
+       DBG("%s: fifo_cfg3=%08x, fifo_cfg4=%08x, fifo_cfg5=%08x\n",
                ag->dev->name,
                ag71xx_rr(ag, AG71XX_REG_FIFO_CFG3),
                ag71xx_rr(ag, AG71XX_REG_FIFO_CFG4),
                ag71xx_rr(ag, AG71XX_REG_FIFO_CFG5));
 }
 
                ag->dev->name,
                ag71xx_rr(ag, AG71XX_REG_FIFO_CFG3),
                ag71xx_rr(ag, AG71XX_REG_FIFO_CFG4),
                ag71xx_rr(ag, AG71XX_REG_FIFO_CFG5));
 }
 
+static inline void ag71xx_dump_intr(struct ag71xx *ag, char *label, u32 intr)
+{
+       DBG("%s: %s intr=%08x %s%s%s%s%s%s\n",
+               ag->dev->name, label, intr,
+               (intr & AG71XX_INT_TX_PS) ? "TXPS " : "",
+               (intr & AG71XX_INT_TX_UR) ? "TXUR " : "",
+               (intr & AG71XX_INT_TX_BE) ? "TXBE " : "",
+               (intr & AG71XX_INT_RX_PR) ? "RXPR " : "",
+               (intr & AG71XX_INT_RX_OF) ? "RXOF " : "",
+               (intr & AG71XX_INT_RX_BE) ? "RXBE " : "");
+}
+
 static void ag71xx_ring_free(struct ag71xx_ring *ring)
 {
        kfree(ring->buf);
 
 static void ag71xx_ring_free(struct ag71xx_ring *ring)
 {
        kfree(ring->buf);
 
-       if (ring->descs)
-               dma_free_coherent(NULL, ring->size * sizeof(*ring->descs),
-                                 ring->descs, ring->descs_dma);
+       if (ring->descs_cpu)
+               dma_free_coherent(NULL, ring->size * ring->desc_size,
+                                 ring->descs_cpu, ring->descs_dma);
 }
 
 }
 
-static int ag71xx_ring_alloc(struct ag71xx_ring *ring, unsigned int size)
+static int ag71xx_ring_alloc(struct ag71xx_ring *ring)
 {
        int err;
 {
        int err;
+       int i;
+
+       ring->desc_size = sizeof(struct ag71xx_desc);
+       if (ring->desc_size % cache_line_size()) {
+               DBG("ag71xx: ring %p, desc size %u rounded to %u\n",
+                       ring, ring->desc_size,
+                       roundup(ring->desc_size, cache_line_size()));
+               ring->desc_size = roundup(ring->desc_size, cache_line_size());
+       }
 
 
-       ring->descs = dma_alloc_coherent(NULL, size * sizeof(*ring->descs),
-                                        &ring->descs_dma,
-                                        GFP_ATOMIC);
-       if (!ring->descs) {
+       ring->descs_cpu = dma_alloc_coherent(NULL, ring->size * ring->desc_size,
+                                            &ring->descs_dma, GFP_ATOMIC);
+       if (!ring->descs_cpu) {
                err = -ENOMEM;
                goto err;
        }
 
                err = -ENOMEM;
                goto err;
        }
 
-       ring->size = size;
 
 
-       ring->buf = kzalloc(size * sizeof(*ring->buf), GFP_KERNEL);
+       ring->buf = kzalloc(ring->size * sizeof(*ring->buf), GFP_KERNEL);
        if (!ring->buf) {
                err = -ENOMEM;
                goto err;
        }
 
        if (!ring->buf) {
                err = -ENOMEM;
                goto err;
        }
 
+       for (i = 0; i < ring->size; i++) {
+               int idx = i * ring->desc_size;
+               ring->buf[i].desc = (struct ag71xx_desc *)&ring->descs_cpu[idx];
+               DBG("ag71xx: ring %p, desc %d at %p\n",
+                       ring, i, ring->buf[i].desc);
+       }
+
        return 0;
 
 err:
        return 0;
 
 err:
@@ -90,10 +136,10 @@ static void ag71xx_ring_tx_clean(struct ag71xx *ag)
        struct net_device *dev = ag->dev;
 
        while (ring->curr != ring->dirty) {
        struct net_device *dev = ag->dev;
 
        while (ring->curr != ring->dirty) {
-               u32 i = ring->dirty % AG71XX_TX_RING_SIZE;
+               u32 i = ring->dirty % ring->size;
 
 
-               if (!ag71xx_desc_empty(&ring->descs[i])) {
-                       ring->descs[i].ctrl = 0;
+               if (!ag71xx_desc_empty(ring->buf[i].desc)) {
+                       ring->buf[i].desc->ctrl = 0;
                        dev->stats.tx_errors++;
                }
 
                        dev->stats.tx_errors++;
                }
 
@@ -115,11 +161,11 @@ static void ag71xx_ring_tx_init(struct ag71xx *ag)
        struct ag71xx_ring *ring = &ag->tx_ring;
        int i;
 
        struct ag71xx_ring *ring = &ag->tx_ring;
        int i;
 
-       for (i = 0; i < AG71XX_TX_RING_SIZE; i++) {
-               ring->descs[i].next = (u32) (ring->descs_dma +
-                       sizeof(*ring->descs) * ((i + 1) % AG71XX_TX_RING_SIZE));
+       for (i = 0; i < ring->size; i++) {
+               ring->buf[i].desc->next = (u32) (ring->descs_dma +
+                       ring->desc_size * ((i + 1) % ring->size));
 
 
-               ring->descs[i].ctrl = DESC_EMPTY;
+               ring->buf[i].desc->ctrl = DESC_EMPTY;
                ring->buf[i].skb = NULL;
        }
 
                ring->buf[i].skb = NULL;
        }
 
@@ -138,38 +184,69 @@ static void ag71xx_ring_rx_clean(struct ag71xx *ag)
        if (!ring->buf)
                return;
 
        if (!ring->buf)
                return;
 
-       for (i = 0; i < AG71XX_RX_RING_SIZE; i++)
-               if (ring->buf[i].skb)
+       for (i = 0; i < ring->size; i++)
+               if (ring->buf[i].skb) {
+                       dma_unmap_single(&ag->dev->dev, ring->buf[i].dma_addr,
+                                        AG71XX_RX_PKT_SIZE, DMA_FROM_DEVICE);
                        kfree_skb(ring->buf[i].skb);
                        kfree_skb(ring->buf[i].skb);
+               }
+}
+
+static int ag71xx_rx_reserve(struct ag71xx *ag)
+{
+       int reserve = 0;
+
+       if (ag71xx_get_pdata(ag)->is_ar724x) {
+               if (!ag71xx_has_ar8216(ag))
+                       reserve = 2;
 
 
+               if (ag->phy_dev)
+                       reserve += 4 - (ag->phy_dev->pkt_align % 4);
+
+               reserve %= 4;
+       }
+
+       return reserve + AG71XX_RX_PKT_RESERVE;
 }
 
 }
 
+
 static int ag71xx_ring_rx_init(struct ag71xx *ag)
 {
        struct ag71xx_ring *ring = &ag->rx_ring;
 static int ag71xx_ring_rx_init(struct ag71xx *ag)
 {
        struct ag71xx_ring *ring = &ag->rx_ring;
+       unsigned int reserve = ag71xx_rx_reserve(ag);
        unsigned int i;
        int ret;
 
        ret = 0;
        unsigned int i;
        int ret;
 
        ret = 0;
-       for (i = 0; i < AG71XX_RX_RING_SIZE; i++)
-               ring->descs[i].next = (u32) (ring->descs_dma +
-                       sizeof(*ring->descs) * ((i + 1) % AG71XX_RX_RING_SIZE));
+       for (i = 0; i < ring->size; i++) {
+               ring->buf[i].desc->next = (u32) (ring->descs_dma +
+                       ring->desc_size * ((i + 1) % ring->size));
+
+               DBG("ag71xx: RX desc at %p, next is %08x\n",
+                       ring->buf[i].desc,
+                       ring->buf[i].desc->next);
+       }
 
 
-       for (i = 0; i < AG71XX_RX_RING_SIZE; i++) {
+       for (i = 0; i < ring->size; i++) {
                struct sk_buff *skb;
                struct sk_buff *skb;
+               dma_addr_t dma_addr;
 
 
-               skb = dev_alloc_skb(AG71XX_RX_PKT_SIZE);
+               skb = dev_alloc_skb(AG71XX_RX_PKT_SIZE + reserve);
                if (!skb) {
                        ret = -ENOMEM;
                        break;
                }
 
                skb->dev = ag->dev;
                if (!skb) {
                        ret = -ENOMEM;
                        break;
                }
 
                skb->dev = ag->dev;
-               skb_reserve(skb, AG71XX_RX_PKT_RESERVE);
+               skb_reserve(skb, reserve);
 
 
+               dma_addr = dma_map_single(&ag->dev->dev, skb->data,
+                                         AG71XX_RX_PKT_SIZE,
+                                         DMA_FROM_DEVICE);
                ring->buf[i].skb = skb;
                ring->buf[i].skb = skb;
-               ring->descs[i].data = virt_to_phys(skb->data);
-               ring->descs[i].ctrl = DESC_EMPTY;
+               ring->buf[i].dma_addr = dma_addr;
+               ring->buf[i].desc->data = (u32) dma_addr;
+               ring->buf[i].desc->ctrl = DESC_EMPTY;
        }
 
        /* flush descriptors */
        }
 
        /* flush descriptors */
@@ -184,31 +261,36 @@ static int ag71xx_ring_rx_init(struct ag71xx *ag)
 static int ag71xx_ring_rx_refill(struct ag71xx *ag)
 {
        struct ag71xx_ring *ring = &ag->rx_ring;
 static int ag71xx_ring_rx_refill(struct ag71xx *ag)
 {
        struct ag71xx_ring *ring = &ag->rx_ring;
+       unsigned int reserve = ag71xx_rx_reserve(ag);
        unsigned int count;
 
        count = 0;
        for (; ring->curr - ring->dirty > 0; ring->dirty++) {
                unsigned int i;
 
        unsigned int count;
 
        count = 0;
        for (; ring->curr - ring->dirty > 0; ring->dirty++) {
                unsigned int i;
 
-               i = ring->dirty % AG71XX_RX_RING_SIZE;
+               i = ring->dirty % ring->size;
 
                if (ring->buf[i].skb == NULL) {
 
                if (ring->buf[i].skb == NULL) {
+                       dma_addr_t dma_addr;
                        struct sk_buff *skb;
 
                        struct sk_buff *skb;
 
-                       skb = dev_alloc_skb(AG71XX_RX_PKT_SIZE);
-                       if (skb == NULL) {
-                               printk(KERN_ERR "%s: no memory for skb\n",
-                                       ag->dev->name);
+                       skb = dev_alloc_skb(AG71XX_RX_PKT_SIZE + reserve);
+                       if (skb == NULL)
                                break;
                                break;
-                       }
 
 
-                       skb_reserve(skb, AG71XX_RX_PKT_RESERVE);
+                       skb_reserve(skb, reserve);
                        skb->dev = ag->dev;
                        skb->dev = ag->dev;
+
+                       dma_addr = dma_map_single(&ag->dev->dev, skb->data,
+                                                 AG71XX_RX_PKT_SIZE,
+                                                 DMA_FROM_DEVICE);
+
                        ring->buf[i].skb = skb;
                        ring->buf[i].skb = skb;
-                       ring->descs[i].data = virt_to_phys(skb->data);
+                       ring->buf[i].dma_addr = dma_addr;
+                       ring->buf[i].desc->data = (u32) dma_addr;
                }
 
                }
 
-               ring->descs[i].ctrl = DESC_EMPTY;
+               ring->buf[i].desc->ctrl = DESC_EMPTY;
                count++;
        }
 
                count++;
        }
 
@@ -224,13 +306,13 @@ static int ag71xx_rings_init(struct ag71xx *ag)
 {
        int ret;
 
 {
        int ret;
 
-       ret = ag71xx_ring_alloc(&ag->tx_ring, AG71XX_TX_RING_SIZE);
+       ret = ag71xx_ring_alloc(&ag->tx_ring);
        if (ret)
                return ret;
 
        ag71xx_ring_tx_init(ag);
 
        if (ret)
                return ret;
 
        ag71xx_ring_tx_init(ag);
 
-       ret = ag71xx_ring_alloc(&ag->rx_ring, AG71XX_RX_RING_SIZE);
+       ret = ag71xx_ring_alloc(&ag->rx_ring);
        if (ret)
                return ret;
 
        if (ret)
                return ret;
 
@@ -247,51 +329,196 @@ static void ag71xx_rings_cleanup(struct ag71xx *ag)
        ag71xx_ring_free(&ag->tx_ring);
 }
 
        ag71xx_ring_free(&ag->tx_ring);
 }
 
+static unsigned char *ag71xx_speed_str(struct ag71xx *ag)
+{
+       switch (ag->speed) {
+       case SPEED_1000:
+               return "1000";
+       case SPEED_100:
+               return "100";
+       case SPEED_10:
+               return "10";
+       }
+
+       return "?";
+}
+
 static void ag71xx_hw_set_macaddr(struct ag71xx *ag, unsigned char *mac)
 {
        u32 t;
 
 static void ag71xx_hw_set_macaddr(struct ag71xx *ag, unsigned char *mac)
 {
        u32 t;
 
-       t = (((u32) mac[0]) << 24) | (((u32) mac[1]) << 16)
-         | (((u32) mac[2]) << 8) | ((u32) mac[2]);
+       t = (((u32) mac[5]) << 24) | (((u32) mac[4]) << 16)
+         | (((u32) mac[3]) << 8) | ((u32) mac[2]);
 
        ag71xx_wr(ag, AG71XX_REG_MAC_ADDR1, t);
 
 
        ag71xx_wr(ag, AG71XX_REG_MAC_ADDR1, t);
 
-       t = (((u32) mac[4]) << 24) | (((u32) mac[5]) << 16);
+       t = (((u32) mac[1]) << 24) | (((u32) mac[0]) << 16);
        ag71xx_wr(ag, AG71XX_REG_MAC_ADDR2, t);
 }
 
        ag71xx_wr(ag, AG71XX_REG_MAC_ADDR2, t);
 }
 
-#define MAC_CFG1_INIT  (MAC_CFG1_RXE | MAC_CFG1_TXE | MAC_CFG1_SRX \
-                       | MAC_CFG1_STX)
+static void ag71xx_dma_reset(struct ag71xx *ag)
+{
+       u32 val;
+       int i;
+
+       ag71xx_dump_dma_regs(ag);
+
+       /* stop RX and TX */
+       ag71xx_wr(ag, AG71XX_REG_RX_CTRL, 0);
+       ag71xx_wr(ag, AG71XX_REG_TX_CTRL, 0);
+
+       /*
+        * give the hardware some time to really stop all rx/tx activity
+        * clearing the descriptors too early causes random memory corruption
+        */
+       mdelay(1);
+
+       /* clear descriptor addresses */
+       ag71xx_wr(ag, AG71XX_REG_TX_DESC, ag->stop_desc_dma);
+       ag71xx_wr(ag, AG71XX_REG_RX_DESC, ag->stop_desc_dma);
+
+       /* clear pending RX/TX interrupts */
+       for (i = 0; i < 256; i++) {
+               ag71xx_wr(ag, AG71XX_REG_RX_STATUS, RX_STATUS_PR);
+               ag71xx_wr(ag, AG71XX_REG_TX_STATUS, TX_STATUS_PS);
+       }
+
+       /* clear pending errors */
+       ag71xx_wr(ag, AG71XX_REG_RX_STATUS, RX_STATUS_BE | RX_STATUS_OF);
+       ag71xx_wr(ag, AG71XX_REG_TX_STATUS, TX_STATUS_BE | TX_STATUS_UR);
+
+       val = ag71xx_rr(ag, AG71XX_REG_RX_STATUS);
+       if (val)
+               printk(KERN_ALERT "%s: unable to clear DMA Rx status: %08x\n",
+                       ag->dev->name, val);
+
+       val = ag71xx_rr(ag, AG71XX_REG_TX_STATUS);
+
+       /* mask out reserved bits */
+       val &= ~0xff000000;
+
+       if (val)
+               printk(KERN_ALERT "%s: unable to clear DMA Tx status: %08x\n",
+                       ag->dev->name, val);
+
+       ag71xx_dump_dma_regs(ag);
+}
+
+#define MAC_CFG1_INIT  (MAC_CFG1_RXE | MAC_CFG1_TXE | \
+                        MAC_CFG1_SRX | MAC_CFG1_STX)
+
+#define FIFO_CFG0_INIT (FIFO_CFG0_ALL << FIFO_CFG0_ENABLE_SHIFT)
+
+#define FIFO_CFG4_INIT (FIFO_CFG4_DE | FIFO_CFG4_DV | FIFO_CFG4_FC | \
+                        FIFO_CFG4_CE | FIFO_CFG4_CR | FIFO_CFG4_LM | \
+                        FIFO_CFG4_LO | FIFO_CFG4_OK | FIFO_CFG4_MC | \
+                        FIFO_CFG4_BC | FIFO_CFG4_DR | FIFO_CFG4_LE | \
+                        FIFO_CFG4_CF | FIFO_CFG4_PF | FIFO_CFG4_UO | \
+                        FIFO_CFG4_VT)
+
+#define FIFO_CFG5_INIT (FIFO_CFG5_DE | FIFO_CFG5_DV | FIFO_CFG5_FC | \
+                        FIFO_CFG5_CE | FIFO_CFG5_LO | FIFO_CFG5_OK | \
+                        FIFO_CFG5_MC | FIFO_CFG5_BC | FIFO_CFG5_DR | \
+                        FIFO_CFG5_CF | FIFO_CFG5_PF | FIFO_CFG5_VT | \
+                        FIFO_CFG5_LE | FIFO_CFG5_FT | FIFO_CFG5_16 | \
+                        FIFO_CFG5_17 | FIFO_CFG5_SF)
+
+static void ag71xx_hw_stop(struct ag71xx *ag)
+{
+       /* disable all interrupts and stop the rx/tx engine */
+       ag71xx_wr(ag, AG71XX_REG_INT_ENABLE, 0);
+       ag71xx_wr(ag, AG71XX_REG_RX_CTRL, 0);
+       ag71xx_wr(ag, AG71XX_REG_TX_CTRL, 0);
+}
+
+static void ag71xx_hw_setup(struct ag71xx *ag)
+{
+       struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
+
+       /* setup MAC configuration registers */
+       ag71xx_wr(ag, AG71XX_REG_MAC_CFG1, MAC_CFG1_INIT);
+
+       ag71xx_sb(ag, AG71XX_REG_MAC_CFG2,
+                 MAC_CFG2_PAD_CRC_EN | MAC_CFG2_LEN_CHECK);
+
+       /* setup max frame length */
+       ag71xx_wr(ag, AG71XX_REG_MAC_MFL, AG71XX_TX_MTU_LEN);
+
+       /* setup MII interface type */
+       ag71xx_mii_ctrl_set_if(ag, pdata->mii_if);
+
+       /* setup FIFO configuration registers */
+       ag71xx_wr(ag, AG71XX_REG_FIFO_CFG0, FIFO_CFG0_INIT);
+       if (pdata->is_ar724x) {
+               ag71xx_wr(ag, AG71XX_REG_FIFO_CFG1, pdata->fifo_cfg1);
+               ag71xx_wr(ag, AG71XX_REG_FIFO_CFG2, pdata->fifo_cfg2);
+       } else {
+               ag71xx_wr(ag, AG71XX_REG_FIFO_CFG1, 0x0fff0000);
+               ag71xx_wr(ag, AG71XX_REG_FIFO_CFG2, 0x00001fff);
+       }
+       ag71xx_wr(ag, AG71XX_REG_FIFO_CFG4, FIFO_CFG4_INIT);
+       ag71xx_wr(ag, AG71XX_REG_FIFO_CFG5, FIFO_CFG5_INIT);
+}
 
 static void ag71xx_hw_init(struct ag71xx *ag)
 {
        struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
 
 static void ag71xx_hw_init(struct ag71xx *ag)
 {
        struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
+       u32 reset_mask = pdata->reset_bit;
+
+       ag71xx_hw_stop(ag);
+
+       if (pdata->is_ar724x) {
+               u32 reset_phy = reset_mask;
+
+               reset_phy &= RESET_MODULE_GE0_PHY | RESET_MODULE_GE1_PHY;
+               reset_mask &= ~(RESET_MODULE_GE0_PHY | RESET_MODULE_GE1_PHY);
+
+               ar71xx_device_stop(reset_phy);
+               mdelay(50);
+               ar71xx_device_start(reset_phy);
+               mdelay(200);
+       }
 
        ag71xx_sb(ag, AG71XX_REG_MAC_CFG1, MAC_CFG1_SR);
        udelay(20);
 
 
        ag71xx_sb(ag, AG71XX_REG_MAC_CFG1, MAC_CFG1_SR);
        udelay(20);
 
-       ar71xx_device_stop(pdata->reset_bit);
-       mdelay(100);
-       ar71xx_device_start(pdata->reset_bit);
+       ar71xx_device_stop(reset_mask);
        mdelay(100);
        mdelay(100);
+       ar71xx_device_start(reset_mask);
+       mdelay(200);
 
 
-       ag71xx_wr(ag, AG71XX_REG_MAC_CFG1, MAC_CFG1_INIT);
+       ag71xx_hw_setup(ag);
 
 
-       /* TODO: set max packet size */
+       ag71xx_dma_reset(ag);
+}
 
 
-       ag71xx_sb(ag, AG71XX_REG_MAC_CFG2,
-                 MAC_CFG2_PAD_CRC_EN | MAC_CFG2_LEN_CHECK);
+static void ag71xx_fast_reset(struct ag71xx *ag)
+{
+       struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
+       struct net_device *dev = ag->dev;
+       u32 reset_mask = pdata->reset_bit;
+       u32 rx_ds, tx_ds;
+       u32 mii_reg;
 
 
-       ag71xx_wr(ag, AG71XX_REG_FIFO_CFG0, 0x00001f00);
+       reset_mask &= RESET_MODULE_GE0_MAC | RESET_MODULE_GE1_MAC;
 
 
-       ag71xx_mii_ctrl_set_if(ag, pdata->mii_if);
+       mii_reg = ag71xx_rr(ag, AG71XX_REG_MII_CFG);
+       rx_ds = ag71xx_rr(ag, AG71XX_REG_RX_DESC);
+       tx_ds = ag71xx_rr(ag, AG71XX_REG_TX_DESC);
+
+       ar71xx_device_stop(reset_mask);
+       udelay(10);
+       ar71xx_device_start(reset_mask);
+       udelay(10);
 
 
-       ag71xx_wr(ag, AG71XX_REG_MII_CFG, MII_CFG_CLK_DIV_28);
+       ag71xx_dma_reset(ag);
+       ag71xx_hw_setup(ag);
 
 
-       ag71xx_wr(ag, AG71XX_REG_FIFO_CFG1, 0x0fff0000);
-       ag71xx_wr(ag, AG71XX_REG_FIFO_CFG2, 0x00001fff);
-       ag71xx_wr(ag, AG71XX_REG_FIFO_CFG4, 0x0000ffff);
-       ag71xx_wr(ag, AG71XX_REG_FIFO_CFG5, 0x0007ffef);
+       ag71xx_wr(ag, AG71XX_REG_RX_DESC, rx_ds);
+       ag71xx_wr(ag, AG71XX_REG_TX_DESC, tx_ds);
+       ag71xx_wr(ag, AG71XX_REG_MII_CFG, mii_reg);
+
+       ag71xx_hw_set_macaddr(ag, dev->dev_addr);
 }
 
 static void ag71xx_hw_start(struct ag71xx *ag)
 }
 
 static void ag71xx_hw_start(struct ag71xx *ag)
@@ -303,14 +530,96 @@ static void ag71xx_hw_start(struct ag71xx *ag)
        ag71xx_wr(ag, AG71XX_REG_INT_ENABLE, AG71XX_INT_INIT);
 }
 
        ag71xx_wr(ag, AG71XX_REG_INT_ENABLE, AG71XX_INT_INIT);
 }
 
-static void ag71xx_hw_stop(struct ag71xx *ag)
+void ag71xx_link_adjust(struct ag71xx *ag)
 {
 {
-       /* stop RX and TX */
-       ag71xx_wr(ag, AG71XX_REG_RX_CTRL, 0);
-       ag71xx_wr(ag, AG71XX_REG_TX_CTRL, 0);
+       struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
+       u32 cfg2;
+       u32 ifctl;
+       u32 fifo5;
+       u32 mii_speed;
+
+       if (!ag->link) {
+               ag71xx_hw_stop(ag);
+               netif_carrier_off(ag->dev);
+               if (netif_msg_link(ag))
+                       printk(KERN_INFO "%s: link down\n", ag->dev->name);
+               return;
+       }
 
 
-       /* disable all interrupts */
-       ag71xx_wr(ag, AG71XX_REG_INT_ENABLE, 0);
+       if (pdata->is_ar724x)
+               ag71xx_fast_reset(ag);
+
+       cfg2 = ag71xx_rr(ag, AG71XX_REG_MAC_CFG2);
+       cfg2 &= ~(MAC_CFG2_IF_1000 | MAC_CFG2_IF_10_100 | MAC_CFG2_FDX);
+       cfg2 |= (ag->duplex) ? MAC_CFG2_FDX : 0;
+
+       ifctl = ag71xx_rr(ag, AG71XX_REG_MAC_IFCTL);
+       ifctl &= ~(MAC_IFCTL_SPEED);
+
+       fifo5 = ag71xx_rr(ag, AG71XX_REG_FIFO_CFG5);
+       fifo5 &= ~FIFO_CFG5_BM;
+
+       switch (ag->speed) {
+       case SPEED_1000:
+               mii_speed =  MII_CTRL_SPEED_1000;
+               cfg2 |= MAC_CFG2_IF_1000;
+               fifo5 |= FIFO_CFG5_BM;
+               break;
+       case SPEED_100:
+               mii_speed = MII_CTRL_SPEED_100;
+               cfg2 |= MAC_CFG2_IF_10_100;
+               ifctl |= MAC_IFCTL_SPEED;
+               break;
+       case SPEED_10:
+               mii_speed = MII_CTRL_SPEED_10;
+               cfg2 |= MAC_CFG2_IF_10_100;
+               break;
+       default:
+               BUG();
+               return;
+       }
+
+       if (pdata->is_ar91xx)
+               ag71xx_wr(ag, AG71XX_REG_FIFO_CFG3, 0x00780fff);
+       else if (pdata->is_ar724x)
+               ag71xx_wr(ag, AG71XX_REG_FIFO_CFG3, pdata->fifo_cfg3);
+       else
+               ag71xx_wr(ag, AG71XX_REG_FIFO_CFG3, 0x008001ff);
+
+       if (pdata->set_pll)
+               pdata->set_pll(ag->speed);
+
+       ag71xx_mii_ctrl_set_speed(ag, mii_speed);
+
+       ag71xx_wr(ag, AG71XX_REG_MAC_CFG2, cfg2);
+       ag71xx_wr(ag, AG71XX_REG_FIFO_CFG5, fifo5);
+       ag71xx_wr(ag, AG71XX_REG_MAC_IFCTL, ifctl);
+       ag71xx_hw_start(ag);
+
+       netif_carrier_on(ag->dev);
+       if (netif_msg_link(ag))
+               printk(KERN_INFO "%s: link up (%sMbps/%s duplex)\n",
+                       ag->dev->name,
+                       ag71xx_speed_str(ag),
+                       (DUPLEX_FULL == ag->duplex) ? "Full" : "Half");
+
+       DBG("%s: fifo_cfg0=%#x, fifo_cfg1=%#x, fifo_cfg2=%#x\n",
+               ag->dev->name,
+               ag71xx_rr(ag, AG71XX_REG_FIFO_CFG0),
+               ag71xx_rr(ag, AG71XX_REG_FIFO_CFG1),
+               ag71xx_rr(ag, AG71XX_REG_FIFO_CFG2));
+
+       DBG("%s: fifo_cfg3=%#x, fifo_cfg4=%#x, fifo_cfg5=%#x\n",
+               ag->dev->name,
+               ag71xx_rr(ag, AG71XX_REG_FIFO_CFG3),
+               ag71xx_rr(ag, AG71XX_REG_FIFO_CFG4),
+               ag71xx_rr(ag, AG71XX_REG_FIFO_CFG5));
+
+       DBG("%s: mac_cfg2=%#x, mac_ifctl=%#x, mii_ctrl=%#x\n",
+               ag->dev->name,
+               ag71xx_rr(ag, AG71XX_REG_MAC_CFG2),
+               ag71xx_rr(ag, AG71XX_REG_MAC_IFCTL),
+               ag71xx_mii_ctrl_rr(ag));
 }
 
 static int ag71xx_open(struct net_device *dev)
 }
 
 static int ag71xx_open(struct net_device *dev)
@@ -325,22 +634,13 @@ static int ag71xx_open(struct net_device *dev)
        napi_enable(&ag->napi);
 
        netif_carrier_off(dev);
        napi_enable(&ag->napi);
 
        netif_carrier_off(dev);
-       if (ag->phy_dev) {
-               phy_start(ag->phy_dev);
-       } else {
-               ag->duplex = DUPLEX_FULL;
-               ag->speed = SPEED_100;
-               ag->link = 1;
-               ag71xx_link_update(ag);
-       }
+       ag71xx_phy_start(ag);
 
        ag71xx_wr(ag, AG71XX_REG_TX_DESC, ag->tx_ring.descs_dma);
        ag71xx_wr(ag, AG71XX_REG_RX_DESC, ag->rx_ring.descs_dma);
 
        ag71xx_hw_set_macaddr(ag, dev->dev_addr);
 
 
        ag71xx_wr(ag, AG71XX_REG_TX_DESC, ag->tx_ring.descs_dma);
        ag71xx_wr(ag, AG71XX_REG_RX_DESC, ag->rx_ring.descs_dma);
 
        ag71xx_hw_set_macaddr(ag, dev->dev_addr);
 
-       ag71xx_hw_start(ag);
-
        netif_start_queue(dev);
 
        return 0;
        netif_start_queue(dev);
 
        return 0;
@@ -355,23 +655,18 @@ static int ag71xx_stop(struct net_device *dev)
        struct ag71xx *ag = netdev_priv(dev);
        unsigned long flags;
 
        struct ag71xx *ag = netdev_priv(dev);
        unsigned long flags;
 
+       netif_carrier_off(dev);
+       ag71xx_phy_stop(ag);
+
        spin_lock_irqsave(&ag->lock, flags);
 
        netif_stop_queue(dev);
 
        ag71xx_hw_stop(ag);
        spin_lock_irqsave(&ag->lock, flags);
 
        netif_stop_queue(dev);
 
        ag71xx_hw_stop(ag);
-
-       netif_carrier_off(dev);
-       if (ag->phy_dev) {
-               phy_stop(ag->phy_dev);
-       } else {
-               ag->duplex = -1;
-               ag->link = 0;
-               ag->speed = 0;
-               ag71xx_link_update(ag);
-       }
+       ag71xx_dma_reset(ag);
 
        napi_disable(&ag->napi);
 
        napi_disable(&ag->napi);
+       del_timer_sync(&ag->oom_timer);
 
        spin_unlock_irqrestore(&ag->lock, flags);
 
 
        spin_unlock_irqrestore(&ag->lock, flags);
 
@@ -380,43 +675,44 @@ static int ag71xx_stop(struct net_device *dev)
        return 0;
 }
 
        return 0;
 }
 
-static int ag71xx_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
+static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
+                                         struct net_device *dev)
 {
        struct ag71xx *ag = netdev_priv(dev);
 {
        struct ag71xx *ag = netdev_priv(dev);
-       struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
        struct ag71xx_ring *ring = &ag->tx_ring;
        struct ag71xx_desc *desc;
        struct ag71xx_ring *ring = &ag->tx_ring;
        struct ag71xx_desc *desc;
-       unsigned long flags;
+       dma_addr_t dma_addr;
        int i;
 
        int i;
 
-       i = ring->curr % AG71XX_TX_RING_SIZE;
-       desc = &ring->descs[i];
-
-       spin_lock_irqsave(&ag->lock, flags);
-       ar71xx_ddr_flush(pdata->flush_reg);
-       spin_unlock_irqrestore(&ag->lock, flags);
+       i = ring->curr % ring->size;
+       desc = ring->buf[i].desc;
 
        if (!ag71xx_desc_empty(desc))
                goto err_drop;
 
 
        if (!ag71xx_desc_empty(desc))
                goto err_drop;
 
+       if (ag71xx_has_ar8216(ag))
+               ag71xx_add_ar8216_header(ag, skb);
+
        if (skb->len <= 0) {
                DBG("%s: packet len is too small\n", ag->dev->name);
                goto err_drop;
        }
 
        if (skb->len <= 0) {
                DBG("%s: packet len is too small\n", ag->dev->name);
                goto err_drop;
        }
 
-       dma_cache_wback_inv((unsigned long)skb->data, skb->len);
+       dma_addr = dma_map_single(&dev->dev, skb->data, skb->len,
+                                 DMA_TO_DEVICE);
 
        ring->buf[i].skb = skb;
 
        ring->buf[i].skb = skb;
+       ring->buf[i].timestamp = jiffies;
 
        /* setup descriptor fields */
 
        /* setup descriptor fields */
-       desc->data = virt_to_phys(skb->data);
+       desc->data = (u32) dma_addr;
        desc->ctrl = (skb->len & DESC_PKTLEN_M);
 
        /* flush descriptor */
        wmb();
 
        ring->curr++;
        desc->ctrl = (skb->len & DESC_PKTLEN_M);
 
        /* flush descriptor */
        wmb();
 
        ring->curr++;
-       if (ring->curr == (ring->dirty + AG71XX_TX_THRES_STOP)) {
+       if (ring->curr == (ring->dirty + ring->size)) {
                DBG("%s: tx queue full\n", ag->dev->name);
                netif_stop_queue(dev);
        }
                DBG("%s: tx queue full\n", ag->dev->name);
                netif_stop_queue(dev);
        }
@@ -426,20 +722,17 @@ static int ag71xx_hard_start_xmit(struct sk_buff *skb, struct net_device *dev)
        /* enable TX engine */
        ag71xx_wr(ag, AG71XX_REG_TX_CTRL, TX_CTRL_TXE);
 
        /* enable TX engine */
        ag71xx_wr(ag, AG71XX_REG_TX_CTRL, TX_CTRL_TXE);
 
-       dev->trans_start = jiffies;
-
-       return 0;
+       return NETDEV_TX_OK;
 
 err_drop:
        dev->stats.tx_dropped++;
 
        dev_kfree_skb(skb);
 
 err_drop:
        dev->stats.tx_dropped++;
 
        dev_kfree_skb(skb);
-       return 0;
+       return NETDEV_TX_OK;
 }
 
 static int ag71xx_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
 }
 
 static int ag71xx_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
 {
-       struct mii_ioctl_data *data = (struct mii_ioctl_data *) &ifr->ifr_data;
        struct ag71xx *ag = netdev_priv(dev);
        int ret;
 
        struct ag71xx *ag = netdev_priv(dev);
        int ret;
 
@@ -471,7 +764,7 @@ static int ag71xx_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
                if (ag->phy_dev == NULL)
                        break;
 
                if (ag->phy_dev == NULL)
                        break;
 
-               return phy_mii_ioctl(ag->phy_dev, data, cmd);
+               return phy_mii_ioctl(ag->phy_dev, ifr, cmd);
 
        default:
                break;
 
        default:
                break;
@@ -480,22 +773,43 @@ static int ag71xx_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd)
        return -EOPNOTSUPP;
 }
 
        return -EOPNOTSUPP;
 }
 
-static void ag71xx_tx_packets(struct ag71xx *ag)
+static void ag71xx_oom_timer_handler(unsigned long data)
+{
+       struct net_device *dev = (struct net_device *) data;
+       struct ag71xx *ag = netdev_priv(dev);
+
+       napi_schedule(&ag->napi);
+}
+
+static void ag71xx_tx_timeout(struct net_device *dev)
+{
+       struct ag71xx *ag = netdev_priv(dev);
+
+       if (netif_msg_tx_err(ag))
+               printk(KERN_DEBUG "%s: tx timeout\n", ag->dev->name);
+
+       schedule_work(&ag->restart_work);
+}
+
+static void ag71xx_restart_work_func(struct work_struct *work)
+{
+       struct ag71xx *ag = container_of(work, struct ag71xx, restart_work);
+
+       ag71xx_stop(ag->dev);
+       ag71xx_open(ag->dev);
+}
+
+static int ag71xx_tx_packets(struct ag71xx *ag)
 {
 {
-       struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
        struct ag71xx_ring *ring = &ag->tx_ring;
        struct ag71xx_ring *ring = &ag->tx_ring;
-       unsigned int sent;
+       int sent;
 
        DBG("%s: processing TX ring\n", ag->dev->name);
 
 
        DBG("%s: processing TX ring\n", ag->dev->name);
 
-#ifdef AG71XX_NAPI_TX
-       ar71xx_ddr_flush(pdata->flush_reg);
-#endif
-
        sent = 0;
        while (ring->dirty != ring->curr) {
        sent = 0;
        while (ring->dirty != ring->curr) {
-               unsigned int i = ring->dirty % AG71XX_TX_RING_SIZE;
-               struct ag71xx_desc *desc = &ring->descs[i];
+               unsigned int i = ring->dirty % ring->size;
+               struct ag71xx_desc *desc = ring->buf[i].desc;
                struct sk_buff *skb = ring->buf[i].skb;
 
                if (!ag71xx_desc_empty(desc))
                struct sk_buff *skb = ring->buf[i].skb;
 
                if (!ag71xx_desc_empty(desc))
@@ -515,70 +829,71 @@ static void ag71xx_tx_packets(struct ag71xx *ag)
 
        DBG("%s: %d packets sent out\n", ag->dev->name, sent);
 
 
        DBG("%s: %d packets sent out\n", ag->dev->name, sent);
 
-       if ((ring->curr - ring->dirty) < AG71XX_TX_THRES_WAKEUP)
+       if ((ring->curr - ring->dirty) < (ring->size * 3) / 4)
                netif_wake_queue(ag->dev);
 
                netif_wake_queue(ag->dev);
 
+       return sent;
 }
 
 static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
 {
        struct net_device *dev = ag->dev;
        struct ag71xx_ring *ring = &ag->rx_ring;
 }
 
 static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
 {
        struct net_device *dev = ag->dev;
        struct ag71xx_ring *ring = &ag->rx_ring;
-#ifndef AG71XX_NAPI_TX
-       struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
-       unsigned long flags;
-#endif
        int done = 0;
 
        int done = 0;
 
-#ifndef AG71XX_NAPI_TX
-       spin_lock_irqsave(&ag->lock, flags);
-       ar71xx_ddr_flush(pdata->flush_reg);
-       spin_unlock_irqrestore(&ag->lock, flags);
-#endif
-
        DBG("%s: rx packets, limit=%d, curr=%u, dirty=%u\n",
                        dev->name, limit, ring->curr, ring->dirty);
 
        while (done < limit) {
        DBG("%s: rx packets, limit=%d, curr=%u, dirty=%u\n",
                        dev->name, limit, ring->curr, ring->dirty);
 
        while (done < limit) {
-               unsigned int i = ring->curr % AG71XX_RX_RING_SIZE;
-               struct ag71xx_desc *desc = &ring->descs[i];
+               unsigned int i = ring->curr % ring->size;
+               struct ag71xx_desc *desc = ring->buf[i].desc;
                struct sk_buff *skb;
                int pktlen;
                struct sk_buff *skb;
                int pktlen;
+               int err = 0;
 
                if (ag71xx_desc_empty(desc))
                        break;
 
 
                if (ag71xx_desc_empty(desc))
                        break;
 
-               if ((ring->dirty + AG71XX_RX_RING_SIZE) == ring->curr) {
+               if ((ring->dirty + ring->size) == ring->curr) {
                        ag71xx_assert(0);
                        break;
                }
 
                        ag71xx_assert(0);
                        break;
                }
 
+               ag71xx_wr(ag, AG71XX_REG_RX_STATUS, RX_STATUS_PR);
+
                skb = ring->buf[i].skb;
                pktlen = ag71xx_desc_pktlen(desc);
                pktlen -= ETH_FCS_LEN;
 
                skb = ring->buf[i].skb;
                pktlen = ag71xx_desc_pktlen(desc);
                pktlen -= ETH_FCS_LEN;
 
-               /* TODO: move it into the refill function */
-               dma_cache_wback_inv((unsigned long)skb->data, pktlen);
-               skb_put(skb, pktlen);
-
-               skb->dev = dev;
-               skb->protocol = eth_type_trans(skb, dev);
-               skb->ip_summed = CHECKSUM_UNNECESSARY;
-
-               netif_receive_skb(skb);
+               dma_unmap_single(&dev->dev, ring->buf[i].dma_addr,
+                                AG71XX_RX_PKT_SIZE, DMA_FROM_DEVICE);
 
                dev->last_rx = jiffies;
                dev->stats.rx_packets++;
                dev->stats.rx_bytes += pktlen;
 
 
                dev->last_rx = jiffies;
                dev->stats.rx_packets++;
                dev->stats.rx_bytes += pktlen;
 
+               skb_put(skb, pktlen);
+               if (ag71xx_has_ar8216(ag))
+                       err = ag71xx_remove_ar8216_header(ag, skb, pktlen);
+
+               if (err) {
+                       dev->stats.rx_dropped++;
+                       kfree_skb(skb);
+               } else {
+                       skb->dev = dev;
+                       skb->ip_summed = CHECKSUM_NONE;
+                       if (ag->phy_dev) {
+                               ag->phy_dev->netif_receive_skb(skb);
+                       } else {
+                               skb->protocol = eth_type_trans(skb, dev);
+                               netif_receive_skb(skb);
+                       }
+               }
+
                ring->buf[i].skb = NULL;
                done++;
 
                ring->buf[i].skb = NULL;
                done++;
 
-               ag71xx_wr(ag, AG71XX_REG_RX_STATUS, RX_STATUS_PR);
-
                ring->curr++;
                ring->curr++;
-               if ((ring->curr - ring->dirty) > (AG71XX_RX_RING_SIZE / 4))
-                       ag71xx_ring_rx_refill(ag);
        }
 
        ag71xx_ring_rx_refill(ag);
        }
 
        ag71xx_ring_rx_refill(ag);
@@ -592,53 +907,67 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
 static int ag71xx_poll(struct napi_struct *napi, int limit)
 {
        struct ag71xx *ag = container_of(napi, struct ag71xx, napi);
 static int ag71xx_poll(struct napi_struct *napi, int limit)
 {
        struct ag71xx *ag = container_of(napi, struct ag71xx, napi);
-#ifdef AG71XX_NAPI_TX
        struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
        struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
-#endif
        struct net_device *dev = ag->dev;
        struct net_device *dev = ag->dev;
+       struct ag71xx_ring *rx_ring;
        unsigned long flags;
        u32 status;
        unsigned long flags;
        u32 status;
-       int done;
+       int tx_done;
+       int rx_done;
 
 
-#ifdef AG71XX_NAPI_TX
-       ar71xx_ddr_flush(pdata->flush_reg);
-       ag71xx_tx_packets(ag);
-#endif
+       pdata->ddr_flush();
+       tx_done = ag71xx_tx_packets(ag);
 
        DBG("%s: processing RX ring\n", dev->name);
 
        DBG("%s: processing RX ring\n", dev->name);
-       done = ag71xx_rx_packets(ag, limit);
+       rx_done = ag71xx_rx_packets(ag, limit);
 
 
-       /* TODO: add OOM handler */
+       ag71xx_debugfs_update_napi_stats(ag, rx_done, tx_done);
 
 
-       status = ag71xx_rr(ag, AG71XX_REG_INT_STATUS);
-       status &= AG71XX_INT_POLL;
+       rx_ring = &ag->rx_ring;
+       if (rx_ring->buf[rx_ring->dirty % rx_ring->size].skb == NULL)
+               goto oom;
+
+       status = ag71xx_rr(ag, AG71XX_REG_RX_STATUS);
+       if (unlikely(status & RX_STATUS_OF)) {
+               ag71xx_wr(ag, AG71XX_REG_RX_STATUS, RX_STATUS_OF);
+               dev->stats.rx_fifo_errors++;
+
+               /* restart RX */
+               ag71xx_wr(ag, AG71XX_REG_RX_CTRL, RX_CTRL_RXE);
+       }
+
+       if (rx_done < limit) {
+               if (status & RX_STATUS_PR)
+                       goto more;
 
 
-       if ((done < limit) && (!status)) {
-               DBG("%s: disable polling mode, done=%d, status=%x\n",
-                       dev->name, done, status);
+               status = ag71xx_rr(ag, AG71XX_REG_TX_STATUS);
+               if (status & TX_STATUS_PS)
+                       goto more;
 
 
-               netif_rx_complete(dev, napi);
+               DBG("%s: disable polling mode, rx=%d, tx=%d,limit=%d\n",
+                       dev->name, rx_done, tx_done, limit);
+
+               napi_complete(napi);
 
                /* enable interrupts */
                spin_lock_irqsave(&ag->lock, flags);
                ag71xx_int_enable(ag, AG71XX_INT_POLL);
                spin_unlock_irqrestore(&ag->lock, flags);
 
                /* enable interrupts */
                spin_lock_irqsave(&ag->lock, flags);
                ag71xx_int_enable(ag, AG71XX_INT_POLL);
                spin_unlock_irqrestore(&ag->lock, flags);
-               return 0;
+               return rx_done;
        }
 
        }
 
-       if (status & AG71XX_INT_RX_OF) {
-               printk(KERN_ALERT "%s: rx owerflow, restarting dma\n",
-                       dev->name);
+more:
+       DBG("%s: stay in polling mode, rx=%d, tx=%d, limit=%d\n",
+                       dev->name, rx_done, tx_done, limit);
+       return rx_done;
 
 
-               /* ack interrupt */
-               ag71xx_wr(ag, AG71XX_REG_RX_STATUS, RX_STATUS_OF);
-               /* restart RX */
-               ag71xx_wr(ag, AG71XX_REG_RX_CTRL, RX_CTRL_RXE);
-       }
+oom:
+       if (netif_msg_rx_err(ag))
+               printk(KERN_DEBUG "%s: out of memory\n", dev->name);
 
 
-       DBG("%s: stay in polling mode, done=%d, status=%x\n",
-                       dev->name, done, status);
-       return 1;
+       mod_timer(&ag->oom_timer, jiffies + AG71XX_OOM_REFILL);
+       napi_complete(napi);
+       return 0;
 }
 
 static irqreturn_t ag71xx_interrupt(int irq, void *dev_id)
 }
 
 static irqreturn_t ag71xx_interrupt(int irq, void *dev_id)
@@ -648,7 +977,7 @@ static irqreturn_t ag71xx_interrupt(int irq, void *dev_id)
        u32 status;
 
        status = ag71xx_rr(ag, AG71XX_REG_INT_STATUS);
        u32 status;
 
        status = ag71xx_rr(ag, AG71XX_REG_INT_STATUS);
-       status &= ag71xx_rr(ag, AG71XX_REG_INT_ENABLE);
+       ag71xx_dump_intr(ag, "raw", status);
 
        if (unlikely(!status))
                return IRQ_NONE;
 
        if (unlikely(!status))
                return IRQ_NONE;
@@ -664,24 +993,14 @@ static irqreturn_t ag71xx_interrupt(int irq, void *dev_id)
                }
        }
 
                }
        }
 
-#if 0
-       if (unlikely(status & AG71XX_INT_TX_UR)) {
-               ag71xx_wr(ag, AG71XX_REG_TX_STATUS, TX_STATUS_UR);
-               DBG("%s: TX underrun\n", dev->name);
-       }
-#endif
-
-#ifndef AG71XX_NAPI_TX
-       if (likely(status & AG71XX_INT_TX_PS))
-               ag71xx_tx_packets(ag);
-#endif
-
        if (likely(status & AG71XX_INT_POLL)) {
                ag71xx_int_disable(ag, AG71XX_INT_POLL);
                DBG("%s: enable polling mode\n", dev->name);
        if (likely(status & AG71XX_INT_POLL)) {
                ag71xx_int_disable(ag, AG71XX_INT_POLL);
                DBG("%s: enable polling mode\n", dev->name);
-               netif_rx_schedule(dev, &ag->napi);
+               napi_schedule(&ag->napi);
        }
 
        }
 
+       ag71xx_debugfs_update_int_stats(ag, status);
+
        return IRQ_HANDLED;
 }
 
        return IRQ_HANDLED;
 }
 
@@ -690,7 +1009,36 @@ static void ag71xx_set_multicast_list(struct net_device *dev)
        /* TODO */
 }
 
        /* TODO */
 }
 
-static int __init ag71xx_probe(struct platform_device *pdev)
+#ifdef CONFIG_NET_POLL_CONTROLLER
+/*
+ * Polling 'interrupt' - used by things like netconsole to send skbs
+ * without having to re-enable interrupts. It's not called while
+ * the interrupt routine is executing.
+ */
+static void ag71xx_netpoll(struct net_device *dev)
+{
+       disable_irq(dev->irq);
+       ag71xx_interrupt(dev->irq, dev);
+       enable_irq(dev->irq);
+}
+#endif
+
+static const struct net_device_ops ag71xx_netdev_ops = {
+       .ndo_open               = ag71xx_open,
+       .ndo_stop               = ag71xx_stop,
+       .ndo_start_xmit         = ag71xx_hard_start_xmit,
+       .ndo_set_multicast_list = ag71xx_set_multicast_list,
+       .ndo_do_ioctl           = ag71xx_do_ioctl,
+       .ndo_tx_timeout         = ag71xx_tx_timeout,
+       .ndo_change_mtu         = eth_change_mtu,
+       .ndo_set_mac_address    = eth_mac_addr,
+       .ndo_validate_addr      = eth_validate_addr,
+#ifdef CONFIG_NET_POLL_CONTROLLER
+       .ndo_poll_controller    = ag71xx_netpoll,
+#endif
+};
+
+static int __devinit ag71xx_probe(struct platform_device *pdev)
 {
        struct net_device *dev;
        struct resource *res;
 {
        struct net_device *dev;
        struct resource *res;
@@ -705,6 +1053,12 @@ static int __init ag71xx_probe(struct platform_device *pdev)
                goto err_out;
        }
 
                goto err_out;
        }
 
+       if (pdata->mii_bus_dev == NULL) {
+               dev_err(&pdev->dev, "no MII bus device specified\n");
+               err = -EINVAL;
+               goto err_out;
+       }
+
        dev = alloc_etherdev(sizeof(*ag));
        if (!dev) {
                dev_err(&pdev->dev, "alloc_etherdev failed\n");
        dev = alloc_etherdev(sizeof(*ag));
        if (!dev) {
                dev_err(&pdev->dev, "alloc_etherdev failed\n");
@@ -717,6 +1071,8 @@ static int __init ag71xx_probe(struct platform_device *pdev)
        ag = netdev_priv(dev);
        ag->pdev = pdev;
        ag->dev = dev;
        ag = netdev_priv(dev);
        ag->pdev = pdev;
        ag->dev = dev;
+       ag->msg_enable = netif_msg_init(ag71xx_msg_level,
+                                       AG71XX_DEFAULT_MSG_ENABLE);
        spin_lock_init(&ag->lock);
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mac_base");
        spin_lock_init(&ag->lock);
 
        res = platform_get_resource_byname(pdev, IORESOURCE_MEM, "mac_base");
@@ -749,7 +1105,7 @@ static int __init ag71xx_probe(struct platform_device *pdev)
 
        dev->irq = platform_get_irq(pdev, 0);
        err = request_irq(dev->irq, ag71xx_interrupt,
 
        dev->irq = platform_get_irq(pdev, 0);
        err = request_irq(dev->irq, ag71xx_interrupt,
-                         IRQF_DISABLED | IRQF_SAMPLE_RANDOM,
+                         IRQF_DISABLED,
                          dev->name, dev);
        if (err) {
                dev_err(&pdev->dev, "unable to request IRQ %d\n", dev->irq);
                          dev->name, dev);
        if (err) {
                dev_err(&pdev->dev, "unable to request IRQ %d\n", dev->irq);
@@ -757,28 +1113,36 @@ static int __init ag71xx_probe(struct platform_device *pdev)
        }
 
        dev->base_addr = (unsigned long)ag->mac_base;
        }
 
        dev->base_addr = (unsigned long)ag->mac_base;
-       dev->open = ag71xx_open;
-       dev->stop = ag71xx_stop;
-       dev->hard_start_xmit = ag71xx_hard_start_xmit;
-       dev->set_multicast_list = ag71xx_set_multicast_list;
-       dev->do_ioctl = ag71xx_do_ioctl;
+       dev->netdev_ops = &ag71xx_netdev_ops;
        dev->ethtool_ops = &ag71xx_ethtool_ops;
 
        dev->ethtool_ops = &ag71xx_ethtool_ops;
 
-       netif_napi_add(dev, &ag->napi, ag71xx_poll, AG71XX_NAPI_WEIGHT);
+       INIT_WORK(&ag->restart_work, ag71xx_restart_work_func);
 
 
-       if (is_valid_ether_addr(pdata->mac_addr))
-               memcpy(dev->dev_addr, pdata->mac_addr, ETH_ALEN);
-       else {
-               dev->dev_addr[0] = 0xde;
-               dev->dev_addr[1] = 0xad;
-               get_random_bytes(&dev->dev_addr[2], 3);
-               dev->dev_addr[5] = pdev->id & 0xff;
-       }
+       init_timer(&ag->oom_timer);
+       ag->oom_timer.data = (unsigned long) dev;
+       ag->oom_timer.function = ag71xx_oom_timer_handler;
+
+       ag->tx_ring.size = AG71XX_TX_RING_SIZE_DEFAULT;
+       ag->rx_ring.size = AG71XX_RX_RING_SIZE_DEFAULT;
+
+       ag->stop_desc = dma_alloc_coherent(NULL,
+               sizeof(struct ag71xx_desc), &ag->stop_desc_dma, GFP_KERNEL);
+
+       if (!ag->stop_desc)
+               goto err_free_irq;
+
+       ag->stop_desc->data = 0;
+       ag->stop_desc->ctrl = 0;
+       ag->stop_desc->next = (u32) ag->stop_desc_dma;
+
+       memcpy(dev->dev_addr, pdata->mac_addr, ETH_ALEN);
+
+       netif_napi_add(dev, &ag->napi, ag71xx_poll, AG71XX_NAPI_WEIGHT);
 
        err = register_netdev(dev);
        if (err) {
                dev_err(&pdev->dev, "unable to register net device\n");
 
        err = register_netdev(dev);
        if (err) {
                dev_err(&pdev->dev, "unable to register net device\n");
-               goto err_free_irq;
+               goto err_free_desc;
        }
 
        printk(KERN_INFO "%s: Atheros AG71xx at 0x%08lx, irq %d\n",
        }
 
        printk(KERN_INFO "%s: Atheros AG71xx at 0x%08lx, irq %d\n",
@@ -790,16 +1154,25 @@ static int __init ag71xx_probe(struct platform_device *pdev)
 
        ag71xx_dump_regs(ag);
 
 
        ag71xx_dump_regs(ag);
 
-       err = ag71xx_mdio_init(ag, pdev->id);
+       err = ag71xx_phy_connect(ag);
        if (err)
                goto err_unregister_netdev;
 
        if (err)
                goto err_unregister_netdev;
 
+       err = ag71xx_debugfs_init(ag);
+       if (err)
+               goto err_phy_disconnect;
+
        platform_set_drvdata(pdev, dev);
 
        return 0;
 
        platform_set_drvdata(pdev, dev);
 
        return 0;
 
+err_phy_disconnect:
+       ag71xx_phy_disconnect(ag);
 err_unregister_netdev:
        unregister_netdev(dev);
 err_unregister_netdev:
        unregister_netdev(dev);
+err_free_desc:
+       dma_free_coherent(NULL, sizeof(struct ag71xx_desc), ag->stop_desc,
+                         ag->stop_desc_dma);
 err_free_irq:
        free_irq(dev->irq, dev);
 err_unmap_mii_ctrl:
 err_free_irq:
        free_irq(dev->irq, dev);
 err_unmap_mii_ctrl:
@@ -813,16 +1186,15 @@ err_out:
        return err;
 }
 
        return err;
 }
 
-static int __exit ag71xx_remove(struct platform_device *pdev)
+static int __devexit ag71xx_remove(struct platform_device *pdev)
 {
        struct net_device *dev = platform_get_drvdata(pdev);
 
        if (dev) {
                struct ag71xx *ag = netdev_priv(dev);
 
 {
        struct net_device *dev = platform_get_drvdata(pdev);
 
        if (dev) {
                struct ag71xx *ag = netdev_priv(dev);
 
-               if (ag->phy_dev)
-                       phy_disconnect(ag->phy_dev);
-               ag71xx_mdio_cleanup(ag);
+               ag71xx_debugfs_exit(ag);
+               ag71xx_phy_disconnect(ag);
                unregister_netdev(dev);
                free_irq(dev->irq, dev);
                iounmap(ag->mii_ctrl);
                unregister_netdev(dev);
                free_irq(dev->irq, dev);
                iounmap(ag->mii_ctrl);
@@ -844,12 +1216,35 @@ static struct platform_driver ag71xx_driver = {
 
 static int __init ag71xx_module_init(void)
 {
 
 static int __init ag71xx_module_init(void)
 {
-       return platform_driver_register(&ag71xx_driver);
+       int ret;
+
+       ret = ag71xx_debugfs_root_init();
+       if (ret)
+               goto err_out;
+
+       ret = ag71xx_mdio_driver_init();
+       if (ret)
+               goto err_debugfs_exit;
+
+       ret = platform_driver_register(&ag71xx_driver);
+       if (ret)
+               goto err_mdio_exit;
+
+       return 0;
+
+err_mdio_exit:
+       ag71xx_mdio_driver_exit();
+err_debugfs_exit:
+       ag71xx_debugfs_root_exit();
+err_out:
+       return ret;
 }
 
 static void __exit ag71xx_module_exit(void)
 {
        platform_driver_unregister(&ag71xx_driver);
 }
 
 static void __exit ag71xx_module_exit(void)
 {
        platform_driver_unregister(&ag71xx_driver);
+       ag71xx_mdio_driver_exit();
+       ag71xx_debugfs_root_exit();
 }
 
 module_init(ag71xx_module_init);
 }
 
 module_init(ag71xx_module_init);
Personal OpenWRT clone
This page took 0.053107 seconds and 4 git commands to generate.