Merge branch 'master' of nyus:/storage/git/netwatch

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

diff --git a/net/3c90x.c b/net/3c90x.c
index 711b69de7f6308466c4581f7786740037c472405..46fe6f121546a9d3ce470daa0434b1d6725a4dce 100644 (file)
--- a/net/3c90x.c
+++ b/net/3c90x.c
@@ -42,15 +42,17 @@
 #include <timer.h>
 #include <io.h>
 #include <pci.h>
 #include <timer.h>
 #include <io.h>
 #include <pci.h>

+#include <pci-bother.h>

 #include <minilib.h>
 #include <output.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    250
+#define        XMIT_RETRIES    5

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


@@ -222,8 +224,6 @@ typedef struct
     {
     unsigned int       DnNextPtr;
     unsigned int       FrameStartHeader;
     {
     unsigned int       DnNextPtr;
     unsigned int       FrameStartHeader;

-    unsigned int       HdrAddr;
-    unsigned int       HdrLength;

     unsigned int       DataAddr;
     unsigned int       DataLength;
     }
     unsigned int       DataAddr;
     unsigned int       DataLength;
     }


@@ -251,75 +251,73 @@ static struct
     RXD                        ReceiveUPD;
     }
     INF_3C90X;
     RXD                        ReceiveUPD;
     }
     INF_3C90X;

+static struct nic nic;

 
 

+#define _outl(v,a) outl((a),(v))
+#define _outw(v,a) outw((a),(v))
+#define _outb(v,a) outb((a),(v))

 
 

-/*** a3c90x_internal_IssueCommand: sends a command to the 3c90x card
- ***/
-static int
-a3c90x_internal_IssueCommand(int ioaddr, int cmd, int param)
-    {
-    unsigned int val;
-
-       /** Build the cmd. **/
-       val = cmd;
-       val <<= 11;
-       val |= param;
-
-       /** Send the cmd to the cmd register **/
-       outw(val, ioaddr + regCommandIntStatus_w);
+static int _issue_command(int ioaddr, int cmd, int param)
+{
+       outw(ioaddr + regCommandIntStatus_w, (cmd << 11) | param);

 
 

-       /** Wait for the cmd to complete, if necessary **/
-       while (inw(ioaddr + regCommandIntStatus_w) & INT_CMDINPROGRESS);
+       while (inw(ioaddr + regCommandIntStatus_w) & INT_CMDINPROGRESS)
+               ;

 
 

-    return 0;
-    }
+       return 0;
+}

 
 
 /*** a3c90x_internal_SetWindow: selects a register window set.
  ***/
 
 
 /*** a3c90x_internal_SetWindow: selects a register window set.
  ***/

-static int
-a3c90x_internal_SetWindow(int ioaddr, int window)
-    {
-
-       /** Window already as set? **/
-       if (INF_3C90X.CurrentWindow == window) return 0;
+static int _set_window(int ioaddr, int window)
+{
+       if (INF_3C90X.CurrentWindow == window)
+               return 0;

 
 

-       /** Issue the window command. **/
-       a3c90x_internal_IssueCommand(ioaddr, cmdSelectRegisterWindow, window);
+       _issue_command(ioaddr, cmdSelectRegisterWindow, window);

        INF_3C90X.CurrentWindow = window;
 
        INF_3C90X.CurrentWindow = window;
 

-    return 0;
-    }
+       return 0;
+}

 
 
 /*** a3c90x_internal_ReadEeprom - read data from the serial eeprom.
  ***/
 static unsigned short
 a3c90x_internal_ReadEeprom(int ioaddr, int address)
 
 
 /*** a3c90x_internal_ReadEeprom - read data from the serial eeprom.
  ***/
 static unsigned short
 a3c90x_internal_ReadEeprom(int ioaddr, int address)

