[src/trunk]: src Back out rev 1.7 of i82365_isa.c; 0x300-0x3ff, or even 0x330...

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

details:   https://anonhg.NetBSD.org/src/rev/b421abf960aa
branches:  trunk
changeset: 485958:b421abf960aa
user:      jhawk <jhawk%NetBSD.org@localhost>
date:      Tue May 09 17:59:39 2000 +0000

description:
Back out rev 1.7 of i82365_isa.c; 0x300-0x3ff, or even 0x330-0x3ff
is not a reasonable place to allocate 12-bit pcmcia iospace.
It seems to cause conflicts on a large number of modern laptops,
necesitating hand-patching of the kernel (mostly due to
video devices in the upper range of that space).

This will presumably cause problems on the NEC Versa 6030X,
however that appears to be a vastly less common case than
the laptops that are inconvenienced by the current state.

12-bit iospace now uses 0x400-0xfff.

diffstat:

 share/man/man4/pcmcia.4      |  22 +++++++++-------------
 sys/dev/isa/i82365_isasubr.c |  21 +--------------------
 2 files changed, 10 insertions(+), 33 deletions(-)

diffs (86 lines):

diff -r 5dfbdefcb694 -r b421abf960aa share/man/man4/pcmcia.4
--- a/share/man/man4/pcmcia.4   Tue May 09 17:05:52 2000 +0000
+++ b/share/man/man4/pcmcia.4   Tue May 09 17:59:39 2000 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pcmcia.4,v 1.15 2000/04/13 19:40:03 jhawk Exp $
+.\" $NetBSD: pcmcia.4,v 1.16 2000/05/09 17:59:39 jhawk Exp $
 .\"
 .\" Copyright (c) 1999 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -143,16 +143,12 @@
 .Nx 
 probes the pcmcia IO bus width and uses that information to decide
 where to map PCMCIA IO space. For 10-bit wide cards, 0x300-0x3ff is
-used, and this is satisfactory. For 12-bit wide cards, however,
-it would nice to use 0x400-0xfff, however this causes some problems
-for some specific PCMCIA devices, as well as some specific laptops;
-consequently, 0x300-0x3ff is used.
+used. For 12-bit wide cards, 0x400-0x4ff is used.
 .Pp
-Unfortunately, the choice of 0x300-0x3ff causes problems as well.
-In particular, a number of video devices are mapped in that range,
-and may conflict. In the event that pcmcia devices are mapped
-in 0x300 and appear to be nonfunctional, remapping to 0x400-0xfff
-may be appropriate; consult 
+Neither choice is perfect. In the 12-bit case, 0x400 appears to work
+on substantially more devices than 0x300. In the event that pcmcia
+devices are mapped in 0x400-0xfff and appear to be nonfunctional,
+remapping to 0x300-0x3ff may be appropriate; consult
 .Cd options PCIC_ISA_ALLOC_IOBASE
 and
 .Cd options PCIC_ISA_ALLOC_IOSIZE
@@ -161,7 +157,7 @@
 Example:
 .Bd -literal -offset indent
 # Avoid pcmcia bus space conflicts with the default io space
-# allocation on 12-bit wide busses (base 0x300 size 0xff).
-options PCIC_ISA_ALLOC_IOBASE=0x400
-options PCIC_ISA_ALLOC_IOSIZE=0xbff
+# allocation on 12-bit wide busses (base 0x400 size 0xfff).
+options PCIC_ISA_ALLOC_IOBASE=0x300
+options PCIC_ISA_ALLOC_IOSIZE=0x0ff
 .Ed
diff -r 5dfbdefcb694 -r b421abf960aa sys/dev/isa/i82365_isasubr.c
--- a/sys/dev/isa/i82365_isasubr.c      Tue May 09 17:05:52 2000 +0000
+++ b/sys/dev/isa/i82365_isasubr.c      Tue May 09 17:59:39 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i82365_isasubr.c,v 1.20 2000/02/28 05:30:19 enami Exp $        */
+/*     $NetBSD: i82365_isasubr.c,v 1.21 2000/05/09 17:59:39 jhawk Exp $        */
 
 #define        PCICISADEBUG
 
@@ -429,11 +429,6 @@
        bus_space_free(iot, ioh_high, length);
 
        /*
-        * XXX mycroft recommends I/O space range 0x400-0xfff .  I should put
-        * this in a header somewhere
-        */
-
-       /*
         * XXX some hardware doesn't seem to grok addresses in 0x400 range--
         * apparently missing a bit or more of address lines. (e.g.
         * CIRRUS_PD672X with Linksys EthernetCard ne2000 clone in TI
@@ -447,22 +442,8 @@
                sc->iobase = 0x300;
                sc->iosize = 0x0ff;
        } else {
-#if 0
-               /*
-                * This is what we'd like to use, but...
-                */
                sc->iobase = 0x400;
                sc->iosize = 0xbff;
-#else
-               /*
-                * ...the above bus width probe doesn't always work.
-                * So, experimentation has shown the following range
-                * to not lose on systems that 0x300-0x3ff loses on
-                * (e.g. the NEC Versa 6030X).
-                */
-               sc->iobase = 0x330;
-               sc->iosize = 0x0cf;
-#endif
        }
 
        DPRINTF(("%s: bus_space_alloc range 0x%04lx-0x%04lx (probed)\n",