Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys Add MCA ne(4) attachment for Novell NE/2 Ethernet adapte...



details:   https://anonhg.NetBSD.org/src/rev/3d97e5b940a5
branches:  trunk
changeset: 508797:3d97e5b940a5
user:      jdolecek <jdolecek%NetBSD.org@localhost>
date:      Fri Apr 20 07:37:42 2001 +0000

description:
Add MCA ne(4) attachment for Novell NE/2 Ethernet adapter and clones.
Tested with NE/2 card provided to me by Hans Hubner <hans%Huebner.ORG@localhost>.

The Compex and Arco cards were not tested. According to Linux ne2 driver,
they should work same way as NE/2.

diffstat:

 sys/arch/i386/conf/PS2  |    3 +-
 sys/dev/mca/files.mca   |    6 +-
 sys/dev/mca/if_ne_mca.c |  220 ++++++++++++++++++++++++++++++++++++++++++++++++
 sys/dev/mca/mcadevs     |    8 +-
 4 files changed, 231 insertions(+), 6 deletions(-)

diffs (288 lines):

diff -r 5dad17d12b72 -r 3d97e5b940a5 sys/arch/i386/conf/PS2
--- a/sys/arch/i386/conf/PS2    Fri Apr 20 07:10:40 2001 +0000
+++ b/sys/arch/i386/conf/PS2    Fri Apr 20 07:37:42 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: PS2,v 1.16 2001/04/19 17:17:28 jdolecek Exp $
+#      $NetBSD: PS2,v 1.17 2001/04/20 07:37:42 jdolecek Exp $
 #
 #      Sample kernel config for PS/2 with MCA bus
 #
@@ -115,6 +115,7 @@
 ep*    at mca? slot ?                  # 3Com EtherLink III (3c529)
 we*    at mca? slot ?                  # WD/SMC Ethernet
 ate*   at mca? slot ?                  # Allied Telesis AT1720
+ne*    at mca? slot ?                  # Novell NE/2 and clones
 
 # MCA ESDI controllers & disks - EXPERIMENTAL
 edc*   at mca? slot ?                  # IBM ESDI Disk Controllers
diff -r 5dad17d12b72 -r 3d97e5b940a5 sys/dev/mca/files.mca
--- a/sys/dev/mca/files.mca     Fri Apr 20 07:10:40 2001 +0000
+++ b/sys/dev/mca/files.mca     Fri Apr 20 07:37:42 2001 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: files.mca,v 1.10 2001/04/19 17:17:29 jdolecek Exp $
+# $NetBSD: files.mca,v 1.11 2001/04/20 07:37:42 jdolecek Exp $
 #
 # Config.new file and device description for machine-independent MCA code.
 # Included by ports that need it.
@@ -48,3 +48,7 @@
 device ed: disk
 attach ed at edc with ed_mca
 file   dev/mca/ed_mca.c                ed_mca          needs-flag