-    {
-    unsigned short val;
+{
+       unsigned short val;

 
        /** Select correct window **/
 
        /** Select correct window **/

-        a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winEepromBios0);
+        _set_window(INF_3C90X.IOAddr, winEepromBios0);

 
        /** Make sure the eeprom isn't busy **/
 
        /** Make sure the eeprom isn't busy **/

-       while((1<<15) & inw(ioaddr + regEepromCommand_0_w));
+       do
+        {
+               int i;
+               for (i = 0; i < 165; i++)
+                       inb(0x80);      /* wait 165 usec */
+        }
+       while(0x8000 & inw(ioaddr + regEepromCommand_0_w));

 
        /** Read the value. **/
        if (INF_3C90X.is3c556)
 
        /** Read the value. **/
        if (INF_3C90X.is3c556)

-        {
-            outw(address + (0x230), ioaddr + regEepromCommand_0_w);
-        }
+               _outw(address + (0x230), ioaddr + regEepromCommand_0_w);

        else
        else

-        {
-            outw(address + ((0x02)<<6), ioaddr + regEepromCommand_0_w);
-        }
- 
-       while((1<<15) & inw(ioaddr + regEepromCommand_0_w));
-       val = inw(ioaddr + regEepromData_0_w);
+               _outw(address + 0x80, ioaddr + regEepromCommand_0_w);

 
 

-    return val;
-    }
+       do
+       {
+               int i;
+               for (i = 0; i < 165; i++)
+                       inb(0x80);      /* wait 165 usec */
+       }
+       while(0x8000 & inw(ioaddr + regEepromCommand_0_w));
+       val = inw(ioaddr + regEepromData_0_w);
+       
+       return val;
+}

 
 
 #ifdef CFG_3C90X_BOOTROM_FIX
 
 
 #ifdef CFG_3C90X_BOOTROM_FIX


@@ -332,26 +330,26 @@ static int
 a3c90x_internal_WriteEepromWord(int ioaddr, int address, unsigned short value)
     {
        /** Select register window **/
 a3c90x_internal_WriteEepromWord(int ioaddr, int address, unsigned short value)
     {
        /** Select register window **/

-        a3c90x_internal_SetWindow(ioaddr, winEepromBios0);
+        _set_window(ioaddr, winEepromBios0);

 
        /** Verify Eeprom not busy **/
        while((1<<15) & inw(ioaddr + regEepromCommand_0_w));
 
        /** Issue WriteEnable, and wait for completion. **/
 
        /** Verify Eeprom not busy **/
        while((1<<15) & inw(ioaddr + regEepromCommand_0_w));
 
        /** Issue WriteEnable, and wait for completion. **/

-       outw(0x30, ioaddr + regEepromCommand_0_w);
+       _outw(0x30, ioaddr + regEepromCommand_0_w);

        while((1<<15) & inw(ioaddr + regEepromCommand_0_w));
 
        /** Issue EraseRegister, and wait for completion. **/
        while((1<<15) & inw(ioaddr + regEepromCommand_0_w));
 
        /** Issue EraseRegister, and wait for completion. **/

-       outw(address + ((0x03)<<6), ioaddr + regEepromCommand_0_w);
+       _outw(address + ((0x03)<<6), ioaddr + regEepromCommand_0_w);

        while((1<<15) & inw(ioaddr + regEepromCommand_0_w));
 
        /** Send the new data to the eeprom, and wait for completion. **/
        while((1<<15) & inw(ioaddr + regEepromCommand_0_w));
 
        /** Send the new data to the eeprom, and wait for completion. **/

-       outw(value, ioaddr + regEepromData_0_w);
-       outw(0x30, ioaddr + regEepromCommand_0_w);
+       _outw(value, ioaddr + regEepromData_0_w);
+       _outw(0x30, ioaddr + regEepromCommand_0_w);

        while((1<<15) & inw(ioaddr + regEepromCommand_0_w));
 
        /** Burn the new data into the eeprom, and wait for completion. **/
        while((1<<15) & inw(ioaddr + regEepromCommand_0_w));
 
        /** Burn the new data into the eeprom, and wait for completion. **/

-       outw(address + ((0x01)<<6), ioaddr + regEepromCommand_0_w);
+       _outw(address + ((0x01)<<6), ioaddr + regEepromCommand_0_w);

        while((1<<15) & inw(ioaddr + regEepromCommand_0_w));
 
     return 0;
        while((1<<15) & inw(ioaddr + regEepromCommand_0_w));
 
     return 0;


@@ -410,65 +408,57 @@ static void a3c90x_reset(void)
 #ifdef CFG_3C90X_PRESERVE_XCVR
     int cfg;
     /** Read the current InternalConfig value. **/
 #ifdef CFG_3C90X_PRESERVE_XCVR
     int cfg;
     /** Read the current InternalConfig value. **/

-    a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winTxRxOptions3);
+    _set_window(INF_3C90X.IOAddr, winTxRxOptions3);

     cfg = inl(INF_3C90X.IOAddr + regInternalConfig_3_l);
 #endif
 
     /** Send the reset command to the card **/
     cfg = inl(INF_3C90X.IOAddr + regInternalConfig_3_l);
 #endif
 
     /** Send the reset command to the card **/

-    outputf("Issuing RESET:");
-    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdGlobalReset, 0);
-
-    /** wait for reset command to complete **/
-    while (inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_CMDINPROGRESS);
+    outputf("3c90x: issuing RESET");
+    _issue_command(INF_3C90X.IOAddr, cmdGlobalReset, 0);

 
     /** global reset command resets station mask, non-B revision cards
      ** require explicit reset of values
      **/
 
     /** global reset command resets station mask, non-B revision cards
      ** require explicit reset of values
      **/

