GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-07-07 06:52:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

net: emaclite: Use dynamic allocation

Browse source 
Every emaclite instance use own setting.

Signed-off-by: Michal Simek <monstr@monstr.eu>
Acked-by: Mike Frysinger <vapier@gentoo.org>
This commit is contained in:
Michal Simek 2011-08-25 12:47:56 +02:00
parent 8d95ddbb5e
commit 773cfa8d08
1 changed files with 25 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

41
drivers/net/xilinx_emaclite.c
View file

@ -63,12 +63,10 @@
/* Recv interrupt enable bit */ /* Recv interrupt enable bit */
#define XEL_RSR_RECV_IE_MASK 0x00000008UL #define XEL_RSR_RECV_IE_MASK 0x00000008UL
typedef struct { 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 */
} xemaclite; };
static xemaclite emaclite;
static u32 etherrxbuff[PKTSIZE_ALIGN/4]; /* Receive buffer */ static u32 etherrxbuff[PKTSIZE_ALIGN/4]; /* Receive buffer */
@ -134,7 +132,6 @@ 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)
{ {
debug ("EmacLite Initialization Started\n"); debug ("EmacLite Initialization Started\n");
memset (&emaclite, 0, sizeof (xemaclite));
/* /*
* TX - TX_PING & TX_PONG initialization * TX - TX_PING & TX_PONG initialization
@ -180,22 +177,24 @@ static int emaclite_init(struct eth_device *dev, bd_t *bis)
return 0; return 0;
} }
static int xemaclite_txbufferavailable (xemaclite *instanceptr) static int xemaclite_txbufferavailable(struct eth_device *dev)
{ {
u32 reg; u32 reg;
u32 txpingbusy; u32 txpingbusy;
u32 txpongbusy; u32 txpongbusy;
struct xemaclite *emaclite = dev->priv;
/* /*
* Read the other buffer register * Read the other buffer register
* and determine if the other buffer is available * and determine if the other buffer is available
*/ */
reg = in_be32 (instanceptr->baseaddress + reg = in_be32 (dev->iobase +
instanceptr->nexttxbuffertouse + 0); emaclite->nexttxbuffertouse + 0);
txpingbusy = ((reg & XEL_TSR_XMIT_BUSY_MASK) == txpingbusy = ((reg & XEL_TSR_XMIT_BUSY_MASK) ==
XEL_TSR_XMIT_BUSY_MASK); XEL_TSR_XMIT_BUSY_MASK);
reg = in_be32 (instanceptr->baseaddress + reg = in_be32 (dev->iobase +
(instanceptr->nexttxbuffertouse ^ XEL_TSR_OFFSET) + 0); (emaclite->nexttxbuffertouse ^ XEL_TSR_OFFSET) + 0);
txpongbusy = ((reg & XEL_TSR_XMIT_BUSY_MASK) == txpongbusy = ((reg & XEL_TSR_XMIT_BUSY_MASK) ==
XEL_TSR_XMIT_BUSY_MASK); XEL_TSR_XMIT_BUSY_MASK);
@ -206,13 +205,14 @@ static int emaclite_send (struct eth_device *dev, volatile void *ptr, int len)
{ {
u32 reg; u32 reg;
u32 baseaddress; u32 baseaddress;
struct xemaclite *emaclite = dev->priv;
u32 maxtry = 1000; u32 maxtry = 1000;
if (len > ENET_MAX_MTU) if (len > ENET_MAX_MTU)
len = ENET_MAX_MTU; len = ENET_MAX_MTU;
while (!xemaclite_txbufferavailable (&emaclite) && maxtry) { while (!xemaclite_txbufferavailable(dev) && maxtry) {
udelay (10); udelay (10);
maxtry--; maxtry--;
} }
@ -229,7 +229,7 @@ static int emaclite_send (struct eth_device *dev, volatile void *ptr, int len)
} }
/* Determine the expected TX buffer address */ /* Determine the expected TX buffer address */
baseaddress = (dev->iobase + emaclite.nexttxbuffertouse); baseaddress = (dev->iobase + emaclite->nexttxbuffertouse);
/* Determine if the expected buffer address is empty */ /* Determine if the expected buffer address is empty */
reg = in_be32 (baseaddress + XEL_TSR_OFFSET); reg = in_be32 (baseaddress + XEL_TSR_OFFSET);
@ -238,7 +238,7 @@ static int emaclite_send (struct eth_device *dev, volatile void *ptr, int len)
& XEL_TSR_XMIT_ACTIVE_MASK) == 0)) { & XEL_TSR_XMIT_ACTIVE_MASK) == 0)) {
#ifdef CONFIG_XILINX_EMACLITE_TX_PING_PONG #ifdef CONFIG_XILINX_EMACLITE_TX_PING_PONG
emaclite.nexttxbuffertouse ^= XEL_BUFFER_OFFSET; emaclite->nexttxbuffertouse ^= XEL_BUFFER_OFFSET;
#endif #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 */
@ -284,13 +284,14 @@ static int emaclite_recv(struct eth_device *dev)
u32 length; u32 length;
u32 reg; u32 reg;
u32 baseaddress; u32 baseaddress;
struct xemaclite *emaclite = dev->priv;
baseaddress = dev->iobase + emaclite.nextrxbuffertouse; baseaddress = dev->iobase + emaclite->nextrxbuffertouse;
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 #ifdef CONFIG_XILINX_EMACLITE_RX_PING_PONG
emaclite.nextrxbuffertouse ^= XEL_BUFFER_OFFSET; emaclite->nextrxbuffertouse ^= XEL_BUFFER_OFFSET;
#endif #endif
} else { } else {
#ifndef CONFIG_XILINX_EMACLITE_RX_PING_PONG #ifndef CONFIG_XILINX_EMACLITE_RX_PING_PONG
@ -343,15 +344,23 @@ static int emaclite_recv(struct eth_device *dev)
int xilinx_emaclite_initialize (bd_t *bis, int base_addr) int xilinx_emaclite_initialize (bd_t *bis, int base_addr)
{ {
struct eth_device *dev; struct eth_device *dev;
struct xemaclite *emaclite;
dev = calloc(1, sizeof(*dev)); dev = calloc(1, sizeof(*dev));
if (dev == NULL) if (dev == NULL)
return -1; return -1;
emaclite = calloc(1, sizeof(struct xemaclite));
if (emaclite == NULL) {
free(dev);
return -1;
}
dev->priv = emaclite;
sprintf(dev->name, "Xelite.%x", base_addr); sprintf(dev->name, "Xelite.%x", base_addr);
dev->iobase = base_addr; dev->iobase = base_addr;
dev->priv = 0;
dev->init = emaclite_init; dev->init = emaclite_init;
dev->halt = emaclite_halt; dev->halt = emaclite_halt;
dev->send = emaclite_send; dev->send = emaclite_send;