+
+# Novell NE2000, and clones
+attach ne at mca with ne_mca
+file   dev/mca/if_ne_mca.c             ne_mca
diff -r 5dad17d12b72 -r 3d97e5b940a5 sys/dev/mca/if_ne_mca.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/dev/mca/if_ne_mca.c   Fri Apr 20 07:37:42 2001 +0000
@@ -0,0 +1,220 @@
+/*     $NetBSD: if_ne_mca.c,v 1.1 2001/04/20 07:37:42 jdolecek Exp $   */
+
+/*-
+ * Copyright (c) 2001 The NetBSD Foundation, Inc.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Jaromir Dolecek.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *     This product includes software developed by the NetBSD
+ *     Foundation, Inc. and its contributors.
+ * 4. Neither the name of The NetBSD Foundation nor the names of its
+ *    contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS
+ * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Driver for Novell NE/2 Ethernet Adapter (and clones).
+ *
+ * According to Linux ne2 driver, Arco and Compex card should be also
+ * supported by this driver. However, NetBSD driver was only tested
+ * with the Novell adapter so far.
+ */
+
+#include <sys/param.h>
+#include <sys/systm.h>
+#include <sys/mbuf.h>
+#include <sys/errno.h>
+#include <sys/device.h>
+#include <sys/protosw.h>
+#include <sys/socket.h>
+
+#include <net/if.h>
+#include <net/if_types.h>
+#include <net/if_media.h>
+#include <net/if_ether.h>
+
+#include <machine/bus.h>
+
+#include <dev/ic/dp8390reg.h>
+#include <dev/ic/dp8390var.h>
+
+#include <dev/ic/ne2000reg.h>
+#include <dev/ic/ne2000var.h>
+
+#include <dev/ic/rtl80x9reg.h>
+#include <dev/ic/rtl80x9var.h>
+
+#include <dev/mca/mcadevs.h>
+#include <dev/mca/mcavar.h>
+
+#define        NE2_NPORTS      0x30
+
+struct ne_mca_softc {
+       struct ne2000_softc sc_ne2000;          /* real "ne2000" softc */
+
+       /* MCA-specific goo */
+       void            *sc_ih;         /* interrupt handle */
+};
+
+int    ne_mca_match __P((struct device *, struct cfdata *, void *));
+void   ne_mca_attach __P((struct device *, struct device *, void *));
+
+struct cfattach ne_mca_ca = {
+       sizeof(struct ne_mca_softc), ne_mca_match, ne_mca_attach
+};
+
+static const struct ne_mca_products {
+       u_int32_t ne_id;
+       const char *ne_name;
+} ne_mca_products[] = {
+       { MCA_PRODUCT_ARCOAE,   "Arco Electronics AE/2 Ethernet Adapter" },
+       { MCA_PRODUCT_NE2,      "Novell NE/2 Ethernet Adapter" },
+       { MCA_PRODUCT_CENET16, "Compex Inc. PS/2 ENET16-MC/P Microchannel Ad."},
+       { 0, NULL }
+};
+
+static const struct ne_mca_products *ne_mca_lookup __P((int id));
+
+static const struct ne_mca_products *
+ne_mca_lookup(int id)
+{
+       const struct ne_mca_products *np;
+
+       for(np = ne_mca_products; np->ne_name; np++) 
+               if (id == np->ne_id)
+                       return (np);
+
+       return (NULL);
+}
+
+int
+ne_mca_match(struct device *parent, struct cfdata *cf, void *aux)
+{
+       struct mca_attach_args *ma = aux;
+
+       if (ne_mca_lookup(ma->ma_id))
+               return (1);
+
+       return (0);
+}
+
+/* These values were taken from NE/2 ADF file */
+static const int ne_mca_irq[] = {
+       3, 4, 5, 9
+};
+static const int ne_mca_iobase[] = {
+       0, 0x1000, 0x2020, 0x8020, 0xa0a0, 0xb0b0, 0xc0c0, 0xc3d0
+};
+
+void
+ne_mca_attach(struct device *parent, struct device *self, void *aux)
+{
+       struct ne_mca_softc *psc = (struct ne_mca_softc *)self;
+       struct ne2000_softc *nsc = &psc->sc_ne2000;
+       struct dp8390_softc *dsc = &nsc->sc_dp8390;
+       struct mca_attach_args *ma = aux;
+       bus_space_tag_t nict;
+       bus_space_handle_t nich;
+       bus_space_tag_t asict;
+       bus_space_handle_t asich;
+       int pos2, iobase, irq;
+       const struct ne_mca_products *np;
+
+       pos2 = mca_conf_read(ma->ma_mc, ma->ma_slot, 2);
+
+       /*
+        * POS register 2: (adf pos0)
+        * 
+        * 7 6 5 4 3 2 1 0
+        *   \_/ | \___/ \__ enable: 0=adapter disabled, 1=adapter enabled
+        *    |  |     \____ I/O, Mem: 001=0x1000-0x102f 010=0x2020-0x204f
+        *    |  |             011=0x8020-0x804f 100=0xa0a0-0xa0cf
+        *    |  |             101=0xb0b0-0xb0df 110=0xc0c0-0xc0ef
+        *     \  \            111=0xc3d0-0xc3ff
+        *      \  \________ Boot Rom: 1=disabled 0=enabled
+        *       \__________ Interrupt level: 00=3 01=4 10=5 11=9
+        */
+
+       np = ne_mca_lookup(ma->ma_id);
+
+       printf(" slot %d: %s\n", ma->ma_slot + 1, np->ne_name);
+
+       iobase = ne_mca_iobase[(pos2 & 0x0e) >> 1];
+       irq = ne_mca_irq[(pos2 & 0x60) >> 5];
+       
+       nict = ma->ma_iot;
+
+       /* Map the device. */
+       if (bus_space_map(nict, iobase, NE2_NPORTS, 0, &nich)) {
+               printf("%s: can't map i/o space\n", dsc->sc_dev.dv_xname);
+               return;
+       }
+
+       asict = nict;
+       if (bus_space_subregion(nict, nich, NE2000_ASIC_OFFSET,
+           NE2000_ASIC_NPORTS, &asich)) {
+               printf("%s: can't subregion i/o space\n", dsc->sc_dev.dv_xname);
+               return;
+       }
+
+       dsc->sc_regt = nict;
+       dsc->sc_regh = nich;
+
+       nsc->sc_asict = asict;
+       nsc->sc_asich = asich;
+
+       /* This interface is always enabled. */
+       dsc->sc_enabled = 1;
+
+       dsc->sc_mediachange     = NULL;
+       dsc->sc_mediastatus     = NULL;
+       dsc->sc_media_init      = NULL;
+       dsc->init_card          = NULL;
+
+       /*
+        * This is necessary for NE/2. Hopefully the other clones also work
+        * this way.
+        */
+       nsc->sc_type = NE2000_TYPE_AX88190;
+
+       /*
+        * Do generic NE2000 attach.  This will read the station address
+        * from the EEPROM.
+        */
+       if (ne2000_attach(nsc, NULL))
+               return;
+
+       /* establish interrupt handler */
+       psc->sc_ih = mca_intr_establish(ma->ma_mc, irq, IPL_NET, dp8390_intr,
+                       dsc);
+       if (psc->sc_ih == NULL) {
+               printf("%s: couldn't establish interrupt handler\n",
+                      dsc->sc_dev.dv_xname);
+               return;
+       }
+       printf("%s: interrupting at irq %d\n", dsc->sc_dev.dv_xname, irq);
+}
diff -r 5dad17d12b72 -r 3d97e5b940a5 sys/dev/mca/mcadevs
--- a/sys/dev/mca/mcadevs       Fri Apr 20 07:10:40 2001 +0000
+++ b/sys/dev/mca/mcadevs       Fri Apr 20 07:37:42 2001 +0000
@@ -1,4 +1,4 @@
-$NetBSD: mcadevs,v 1.10 2001/04/20 07:10:12 jdolecek Exp $
+$NetBSD: mcadevs,v 1.11 2001/04/20 07:37:42 jdolecek Exp $
 
 /*-
  * Copyright (c) 2000 The NetBSD Foundation, Inc.
@@ -159,7 +159,7 @@
 product 0x62F0 "Plexus AIP2 Card"                                      [6]
 product 0x62F6 3C529_2T "3Com 3C529 Ethernet Adapter (10base2/T)"      [2]
 product 0x62F7 3C529_T "3Com 3C529 Ethernet Adapter (10baseT)"         [2]
-product 0x6354 "Arco Electronics AE/2 Ethernet Adapter"                        [11]
+product 0x6354 ARCOAE "Arco Electronics AE/2 Ethernet Adapter"         [11]
 product 0x6361 "Arnet Smartport/2 Communications Adapter"              [6]
 product 0x63B3 "CH GameCard III-Automatic/MCA Adapter"                 [5]
 product 0x63CA "HP 27246 Ethernet Adapter"                             [1]
@@ -287,9 +287,9 @@
 product 0x70B0 "Intel AboveBoard MC32"                                 [6]
 product 0x70D0 KINGRAM16 "Kingston KTM-16000/386 Memory Expansion"     [6]
 product 0x70D4 KINGRAM609 "Kingston KTM-609/16 Memory Expansion"       [4]
-product 0x70DE "COMPEX INC. PS/2 ENET16-MC/P Microchannel Ad."         [10]
+product 0x70DE CENET16 "Compex Inc. PS/2 ENET16-MC/P Microchannel Ad." [10]
 product 0x7151 "Novell NE/2-32 Ethernet Adapter"                       [6]
-product 0x7154 "Novell NE/2 Ethernet Adapter"                          [1]
+product 0x7154 NE2 "Novell NE/2 Ethernet Adapter"                      [1]
 product 0x7188 "Mountain QIC-02 Tape Adapter"                          [6]
 product 0x71D4 "Kingston DataCard 16 Adapter"                          [4]
 product 0x72F3 HYPRAM "HyperRAM MC 32/16 SIMM-MF Memory Expansion"     [7]



Home | Main Index | Thread Index | Old Index