-    a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winAddressing2);
-    outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+0);
-    outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+2);
-    outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+4);
+    _set_window(INF_3C90X.IOAddr, winAddressing2);
+    _outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+0);
+    _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 **/
 
 #ifdef CFG_3C90X_PRESERVE_XCVR
     /** Re-set the original InternalConfig value from before reset **/

-    a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winTxRxOptions3);
-    outl(cfg, INF_3C90X.IOAddr + regInternalConfig_3_l);
+    _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)
        {
 
     /** enable DC converter for 10-Base-T **/
     if ((cfg&0x0300) == 0x0300)
        {

-       a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdEnableDcConverter, 0);
+       _issue_command(INF_3C90X.IOAddr, cmdEnableDcConverter, 0);

        }
 #endif
 
     /** Issue transmit reset, wait for command completion **/
        }
 #endif
 
     /** Issue transmit reset, wait for command completion **/

-    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdTxReset, 0);
-    while (inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_CMDINPROGRESS)
-       ;
+    _issue_command(INF_3C90X.IOAddr, cmdTxReset, 0);

     if (! INF_3C90X.isBrev)
     if (! INF_3C90X.isBrev)

-       outb(0x01, INF_3C90X.IOAddr + regTxFreeThresh_b);
-    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdTxEnable, 0);
+       _outb(0x01, INF_3C90X.IOAddr + regTxFreeThresh_b);
+    _issue_command(INF_3C90X.IOAddr, cmdTxEnable, 0);

 
     /**
      ** reset of the receiver on B-revision cards re-negotiates the link
      ** takes several seconds (a computer eternity)
      **/
     if (INF_3C90X.isBrev)
 
     /**
      ** reset of the receiver on B-revision cards re-negotiates the link
      ** takes several seconds (a computer eternity)
      **/
     if (INF_3C90X.isBrev)

-       a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdRxReset, 0x04);
+       _issue_command(INF_3C90X.IOAddr, cmdRxReset, 0x04);

     else
     else

-       a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdRxReset, 0x00);
-    while (inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_CMDINPROGRESS);
-       ;
-    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdRxEnable, 0);
+       _issue_command(INF_3C90X.IOAddr, cmdRxReset, 0x00);
+    while (inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_CMDINPROGRESS)
+       ;
+    _issue_command(INF_3C90X.IOAddr, cmdRxEnable, 0);

 
 

-    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr,
-                                 cmdSetInterruptEnable, 0);
+    _issue_command(INF_3C90X.IOAddr, cmdSetInterruptEnable, 0);

     /** enable rxComplete and txComplete **/
     /** enable rxComplete and txComplete **/

-    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr,
-                                 cmdSetIndicationEnable, 0x0014);
+    _issue_command(INF_3C90X.IOAddr, cmdSetIndicationEnable, 0x0014);

     /** acknowledge any pending status flags **/
     /** acknowledge any pending status flags **/

-    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr,
-                                 cmdAcknowledgeInterrupt, 0x661);
+    _issue_command(INF_3C90X.IOAddr, cmdAcknowledgeInterrupt, 0x661);

 
     return;
     }
 
     return;
     }


