Merge nyus.joshuawise.com:/storage/git/netwatch

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

diff --git a/net/3c90x.c b/net/3c90x.c
index 64f1d0184caa5ef20cddbc05ff222a9fca21c6fa..83a30efc67c8a4efad12655b40ccb467b3f0f589 100644 (file)
--- a/net/3c90x.c
+++ b/net/3c90x.c
@@ -45,13 +45,14 @@
 #include <pci-bother.h>
 #include <minilib.h>
 #include <output.h>
 #include <pci-bother.h>
 #include <minilib.h>
 #include <output.h>

+#include <paging.h>

 
 #define        XCVR_MAGIC      (0x5A00)
 /** any single transmission fails after 16 collisions or other errors
  ** this is the number of times to retry the transmission -- this should
  ** be plenty
  **/
 
 #define        XCVR_MAGIC      (0x5A00)
 /** any single transmission fails after 16 collisions or other errors
  ** this is the number of times to retry the transmission -- this should
  ** be plenty
  **/

-#define        XMIT_RETRIES    1
+#define        XMIT_RETRIES    5

 
 /*** Register definitions for the 3c905 ***/
 enum Registers
 
 /*** Register definitions for the 3c905 ***/
 enum Registers


@@ -492,8 +493,6 @@ a3c90x_transmit(const char *dest_addr, unsigned int proto,
                if (retries != 0)
                        outputf("3c90x: retrying packet send (%d)", retries);
                
                if (retries != 0)
                        outputf("3c90x: retrying packet send (%d)", retries);
                

-               /** Stall the download engine **/
-               outputf("3c90x: stalling transmit engine");

                _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 2 /* Stall download */);
 
                hdr.type = htons(proto);
                _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 2 /* Stall download */);
 
                hdr.type = htons(proto);


@@ -510,43 +509,28 @@ a3c90x_transmit(const char *dest_addr, unsigned int proto,
                INF_3C90X.TransmitDPD.DataLength = size + (1<<31);
 
                /** Send the packet **/
                INF_3C90X.TransmitDPD.DataLength = size + (1<<31);
 
                /** Send the packet **/

-               outputf("3c90x: pointing card at %08x", virt_to_bus(&(INF_3C90X.TransmitDPD)));

                outl(INF_3C90X.IOAddr + regDnListPtr_l, virt_to_bus(&(INF_3C90X.TransmitDPD)));
                outl(INF_3C90X.IOAddr + regDnListPtr_l, virt_to_bus(&(INF_3C90X.TransmitDPD)));

-
-               outputf("3c90x: unstalling transmit engine");

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

-               outputf("3c90x: waiting for download pointer");

                oneshot_start_ms(100);
                while((inl(INF_3C90X.IOAddr + regDnListPtr_l) != 0) && oneshot_running())
                        ;
                if (!oneshot_running())
                oneshot_start_ms(100);
                while((inl(INF_3C90X.IOAddr + regDnListPtr_l) != 0) && oneshot_running())
                        ;
                if (!oneshot_running())

-               {

                        outputf("3c90x: Download engine pointer timeout");
                        outputf("3c90x: Download engine pointer timeout");

-               }

 
 

-               outputf("3c90x: waiting for TXCOMPLETE");

                oneshot_start_ms(10);   /* Give it 10 ms */
                while (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE) && oneshot_running())
                        ;
 
                if (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE))
                {
                oneshot_start_ms(10);   /* Give it 10 ms */
                while (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE) && oneshot_running())
                        ;
 
                if (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE))
                {

-                       outputf("3c90x: tx timeout? stat %02x", inb(INF_3C90X.IOAddr + regTxStatus_b));
-                       _issue_command(INF_3C90X.IOAddr, cmdTxReset, 0);
-    if (! INF_3C90X.isBrev)
-       _outb(0x01, INF_3C90X.IOAddr + regTxFreeThresh_b);
-    _issue_command(INF_3C90X.IOAddr, cmdTxEnable, 0);
-    _issue_command(INF_3C90X.IOAddr, cmdSetInterruptEnable, 0);
-    _issue_command(INF_3C90X.IOAddr, cmdSetIndicationEnable, 0x0014);
-    _issue_command(INF_3C90X.IOAddr, cmdAcknowledgeInterrupt, 0x661);
+                       outputf("3c90x: tx timeout? txstat %02x", inb(INF_3C90X.IOAddr + regTxStatus_b));
+                       outputf("3c90x: Gen sts %04x", inw(INF_3C90X.IOAddr + regCommandIntStatus_w));

                        continue;
                }
                status = inb(INF_3C90X.IOAddr + regTxStatus_b);
                outb(INF_3C90X.IOAddr + regTxStatus_b, 0x00);
                
                        continue;
                }
                status = inb(INF_3C90X.IOAddr + regTxStatus_b);
                outb(INF_3C90X.IOAddr + regTxStatus_b, 0x00);
                

-               _issue_command(INF_3C90X.IOAddr, cmdAcknowledgeInterrupt, INT_TXCOMPLETE);
-

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


@@ -700,7 +684,7 @@ static int a3c90x_probe(struct pci_dev * pci, void * data)
        pci_read16(pci->bus, pci->dev, pci->fn, 0xE0) & ~0x3);
     
     outputf("3c90x: Picked I/O address %04x", ioaddr);
        pci_read16(pci->bus, pci->dev, pci->fn, 0xE0) & ~0x3);
     
     outputf("3c90x: Picked I/O address %04x", ioaddr);

-//    pci_bother_add(pci);
+    pci_bother_add(pci);

     nic.ioaddr = ioaddr & ~3;
     nic.irqno = 0;
 
     nic.ioaddr = ioaddr & ~3;
     nic.irqno = 0;