X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=drivers%2Fnet%2Fxilinx_emaclite.c;h=d890d6045378371eb7fc4d5ecda2f7d4f49bf507;hb=714afa64f3d81a660715b61785f1f3a3b986f852;hp=93424761b26d3089d482ebd56c9d404ac690f39c;hpb=947324b9ca19305fdc738f9034a98e643dc8188c;p=u-boot diff --git a/drivers/net/xilinx_emaclite.c b/drivers/net/xilinx_emaclite.c index 93424761b2..d890d60453 100644 --- a/drivers/net/xilinx_emaclite.c +++ b/drivers/net/xilinx_emaclite.c @@ -28,11 +28,12 @@ #include #include #include +#include + +DECLARE_GLOBAL_DATA_PTR; #undef DEBUG -#define ENET_MAX_MTU PKTSIZE -#define ENET_MAX_MTU_ALIGNED PKTSIZE_ALIGN #define ENET_ADDR_LENGTH 6 /* EmacLite constants */ @@ -72,7 +73,7 @@ struct xemaclite { static u32 etherrxbuff[PKTSIZE_ALIGN/4]; /* Receive buffer */ -static void xemaclite_alignedread (u32 *srcptr, void *destptr, u32 bytecount) +static void xemaclite_alignedread(u32 *srcptr, void *destptr, u32 bytecount) { u32 i; u32 alignbuffer; @@ -92,14 +93,13 @@ static void xemaclite_alignedread (u32 *srcptr, void *destptr, u32 bytecount) to8ptr = (u8 *) to32ptr; alignbuffer = *from32ptr++; - from8ptr = (u8 *) & alignbuffer; + from8ptr = (u8 *) &alignbuffer; - for (i = 0; i < bytecount; i++) { + for (i = 0; i < bytecount; i++) *to8ptr++ = *from8ptr++; - } } -static void xemaclite_alignedwrite (void *srcptr, u32 destptr, u32 bytecount) +static void xemaclite_alignedwrite(void *srcptr, u32 destptr, u32 bytecount) { u32 i; u32 alignbuffer; @@ -116,25 +116,24 @@ static void xemaclite_alignedwrite (void *srcptr, u32 destptr, u32 bytecount) } alignbuffer = 0; - to8ptr = (u8 *) & alignbuffer; + to8ptr = (u8 *) &alignbuffer; from8ptr = (u8 *) from32ptr; - for (i = 0; i < bytecount; i++) { + for (i = 0; i < bytecount; i++) *to8ptr++ = *from8ptr++; - } *to32ptr++ = alignbuffer; } static void emaclite_halt(struct eth_device *dev) { - debug ("eth_halt\n"); + debug("eth_halt\n"); } 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"); /* * TX - TX_PING & TX_PONG initialization @@ -142,8 +141,7 @@ static int emaclite_init(struct eth_device *dev, bd_t *bis) /* Restart PING TX */ out_be32 (dev->iobase + XEL_TSR_OFFSET, 0); /* Copy MAC address */ - xemaclite_alignedwrite (dev->enetaddr, - dev->iobase, ENET_ADDR_LENGTH); + xemaclite_alignedwrite(dev->enetaddr, dev->iobase, ENET_ADDR_LENGTH); /* Set the length */ out_be32 (dev->iobase + XEL_TPLR_OFFSET, ENET_ADDR_LENGTH); /* Update the MAC address in the EMAC Lite */ @@ -176,7 +174,7 @@ static int emaclite_init(struct eth_device *dev, bd_t *bis) out_be32 (dev->iobase + XEL_RSR_OFFSET + XEL_BUFFER_OFFSET, XEL_RSR_RECV_IE_MASK); - debug ("EmacLite Initialization complete\n"); + debug("EmacLite Initialization complete\n"); return 0; } @@ -201,10 +199,10 @@ static int xemaclite_txbufferavailable(struct eth_device *dev) txpongbusy = ((reg & XEL_TSR_XMIT_BUSY_MASK) == XEL_TSR_XMIT_BUSY_MASK); - return (!(txpingbusy && txpongbusy)); + return !(txpingbusy && txpongbusy); } -static int emaclite_send (struct eth_device *dev, volatile void *ptr, int len) +static int emaclite_send(struct eth_device *dev, void *ptr, int len) { u32 reg; u32 baseaddress; @@ -212,16 +210,16 @@ static int emaclite_send (struct eth_device *dev, volatile void *ptr, int len) u32 maxtry = 1000; - if (len > ENET_MAX_MTU) - len = ENET_MAX_MTU; + if (len > PKTSIZE) + len = PKTSIZE; while (!xemaclite_txbufferavailable(dev) && maxtry) { - udelay (10); + udelay(10); maxtry--; } if (!maxtry) { - printf ("Error: Timeout waiting for ethernet TX buffer\n"); + printf("Error: Timeout waiting for ethernet TX buffer\n"); /* Restart PING TX */ out_be32 (dev->iobase + XEL_TSR_OFFSET, 0); if (emaclite->txpp) { @@ -243,16 +241,15 @@ static int emaclite_send (struct eth_device *dev, volatile void *ptr, int len) if (emaclite->txpp) emaclite->nexttxbuffertouse ^= XEL_BUFFER_OFFSET; - debug ("Send packet from 0x%x\n", baseaddress); + debug("Send packet from 0x%x\n", baseaddress); /* Write the frame to the buffer */ - xemaclite_alignedwrite ((void *) ptr, baseaddress, len); + xemaclite_alignedwrite(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) { + if ((reg & XEL_TSR_XMIT_IE_MASK) != 0) reg |= XEL_TSR_XMIT_ACTIVE_MASK; - } out_be32 (baseaddress + XEL_TSR_OFFSET, reg); return 0; } @@ -267,7 +264,7 @@ static int emaclite_send (struct eth_device *dev, volatile void *ptr, int len) & 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); + xemaclite_alignedwrite(ptr, baseaddress, len); out_be32 (baseaddress + XEL_TPLR_OFFSET, (len & (XEL_TPLR_LENGTH_MASK_HI | XEL_TPLR_LENGTH_MASK_LO))); @@ -280,7 +277,7 @@ static int emaclite_send (struct eth_device *dev, volatile void *ptr, int len) } } - puts ("Error while sending frame\n"); + puts("Error while sending frame\n"); return -1; } @@ -293,14 +290,14 @@ static int emaclite_recv(struct eth_device *dev) baseaddress = dev->iobase + emaclite->nextrxbuffertouse; 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 (emaclite->rxpp) emaclite->nextrxbuffertouse ^= XEL_BUFFER_OFFSET; } else { if (!emaclite->rxpp) { - debug ("No data was available - address 0x%x\n", + debug("No data was available - address 0x%x\n", baseaddress); return 0; } else { @@ -319,21 +316,22 @@ static int emaclite_recv(struct eth_device *dev) 0xFFFF0000 ) >> 16) { case 0x806: length = 42 + 20; /* FIXME size of ARP */ - debug ("ARP Packet\n"); + debug("ARP Packet\n"); break; case 0x800: length = 14 + 14 + - (((ntohl(in_be32 (baseaddress + XEL_RXBUFF_OFFSET + 0x10))) & - 0xFFFF0000) >> 16); /* FIXME size of IP packet */ + (((ntohl(in_be32 (baseaddress + XEL_RXBUFF_OFFSET + + 0x10))) & 0xFFFF0000) >> 16); + /* FIXME size of IP packet */ debug ("IP Packet\n"); break; default: - debug ("Other Packet\n"); - length = ENET_MAX_MTU; + debug("Other Packet\n"); + length = PKTSIZE; break; } - xemaclite_alignedread ((u32 *) (baseaddress + XEL_RXBUFF_OFFSET), + xemaclite_alignedread((u32 *) (baseaddress + XEL_RXBUFF_OFFSET), etherrxbuff, length); /* Acknowledge the frame */ @@ -341,13 +339,14 @@ static int emaclite_recv(struct eth_device *dev) reg &= ~XEL_RSR_RECV_DONE_MASK; out_be32 (baseaddress + XEL_RSR_OFFSET, reg); - debug ("Packet receive from 0x%x, length %dB\n", baseaddress, length); - NetReceive ((uchar *) etherrxbuff, length); + debug("Packet receive from 0x%x, length %dB\n", baseaddress, length); + NetReceive((uchar *) etherrxbuff, length); return length; } -int xilinx_emaclite_initialize (bd_t *bis, int base_addr) +int xilinx_emaclite_initialize(bd_t *bis, unsigned long base_addr, + int txpp, int rxpp) { struct eth_device *dev; struct xemaclite *emaclite; @@ -364,14 +363,10 @@ int xilinx_emaclite_initialize (bd_t *bis, int base_addr) 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 + emaclite->txpp = txpp; + emaclite->rxpp = rxpp; - sprintf(dev->name, "Xelite.%x", base_addr); + sprintf(dev->name, "Xelite.%lx", base_addr); dev->iobase = base_addr; dev->init = emaclite_init; @@ -383,3 +378,30 @@ int xilinx_emaclite_initialize (bd_t *bis, int base_addr) return 1; } + +#ifdef CONFIG_OF_CONTROL +int xilinx_emaclite_init(bd_t *bis) +{ + int offset = 0; + u32 ret = 0; + u32 reg; + + do { + offset = fdt_node_offset_by_compatible(gd->fdt_blob, offset, + "xlnx,xps-ethernetlite-1.00.a"); + if (offset != -1) { + reg = fdtdec_get_addr(gd->fdt_blob, offset, "reg"); + if (reg != FDT_ADDR_T_NONE) { + u32 rxpp = fdtdec_get_int(gd->fdt_blob, offset, + "xlnx,rx-ping-pong", 0); + u32 txpp = fdtdec_get_int(gd->fdt_blob, offset, + "xlnx,tx-ping-pong", 0); + ret |= xilinx_emaclite_initialize(bis, reg, + txpp, rxpp); + } + } + } while (offset != -1); + + return ret; +} +#endif