tulip net driver updates:

* Add support for Conexant tulip clones.
* Do not store eeprom data on stack (128 or 512 bytes), it's a
large object, and also, we already have a copy in kmalloc'd RAM.

Contributor: Pavel Roskin

diff --git a/drivers/net/tulip/ChangeLog b/drivers/net/tulip/ChangeLog
index 8cd389cb5d7074f68102ee9df1f35585e4e6035f..fc513785150a2d6dcab66f9134b09d72b39e1d00 100644 (file)
--- a/drivers/net/tulip/ChangeLog
+++ b/drivers/net/tulip/ChangeLog
@@ -1,3 +1,13 @@
+2002-01-28  Pavel Roskin  <proski@gnu.org>
+
+       * tulip_core.c (tulip_init_one): Use tp->eeprom instead of
+       allocating a buffer for EEPROM copy on the stack.
+
+       * tulip_core.c: Add support for Conexant RS7112 (a.k.a. CN7112)
+       chip.
+       * tulip.h: Likewise.  Increase EEPROM_SIZE to 512 bytes to
+       accomodate EEPROM on Conexant RS7112.
+
 2002-02-07  Uwe Bonnes  <bon@elektron.ikp.physik.tu-darmstadt.de>
 
         * tulip_core (tulip_pci_tbl[]):

diff --git a/drivers/net/tulip/tulip.h b/drivers/net/tulip/tulip.h
index 2171eb9dc8f860eb51048d21b4665ed3bf9e3c53..c39cb3cb2b74aef43803ecf158bb277848a17eb4 100644 (file)
--- a/drivers/net/tulip/tulip.h
+++ b/drivers/net/tulip/tulip.h
@@ -84,6 +84,7 @@ enum chips {
        COMPEX9881,
        I21145,
        DM910X,
+       CONEXANT,
 };
 
 
@@ -290,7 +291,7 @@ enum t21143_csr6_bits {
 #define DESC_RING_WRAP 0x02000000
 
 
-#define EEPROM_SIZE 128        /* 2 << EEPROM_ADDRLEN */
+#define EEPROM_SIZE 512        /* 2 << EEPROM_ADDRLEN */
 
 
 #define RUN_AT(x) (jiffies + (x))

diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c
index 52ad8a5b6af5a4b09171eea4cc0043e029ffad3a..9143debdef24192f2b59e17e86c9fb8c5069c480 100644 (file)
--- a/drivers/net/tulip/tulip_core.c
+++ b/drivers/net/tulip/tulip_core.c
@@ -15,8 +15,8 @@
 */
 
 #define DRV_NAME       "tulip"
-#define DRV_VERSION    "1.1.0"
-#define DRV_RELDATE    "Dec 11, 2001"
+#define DRV_VERSION    "1.1.11"
+#define DRV_RELDATE    "Feb 08, 2002"
 
 #include <linux/config.h>
 #include <linux/module.h>
@@ -185,6 +185,10 @@ struct tulip_chip_table tulip_tbl[] = {
   { "Davicom DM9102/DM9102A", 128, 0x0001ebef,
        HAS_MII | HAS_MEDIA_TABLE | CSR12_IN_SROM | HAS_ACPI,
        tulip_timer },
+
+  /* RS7112 */
+  { "Conexant LANfinity", 256, 0x0001ebef,
+       HAS_MII | HAS_ACPI, tulip_timer },
 };
 
 
@@ -212,6 +216,7 @@ static struct pci_device_id tulip_pci_tbl[] __devinitdata = {
        { 0x1113, 0x1216, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
        { 0x1113, 0x1217, PCI_ANY_ID, PCI_ANY_ID, 0, 0, MX98715 },
        { 0x1113, 0x9511, PCI_ANY_ID, PCI_ANY_ID, 0, 0, COMET },
+       { 0x14f1, 0x1803, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CONEXANT },
        { } /* terminate list */
 };
 MODULE_DEVICE_TABLE(pci, tulip_pci_tbl);
@@ -418,7 +423,7 @@ media_picked:
                tp->csr6 = 0x01a80200;
                outl(0x0f370000 | inw(ioaddr + 0x80), ioaddr + 0x80);
                outl(0x11000 | inw(ioaddr + 0xa0), ioaddr + 0xa0);
-       } else if (tp->chip_id == COMET) {
+       } else if (tp->chip_id == COMET || tp->chip_id == CONEXANT) {
                /* Enable automatic Tx underrun recovery. */
                outl(inl(ioaddr + 0x88) | 1, ioaddr + 0x88);
                dev->if_port = tp->mii_cnt ? 11 : 0;
@@ -1254,7 +1259,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
        u8 chip_rev;
        int i, irq;
        unsigned short sum;
-       u8 ee_data[EEPROM_SIZE];
+       unsigned char *ee_data;
        struct net_device *dev;
        long ioaddr;
        static int board_idx = -1;
@@ -1431,6 +1436,7 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
           be polled, waiting for the value to be read bit serially from the
           EEPROM.
           */
+       ee_data = tp->eeprom;
        sum = 0;
        if (chip_idx == LC82C168) {
                for (i = 0; i < 3; i++) {
@@ -1453,17 +1459,22 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
                int sa_offset = 0;
                int ee_addr_size = tulip_read_eeprom(ioaddr, 0xff, 8) & 0x40000 ? 8 : 6;
 
-               for (i = 0; i < sizeof(ee_data)/2; i++)
+               for (i = 0; i < sizeof(tp->eeprom)/2; i++)
                        ((u16 *)ee_data)[i] =
                                le16_to_cpu(tulip_read_eeprom(ioaddr, i, ee_addr_size));
 
                /* DEC now has a specification (see Notes) but early board makers
                   just put the address in the first EEPROM locations. */
-               /* This does  memcmp(eedata, eedata+16, 8) */
+               /* This does  memcmp(ee_data, ee_data+16, 8) */
                for (i = 0; i < 8; i ++)
                        if (ee_data[i] != ee_data[16+i])
                                sa_offset = 20;
-               if (ee_data[0] == 0xff  &&  ee_data[1] == 0xff &&  ee_data[2] == 0) {
+               if (chip_idx == CONEXANT) {
+                       /* Check that the tuple type and length is correct. */
+                       if (ee_data[0x198] == 0x04  &&  ee_data[0x199] == 6)
+                               sa_offset = 0x19A;
+               } else if (ee_data[0] == 0xff  &&  ee_data[1] == 0xff &&
+                                  ee_data[2] == 0) {
                        sa_offset = 2;          /* Grrr, damn Matrox boards. */
                        multiport_cnt = 4;
                }
@@ -1556,8 +1567,6 @@ static int __devinit tulip_init_one (struct pci_dev *pdev,
        }
 
        if (tp->flags & HAS_MEDIA_TABLE) {
-               memcpy(tp->eeprom, ee_data, sizeof(tp->eeprom));
-
                sprintf(dev->name, "tulip%d", board_idx);       /* hack */
                tulip_parse_eeprom(dev);
                strcpy(dev->name, "eth%d");                     /* un-hack */