Queue up a rxdesc, instead of busy waiting for the card to get back to us. This...

[netwatch.git] / net / 3c90x.c

diff --git a/net/3c90x.c b/net/3c90x.c
index 64dd65549d96ca977e8cead947278cf713a7f4c9..74035e0fad0ada4e4c4842bfcf783da076259dd0 100644 (file)
--- a/net/3c90x.c
+++ b/net/3c90x.c
@@ -218,26 +218,24 @@ enum Commands
 #define INT_CMDINPROGRESS      (1<<12)
 #define INT_WINDOWNUMBER       (7<<13)
 
 #define INT_CMDINPROGRESS      (1<<12)
 #define INT_WINDOWNUMBER       (7<<13)
 

-
-/*** TX descriptor ***/
-typedef struct
-    {
-    unsigned int       DnNextPtr;
-    unsigned int       FrameStartHeader;
-    unsigned int       DataAddr;
-    unsigned int       DataLength;
-    }
-    TXD __attribute__ ((aligned(8))); /* 64-bit aligned for bus mastering */
+/* These structures are all 64-bit aligned, as needed for bus-mastering I/O. */
+typedef struct {
+       unsigned int addr;
+       unsigned int len;
+} segment_t __attribute__ ((aligned(8)));
+
+typedef struct {
+       unsigned int next;
+       unsigned int hdr;
+       segment_t segments[64 /* XXX magic */];
+} txdesc_t __attribute__ ((aligned(8)));

 
 /*** RX descriptor ***/
 
 /*** RX descriptor ***/

-typedef struct
-    {
-    unsigned int       UpNextPtr;
-    unsigned int       UpPktStatus;
-    unsigned int       DataAddr;
-    unsigned int       DataLength;
-    }
-    RXD __attribute__ ((aligned(8))); /* 64-bit aligned for bus mastering */
+typedef struct {
+       unsigned int    next;
+       unsigned int    status;
+       segment_t segments[64];
+} rxdesc_t __attribute__ ((aligned(8)));

 
 /*** Global variables ***/
 static struct
 
 /*** Global variables ***/
 static struct


@@ -247,11 +245,14 @@ static struct
     unsigned char      CurrentWindow;
     unsigned int       IOAddr;
     unsigned char      HWAddr[ETH_ALEN];
     unsigned char      CurrentWindow;
     unsigned int       IOAddr;
     unsigned char      HWAddr[ETH_ALEN];

-    TXD                        TransmitDPD;
-    RXD                        ReceiveUPD;

     }
     INF_3C90X;
     }
     INF_3C90X;

+

 static struct nic nic;
 static struct nic nic;

+static txdesc_t txdesc;
+static rxdesc_t rxdesc;
+static struct pbuf *currecv;
+

 
 #define _outl(v,a) outl((a),(v))
 #define _outw(v,a) outw((a),(v))
 
 #define _outl(v,a) outl((a),(v))
 #define _outw(v,a) outw((a),(v))


@@ -405,13 +406,6 @@ a3c90x_internal_WriteEeprom(int ioaddr, int address, unsigned short value)
  ***/
 static void a3c90x_reset(void)
     {
  ***/
 static void a3c90x_reset(void)
     {

-#ifdef CFG_3C90X_PRESERVE_XCVR
-    int cfg;
-    /** Read the current InternalConfig value. **/
-    _set_window(INF_3C90X.IOAddr, winTxRxOptions3);
-    cfg = inl(INF_3C90X.IOAddr + regInternalConfig_3_l);
-#endif
-

     /** Send the reset command to the card **/
     outputf("3c90x: issuing RESET");
     _issue_command(INF_3C90X.IOAddr, cmdGlobalReset, 0);
     /** Send the reset command to the card **/
     outputf("3c90x: issuing RESET");
     _issue_command(INF_3C90X.IOAddr, cmdGlobalReset, 0);


@@ -424,18 +418,6 @@ static void a3c90x_reset(void)
     _outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+2);
     _outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+4);
 
     _outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+2);
     _outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+4);
 

