projects / openwrt.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
ar71xx: reset the phy in the ethernet init on ar724x
[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 4e597eb..ce2af53 100644 (file)
--- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
+++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c
@@ -14,14 +14,14 @@
 #include "ag71xx.h"
 
 #define AG71XX_DEFAULT_MSG_ENABLE      \
 #include "ag71xx.h"
 
 #define AG71XX_DEFAULT_MSG_ENABLE      \
-       ( NETIF_MSG_DRV                 \
+       (NETIF_MSG_DRV                  \
        | NETIF_MSG_PROBE               \
        | NETIF_MSG_LINK                \
        | NETIF_MSG_TIMER               \
        | NETIF_MSG_IFDOWN              \
        | NETIF_MSG_IFUP                \
        | NETIF_MSG_RX_ERR              \
        | NETIF_MSG_PROBE               \
        | NETIF_MSG_LINK                \
        | NETIF_MSG_TIMER               \
        | NETIF_MSG_IFDOWN              \
        | NETIF_MSG_IFUP                \
        | NETIF_MSG_RX_ERR              \
-       | NETIF_MSG_TX_ERR )
+       | NETIF_MSG_TX_ERR)
 
 static int ag71xx_msg_level = -1;
 
 
 static int ag71xx_msg_level = -1;
 
@@ -90,7 +90,7 @@ static void ag71xx_ring_free(struct ag71xx_ring *ring)
                                  ring->descs_cpu, ring->descs_dma);
 }
 
                                  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 i;
 {
        int err;
        int i;
@@ -103,30 +103,30 @@ static int ag71xx_ring_alloc(struct ag71xx_ring *ring, unsigned int size)
                ring->desc_size = roundup(ring->desc_size, cache_line_size());
        }
 
                ring->desc_size = roundup(ring->desc_size, cache_line_size());
        }
 
-       ring->descs_cpu = dma_alloc_coherent(NULL, size * ring->desc_size,
+       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;
        }
 
                                             &ring->descs_dma, GFP_ATOMIC);
        if (!ring->descs_cpu) {
                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 < size; i++) {
-               ring->buf[i].desc = (struct ag71xx_desc *)&ring->descs_cpu[i * ring->desc_size];
+       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;
 
                DBG("ag71xx: ring %p, desc %d at %p\n",
                        ring, i, ring->buf[i].desc);
        }
 
        return 0;
 
- err:
+err:
        return err;
 }
 
        return err;
 }
 
