Commit c3b7c12c authored by Steven J. Magnani's avatar Steven J. Magnani Committed by David S. Miller

ll_temac: Add support for V2 LLTEMAC core

LLTEMAC V1 cores place only received packet length in the app4 word.
V2 cores place additional information in app4.
Mask out the additional information when retrieving the packet length.
Signed-off-by: default avatarSteven J. Magnani <steve@digidescorp.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e1d44477
...@@ -615,7 +615,7 @@ static void ll_temac_recv(struct net_device *ndev) ...@@ -615,7 +615,7 @@ static void ll_temac_recv(struct net_device *ndev)
while ((bdstat & STS_CTRL_APP0_CMPLT)) { while ((bdstat & STS_CTRL_APP0_CMPLT)) {
skb = lp->rx_skb[lp->rx_bd_ci]; skb = lp->rx_skb[lp->rx_bd_ci];
length = cur_p->app4; length = cur_p->app4 & 0x3FFF;
skb_vaddr = virt_to_bus(skb->data); skb_vaddr = virt_to_bus(skb->data);
dma_unmap_single(ndev->dev.parent, skb_vaddr, length, dma_unmap_single(ndev->dev.parent, skb_vaddr, length,
...@@ -938,6 +938,9 @@ static int __devexit temac_of_remove(struct of_device *op) ...@@ -938,6 +938,9 @@ static int __devexit temac_of_remove(struct of_device *op)
static struct of_device_id temac_of_match[] __devinitdata = { static struct of_device_id temac_of_match[] __devinitdata = {
{ .compatible = "xlnx,xps-ll-temac-1.01.b", }, { .compatible = "xlnx,xps-ll-temac-1.01.b", },
{ .compatible = "xlnx,xps-ll-temac-2.00.a", },
{ .compatible = "xlnx,xps-ll-temac-2.02.a", },
{ .compatible = "xlnx,xps-ll-temac-2.03.a", },
{}, {},
}; };
MODULE_DEVICE_TABLE(of, temac_of_match); MODULE_DEVICE_TABLE(of, temac_of_match);
......
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