From 1b0d314332f9dade6e41665da4b1d0ddc1ad5af3 Mon Sep 17 00:00:00 2001 From: Joerg Wunsch Date: Wed, 12 Mar 1997 17:41:35 +0000 Subject: [PATCH] Since i don't see that anybody is implementing a more correct EISA probing anytime soon, make EISA_SLOTS a fully supported option. It's required for the HP NetServer LC series machines. Next stop: make dset(8) aware of it as well. --- sys/conf/NOTES | 10 +++++++++- sys/conf/options.i386 | 4 +++- sys/dev/eisa/eisaconf.h | 6 +++++- sys/i386/conf/LINT | 10 +++++++++- sys/i386/conf/NOTES | 10 +++++++++- sys/i386/conf/options.i386 | 4 +++- sys/i386/eisa/eisaconf.h | 6 +++++- 7 files changed, 43 insertions(+), 7 deletions(-) diff --git a/sys/conf/NOTES b/sys/conf/NOTES index 79be523d62d1..86d1021515cb 100644 --- a/sys/conf/NOTES +++ b/sys/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id$ +# $Id: LINT,v 1.314 1997/02/22 09:31:37 peter Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -914,6 +914,14 @@ options AHC_SCBPAGING_ENABLE # default. options AHC_ALLOW_MEMIO +# By default, only 10 EISA slots are probed, since the slot numbers +# above clash with the configuration address space of the PCI subsystem, +# and the EISA probe is not very smart about this. This is sufficient +# for most machines, but in particular the HP NetServer LC series comes +# with an onboard AIC7770 dual-channel SCSI controller on EISA slot #11, +# thus you need to bump this figure to 12 for them. +options "EISA_SLOTS=12" + # # PCI devices: # diff --git a/sys/conf/options.i386 b/sys/conf/options.i386 index d945308a8e76..eba1a8737362 100644 --- a/sys/conf/options.i386 +++ b/sys/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.35 1997/02/22 09:31:46 peter Exp $ +# $Id: options.i386,v 1.36 1997/02/28 16:56:06 bde Exp $ BOUNCEPAGES opt_bounce.h USER_LDT MATH_EMULATE opt_math_emulate.h @@ -62,3 +62,5 @@ ATAPI_STATIC opt_atapi.h USERCONFIG opt_userconfig.h VISUAL_USERCONFIG opt_userconfig.h USERCONFIG_BOOT opt_userconfig.h + +EISA_SLOTS opt_eisa.h diff --git a/sys/dev/eisa/eisaconf.h b/sys/dev/eisa/eisaconf.h index 1f2cca38a2ac..a9921136a58a 100644 --- a/sys/dev/eisa/eisaconf.h +++ b/sys/dev/eisa/eisaconf.h @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: eisaconf.h,v 1.14 1997/02/22 09:32:03 peter Exp $ */ #ifndef _I386_EISA_EISACONF_H_ @@ -36,7 +36,11 @@ #include +#include "opt_eisa.h" + +#ifndef EISA_SLOTS #define EISA_SLOTS 10 /* PCI clashes with higher ones.. fix later */ +#endif #define EISA_SLOT_SIZE 0x1000 #define EISA_MFCTR_CHAR0(ID) (char)(((ID>>26) & 0x1F) | '@') /* Bits 26-30 */ diff --git a/sys/i386/conf/LINT b/sys/i386/conf/LINT index 79be523d62d1..86d1021515cb 100644 --- a/sys/i386/conf/LINT +++ b/sys/i386/conf/LINT @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id$ +# $Id: LINT,v 1.314 1997/02/22 09:31:37 peter Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -914,6 +914,14 @@ options AHC_SCBPAGING_ENABLE # default. options AHC_ALLOW_MEMIO +# By default, only 10 EISA slots are probed, since the slot numbers +# above clash with the configuration address space of the PCI subsystem, +# and the EISA probe is not very smart about this. This is sufficient +# for most machines, but in particular the HP NetServer LC series comes +# with an onboard AIC7770 dual-channel SCSI controller on EISA slot #11, +# thus you need to bump this figure to 12 for them. +options "EISA_SLOTS=12" + # # PCI devices: # diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 79be523d62d1..86d1021515cb 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -2,7 +2,7 @@ # LINT -- config file for checking all the sources, tries to pull in # as much of the source tree as it can. # -# $Id$ +# $Id: LINT,v 1.314 1997/02/22 09:31:37 peter Exp $ # # NB: You probably don't want to try running a kernel built from this # file. Instead, you should start from GENERIC, and add options from @@ -914,6 +914,14 @@ options AHC_SCBPAGING_ENABLE # default. options AHC_ALLOW_MEMIO +# By default, only 10 EISA slots are probed, since the slot numbers +# above clash with the configuration address space of the PCI subsystem, +# and the EISA probe is not very smart about this. This is sufficient +# for most machines, but in particular the HP NetServer LC series comes +# with an onboard AIC7770 dual-channel SCSI controller on EISA slot #11, +# thus you need to bump this figure to 12 for them. +options "EISA_SLOTS=12" + # # PCI devices: # diff --git a/sys/i386/conf/options.i386 b/sys/i386/conf/options.i386 index d945308a8e76..eba1a8737362 100644 --- a/sys/i386/conf/options.i386 +++ b/sys/i386/conf/options.i386 @@ -1,4 +1,4 @@ -# $Id: options.i386,v 1.35 1997/02/22 09:31:46 peter Exp $ +# $Id: options.i386,v 1.36 1997/02/28 16:56:06 bde Exp $ BOUNCEPAGES opt_bounce.h USER_LDT MATH_EMULATE opt_math_emulate.h @@ -62,3 +62,5 @@ ATAPI_STATIC opt_atapi.h USERCONFIG opt_userconfig.h VISUAL_USERCONFIG opt_userconfig.h USERCONFIG_BOOT opt_userconfig.h + +EISA_SLOTS opt_eisa.h diff --git a/sys/i386/eisa/eisaconf.h b/sys/i386/eisa/eisaconf.h index 1f2cca38a2ac..a9921136a58a 100644 --- a/sys/i386/eisa/eisaconf.h +++ b/sys/i386/eisa/eisaconf.h @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id$ + * $Id: eisaconf.h,v 1.14 1997/02/22 09:32:03 peter Exp $ */ #ifndef _I386_EISA_EISACONF_H_ @@ -36,7 +36,11 @@ #include +#include "opt_eisa.h" + +#ifndef EISA_SLOTS #define EISA_SLOTS 10 /* PCI clashes with higher ones.. fix later */ +#endif #define EISA_SLOT_SIZE 0x1000 #define EISA_MFCTR_CHAR0(ID) (char)(((ID>>26) & 0x1F) | '@') /* Bits 26-30 */