@@ -136,7 +136,7 @@ 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->buf[i].desc)) {
                        ring->buf[i].desc->ctrl = 0;
 
                if (!ag71xx_desc_empty(ring->buf[i].desc)) {
                        ring->buf[i].desc->ctrl = 0;
@@ -161,9 +161,9 @@ 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++) {
+       for (i = 0; i < ring->size; i++) {
                ring->buf[i].desc->next = (u32) (ring->descs_dma +
                ring->buf[i].desc->next = (u32) (ring->descs_dma +
-                       ring->desc_size * ((i + 1) % AG71XX_TX_RING_SIZE));
+                       ring->desc_size * ((i + 1) % ring->size));
 
                ring->buf[i].desc->ctrl = DESC_EMPTY;
                ring->buf[i].skb = NULL;
 
                ring->buf[i].desc->ctrl = DESC_EMPTY;
                ring->buf[i].skb = NULL;
@@ -184,7 +184,7 @@ 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++)
+       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);
                if (ring->buf[i].skb) {
                        dma_unmap_single(&ag->dev->dev, ring->buf[i].dma_addr,
                                         AG71XX_RX_PKT_SIZE, DMA_FROM_DEVICE);
@@ -218,16 +218,16 @@ static int ag71xx_ring_rx_init(struct ag71xx *ag)
        int ret;
 
        ret = 0;
        int ret;
 
        ret = 0;
-       for (i = 0; i < AG71XX_RX_RING_SIZE; i++) {
+       for (i = 0; i < ring->size; i++) {
                ring->buf[i].desc->next = (u32) (ring->descs_dma +
                ring->buf[i].desc->next = (u32) (ring->descs_dma +
-                       ring->desc_size * ((i + 1) % AG71XX_RX_RING_SIZE));
+                       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);
        }
 
 
                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;
                dma_addr_t dma_addr;
 
                struct sk_buff *skb;
                dma_addr_t dma_addr;
 
@@ -268,7 +268,7 @@ static int ag71xx_ring_rx_refill(struct ag71xx *ag)
        for (; ring->curr - ring->dirty > 0; ring->dirty++) {
                unsigned int i;
 
        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) {
                        dma_addr_t dma_addr;
 
                if (ring->buf[i].skb == NULL) {
                        dma_addr_t dma_addr;
@@ -306,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;
 
@@ -343,93 +343,6 @@ static unsigned char *ag71xx_speed_str(struct ag71xx *ag)
        return "?";
 }
 
        return "?";
 }
 
-void ag71xx_link_adjust(struct ag71xx *ag)
-{
-       struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
-       u32 cfg2;
-       u32 ifctl;
-       u32 fifo5;
-       u32 mii_speed;
-
-       if (!ag->link) {
-               netif_carrier_off(ag->dev);
-               if (netif_msg_link(ag))
-                       printk(KERN_INFO "%s: link down\n", ag->dev->name);
-               return;
-       }
-
-       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);
-
-       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 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;
@@ -510,9 +423,31 @@ static void ag71xx_dma_reset(struct ag71xx *ag)
                         FIFO_CFG5_LE | FIFO_CFG5_FT | FIFO_CFG5_16 | \
                         FIFO_CFG5_17 | FIFO_CFG5_SF)
 
                         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 engine */
+       ag71xx_wr(ag, AG71XX_REG_INT_ENABLE, 0);
+       ag71xx_wr(ag, AG71XX_REG_RX_CTRL, 0);
+}
+
 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);
@@ -520,14 +455,10 @@ static void ag71xx_hw_init(struct ag71xx *ag)
        ar71xx_device_stop(pdata->reset_bit);
        mdelay(100);
        ar71xx_device_start(pdata->reset_bit);
        ar71xx_device_stop(pdata->reset_bit);
        mdelay(100);
        ar71xx_device_start(pdata->reset_bit);
-       mdelay(100);
+       mdelay(200);
 
        /* setup MAC configuration registers */
 
        /* setup MAC configuration registers */
-       if (pdata->is_ar724x)
-               ag71xx_wr(ag, AG71XX_REG_MAC_CFG1,
-                         MAC_CFG1_INIT | MAC_CFG1_TFC | MAC_CFG1_RFC);
-       else
-               ag71xx_wr(ag, AG71XX_REG_MAC_CFG1, MAC_CFG1_INIT);
+       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);
 
        ag71xx_sb(ag, AG71XX_REG_MAC_CFG2,
                  MAC_CFG2_PAD_CRC_EN | MAC_CFG2_LEN_CHECK);
@@ -562,12 +493,93 @@ 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)
 {
 {
-       /* disable all interrupts */
-       ag71xx_wr(ag, AG71XX_REG_INT_ENABLE, 0);
+       struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag);
+       u32 cfg2;
+       u32 ifctl;
+       u32 fifo5;
+       u32 mii_speed;
 
 
-       ag71xx_dma_reset(ag);
+       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;
+       }
+
+       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)
@@ -579,8 +591,6 @@ static int ag71xx_open(struct net_device *dev)
        if (ret)
                goto err;
 
        if (ret)
                goto err;
 
-       ag71xx_hw_init(ag);
-
        napi_enable(&ag->napi);
 
        netif_carrier_off(dev);
        napi_enable(&ag->napi);
 
        netif_carrier_off(dev);
@@ -591,13 +601,11 @@ static int ag71xx_open(struct net_device *dev)
 
        ag71xx_hw_set_macaddr(ag, dev->dev_addr);
 
 
        ag71xx_hw_set_macaddr(ag, dev->dev_addr);
 
-       ag71xx_hw_start(ag);
-
        netif_start_queue(dev);
 
        return 0;
 
        netif_start_queue(dev);
 
        return 0;
 