@@ -483,125 +473,95 @@ 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(const char *dest_addr, unsigned int proto,
-                unsigned int size, const char *pkt)
-    {
+a3c90x_transmit(unsigned int size, const char *pkt)
+{
+       unsigned char status;
+       unsigned int i, retries;
+       static unsigned int stillwaiting = 0;

 
 

-    struct eth_hdr
+       if (stillwaiting)

        {
        {

-       unsigned char dst_addr[ETH_ALEN];
-       unsigned char src_addr[ETH_ALEN];
-       unsigned short type;
-       } hdr;
-
-    unsigned char status;
-    unsigned i, retries;
+               while (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE) && oneshot_running())
+                       ;
+               if (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_TXCOMPLETE))
+               {
+                       outputf("3c90x: tx timeout? txstat %02x", inb(INF_3C90X.IOAddr + regTxStatus_b));
+                       outputf("3c90x: Gen sts %04x", inw(INF_3C90X.IOAddr + regCommandIntStatus_w));
+               }
+               status = inb(INF_3C90X.IOAddr + regTxStatus_b);
+               outb(INF_3C90X.IOAddr + regTxStatus_b, 0x00);
+               stillwaiting = 0;
+       }

 
 

-    for (retries=0; retries < XMIT_RETRIES ; retries++)
+       for (retries=0; retries < XMIT_RETRIES; retries++)

        {
        {

-       /** Stall the download engine **/
-       a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdStallCtl, 2);
-
-       /** Make sure the card is not waiting on us **/
-       inw(INF_3C90X.IOAddr + regCommandIntStatus_w);
-       inw(INF_3C90X.IOAddr + regCommandIntStatus_w);
-
-       while (inw(INF_3C90X.IOAddr+regCommandIntStatus_w) &
-              INT_CMDINPROGRESS)
-           ;
-
-       /** Set the ethernet packet type **/
-       hdr.type = htons(proto);
-
-       /** Copy the destination address **/
-       memcpy(hdr.dst_addr, dest_addr, ETH_ALEN);
-
-       /** Copy our MAC address **/
-       memcpy(hdr.src_addr, INF_3C90X.HWAddr, ETH_ALEN);
-
-       /** Setup the DPD (download descriptor) **/
-       INF_3C90X.TransmitDPD.DnNextPtr = 0;
-       /** set notification for transmission completion (bit 15) **/
-       INF_3C90X.TransmitDPD.FrameStartHeader = (size + sizeof(hdr)) | 0x8000;
-       INF_3C90X.TransmitDPD.HdrAddr = virt_to_bus(&hdr);
-       INF_3C90X.TransmitDPD.HdrLength = sizeof(hdr);
-       INF_3C90X.TransmitDPD.DataAddr = virt_to_bus(pkt);
-       INF_3C90X.TransmitDPD.DataLength = size + (1<<31);
-
-       /** Send the packet **/
-       outl(virt_to_bus(&(INF_3C90X.TransmitDPD)),
-            INF_3C90X.IOAddr + regDnListPtr_l);
-
-       /** End Stall and Wait for upload to complete. **/
-       a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdStallCtl, 3);
-       while(inl(INF_3C90X.IOAddr + regDnListPtr_l) != 0)
-           ;
-
-       /** Wait for NIC Transmit to Complete **/
-       oneshot_start_ms(10);   /* Give it 10 ms */
-       while (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w)&0x0004) &&
-               oneshot_running())
-               ;
-
-       if (!(inw(INF_3C90X.IOAddr + regCommandIntStatus_w)&0x0004))
-           {
-           outputf("3C90X: Tx Timeout");
-           continue;
-           }
-
-       status = inb(INF_3C90X.IOAddr + regTxStatus_b);
-
-       /** acknowledge transmit interrupt by writing status **/
-       outb(0x00, INF_3C90X.IOAddr + regTxStatus_b);
-
-       /** successful completion (sans "interrupt Requested" bit) **/
-       if ((status & 0xbf) == 0x80)
-           return;
+               if (retries != 0)
+                       outputf("3c90x: retrying packet send (%d)", retries);
+               
+               _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 2 /* Stall download */);
+
+               /** Setup the DPD (download descriptor) **/
+               INF_3C90X.TransmitDPD.DnNextPtr = 0;
+               /** 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);
+
+               /** Send the packet **/
+               outl(INF_3C90X.IOAddr + regDnListPtr_l, v2p(&(INF_3C90X.TransmitDPD)));
+               _issue_command(INF_3C90X.IOAddr, cmdStallCtl, 3 /* Unstall download */);
+               
+               oneshot_start_ms(10);
+               while((inl(INF_3C90X.IOAddr + regDnListPtr_l) != 0) && oneshot_running())
+                       ;
+               if (!oneshot_running())
+               {
+                       outputf("3c90x: Download engine pointer timeout");
+                       continue;
+               }

 
 

