Commit 3ee19a85 authored by Thomas Chou's avatar Thomas Chou Committed by David S. Miller

ethoc: fix buffer address mapping

The pointer address in buffer descriptors is physical address. The
pointer that processor used to access packet is virtual address.

Though the higher bits of pointer address used by the MAC may be
truncated to zero in special case, it is not always true in larger
designs.
Signed-off-by: default avatarThomas Chou <thomas@wytron.com.tw>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 639b62a5
...@@ -284,7 +284,7 @@ static int ethoc_init_ring(struct ethoc *dev) ...@@ -284,7 +284,7 @@ static int ethoc_init_ring(struct ethoc *dev)
dev->cur_rx = 0; dev->cur_rx = 0;
/* setup transmission buffers */ /* setup transmission buffers */
bd.addr = 0; bd.addr = virt_to_phys(dev->membase);
bd.stat = TX_BD_IRQ | TX_BD_CRC; bd.stat = TX_BD_IRQ | TX_BD_CRC;
for (i = 0; i < dev->num_tx; i++) { for (i = 0; i < dev->num_tx; i++) {
...@@ -295,7 +295,6 @@ static int ethoc_init_ring(struct ethoc *dev) ...@@ -295,7 +295,6 @@ static int ethoc_init_ring(struct ethoc *dev)
bd.addr += ETHOC_BUFSIZ; bd.addr += ETHOC_BUFSIZ;
} }
bd.addr = dev->num_tx * ETHOC_BUFSIZ;
bd.stat = RX_BD_EMPTY | RX_BD_IRQ; bd.stat = RX_BD_EMPTY | RX_BD_IRQ;
for (i = 0; i < dev->num_rx; i++) { for (i = 0; i < dev->num_rx; i++) {
...@@ -401,7 +400,7 @@ static int ethoc_rx(struct net_device *dev, int limit) ...@@ -401,7 +400,7 @@ static int ethoc_rx(struct net_device *dev, int limit)
int size = bd.stat >> 16; int size = bd.stat >> 16;
struct sk_buff *skb = netdev_alloc_skb(dev, size); struct sk_buff *skb = netdev_alloc_skb(dev, size);
if (likely(skb)) { if (likely(skb)) {
void *src = priv->membase + bd.addr; void *src = phys_to_virt(bd.addr);
memcpy_fromio(skb_put(skb, size), src, size); memcpy_fromio(skb_put(skb, size), src, size);
skb->protocol = eth_type_trans(skb, dev); skb->protocol = eth_type_trans(skb, dev);
priv->stats.rx_packets++; priv->stats.rx_packets++;
...@@ -823,7 +822,7 @@ static netdev_tx_t ethoc_start_xmit(struct sk_buff *skb, struct net_device *dev) ...@@ -823,7 +822,7 @@ static netdev_tx_t ethoc_start_xmit(struct sk_buff *skb, struct net_device *dev)
else else
bd.stat &= ~TX_BD_PAD; bd.stat &= ~TX_BD_PAD;
dest = priv->membase + bd.addr; dest = phys_to_virt(bd.addr);
memcpy_toio(dest, skb->data, skb->len); memcpy_toio(dest, skb->data, skb->len);
bd.stat &= ~(TX_BD_STATS | TX_BD_LEN_MASK); bd.stat &= ~(TX_BD_STATS | TX_BD_LEN_MASK);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment