Very Computer

Any clues?

George Erhart
AT&T bell labs

--- drivers/net/lance.c Sun Oct  9 13:28:49 1994
+++ /usr/src/linux/drivers/net/lance.c  Thu Nov 10 00:06:41 1994
@@ -26,6 +26,8 @@
 #include <linux/ioport.h>
 #include <linux/malloc.h>
 #include <linux/interrupt.h>
+#include <linux/pci.h>
+#include <linux/bios32.h>
 #include <asm/bitops.h>
 #include <asm/io.h>
 #include <asm/dma.h>
@@ -37,7 +39,7 @@
 struct device *init_etherdev(struct device *dev, int sizeof_private,
                                                         unsigned long *mem_startp);
 static unsigned int lance_portlist[] = {0x300, 0x320, 0x340, 0x360, 0};
-unsigned long lance_probe1(short ioaddr, unsigned long mem_start);
+unsigned long lance_probe1(int ioaddr, unsigned long mem_start);

 #ifdef HAVE_DEVLIST
 struct netdev_entry lance_drv =
@@ -72,7 +74,7 @@
 Most ISA boards have jumpered settings for the I/O base, IRQ line, and DMA
 channel.  This driver probes the likely base addresses:
 {0x300, 0x320, 0x340, 0x360}.
-After the board is found it generates an DMA-timeout interrupt and uses
+After the board is found it generates a DMA-timeout interrupt and uses
 autoIRQ to find the IRQ line.  The DMA channel can be set with the low bits
 of the otherwise-unused dev->mem_start value (aka PARAM1).  If unset it is
 probed for by enabling each free DMA channel in turn and checking if
@@ -102,14 +104,14 @@
 avoid the administrative overhead. For the Rx side this avoids dynamically
 allocating full-sized buffers "just in case", at the expense of a
 memory-to-memory data copy for each packet received.  For most systems this
-is an good tradeoff: the Rx buffer will always be in low memory, the copy
+is a good tradeoff: the Rx buffer will always be in low memory, the copy
 is inexpensive, and it primes the cache for later packet processing.  For Tx
 the buffers are only used when needed as low-memory bounce buffers.

 IIIB. 16M memory limitations.
 For the ISA bus master mode all structures used directly by the LANCE,
 the initialization block, Rx and Tx rings, and data buffers, must be
-accessable from the ISA bus, i.e. in the lower 16M of real memory.
+accessible from the ISA bus, i.e. in the lower 16M of real memory.
 This is a problem for current Linux kernels on >16M machines. The network
 devices are initialized after memory initialization, and the kernel doles out
 memory from the top of memory downward.         The current solution is to have a
@@ -207,7 +209,7 @@
 };

 /* A mapping from the chip ID number to the part number and features.
-   These are fro the datasheets -- in real life the '970 version
+   These are from the datasheets -- in real life the '970 version
    reportedly has the same ID as the '965. */
 static struct lance_chip_type {
        int id_number;
@@ -218,12 +220,15 @@
        {0x0003, "PCnet/ISA 79C960", 0},      /* 79C960 PCnet/ISA.  */
        {0x2260, "PCnet/ISA+ 79C961", 0},     /* 79C961 PCnet/ISA+, Plug-n-Play.  */
        {0x2420, "PCnet/PCI 79C970", 0},      /* 79C970 or 79C974 PCnet-SCSI, PCI. */
-       {0x2430, "PCnet/VLB 79C965", 0},      /* 79C965 PCnet for VL bus. */
+       {0x2430, "PCnet32", 0},                               /* 79C965 PCnet for VL bus. */
        {0x0,    "PCnet (unknown)", 0},
 };

 enum {OLD_LANCE = 0, PCNET_ISA=1, PCNET_ISAP=2, PCNET_PCI=3, PCNET_VLB=4, LANCE_UNKNOWN=5};

+/* Non-zero only if this is a PCI card with BIOS-set IRQ. */
+static unsigned char pci_irq_line = 0;
+
 static int lance_open(struct device *dev);
 static void lance_init_ring(struct device *dev);
 static int lance_start_xmit(struct sk_buff *skb, struct device *dev);