-          outputf("3C90X: Status (%hhX)", status);
-       /** check error codes **/
-       if (status & 0x02)
-           {
-           outputf("3C90X: Tx Reclaim Error (%hhX)", status);
-           a3c90x_reset();
-           }
-       else if (status & 0x04)
-           {
-           outputf("3C90X: Tx Status Overflow (%hhX)", status);
-           for (i=0; i<32; i++)
-               outb(0x00, INF_3C90X.IOAddr + regTxStatus_b);
-           /** must re-enable after max collisions before re-issuing tx **/
-           a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdTxEnable, 0);
-           }
-       else if (status & 0x08)
-           {
-           outputf("3C90X: Tx Max Collisions (%hhX)", status);
-           /** must re-enable after max collisions before re-issuing tx **/
-           a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdTxEnable, 0);
-           }
-       else if (status & 0x10)
-           {
-           outputf("3C90X: Tx Underrun (%hhX)", status);
-           a3c90x_reset();
-           }
-       else if (status & 0x20)
-           {
-           outputf("3C90X: Tx Jabber (%hhX)", status);
-           a3c90x_reset();
-           }
-       else if ((status & 0x80) != 0x80)
-           {
-           outputf("3C90X: Internal Error - Incomplete Transmission (%hhX)",
-                  status);
-           a3c90x_reset();
-           }
+               oneshot_start_ms(10);
+               stillwaiting = 1;
+               break;
+               
+#if 0          
+               /** successful completion (sans "interrupt Requested" bit) **/
+               if ((status & 0xbf) == 0x80)
+                       return;
+
+               outputf("3c90x: Status (%hhX)", status);
+               /** check error codes **/
+               if (status & 0x02)
+               {
+                       outputf("3c90x: Tx Reclaim Error (%hhX)", status);
+                       a3c90x_reset();
+               } else if (status & 0x04) {
+                       outputf("3c90x: Tx Status Overflow (%hhX)", status);
+                       for (i=0; i<32; i++)
+                               _outb(0x00, INF_3C90X.IOAddr + regTxStatus_b);
+                       /** must re-enable after max collisions before re-issuing tx **/
+                       _issue_command(INF_3C90X.IOAddr, cmdTxEnable, 0);
+               } else if (status & 0x08) {
+                       outputf("3c90x: Tx Max Collisions (%hhX)", status);
+                       /** must re-enable after max collisions before re-issuing tx **/
+                       _issue_command(INF_3C90X.IOAddr, cmdTxEnable, 0);
+               } else if (status & 0x10) {
+                       outputf("3c90x: Tx Underrun (%hhX)", status);
+                       a3c90x_reset();
+               } else if (status & 0x20) {
+                       outputf("3c90x: Tx Jabber (%hhX)", status);
+                       a3c90x_reset();
+               } else if ((status & 0x80) != 0x80) {
+                       outputf("3c90x: Internal Error - Incomplete Transmission (%hhX)", status);
+                       a3c90x_reset();
+               }
+#endif

        }
 
        }
 

-    /** failed after RETRY attempts **/
-    outputf("Failed to send after %d retries", retries);
-    return;
-
-    }
+       /** failed after RETRY attempts **/
+       outputf("3c90x: Failed to send after %d retries", retries);
+       return;
+}

 
 
 
 
 
 


@@ -629,11 +589,11 @@ a3c90x_poll(struct nic *nic, int retrieve)
     /** Build the up-load descriptor **/
     INF_3C90X.ReceiveUPD.UpNextPtr = 0;
     INF_3C90X.ReceiveUPD.UpPktStatus = 0;
     /** Build the up-load descriptor **/
     INF_3C90X.ReceiveUPD.UpNextPtr = 0;
     INF_3C90X.ReceiveUPD.UpPktStatus = 0;

-    INF_3C90X.ReceiveUPD.DataAddr = virt_to_bus(nic->packet);
+    INF_3C90X.ReceiveUPD.DataAddr = v2p(nic->packet);

     INF_3C90X.ReceiveUPD.DataLength = 1536 + (1<<31);
 
     /** Submit the upload descriptor to the NIC **/
     INF_3C90X.ReceiveUPD.DataLength = 1536 + (1<<31);
 
     /** Submit the upload descriptor to the NIC **/

