X-Git-Url: http://git.joshuawise.com/netwatch.git/blobdiff_plain/9c86d6da946b19a513ab554ee12473360d38d93d..bec09bd18a879a22688c68febaff8c65da41f752:/net/3c90x.c?ds=sidebyside

diff --git a/net/3c90x.c b/net/3c90x.c
index ce35b95..5686327 100644
--- a/net/3c90x.c
+++ b/net/3c90x.c
@@ -250,8 +250,6 @@ static struct
 
 static struct nic nic;
 static txdesc_t txdesc;
-static rxdesc_t rxdesc;
-
 
 #define _outl(v,a) outl((a),(v))
 #define _outw(v,a) outw((a),(v))
@@ -453,8 +451,7 @@ static void a3c90x_reset(void)
  *** size - size of the non-header part of the packet that needs transmitted;
  *** pkt - the pointer to the packet data itself.
  ***/
-static void
-a3c90x_transmit(struct pbuf *p)
+static void _transmit(struct pbuf *p)
 {
 	unsigned char status;
 	static struct pbuf *oldpbuf = NULL;
@@ -462,8 +459,11 @@ a3c90x_transmit(struct pbuf *p)
 	
 	if (oldpbuf)
 	{
+		int i = 0;
 		while (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE) && oneshot_running())
-			;
+			i++;
+		if (i)
+			outputf("3c90x: had to wait %d loops to tx", i);
 		if (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE))
 		{
 			outputf("3c90x: tx timeout? txstat %02x", inb(INF_3C90X.IOAddr + regTxStatus_b));
@@ -493,8 +493,6 @@ a3c90x_transmit(struct pbuf *p)
 	/** set notification for transmission completion (bit 15) **/
 	txdesc.hdr = (len) | 0x8000;
 	
-	outputf("3c90x: Sending %d byte %d seg packet", len, n);
-
 	/** Send the packet **/
 	outl(INF_3C90X.IOAddr + regDnListPtr_l, v2p(&txdesc));
 	_issue_command(INF_3C90X.IOAddr, cmdStallCtl, 3 /* Unstall download */);
@@ -542,75 +540,120 @@ a3c90x_transmit(struct pbuf *p)
 #endif
 }
 
+/***************************** Receive routines *****************************/
+#define MAX_RECV_SIZE 1536
+#define RECV_BUFS 4
 
+static rxdesc_t rxdescs[RECV_BUFS];
+static struct pbuf *pbufs[RECV_BUFS] = {0,};
 
-/*** a3c90x_poll: exported routine that waits for a certain length of time
- *** for a packet, and if it sees none, returns 0.  This routine should
- *** copy the packet to nic->packet if it gets a packet and set the size
- *** in nic->packetlen.  Return 1 if a packet was found.
- ***/
-static struct pbuf * a3c90x_poll(struct nic *nic)
+/* rxcons is the pointer to the receive descriptor that the ethernet card will
+ * write into next.
+ */
+static int rxcons = 0;
+
+/* rxprod is the pointer to the receive descriptor that the driver will
+ * allocate next.
+ */
+static int rxprod = 0;
+
+/* _recv_prepare fills the 3c90x's ring buffer with fresh pbufs from lwIP.
+ * The upload engine need not be stalled.
+ */
+static void _recv_prepare(struct nic *nic)
 {
-	int i, errcode;
-	struct pbuf *p, *q;
-	
-	/* Upload engine acks rxComplete for us later. */
-	if (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & 0x0010))
-		return NULL;
-	
-	p = pbuf_alloc(PBUF_RAW, 1536 /* XXX magic Max len */, PBUF_POOL);
-	if (!p)
+	int oldprod;
+
+	oldprod = rxprod;
+	while ((rxprod != rxcons) || !pbufs[rxprod])
 	{
-		outputf("3c90x: out of memory for packet?");
-		return NULL;
+		int i;
+		struct pbuf *p;
+		
+		if (!pbufs[rxprod])
+			pbufs[rxprod] = p = pbuf_alloc(PBUF_RAW, MAX_RECV_SIZE, PBUF_POOL);
+		else {
+			outputf("WARNING: 3c90x has pbuf in slot %d", rxprod);
+			p = pbufs[rxprod];
+		}
+		
+		if (!p)
+		{
+			outputf("3c90x: out of memory for rx pbuf?");
+			break;
+		}
+		
+		rxdescs[rxprod].status = 0;
+		rxdescs[rxprod].next = 0;
+		for (i = 0; p; p = p->next, i++)
+		{
+			rxdescs[rxprod].segments[i].addr = v2p(p->payload);
+			rxdescs[rxprod].segments[i].len = p->len | (p->next ? 0 : (1 << 31));
+		}
+		
+		/* Hook in the new one after and only after it's been fully set up. */
+		rxdescs[(rxprod + RECV_BUFS - 1) % RECV_BUFS].next = v2p(&(rxdescs[rxprod]));
+		rxprod = (rxprod + 1) % RECV_BUFS;
 	}