-#ifdef CFG_3C90X_PRESERVE_XCVR
-    /** Re-set the original InternalConfig value from before reset **/
-    _set_window(INF_3C90X.IOAddr, winTxRxOptions3);
-    _outl(cfg, INF_3C90X.IOAddr + regInternalConfig_3_l);
-
-    /** enable DC converter for 10-Base-T **/
-    if ((cfg&0x0300) == 0x0300)
-       {
-       _issue_command(INF_3C90X.IOAddr, cmdEnableDcConverter, 0);
-       }
-#endif
-

     /** Issue transmit reset, wait for command completion **/
     _issue_command(INF_3C90X.IOAddr, cmdTxReset, 0);
     if (! INF_3C90X.isBrev)
     /** Issue transmit reset, wait for command completion **/
     _issue_command(INF_3C90X.IOAddr, cmdTxReset, 0);
     if (! INF_3C90X.isBrev)


@@ -473,17 +455,16 @@ static void a3c90x_reset(void)
  *** pkt - the pointer to the packet data itself.
  ***/
 static void
  *** pkt - the pointer to the packet data itself.
  ***/
 static void

-a3c90x_transmit(unsigned int size, const char *pkt)
+a3c90x_transmit(struct pbuf *p)

 {
        unsigned char status;
 {
        unsigned char status;

-       static unsigned int stillwaiting = 0;
-
-       if (stillwaiting)
+       static struct pbuf *oldpbuf = NULL;
+       unsigned int n, len;
+       
+       if (oldpbuf)

        {
        {

-               outputf("Waiting for network completion...");

                while (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE) && oneshot_running())
                        ;
                while (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE) && oneshot_running())
                        ;

-               outputf("Done");

                if (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE))
                {
                        outputf("3c90x: tx timeout? txstat %02x", inb(INF_3C90X.IOAddr + regTxStatus_b));
                if (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE))
                {
                        outputf("3c90x: tx timeout? txstat %02x", inb(INF_3C90X.IOAddr + regTxStatus_b));


@@ -491,20 +472,32 @@ a3c90x_transmit(unsigned int size, const char *pkt)
                }
                status = inb(INF_3C90X.IOAddr + regTxStatus_b);
                outb(INF_3C90X.IOAddr + regTxStatus_b, 0x00);
                }
                status = inb(INF_3C90X.IOAddr + regTxStatus_b);
                outb(INF_3C90X.IOAddr + regTxStatus_b, 0x00);

-               stillwaiting = 0;
+               pbuf_free(oldpbuf);
+               oldpbuf = NULL;

        }
 
        _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 2 /* Stall download */);
 
        /** Setup the DPD (download descriptor) **/
        }
 
        _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 2 /* Stall download */);
 
        /** Setup the DPD (download descriptor) **/

-       INF_3C90X.TransmitDPD.DnNextPtr = 0;
+       txdesc.next = 0;
+       len = 0;
+       n = 0;
+       oldpbuf = p;
+       for (; p; p = p->next)
+       {
+               txdesc.segments[n].addr = v2p(p->payload);
+               txdesc.segments[n].len = p->len | (p->next ? 0 : (1 << 31));
+               len += p->len;
+               pbuf_ref(p);
+               n++;
+       }

        /** set notification for transmission completion (bit 15) **/
        /** set notification for transmission completion (bit 15) **/

-       INF_3C90X.TransmitDPD.FrameStartHeader = (size) | 0x8000;
-       INF_3C90X.TransmitDPD.DataAddr = v2p((void*)pkt);
-       INF_3C90X.TransmitDPD.DataLength = size + (1<<31);
+       txdesc.hdr = (len) | 0x8000;

        
        

+       outputf("3c90x: Sending %d byte %d seg packet", len, n);
+

        /** Send the packet **/
        /** Send the packet **/

-       outl(INF_3C90X.IOAddr + regDnListPtr_l, v2p(&(INF_3C90X.TransmitDPD)));
+       outl(INF_3C90X.IOAddr + regDnListPtr_l, v2p(&txdesc));

        _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 3 /* Unstall download */);
                
        oneshot_start_ms(10);
        _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 3 /* Unstall download */);
                
        oneshot_start_ms(10);


@@ -516,9 +509,6 @@ a3c90x_transmit(unsigned int size, const char *pkt)
                return;
        }
 
                return;
        }
 