-    outl(virt_to_bus(&(INF_3C90X.ReceiveUPD)),
+    _outl(v2p(&(INF_3C90X.ReceiveUPD)),

          INF_3C90X.IOAddr + regUpListPtr_l);
 
     /** Wait for upload completion (upComplete(15) or upError (14)) **/
          INF_3C90X.IOAddr + regUpListPtr_l);
 
     /** Wait for upload completion (upComplete(15) or upError (14)) **/


@@ -679,8 +639,8 @@ void a3c90x_disable(struct dev *dev)
        /* reset and disable merge */
        a3c90x_reset();
        /* Disable the receiver and transmitter. */
        /* reset and disable merge */
        a3c90x_reset();
        /* Disable the receiver and transmitter. */

-       outw(cmdRxDisable, INF_3C90X.IOAddr + regCommandIntStatus_w);
-       outw(cmdTxDisable, INF_3C90X.IOAddr + regCommandIntStatus_w);
+       _outw(cmdRxDisable, INF_3C90X.IOAddr + regCommandIntStatus_w);
+       _outw(cmdTxDisable, INF_3C90X.IOAddr + regCommandIntStatus_w);

 }
 
 
 }
 
 


@@ -693,7 +653,7 @@ static int a3c90x_probe(struct pci_dev * pci, void * data)
     INF_3C90X.is3c556 = (pci->did == 0x6055);
  
     int i, c;
     INF_3C90X.is3c556 = (pci->did == 0x6055);
  
     int i, c;

-    unsigned short eeprom[0x21];
+    unsigned short eeprom[0x100];

     unsigned int cfg;
     unsigned int mopt;
     unsigned int mstat;
     unsigned int cfg;
     unsigned int mopt;
     unsigned int mstat;


@@ -709,14 +669,21 @@ static int a3c90x_probe(struct pci_dev * pci, void * data)
     }
 
     if (ioaddr == 0)
     }
 
     if (ioaddr == 0)

-          return 0;
-/*
-    adjust_pci_dev(pci);
-*/
+    {
+        outputf("3c90x: Unable to find I/O address");
+        return 0;
+    }
+    
+    /* Power it on */
+    pci_write16(pci->bus, pci->dev, pci->fn, 0xE0,
+       pci_read16(pci->bus, pci->dev, pci->fn, 0xE0) & ~0x3);
+    
+    outputf("3c90x: Picked I/O address %04x", ioaddr);
+    pci_bother_add(pci);

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

