[src/netbsd-1-4]: src/sys/dev/eisa Pull up revision 1.22 (requested by martin):

[he <he%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b29ca1e1b288
branches:  netbsd-1-4
changeset: 470589:b29ca1e1b288
user:      he <he%NetBSD.org@localhost>
date:      Thu May 11 09:56:15 2000 +0000

description:
Pull up revision 1.22 (requested by martin):
  Only allocate the I/O space required.  This permits an ISDN4BSD kernel
  with e.g. an AVM Fritz! card to work with an ep0 card in EISA slot 1.
  Fixes PR#5279.

diffstat:

 sys/dev/eisa/if_ep_eisa.c |  41 +++++++++++++++++++++++++++++++++--------
 1 files changed, 33 insertions(+), 8 deletions(-)

diffs (88 lines):

diff -r aca4aa0cf6fb -r b29ca1e1b288 sys/dev/eisa/if_ep_eisa.c
--- a/sys/dev/eisa/if_ep_eisa.c Thu May 11 09:43:47 2000 +0000
+++ b/sys/dev/eisa/if_ep_eisa.c Thu May 11 09:56:15 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: if_ep_eisa.c,v 1.19.6.1 1999/08/22 17:07:16 he Exp $   */
+/*     $NetBSD: if_ep_eisa.c,v 1.19.6.2 2000/05/11 09:56:15 he Exp $   */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -126,7 +126,19 @@
 };
 
 /* XXX move these somewhere else */
-#define EISA_CONTROL   0x0c84
+/* While attaching we need a few special EISA registers of the card,
+   these are mapped at slotbase+EP_EISA_CFG_BASE with len EP_EISA_CFG_SIZE */
+#define EP_EISA_CFG_BASE       0x0c80
+#define        EP_EISA_CFG_CONTROL     0x0004  /* 1 byte */
+#define        EP_EISA_CFG_RESOURCE    0x0008  /* 2 byte */
+#define        EP_EISA_CFG_SIZE        0x000a
+
+/* The generic driver backend only needs access to the standard ports,
+   mapped at the beginning of the eisa slot space */
+#define        EP_IOPORT_OFFSET        0x0000
+#define        EP_IOPORT_SIZE          0x0020
+
+/* Bits for the eisa control register */
 #define EISA_RESET     0x04
 #define EISA_ERROR     0x02
 #define EISA_ENABLE    0x01
@@ -203,7 +215,7 @@
        struct ep_softc *sc = (void *)self;
        struct eisa_attach_args *ea = aux;
        bus_space_tag_t iot = ea->ea_iot;
-       bus_space_handle_t ioh;
+       bus_space_handle_t ioh, ioh_cfg;
        eisa_chipset_tag_t ec = ea->ea_ec;
        eisa_intr_handle_t ih;
        const char *intrstr;
@@ -211,8 +223,13 @@
        u_int irq;
 
        /* Map i/o space. */
-       if (bus_space_map(iot, EISA_SLOT_ADDR(ea->ea_slot),
-           EISA_SLOT_SIZE, 0, &ioh)) {
+       if (bus_space_map(iot, EISA_SLOT_ADDR(ea->ea_slot) + EP_EISA_CFG_BASE,
+           EP_EISA_CFG_SIZE, 0, &ioh_cfg)) {
+               printf("\n");
+               panic("ep_eisa_attach: can't map eisa cfg i/o space");
+       }
+       if (bus_space_map(iot, EISA_SLOT_ADDR(ea->ea_slot) + EP_IOPORT_OFFSET,
+           EP_IOPORT_SIZE, 0, &ioh)) {
                printf("\n");
                panic("ep_eisa_attach: can't map i/o space");
        }
@@ -221,14 +238,15 @@
        sc->sc_iot = iot;
 
        /* Reset card. */
-       bus_space_write_1(iot, ioh, EISA_CONTROL, EISA_ENABLE | EISA_RESET);
+       bus_space_write_1(iot, ioh_cfg, EP_EISA_CFG_CONTROL, 
+           EISA_ENABLE | EISA_RESET);
        delay(10);
-       bus_space_write_1(iot, ioh, EISA_CONTROL, EISA_ENABLE);
+       bus_space_write_1(iot, ioh_cfg, EP_EISA_CFG_CONTROL, EISA_ENABLE);
        /* Wait for reset? */
        delay(1000);
 
        /* Read the IRQ from the card. */
-       irq = bus_space_read_2(iot, ioh, ELINK_W0_RESOURCE_CFG) >> 12;
+       irq = bus_space_read_2(iot, ioh_cfg, EP_EISA_CFG_RESOURCE) >> 12;
 
        eep = ep_eisa_lookup(ea);
        if (eep == NULL) {
@@ -236,6 +254,13 @@
                panic("ep_eisa_attach: impossible");
        }
 
+       /* we don't need access to the config registers any more, but
+          noone else should be able to map this space, so keep it
+          reserved? */
+#if 0
+       bus_space_unmap(iot, ioh_cfg, EP_EISA_CFG_SIZE);
+#endif
+
        printf(": 3Com %s\n", eep->eep_name);
 
        sc->enable = NULL;