-       oneshot_start_ms(10);
-       stillwaiting = 1;
-               

 #if 0          
        /** successful completion (sans "interrupt Requested" bit) **/
        if ((status & 0xbf) == 0x80)
 #if 0          
        /** successful completion (sans "interrupt Requested" bit) **/
        if ((status & 0xbf) == 0x80)


@@ -553,70 +543,84 @@ a3c90x_transmit(unsigned int size, const char *pkt)
 #endif
 }
 
 #endif
 }
 

-
+/* _setup_recv allocates and sets a pbuf from lwIP as the active receive
+ * packet chain for the 3c90x.  The 3c90x must not be trying to receive
+ * when _setup_recv is being called.
+ */
+static void _setup_recv(struct nic *nic)
+{
+       struct pbuf *p, *q;
+       int i;
+       
+       rxdesc.status = 0;      /* Clear it out in the very beginning. */
+       
+       p = pbuf_alloc(PBUF_RAW, 1536 /* XXX magic Max len */, PBUF_POOL);
+       if (!p)
+       {
+               outputf("3c90x: out of memory for packet?");
+               currecv = p;
+               return;
+       }
+       
+       rxdesc.next = 0;
+       rxdesc.status = 0;
+       for (i = 0, q = p; q; q = q->next, i++)
+       {
+               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(&rxdesc));
+       
+       currecv = p;
+}

 
 /*** 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.
  ***/
 
 /*** 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 int
-a3c90x_poll(struct nic *nic, int retrieve)
-    {
-    int i, errcode;
-
-    if (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w)&0x0010))
-       {
-       return 0;
-       }
-
-    if ( ! retrieve ) return 1;
-
-    /** we don't need to acknowledge rxComplete -- the upload engine
-     ** does it for us.
-     **/
-
-    /** Build the up-load descriptor **/
-    INF_3C90X.ReceiveUPD.UpNextPtr = 0;
-    INF_3C90X.ReceiveUPD.UpPktStatus = 0;
-    INF_3C90X.ReceiveUPD.DataAddr = v2p(nic->packet);
-    INF_3C90X.ReceiveUPD.DataLength = 1536 + (1<<31);
-
-    /** Submit the upload descriptor to the NIC **/
-    _outl(v2p(&(INF_3C90X.ReceiveUPD)),
-         INF_3C90X.IOAddr + regUpListPtr_l);
-
-    /** Wait for upload completion (upComplete(15) or upError (14)) **/
-    for(i=0;i<40000;i++);
-    while((INF_3C90X.ReceiveUPD.UpPktStatus & ((1<<14) | (1<<15))) == 0)
-       for(i=0;i<40000;i++);
-
-    /** Check for Error (else we have good packet) **/
-    if (INF_3C90X.ReceiveUPD.UpPktStatus & (1<<14))
+static struct pbuf * a3c90x_poll(struct nic *nic)
+{
+       int errcode;
+       struct pbuf *p;
+       
+       if (!currecv)
+               _setup_recv(nic);
+       
+       /* Nothing to do? */
+       if ((rxdesc.status & ((1<<14) | (1<<15))) == 0)
+               return NULL;
+       
+       p = currecv;
+       
+       /** Check for Error (else we have good packet) **/
+       if (rxdesc.status & (1<<14))

        {
        {

-       errcode = INF_3C90X.ReceiveUPD.UpPktStatus;
-       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 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);
+               
+               pbuf_free(p);           /* Bounce the old one before setting it up again. */
+               _setup_recv(nic);
+               return NULL;

        }
 
        }
 