-    INF_3C90X.IOAddr = ioaddr & ~3;
+    INF_3C90X.IOAddr = ioaddr;

     INF_3C90X.CurrentWindow = 255;
     switch (a3c90x_internal_ReadEeprom(INF_3C90X.IOAddr, 0x03))
        {
     INF_3C90X.CurrentWindow = 255;
     switch (a3c90x_internal_ReadEeprom(INF_3C90X.IOAddr, 0x03))
        {


@@ -742,7 +709,7 @@ static int a3c90x_probe(struct pci_dev * pci, void * data)
     /** Load the EEPROM contents **/
     if (INF_3C90X.isBrev)
        {
     /** Load the EEPROM contents **/
     if (INF_3C90X.isBrev)
        {

-       for(i=0;i<=0x20;i++)
+       for(i=0;i<=/*0x20*/0x7F;i++)

            {
            eeprom[i] = a3c90x_internal_ReadEeprom(INF_3C90X.IOAddr, i);
            }
            {
            eeprom[i] = a3c90x_internal_ReadEeprom(INF_3C90X.IOAddr, i);
            }


@@ -771,7 +738,7 @@ static int a3c90x_probe(struct pci_dev * pci, void * data)
        }
     else
        {
        }
     else
        {

-       for(i=0;i<=0x17;i++)
+       for(i=0;i<=/*0x17*/0x7F;i++)

            {
            eeprom[i] = a3c90x_internal_ReadEeprom(INF_3C90X.IOAddr, i);
            }
            {
            eeprom[i] = a3c90x_internal_ReadEeprom(INF_3C90X.IOAddr, i);
            }


@@ -793,19 +760,25 @@ static int a3c90x_probe(struct pci_dev * pci, void * data)
     INF_3C90X.HWAddr[3] = eeprom[HWADDR_OFFSET + 1]&0xFF;
     INF_3C90X.HWAddr[4] = eeprom[HWADDR_OFFSET + 2]>>8;
     INF_3C90X.HWAddr[5] = eeprom[HWADDR_OFFSET + 2]&0xFF;
     INF_3C90X.HWAddr[3] = eeprom[HWADDR_OFFSET + 1]&0xFF;
     INF_3C90X.HWAddr[4] = eeprom[HWADDR_OFFSET + 2]>>8;
     INF_3C90X.HWAddr[5] = eeprom[HWADDR_OFFSET + 2]&0xFF;

-    outputf("MAC Address = %!", INF_3C90X.HWAddr);
+    outputf("MAC Address = %02x:%02x:%02x:%02x:%02x:%02x",
+       INF_3C90X.HWAddr[0],
+       INF_3C90X.HWAddr[1],
+       INF_3C90X.HWAddr[2],
+       INF_3C90X.HWAddr[3],
+       INF_3C90X.HWAddr[4],
+       INF_3C90X.HWAddr[5]);

 
     /** 3C556: Invert MII power **/
     if (INF_3C90X.is3c556) {
        unsigned int tmp;
 
     /** 3C556: Invert MII power **/
     if (INF_3C90X.is3c556) {
        unsigned int tmp;

-       a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winAddressing2);
+       _set_window(INF_3C90X.IOAddr, winAddressing2);

        tmp = inw(INF_3C90X.IOAddr + regResetOptions_2_w);
        tmp |= 0x4000;
        tmp = inw(INF_3C90X.IOAddr + regResetOptions_2_w);
        tmp |= 0x4000;

-       outw(tmp, INF_3C90X.IOAddr + regResetOptions_2_w);
+       _outw(tmp, INF_3C90X.IOAddr + regResetOptions_2_w);

     }
 
     /* Test if the link is good, if not continue */
     }
 
     /* Test if the link is good, if not continue */

-    a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winDiagnostics4);
+    _set_window(INF_3C90X.IOAddr, winDiagnostics4);

     mstat = inw(INF_3C90X.IOAddr + regMediaStatus_4_w);
     if((mstat & (1<<11)) == 0) {
        outputf("Valid link not established");
     mstat = inw(INF_3C90X.IOAddr + regMediaStatus_4_w);
     if((mstat & (1<<11)) == 0) {
        outputf("Valid link not established");


@@ -813,13 +786,13 @@ static int a3c90x_probe(struct pci_dev * pci, void * data)
     }
 
     /** Program the MAC address into the station address registers **/
     }
 
     /** Program the MAC address into the station address registers **/

-    a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winAddressing2);
-    outw(htons(eeprom[HWADDR_OFFSET + 0]), INF_3C90X.IOAddr + regStationAddress_2_3w);
-    outw(htons(eeprom[HWADDR_OFFSET + 1]), INF_3C90X.IOAddr + regStationAddress_2_3w+2);
-    outw(htons(eeprom[HWADDR_OFFSET + 2]), INF_3C90X.IOAddr + regStationAddress_2_3w+4);
-    outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+0);
-    outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+2);
-    outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+4);
+    _set_window(INF_3C90X.IOAddr, winAddressing2);
+    _outw(htons(eeprom[HWADDR_OFFSET + 0]), INF_3C90X.IOAddr + regStationAddress_2_3w);
+    _outw(htons(eeprom[HWADDR_OFFSET + 1]), INF_3C90X.IOAddr + regStationAddress_2_3w+2);
+    _outw(htons(eeprom[HWADDR_OFFSET + 2]), INF_3C90X.IOAddr + regStationAddress_2_3w+4);
+    _outw(0, INF_3C90X.IOAddr + regStationMask_2_3w+0);
+    _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? 
 
     /** Fill in our entry in the etherboot arp table **/
 /* XXX ? for lwip? 


@@ -833,7 +806,7 @@ static int a3c90x_probe(struct pci_dev * pci, void * data)
      ** Uses Media Option command on B revision, Reset Option on non-B
      ** revision cards -- same register address
      **/
      ** Uses Media Option command on B revision, Reset Option on non-B
      ** revision cards -- same register address
      **/

-    a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winTxRxOptions3);
+    _set_window(INF_3C90X.IOAddr, winTxRxOptions3);

     mopt = inw(INF_3C90X.IOAddr + regResetMediaOptions_3_w);
 
     /** mask out VCO bit that is defined as 10baseFL bit on B-rev cards **/
     mopt = inw(INF_3C90X.IOAddr + regResetMediaOptions_3_w);
 
     /** mask out VCO bit that is defined as 10baseFL bit on B-rev cards **/


