* by the Free Software Foundation.
*/
-#include <linux/cache.h>
#include "ag71xx.h"
#define AG71XX_DEFAULT_MSG_ENABLE \
for (i = 0; i < AG71XX_RX_RING_SIZE; i++) {
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 + AG71XX_RX_PKT_RESERVE);
if (!skb) {
ret = -ENOMEM;
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);
+ 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].desc->data = virt_to_phys(skb->data);
+ ring->buf[i].desc->data = (u32) dma_addr;
ring->buf[i].desc->ctrl = DESC_EMPTY;
}
i = ring->dirty % AG71XX_RX_RING_SIZE;
if (ring->buf[i].skb == NULL) {
+ dma_addr_t dma_addr;
struct sk_buff *skb;
- skb = dev_alloc_skb(AG71XX_RX_PKT_SIZE);
+ skb = dev_alloc_skb(AG71XX_RX_PKT_SIZE +
+ AG71XX_RX_PKT_RESERVE);
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;
+ 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].desc->data = virt_to_phys(skb->data);
+ ring->buf[i].desc->data = (u32) dma_addr;
}
ring->buf[i].desc->ctrl = DESC_EMPTY;
mdelay(100);
/* setup MAC configuration registers */
- ag71xx_wr(ag, AG71XX_REG_MAC_CFG1, MAC_CFG1_INIT);
+ 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_sb(ag, AG71XX_REG_MAC_CFG2,
MAC_CFG2_PAD_CRC_EN | MAC_CFG2_LEN_CHECK);
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_ring *ring = &ag->tx_ring;
struct ag71xx_desc *desc;
+ dma_addr_t dma_addr;
int i;
i = ring->curr % AG71XX_TX_RING_SIZE;
goto err_drop;
}
- dma_map_single(NULL, skb->data, skb->len, DMA_TO_DEVICE);
+ dma_addr = dma_map_single(&dev->dev, skb->data, skb->len,
+ DMA_TO_DEVICE);
ring->buf[i].skb = skb;
/* setup descriptor fields */
- desc->data = virt_to_phys(skb->data);
+ desc->data = (u32) dma_addr;
desc->ctrl = (skb->len & DESC_PKTLEN_M);
/* flush descriptor */
dev->trans_start = jiffies;
- return 0;
+ return NETDEV_TX_OK;
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)