@@ -239,12 +244,40 @@

 /* This lance probe is unlike the other board probes in 1.0.*.  The LANCE may
    have to allocate a contiguous low-memory region for bounce buffers.
-   This requirement is satified by having the lance initialization occur before the
-   memory management system is started, and thus well before the other probes. */
+   This requirement is satisfied by having the lance initialization occur
+   before the memory management system is started, and thus well before the
+   other probes. */
 unsigned long lance_init(unsigned long mem_start, unsigned long mem_end)
 {
        int *port;

+#if defined(CONFIG_PCI)
+#define AMD_VENDOR_ID 0x1022
+#define AMD_DEVICE_ID 0x2000
+    if (pcibios_present()) {
+           int pci_index;
+               printk("lance.c: PCI bios is present, checking for devices...\n");
+               for (pci_index = 0; pci_index < 8; pci_index++) {
+                       unsigned char pci_bus, pci_device_fn;
+                       unsigned long pci_ioaddr;
+              
+                       if (pcibios_find_device (AMD_VENDOR_ID, AMD_DEVICE_ID, pci_index,
+                                                                        &pci_bus, &pci_device_fn) != 0)
+                               break;
+                       pcibios_read_config_byte(pci_bus, pci_device_fn,
+                                                                        PCI_INTERRUPT_LINE, &pci_irq_line);
+                       pcibios_read_config_dword(pci_bus, pci_device_fn,
+                                                                         PCI_BASE_ADDRESS_0, &pci_ioaddr);
+                       /* Remove I/O space marker in bit 0. */
+                       pci_ioaddr &= ~3;
+                       printk("Found PCnet/PCI at %#lx, irq %d (mem_start is %#lx).\n",
+                                  pci_ioaddr, pci_irq_line, mem_start);
+                       mem_start = lance_probe1(pci_ioaddr, mem_start);
+                       pci_irq_line = 0;
+               }
+       }
+#endif  /* defined(CONFIG_PCI) */
+
        for (port = lance_portlist; *port; port++) {
                int ioaddr = *port;

@@ -258,7 +291,7 @@
        return mem_start;
 }

-unsigned long lance_probe1(short ioaddr, unsigned long mem_start)
+unsigned long lance_probe1(int ioaddr, unsigned long mem_start)
 {
        struct device *dev;
        struct lance_private *lp;
@@ -365,7 +398,10 @@
        outw(0x0000, ioaddr+LANCE_ADDR);
        inw(ioaddr+LANCE_ADDR);

-       if (hp_builtin) {
+       if (pci_irq_line) {
+               dev->dma = 4;                        /* Native bus-master, no DMA channel needed. */
+               dev->irq = pci_irq_line;
+       } else if (hp_builtin) {
                char dma_tbl[4] = {3, 5, 6, 0};
                char irq_tbl[8] = {3, 4, 5, 9};
                unsigned char port_val = inb(hp_builtin);
@@ -971,6 +1007,7 @@
                }
                outw(0x0000, ioaddr+LANCE_DATA); /* Unset promiscuous mode */
        } else {
+               printk("%s: Promiscuous mode enabled.\n", dev->name);
                outw(0x8000, ioaddr+LANCE_DATA); /* Set promiscuous mode */
        }

--
Donald Becker                                     bec...@cesdis.gsfc.nasa.gov
USRA-CESDIS, Center of Excellence in Space Data and Information Sciences.
Code 930.5, Goddard Space Flight Center,  Greenbelt, MD.  20771
301-286-0882         http://cesdis.gsfc.nasa.gov/pub/people/becker/whoiam.html

: Use the following diff on 1.1.62 to get it to work.
: This diff assumes that you somehow #defined CONFIG_PCI, probably
: including the NCR '810 SCSI driver.
: If I get enough positive (and no negative) reports I'll put this in the
: development kernel.

[...]

The patch works for me.  Thanks, Don.

I built 1.1.62 with gcc 2.5.8.  I have ASUS SP3G 1.6.  The Boca card
is at IRQ 10.

--
Lam Dang