- err:
+err:
        ag71xx_rings_cleanup(ag);
        return ret;
 }
        ag71xx_rings_cleanup(ag);
        return ret;
 }
@@ -615,6 +623,7 @@ static int ag71xx_stop(struct net_device *dev)
        netif_stop_queue(dev);
 
        ag71xx_hw_stop(ag);
        netif_stop_queue(dev);
 
        ag71xx_hw_stop(ag);
+       ag71xx_dma_reset(ag);
 
        napi_disable(&ag->napi);
        del_timer_sync(&ag->oom_timer);
 
        napi_disable(&ag->napi);
        del_timer_sync(&ag->oom_timer);
@@ -635,7 +644,7 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
        dma_addr_t dma_addr;
        int i;
 
        dma_addr_t dma_addr;
        int i;
 
-       i = ring->curr % AG71XX_TX_RING_SIZE;
+       i = ring->curr % ring->size;
        desc = ring->buf[i].desc;
 
        if (!ag71xx_desc_empty(desc))
        desc = ring->buf[i].desc;
 
        if (!ag71xx_desc_empty(desc))
@@ -653,6 +662,7 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
                                  DMA_TO_DEVICE);
 
        ring->buf[i].skb = skb;
                                  DMA_TO_DEVICE);
 
        ring->buf[i].skb = skb;
+       ring->buf[i].timestamp = jiffies;
 
        /* setup descriptor fields */
        desc->data = (u32) dma_addr;
 
        /* setup descriptor fields */
        desc->data = (u32) dma_addr;
@@ -662,7 +672,7 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
        wmb();
 
        ring->curr++;
        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);
        }
@@ -674,7 +684,7 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
 
        return NETDEV_TX_OK;
 
 
        return NETDEV_TX_OK;
 
- err_drop:
+err_drop:
        dev->stats.tx_dropped++;
 
        dev_kfree_skb(skb);
        dev->stats.tx_dropped++;
 
        dev_kfree_skb(skb);
@@ -683,7 +693,6 @@ static netdev_tx_t ag71xx_hard_start_xmit(struct sk_buff *skb,
 
 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;
 
@@ -715,7 +724,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;
@@ -759,7 +768,7 @@ static int ag71xx_tx_packets(struct ag71xx *ag)
 
        sent = 0;
        while (ring->dirty != ring->curr) {
 
        sent = 0;
        while (ring->dirty != ring->curr) {
-               unsigned int i = ring->dirty % AG71XX_TX_RING_SIZE;
+               unsigned int i = ring->dirty % ring->size;
                struct ag71xx_desc *desc = ring->buf[i].desc;
                struct sk_buff *skb = ring->buf[i].skb;
 
                struct ag71xx_desc *desc = ring->buf[i].desc;
                struct sk_buff *skb = ring->buf[i].skb;
 
@@ -780,7 +789,7 @@ static int 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);
 
        return sent;
                netif_wake_queue(ag->dev);
 
        return sent;
@@ -796,7 +805,7 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
                        dev->name, limit, ring->curr, ring->dirty);
 
        while (done < limit) {
                        dev->name, limit, ring->curr, ring->dirty);
 
        while (done < limit) {
-               unsigned int i = ring->curr % AG71XX_RX_RING_SIZE;
+               unsigned int i = ring->curr % ring->size;
                struct ag71xx_desc *desc = ring->buf[i].desc;
                struct sk_buff *skb;
                int pktlen;
                struct ag71xx_desc *desc = ring->buf[i].desc;
                struct sk_buff *skb;
                int pktlen;
@@ -805,7 +814,7 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit)
                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;
                }
@@ -875,7 +884,7 @@ static int ag71xx_poll(struct napi_struct *napi, int limit)
        ag71xx_debugfs_update_napi_stats(ag, rx_done, tx_done);
 
        rx_ring = &ag->rx_ring;
        ag71xx_debugfs_update_napi_stats(ag, rx_done, tx_done);
 
        rx_ring = &ag->rx_ring;
