GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-21 14:41:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: emaclite: Setup RX/TX ping pong for every instance

Browse source 
Setup RX/TX ping-pong buffer for every emaclite IP separately.
The next patch move initialization directly to board code.

Signed-off-by: Michal Simek <monstr@monstr.eu>
This commit is contained in:
Michal Simek 2011-09-12 21:10:01 +00:00 • committed by Wolfgang Denk
parent 7bf5228ce1
commit 947324b9ca
1 changed files with 68 additions and 55 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

123
drivers/net/xilinx_emaclite.c
View file

@ -66,6 +66,8 @@
struct xemaclite { struct xemaclite {
u32 nexttxbuffertouse; /* Next TX buffer to write to */ u32 nexttxbuffertouse; /* Next TX buffer to write to */
u32 nextrxbuffertouse; /* Next RX buffer to read from */ u32 nextrxbuffertouse; /* Next RX buffer to read from */
u32 txpp; /* TX ping pong buffer */
u32 rxpp; /* RX ping pong buffer */
}; };
static u32 etherrxbuff[PKTSIZE_ALIGN/4]; /* Receive buffer */ static u32 etherrxbuff[PKTSIZE_ALIGN/4]; /* Receive buffer */
@ -131,6 +133,7 @@ static void emaclite_halt(struct eth_device *dev)
static int emaclite_init(struct eth_device *dev, bd_t *bis) static int emaclite_init(struct eth_device *dev, bd_t *bis)
{ {
struct xemaclite *emaclite = dev->priv;
debug ("EmacLite Initialization Started\n"); debug ("EmacLite Initialization Started\n");
/* /*
@ -150,28 +153,28 @@ static int emaclite_init(struct eth_device *dev, bd_t *bis)
XEL_TSR_PROG_MAC_ADDR) != 0) XEL_TSR_PROG_MAC_ADDR) != 0)
; ;
#ifdef CONFIG_XILINX_EMACLITE_TX_PING_PONG if (emaclite->txpp) {
/* The same operation with PONG TX */ /* The same operation with PONG TX */
out_be32 (dev->iobase + XEL_TSR_OFFSET + XEL_BUFFER_OFFSET, 0); out_be32 (dev->iobase + XEL_TSR_OFFSET + XEL_BUFFER_OFFSET, 0);
xemaclite_alignedwrite(dev->enetaddr, dev->iobase + xemaclite_alignedwrite(dev->enetaddr, dev->iobase +
XEL_BUFFER_OFFSET, ENET_ADDR_LENGTH); XEL_BUFFER_OFFSET, ENET_ADDR_LENGTH);
out_be32 (dev->iobase + XEL_TPLR_OFFSET, ENET_ADDR_LENGTH); out_be32 (dev->iobase + XEL_TPLR_OFFSET, ENET_ADDR_LENGTH);
out_be32 (dev->iobase + XEL_TSR_OFFSET + XEL_BUFFER_OFFSET, out_be32 (dev->iobase + XEL_TSR_OFFSET + XEL_BUFFER_OFFSET,
XEL_TSR_PROG_MAC_ADDR); XEL_TSR_PROG_MAC_ADDR);
while ((in_be32 (dev->iobase + XEL_TSR_OFFSET + while ((in_be32 (dev->iobase + XEL_TSR_OFFSET +
XEL_BUFFER_OFFSET) & XEL_TSR_PROG_MAC_ADDR) != 0) XEL_BUFFER_OFFSET) & XEL_TSR_PROG_MAC_ADDR) != 0)
; ;
#endif }
/* /*
* RX - RX_PING & RX_PONG initialization * RX - RX_PING & RX_PONG initialization
*/ */
/* Write out the value to flush the RX buffer */ /* Write out the value to flush the RX buffer */
out_be32 (dev->iobase + XEL_RSR_OFFSET, XEL_RSR_RECV_IE_MASK); out_be32 (dev->iobase + XEL_RSR_OFFSET, XEL_RSR_RECV_IE_MASK);
#ifdef CONFIG_XILINX_EMACLITE_RX_PING_PONG
out_be32 (dev->iobase + XEL_RSR_OFFSET + XEL_BUFFER_OFFSET, if (emaclite->rxpp)
XEL_RSR_RECV_IE_MASK); out_be32 (dev->iobase + XEL_RSR_OFFSET + XEL_BUFFER_OFFSET,
#endif XEL_RSR_RECV_IE_MASK);
debug ("EmacLite Initialization complete\n"); debug ("EmacLite Initialization complete\n");
return 0; return 0;
@ -221,10 +224,10 @@ static int emaclite_send (struct eth_device *dev, volatile void *ptr, int len)
printf ("Error: Timeout waiting for ethernet TX buffer\n"); printf ("Error: Timeout waiting for ethernet TX buffer\n");
/* Restart PING TX */ /* Restart PING TX */
out_be32 (dev->iobase + XEL_TSR_OFFSET, 0); out_be32 (dev->iobase + XEL_TSR_OFFSET, 0);
#ifdef CONFIG_XILINX_EMACLITE_TX_PING_PONG if (emaclite->txpp) {
out_be32 (dev->iobase + XEL_TSR_OFFSET + out_be32 (dev->iobase + XEL_TSR_OFFSET +
XEL_BUFFER_OFFSET, 0); XEL_BUFFER_OFFSET, 0);
#endif }
return -1; return -1;
} }
@ -237,9 +240,9 @@ static int emaclite_send (struct eth_device *dev, volatile void *ptr, int len)
&& ((in_be32 ((baseaddress) + XEL_TSR_OFFSET) && ((in_be32 ((baseaddress) + XEL_TSR_OFFSET)
& XEL_TSR_XMIT_ACTIVE_MASK) == 0)) { & XEL_TSR_XMIT_ACTIVE_MASK) == 0)) {
#ifdef CONFIG_XILINX_EMACLITE_TX_PING_PONG if (emaclite->txpp)
emaclite->nexttxbuffertouse ^= XEL_BUFFER_OFFSET; emaclite->nexttxbuffertouse ^= XEL_BUFFER_OFFSET;
#endif
debug ("Send packet from 0x%x\n", baseaddress); debug ("Send packet from 0x%x\n", baseaddress);
/* Write the frame to the buffer */ /* Write the frame to the buffer */
xemaclite_alignedwrite ((void *) ptr, baseaddress, len); xemaclite_alignedwrite ((void *) ptr, baseaddress, len);
@ -253,28 +256,30 @@ static int emaclite_send (struct eth_device *dev, volatile void *ptr, int len)
out_be32 (baseaddress + XEL_TSR_OFFSET, reg); out_be32 (baseaddress + XEL_TSR_OFFSET, reg);
return 0; return 0;
} }
#ifdef CONFIG_XILINX_EMACLITE_TX_PING_PONG
/* Switch to second buffer */ if (emaclite->txpp) {
baseaddress ^= XEL_BUFFER_OFFSET; /* Switch to second buffer */
/* Determine if the expected buffer address is empty */ baseaddress ^= XEL_BUFFER_OFFSET;
reg = in_be32 (baseaddress + XEL_TSR_OFFSET); /* Determine if the expected buffer address is empty */
if (((reg & XEL_TSR_XMIT_BUSY_MASK) == 0)
&& ((in_be32 ((baseaddress) + XEL_TSR_OFFSET)
& XEL_TSR_XMIT_ACTIVE_MASK) == 0)) {
debug("Send packet from 0x%x\n", baseaddress);
/* Write the frame to the buffer */
xemaclite_alignedwrite ((void *) ptr, baseaddress, len);
out_be32 (baseaddress + XEL_TPLR_OFFSET,(len &
(XEL_TPLR_LENGTH_MASK_HI | XEL_TPLR_LENGTH_MASK_LO)));
reg = in_be32 (baseaddress + XEL_TSR_OFFSET); reg = in_be32 (baseaddress + XEL_TSR_OFFSET);
reg |= XEL_TSR_XMIT_BUSY_MASK; if (((reg & XEL_TSR_XMIT_BUSY_MASK) == 0)
if ((reg & XEL_TSR_XMIT_IE_MASK) != 0) { && ((in_be32 ((baseaddress) + XEL_TSR_OFFSET)
reg |= XEL_TSR_XMIT_ACTIVE_MASK; & XEL_TSR_XMIT_ACTIVE_MASK) == 0)) {
debug("Send packet from 0x%x\n", baseaddress);
/* Write the frame to the buffer */
xemaclite_alignedwrite((void *) ptr, baseaddress, len);
out_be32 (baseaddress + XEL_TPLR_OFFSET, (len &
(XEL_TPLR_LENGTH_MASK_HI |
XEL_TPLR_LENGTH_MASK_LO)));
reg = in_be32 (baseaddress + XEL_TSR_OFFSET);
reg |= XEL_TSR_XMIT_BUSY_MASK;
if ((reg & XEL_TSR_XMIT_IE_MASK) != 0)
reg |= XEL_TSR_XMIT_ACTIVE_MASK;
out_be32 (baseaddress + XEL_TSR_OFFSET, reg);
return 0;
} }
out_be32 (baseaddress + XEL_TSR_OFFSET, reg);
return 0;
} }
#endif
puts ("Error while sending frame\n"); puts ("Error while sending frame\n");
return -1; return -1;
} }
@ -290,23 +295,24 @@ static int emaclite_recv(struct eth_device *dev)
reg = in_be32 (baseaddress + XEL_RSR_OFFSET); reg = in_be32 (baseaddress + XEL_RSR_OFFSET);
debug ("Testing data at address 0x%x\n", baseaddress); debug ("Testing data at address 0x%x\n", baseaddress);
if ((reg & XEL_RSR_RECV_DONE_MASK) == XEL_RSR_RECV_DONE_MASK) { if ((reg & XEL_RSR_RECV_DONE_MASK) == XEL_RSR_RECV_DONE_MASK) {
#ifdef CONFIG_XILINX_EMACLITE_RX_PING_PONG if (emaclite->rxpp)
emaclite->nextrxbuffertouse ^= XEL_BUFFER_OFFSET; emaclite->nextrxbuffertouse ^= XEL_BUFFER_OFFSET;
#endif
} else { } else {
#ifndef CONFIG_XILINX_EMACLITE_RX_PING_PONG
debug ("No data was available - address 0x%x\n", baseaddress); if (!emaclite->rxpp) {
return 0;
#else
baseaddress ^= XEL_BUFFER_OFFSET;
reg = in_be32 (baseaddress + XEL_RSR_OFFSET);
if ((reg & XEL_RSR_RECV_DONE_MASK) !=
XEL_RSR_RECV_DONE_MASK) {
debug ("No data was available - address 0x%x\n", debug ("No data was available - address 0x%x\n",
baseaddress); baseaddress);
return 0; return 0;
} else {
baseaddress ^= XEL_BUFFER_OFFSET;
reg = in_be32 (baseaddress + XEL_RSR_OFFSET);
if ((reg & XEL_RSR_RECV_DONE_MASK) !=
XEL_RSR_RECV_DONE_MASK) {
debug("No data was available - address 0x%x\n",
baseaddress);
return 0;
}
} }
#endif
} }
/* Get the length of the frame that arrived */ /* Get the length of the frame that arrived */
switch(((ntohl(in_be32 (baseaddress + XEL_RXBUFF_OFFSET + 0xC))) & switch(((ntohl(in_be32 (baseaddress + XEL_RXBUFF_OFFSET + 0xC))) &
@ -358,6 +364,13 @@ int xilinx_emaclite_initialize (bd_t *bis, int base_addr)
dev->priv = emaclite; dev->priv = emaclite;
#ifdef CONFIG_XILINX_EMACLITE_TX_PING_PONG
emaclite->txpp = 1;
#endif
#ifdef CONFIG_XILINX_EMACLITE_RX_PING_PONG
emaclite->rxpp = 1;
#endif
sprintf(dev->name, "Xelite.%x", base_addr); sprintf(dev->name, "Xelite.%x", base_addr);
dev->iobase = base_addr; dev->iobase = base_addr;