X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=blobdiff_plain;f=target%2Flinux%2Far71xx%2Ffiles%2Fdrivers%2Fnet%2Fag71xx%2Fag71xx_main.c;h=58e3b115189804bb37a1373e03e6228c728d8e08;hp=6793b4d72dc8ce6a30b44fd4d2135529c524f67e;hb=a128872119a2d48d00ae2571b6a10fdac60f6961;hpb=f546ae37cce43c6cce487f2477f58fe9b4fea037 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 6793b4d72d..58e3b11518 100644 --- a/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c +++ b/target/linux/ar71xx/files/drivers/net/ag71xx/ag71xx_main.c @@ -196,6 +196,9 @@ static int ag71xx_ring_rx_init(struct ag71xx *ag) break; } + dma_map_single(NULL, skb->data, AG71XX_RX_PKT_SIZE, + DMA_FROM_DEVICE); + skb->dev = ag->dev; skb_reserve(skb, AG71XX_RX_PKT_RESERVE); @@ -228,14 +231,15 @@ static int ag71xx_ring_rx_refill(struct ag71xx *ag) 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); + if (skb == NULL) break; - } + + dma_map_single(NULL, skb->data, AG71XX_RX_PKT_SIZE, + DMA_FROM_DEVICE); skb_reserve(skb, AG71XX_RX_PKT_RESERVE); skb->dev = ag->dev; + ring->buf[i].skb = skb; ring->descs[i].data = virt_to_phys(skb->data); } @@ -292,17 +296,6 @@ static void ag71xx_hw_set_macaddr(struct ag71xx *ag, unsigned char *mac) ag71xx_wr(ag, AG71XX_REG_MAC_ADDR2, t); } -#define AR71XX_MAC_CFG1_INIT (MAC_CFG1_RXE | MAC_CFG1_TXE | \ - MAC_CFG1_SRX | MAC_CFG1_STX) -#define AR71XX_FIFO_CFG5_INIT 0x0007ffef - -#define AR91XX_MAC_CFG1_INIT (MAC_CFG1_RXE | MAC_CFG1_TXE | \ - MAC_CFG1_SRX | MAC_CFG1_STX | \ - MAC_CFG1_TFC | MAC_CFG1_RFC) -#define AR91XX_FIFO_CFG5_INIT 0x0007efef - -#define FIFO_CFG0_INIT (FIFO_CFG0_ALL << FIFO_CFG0_ENABLE_SHIFT) - static void ag71xx_dma_reset(struct ag71xx *ag) { int i; @@ -338,6 +331,25 @@ static void ag71xx_dma_reset(struct ag71xx *ag) 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_init(struct ag71xx *ag) { struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag); @@ -351,8 +363,7 @@ static void ag71xx_hw_init(struct ag71xx *ag) mdelay(100); /* setup MAC configuration registers */ - ag71xx_wr(ag, AG71XX_REG_MAC_CFG1, - pdata->is_ar91xx ? AR91XX_MAC_CFG1_INIT : AR71XX_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); @@ -366,10 +377,8 @@ static void ag71xx_hw_init(struct ag71xx *ag) ag71xx_wr(ag, AG71XX_REG_FIFO_CFG0, FIFO_CFG0_INIT); 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, - pdata->is_ar91xx ? AR91XX_FIFO_CFG5_INIT - : AR71XX_FIFO_CFG5_INIT); + ag71xx_wr(ag, AG71XX_REG_FIFO_CFG4, FIFO_CFG4_INIT); + ag71xx_wr(ag, AG71XX_REG_FIFO_CFG5, FIFO_CFG5_INIT); ag71xx_dma_reset(ag); } @@ -436,6 +445,7 @@ static int ag71xx_stop(struct net_device *dev) ag71xx_phy_stop(ag); napi_disable(&ag->napi); + del_timer_sync(&ag->oom_timer); spin_unlock_irqrestore(&ag->lock, flags); @@ -468,7 +478,7 @@ static int ag71xx_hard_start_xmit(struct sk_buff *skb, struct net_device *dev) goto err_drop; } - dma_cache_wback_inv((unsigned long)skb->data, skb->len); + dma_map_single(NULL, skb->data, skb->len, DMA_TO_DEVICE); ring->buf[i].skb = skb; @@ -544,18 +554,39 @@ static int ag71xx_do_ioctl(struct net_device *dev, struct ifreq *ifr, int cmd) return -EOPNOTSUPP; } +static void ag71xx_oom_timer_handler(unsigned long data) +{ + struct net_device *dev = (struct net_device *) data; + struct ag71xx *ag = netdev_priv(dev); + + netif_rx_schedule(dev, &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 void ag71xx_tx_packets(struct ag71xx *ag) { - struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag); struct ag71xx_ring *ring = &ag->tx_ring; unsigned int sent; DBG("%s: processing TX ring\n", ag->dev->name); -#ifdef AG71XX_NAPI_TX - pdata->ddr_flush(); -#endif - sent = 0; while (ring->dirty != ring->curr) { unsigned int i = ring->dirty % AG71XX_TX_RING_SIZE; @@ -588,18 +619,8 @@ 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; -#ifndef AG71XX_NAPI_TX - spin_lock_irqsave(&ag->lock, flags); - pdata->ddr_flush(); - 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); @@ -617,12 +638,12 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit) 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; - /* TODO: move it into the refill function */ - dma_cache_wback_inv((unsigned long)skb->data, pktlen); skb_put(skb, pktlen); skb->dev = dev; @@ -638,11 +659,7 @@ static int ag71xx_rx_packets(struct ag71xx *ag, int limit) ring->buf[i].skb = NULL; done++; - ag71xx_wr(ag, AG71XX_REG_RX_STATUS, RX_STATUS_PR); - ring->curr++; - if ((ring->curr - ring->dirty) > (AG71XX_RX_RING_SIZE / 4)) - ag71xx_ring_rx_refill(ag); } ag71xx_ring_rx_refill(ag); @@ -656,30 +673,42 @@ 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); -#ifdef AG71XX_NAPI_TX struct ag71xx_platform_data *pdata = ag71xx_get_pdata(ag); -#endif struct net_device *dev = ag->dev; + struct ag71xx_ring *rx_ring; unsigned long flags; u32 status; int done; -#ifdef AG71XX_NAPI_TX pdata->ddr_flush(); ag71xx_tx_packets(ag); -#endif DBG("%s: processing RX ring\n", dev->name); done = ag71xx_rx_packets(ag, limit); - /* TODO: add OOM handler */ + rx_ring = &ag->rx_ring; + if (rx_ring->buf[rx_ring->dirty % AG71XX_RX_RING_SIZE].skb == NULL) + goto oom; - status = ag71xx_rr(ag, AG71XX_REG_INT_STATUS); - status &= AG71XX_INT_POLL; + 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 (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; + + DBG("%s: disable polling mode, done=%d, limit=%d\n", + dev->name, done, limit); netif_rx_complete(dev, napi); @@ -690,20 +719,18 @@ static int ag71xx_poll(struct napi_struct *napi, int limit) return 0; } - if (status & AG71XX_INT_RX_OF) { - if (netif_msg_rx_err(ag)) - printk(KERN_ALERT "%s: rx owerflow, restarting dma\n", - dev->name); + more: + DBG("%s: stay in polling mode, done=%d, limit=%d\n", + dev->name, done, limit); + return 1; - /* 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); + netif_rx_complete(dev, napi); + return 0; } static irqreturn_t ag71xx_interrupt(int irq, void *dev_id) @@ -714,8 +741,6 @@ static irqreturn_t ag71xx_interrupt(int irq, void *dev_id) status = ag71xx_rr(ag, AG71XX_REG_INT_STATUS); ag71xx_dump_intr(ag, "raw", status); - status &= ag71xx_rr(ag, AG71XX_REG_INT_ENABLE); - ag71xx_dump_intr(ag, "masked", status); if (unlikely(!status)) return IRQ_NONE; @@ -731,18 +756,6 @@ 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); @@ -848,6 +861,13 @@ static int __init ag71xx_probe(struct platform_device *pdev) dev->do_ioctl = ag71xx_do_ioctl; dev->ethtool_ops = &ag71xx_ethtool_ops; + dev->tx_timeout = ag71xx_tx_timeout; + INIT_WORK(&ag->restart_work, ag71xx_restart_work_func); + + init_timer(&ag->oom_timer); + ag->oom_timer.data = (unsigned long) dev; + ag->oom_timer.function = ag71xx_oom_timer_handler; + netif_napi_add(dev, &ag->napi, ag71xx_poll, AG71XX_NAPI_WEIGHT); if (is_valid_ether_addr(pdata->mac_addr))