@@ -918,54 +891,49 @@ static int a3c90x_probe(struct pci_dev * pci, void * data)
     /** enable DC converter for 10-Base-T **/
     if (linktype == 0x0003)
        {
     /** enable DC converter for 10-Base-T **/
     if (linktype == 0x0003)
        {

-       a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdEnableDcConverter, 0);
+       _issue_command(INF_3C90X.IOAddr, cmdEnableDcConverter, 0);

        }
 
     /** Set the link to the type we just determined. **/
        }
 
     /** Set the link to the type we just determined. **/

-    a3c90x_internal_SetWindow(INF_3C90X.IOAddr, winTxRxOptions3);
+    _set_window(INF_3C90X.IOAddr, winTxRxOptions3);

     cfg = inl(INF_3C90X.IOAddr + regInternalConfig_3_l);
     cfg &= ~(0xF<<20);
     cfg |= (linktype<<20);
     cfg = inl(INF_3C90X.IOAddr + regInternalConfig_3_l);
     cfg &= ~(0xF<<20);
     cfg |= (linktype<<20);

-    outl(cfg, INF_3C90X.IOAddr + regInternalConfig_3_l);
+    _outl(cfg, INF_3C90X.IOAddr + regInternalConfig_3_l);

 
     /** Now that we set the xcvr type, reset the Tx and Rx, re-enable. **/
 
     /** Now that we set the xcvr type, reset the Tx and Rx, re-enable. **/

-    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdTxReset, 0x00);
-    while (inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_CMDINPROGRESS)
-       ;
-
+    _issue_command(INF_3C90X.IOAddr, cmdTxReset, 0);

     if (!INF_3C90X.isBrev)
     if (!INF_3C90X.isBrev)

-       outb(0x01, INF_3C90X.IOAddr + regTxFreeThresh_b);
+       _outb(0x01, INF_3C90X.IOAddr + regTxFreeThresh_b);

 
 

-    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdTxEnable, 0);
+    _issue_command(INF_3C90X.IOAddr, cmdTxEnable, 0);

 
     /**
      ** reset of the receiver on B-revision cards re-negotiates the link
      ** takes several seconds (a computer eternity)
      **/
     if (INF_3C90X.isBrev)
 
     /**
      ** reset of the receiver on B-revision cards re-negotiates the link
      ** takes several seconds (a computer eternity)
      **/
     if (INF_3C90X.isBrev)

-       a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdRxReset, 0x04);
+       _issue_command(INF_3C90X.IOAddr, cmdRxReset, 0x04);

     else
     else

-       a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdRxReset, 0x00);
-    while (inw(INF_3C90X.IOAddr + regCommandIntStatus_w) & INT_CMDINPROGRESS)
-       ;
+       _issue_command(INF_3C90X.IOAddr, cmdRxReset, 0x00);

 
     /** Set the RX filter = receive only individual pkts & multicast & bcast. **/
 
     /** Set the RX filter = receive only individual pkts & multicast & bcast. **/

-    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdSetRxFilter, 0x01 + 0x02 + 0x04);
-    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdRxEnable, 0);
+    _issue_command(INF_3C90X.IOAddr, cmdSetRxFilter, 0x01 + 0x02 + 0x04);
+    _issue_command(INF_3C90X.IOAddr, cmdRxEnable, 0);

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

-    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr, cmdSetInterruptEnable, 0);
-    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr,
-                                 cmdSetIndicationEnable, 0x0014);
-    a3c90x_internal_IssueCommand(INF_3C90X.IOAddr,
-                                 cmdAcknowledgeInterrupt, 0x661);
+    _issue_command(INF_3C90X.IOAddr, cmdSetInterruptEnable, 0);
+    _issue_command(INF_3C90X.IOAddr, cmdSetIndicationEnable, 0x0014);
+    _issue_command(INF_3C90X.IOAddr, cmdAcknowledgeInterrupt, 0x661);

 
     /* * Set our exported functions **/
     nic.poll     = a3c90x_poll;
     nic.transmit = a3c90x_transmit;
 
     /* * Set our exported functions **/
     nic.poll     = a3c90x_poll;
     nic.transmit = a3c90x_transmit;

+    memcpy(nic.hwaddr, INF_3C90X.HWAddr, 6);
+    eth_register(&nic);

 
     return 1;
 }
 
     return 1;
 }