-       if (rx_ring->buf[rx_ring->dirty % AG71XX_RX_RING_SIZE].skb == NULL)
+       if (rx_ring->buf[rx_ring->dirty % rx_ring->size].skb == NULL)
                goto oom;
 
        status = ag71xx_rr(ag, AG71XX_REG_RX_STATUS);
                goto oom;
 
        status = ag71xx_rr(ag, AG71XX_REG_RX_STATUS);
@@ -907,12 +916,12 @@ static int ag71xx_poll(struct napi_struct *napi, int limit)
                return rx_done;
        }
 
                return rx_done;
        }
 
- more:
+more:
        DBG("%s: stay in polling mode, rx=%d, tx=%d, limit=%d\n",
                        dev->name, rx_done, tx_done, limit);
        return rx_done;
 
        DBG("%s: stay in polling mode, rx=%d, tx=%d, limit=%d\n",
                        dev->name, rx_done, tx_done, limit);
        return rx_done;
 
- oom:
+oom:
        if (netif_msg_rx_err(ag))
                printk(KERN_DEBUG "%s: out of memory\n", dev->name);
 
        if (netif_msg_rx_err(ag))
                printk(KERN_DEBUG "%s: out of memory\n", dev->name);
 
@@ -989,7 +998,7 @@ static const struct net_device_ops ag71xx_netdev_ops = {
 #endif
 };
 
 #endif
 };
 
-static int __init ag71xx_probe(struct platform_device *pdev)
+static int __devinit ag71xx_probe(struct platform_device *pdev)
 {
        struct net_device *dev;
        struct resource *res;
 {
        struct net_device *dev;
        struct resource *res;
@@ -1056,7 +1065,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);
@@ -1073,6 +1082,9 @@ static int __init ag71xx_probe(struct platform_device *pdev)
        ag->oom_timer.data = (unsigned long) dev;
        ag->oom_timer.function = ag71xx_oom_timer_handler;
 
        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;
+
        memcpy(dev->dev_addr, pdata->mac_addr, ETH_ALEN);
 
        netif_napi_add(dev, &ag->napi, ag71xx_poll, AG71XX_NAPI_WEIGHT);
        memcpy(dev->dev_addr, pdata->mac_addr, ETH_ALEN);
 
        netif_napi_add(dev, &ag->napi, ag71xx_poll, AG71XX_NAPI_WEIGHT);
@@ -1104,24 +1116,24 @@ static int __init ag71xx_probe(struct platform_device *pdev)
 
        return 0;
 
 
        return 0;
 
- err_phy_disconnect:
+err_phy_disconnect:
        ag71xx_phy_disconnect(ag);
        ag71xx_phy_disconnect(ag);
- err_unregister_netdev:
+err_unregister_netdev:
        unregister_netdev(dev);
        unregister_netdev(dev);
- err_free_irq:
+err_free_irq:
        free_irq(dev->irq, dev);
        free_irq(dev->irq, dev);
- err_unmap_mii_ctrl:
+err_unmap_mii_ctrl:
        iounmap(ag->mii_ctrl);
        iounmap(ag->mii_ctrl);
- err_unmap_base:
+err_unmap_base:
        iounmap(ag->mac_base);
        iounmap(ag->mac_base);
- err_free_dev:
+err_free_dev:
        kfree(dev);
        kfree(dev);
- err_out:
+err_out:
        platform_set_drvdata(pdev, NULL);
        return err;
 }
 
        platform_set_drvdata(pdev, NULL);
        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);
 
 {
        struct net_device *dev = platform_get_drvdata(pdev);
 
@@ -1167,11 +1179,11 @@ static int __init ag71xx_module_init(void)
 
        return 0;
 
 
        return 0;
 
- err_mdio_exit:
+err_mdio_exit:
        ag71xx_mdio_driver_exit();
        ag71xx_mdio_driver_exit();
- err_debugfs_exit:
+err_debugfs_exit:
        ag71xx_debugfs_root_exit();
        ag71xx_debugfs_root_exit();
- err_out:
+err_out:
        return ret;
 }
 
        return ret;
 }
 
Personal OpenWRT clone
This page took 0.040606 seconds and 4 git commands to generate.