-    /** Ok, got packet.  Set length in nic->packetlen. **/
-    nic->packetlen = (INF_3C90X.ReceiveUPD.UpPktStatus & 0x1FFF);
-
-    return 1;
-    }
-
-
+       pbuf_realloc(p, rxdesc.status & 0x1FFF);        /* Resize the packet to how large it actually is. */
+       _setup_recv(nic);       /* ..and light the NIC up again. */
+       
+       return p;
+}

 
 /*** a3c90x_disable: exported routine to disable the card.  What's this for?
  *** the eepro100.c driver didn't have one, so I just left this one empty too.
 
 /*** a3c90x_disable: exported routine to disable the card.  What's this for?
  *** the eepro100.c driver didn't have one, so I just left this one empty too.


@@ -810,45 +814,44 @@ static int a3c90x_probe(struct pci_dev * pci, void * data)
     linktype = 0x0008;
     if (mopt & 0x01)
        {
     linktype = 0x0008;
     if (mopt & 0x01)
        {

-       outputf("%s100Base-T4",(c++)?", ":"");
+       outputf("  100Base-T4");

        linktype = 0x0006;
        }
     if (mopt & 0x04)
        {
        linktype = 0x0006;
        }
     if (mopt & 0x04)
        {

-       outputf("%s100Base-FX",(c++)?", ":"");
+       outputf("  100Base-FX");

        linktype = 0x0005;
        }
     if (mopt & 0x10)
        {
        linktype = 0x0005;
        }
     if (mopt & 0x10)
        {

-       outputf("%s10Base-2",(c++)?", ":"");
+       outputf("  10Base-2");

        linktype = 0x0003;
        }
     if (mopt & 0x20)
        {
        linktype = 0x0003;
        }
     if (mopt & 0x20)
        {

-       outputf("%sAUI",(c++)?", ":"");
+       outputf("  AUI");

        linktype = 0x0001;
        }
     if (mopt & 0x40)
        {
        linktype = 0x0001;
        }
     if (mopt & 0x40)
        {

-       outputf("%sMII",(c++)?", ":"");
+       outputf("  MII");

        linktype = 0x0006;
        }
     if ((mopt & 0xA) == 0xA)
        {
        linktype = 0x0006;
        }
     if ((mopt & 0xA) == 0xA)
        {

-       outputf("%s10Base-T / 100Base-TX",(c++)?", ":"");
+       outputf("  10Base-T / 100Base-TX");

        linktype = 0x0008;
        }
     else if ((mopt & 0xA) == 0x2)
        {
        linktype = 0x0008;
        }
     else if ((mopt & 0xA) == 0x2)
        {

-       outputf("%s100Base-TX",(c++)?", ":"");
+       outputf("  100Base-TX");

        linktype = 0x0008;
        }
     else if ((mopt & 0xA) == 0x8)
        {
        linktype = 0x0008;
        }
     else if ((mopt & 0xA) == 0x8)
        {

-       outputf("%s10Base-T",(c++)?", ":"");
+       outputf("  10Base-T");

        linktype = 0x0008;
        }
        linktype = 0x0008;
        }

-    outputf(".");

 
     /** Determine transceiver type to use, depending on value stored in
      ** eeprom 0x16
 
     /** Determine transceiver type to use, depending on value stored in
      ** eeprom 0x16


@@ -910,7 +913,9 @@ 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);
     _issue_command(INF_3C90X.IOAddr, cmdRxEnable, 0);
     /** Set the RX filter = receive only individual pkts & multicast & bcast. **/
     _issue_command(INF_3C90X.IOAddr, cmdSetRxFilter, 0x01 + 0x02 + 0x04);
     _issue_command(INF_3C90X.IOAddr, cmdRxEnable, 0);

-
+    
+    /* Now stick a packet in the queue. */
+    _setup_recv(&nic);

 
     /**
      ** set Indication and Interrupt flags , acknowledge any IRQ's
 
     /**
      ** set Indication and Interrupt flags , acknowledge any IRQ's


@@ -920,7 +925,7 @@ static int a3c90x_probe(struct pci_dev * pci, void * data)
     _issue_command(INF_3C90X.IOAddr, cmdAcknowledgeInterrupt, 0x661);
 
     /* * Set our exported functions **/
     _issue_command(INF_3C90X.IOAddr, cmdAcknowledgeInterrupt, 0x661);
 
     /* * Set our exported functions **/

-    nic.poll     = a3c90x_poll;
+    nic.recv     = a3c90x_poll;

     nic.transmit = a3c90x_transmit;
     memcpy(nic.hwaddr, INF_3C90X.HWAddr, 6);
     eth_register(&nic);
     nic.transmit = a3c90x_transmit;
     memcpy(nic.hwaddr, INF_3C90X.HWAddr, 6);
     eth_register(&nic);