-
-	/* We don't need to acknowledge rxComplete -- the upload engine does
-	 * it for us. 
-	 */
-
-	/** Build the up-load descriptor **/
-	rxdesc.next = 0;
-	rxdesc.status = 0;
-	for (i = 0, q = p; q; q = q->next, i++)
+	
+	if (inl(INF_3C90X.IOAddr + regUpListPtr_l) == 0 && pbufs[oldprod])	/* Ran out of shit, and got new shit? */
 	{
-		rxdesc.segments[i].addr = v2p(q->payload);
-		rxdesc.segments[i].len = q->len | (q->next ? 0 : (1 << 31));
+		outl(INF_3C90X.IOAddr + regUpListPtr_l, v2p(&rxdescs[oldprod]));
+		outputf("3c90x: WARNING: Ran out of rx slots");
 	}
+	
+}
 
-	/** Submit the upload descriptor to the NIC **/
-	outl(INF_3C90X.IOAddr + regUpListPtr_l, v2p(&rxdesc));
-
-	/** Wait for upload completion (upComplete(15) or upError (14)) **/
-	for (i = 0; i < 40000; i++)	/* XXX What is this shit?! */
-		;
-	while((rxdesc.status & ((1<<14) | (1<<15))) == 0)
-		for (i = 0; i < 40000; i++)
-			;
-
-	/** Check for Error (else we have good packet) **/
-	if (rxdesc.status & (1<<14))
+/* _recv polls the ring buffer to see if any packets are available.  If any 
+ * are, then eth_recv is called for each available.  _recv returns how many
+ * packets it received successfully.  Whether _recv got any packets or not,
+ * _recv does not block, and reinitializes the ring buffer with fresh pbufs.
+ */
+static int _recv(struct nic *nic)
+{
+	int errcode, n = 0;
+	struct pbuf *p;
+	
+	/* Nothing to do? */
+	while ((rxdescs[rxcons].status & ((1<<14) | (1<<15))) != 0)
 	{
-		errcode = rxdesc.status;
-		if (errcode & (1<<16))
-			outputf("3C90X: Rx Overrun (%hX)",errcode>>16);
-		else if (errcode & (1<<17))
-			outputf("3C90X: Runt Frame (%hX)",errcode>>16);
-		else if (errcode & (1<<18))
-			outputf("3C90X: Alignment Error (%hX)",errcode>>16);
-		else if (errcode & (1<<19))
-			outputf("3C90X: CRC Error (%hX)",errcode>>16);
-		else if (errcode & (1<<20))
-			outputf("3C90X: Oversized Frame (%hX)",errcode>>16);
-		else
-			outputf("3C90X: Packet error (%hX)",errcode>>16);
-		return NULL;
+		/** Check for Error (else we have good packet) **/
+		if (rxdescs[rxcons].status & (1<<14))
+		{
+			errcode = rxdescs[rxcons].status;
+			if (errcode & (1<<16))
+				outputf("3C90X: Rx Overrun (%hX)",errcode>>16);
+			else if (errcode & (1<<17))
+				outputf("3C90X: Runt Frame (%hX)",errcode>>16);
+			else if (errcode & (1<<18))
+				outputf("3C90X: Alignment Error (%hX)",errcode>>16);
+			else if (errcode & (1<<19))
+				outputf("3C90X: CRC Error (%hX)",errcode>>16);
+			else if (errcode & (1<<20))
+				outputf("3C90X: Oversized Frame (%hX)",errcode>>16);
+			else
+				outputf("3C90X: Packet error (%hX)",errcode>>16);
+		
+			p = NULL;	
+			pbuf_free(pbufs[rxcons]);		/* Bounce the old one before setting it up again. */
+		} else {
+			p = pbufs[rxcons];
+			pbuf_realloc(p, rxdescs[rxcons].status & 0x1FFF);	/* Resize the packet to how large it actually is. */
+		}
+		
+		pbufs[rxcons] = NULL;
+		rxdescs[rxcons].status = 0; 
+		rxcons = (rxcons + 1) % RECV_BUFS;
+		
+		if (p)
+		{
+			eth_recv(nic, p);
+			n++;
+		}
 	}
 
-	/* Resize the packet to how large it actually is. */
-	pbuf_realloc(p, rxdesc.status & 0x1FFF);
-	
-	return p;
+	_recv_prepare(nic);	/* Light the NIC up again. */
+	return n;
 }
 
 /*** a3c90x_disable: exported routine to disable the card.  What's this for?
@@ -779,12 +822,6 @@ static int a3c90x_probe(struct pci_dev * pci, void * data)
     _outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+2);
     _outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+4);
 
-    /** Fill in our entry in the etherboot arp table **/
-/* XXX ? for lwip? 
-    for(i=0;i<ETH_ALEN;i++)
-	nic.node_addr[i] = (eeprom[HWADDR_OFFSET + i/2] >> (8*((i&1)^1))) & 0xff;
-*/
-
     /** Read the media options register, print a message and set default
      ** xcvr.
      **
@@ -805,45 +842,44 @@ static int a3c90x_probe(struct pci_dev * pci, void * data)
     linktype = 0x0008;
     if (mopt & 0x01)
 	{
-	outputf("%s100Base-T4",(c++)?", ":"");
+	outputf("  100Base-T4");
 	linktype = 0x0006;
 	}
     if (mopt & 0x04)
 	{
-	outputf("%s100Base-FX",(c++)?", ":"");
+	outputf("  100Base-FX");
 	linktype = 0x0005;
 	}
     if (mopt & 0x10)
 	{
-	outputf("%s10Base-2",(c++)?", ":"");
+	outputf("  10Base-2");
 	linktype = 0x0003;
 	}
     if (mopt & 0x20)
 	{
-	outputf("%sAUI",(c++)?", ":"");
+	outputf("  AUI");
 	linktype = 0x0001;
 	}
     if (mopt & 0x40)
 	{
-	outputf("%sMII",(c++)?", ":"");
+	outputf("  MII");
 	linktype = 0x0006;
 	}
     if ((mopt & 0xA) == 0xA)
 	{
-	outputf("%s10Base-T / 100Base-TX",(c++)?", ":"");
+	outputf("  10Base-T / 100Base-TX");
 	linktype = 0x0008;
 	}
     else if ((mopt & 0xA) == 0x2)
 	{
-	outputf("%s100Base-TX",(c++)?", ":"");
+	outputf("  100Base-TX");
 	linktype = 0x0008;
 	}
     else if ((mopt & 0xA) == 0x8)
 	{
-	outputf("%s10Base-T",(c++)?", ":"");
+	outputf("  10Base-T");
 	linktype = 0x0008;
 	}
-    outputf(".");
 
     /** Determine transceiver type to use, depending on value stored in
      ** eeprom 0x16
@@ -904,9 +940,13 @@ static int a3c90x_probe(struct pci_dev * pci, void * data)
 
     /** Set the RX filter = receive only individual pkts & multicast & bcast. **/
     _issue_command(INF_3C90X.IOAddr, cmdSetRxFilter, 0x01 + 0x02 + 0x04);
+    
+    /* Stick some packets in the queue. */
+    _recv_prepare(&nic);
+    
+    /* And light up the RX engine. */
     _issue_command(INF_3C90X.IOAddr, cmdRxEnable, 0);
 
-
     /**
      ** set Indication and Interrupt flags , acknowledge any IRQ's
      **/
@@ -915,8 +955,8 @@ static int a3c90x_probe(struct pci_dev * pci, void * data)
     _issue_command(INF_3C90X.IOAddr, cmdAcknowledgeInterrupt, 0x661);
 
     /* * Set our exported functions **/
-    nic.recv     = a3c90x_poll;
-    nic.transmit = a3c90x_transmit;
+    nic.recv     = _recv;
+    nic.transmit = _transmit;
     memcpy(nic.hwaddr, INF_3C90X.HWAddr, 6);
     eth_register(&nic);