d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Since there have been so many reports of the Memory Mapped I/O to the

Browse Source 
aic7xxx cards failing on certain motherboards, reverse the logic used to
control this feature.  AHC_FORCE_PIO is replaced with AHC_ALLOW_MEMIO.
GENERIC no longer needs to specify the AHC_FORCE_PIO option since this is
the default.
This commit is contained in:
Justin T. Gibbs 1996-11-16 01:09:20 +00:00
parent bde5245890
commit 11b5ea7239
7 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sys/amd64/conf/GENERIC
View File

@ -11,7 +11,7 @@
# device lines is present in the ./LINT configuration file. If you are # device lines is present in the ./LINT configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in LINT. # in doubt as to the purpose or necessity of a line, check first in LINT.
# #
# $Id: GENERIC,v 1.76 1996/09/11 19:53:28 phk Exp $ # $Id: GENERIC,v 1.77 1996/10/28 06:05:56 gibbs Exp $
machine "i386" machine "i386"
cpu "I386_CPU" cpu "I386_CPU"
@ -64,9 +64,6 @@ device wcd0 #IDE CD-ROM
controller ncr0 controller ncr0
controller ahb0 controller ahb0
controller ahc0 controller ahc0
options "AHC_FORCE_PIO" # Some motherboards choke on MemI/O,
# so use PIO in the ahc driver in the
# generic kernel.
controller bt0 at isa? port "IO_BT0" bio irq ? vector bt_isa_intr controller bt0 at isa? port "IO_BT0" bio irq ? vector bt_isa_intr
controller uha0 at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr controller uha0 at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr

10
sys/conf/NOTES
View File

@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in # LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can. # as much of the source tree as it can.
# #
# $Id: LINT,v 1.293 1996/11/13 22:50:32 ache Exp $ # $Id: LINT,v 1.294 1996/11/15 18:36:21 jkh Exp $
# #
# NB: You probably don't want to try running a kernel built from this # 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 # file. Instead, you should start from GENERIC, and add options from
@ -903,10 +903,10 @@ options AHC_TAGENABLE
options AHC_SCBPAGING_ENABLE options AHC_SCBPAGING_ENABLE
# The aic7xxx driver will attempt to use memory mapped I/O for all PCI # The aic7xxx driver will attempt to use memory mapped I/O for all PCI
# controllers that have it configured. Unfortunately, this doesn't work # controllers that have it configured only if this option is set. Unfortunately,
# on some motherboards. This option will force the driver to use programmed # this doesn't work on some motherboards, which prevents it from being the
# I/O instead. # default.
options AHC_FORCE_PIO options AHC_ALLOW_MEMIO
# #
# PCI devices: # PCI devices:

4
sys/conf/options.i386
View File

@ -1,4 +1,4 @@
# $Id: options.i386,v 1.29 1996/11/11 20:38:29 bde Exp $ # $Id: options.i386,v 1.30 1996/11/11 22:04:31 nate Exp $
BOUNCEPAGES opt_bounce.h BOUNCEPAGES opt_bounce.h
USER_LDT USER_LDT
MATH_EMULATE opt_math_emulate.h MATH_EMULATE opt_math_emulate.h
@ -30,7 +30,7 @@ XSERVER opt_pcvt.h
AHC_TAGENABLE opt_aic7xxx.h AHC_TAGENABLE opt_aic7xxx.h
AHC_SCBPAGING_ENABLE opt_aic7xxx.h AHC_SCBPAGING_ENABLE opt_aic7xxx.h
AHC_FORCE_PIO opt_aic7xxx.h AHC_ALLOW_MEMIO opt_aic7xxx.h
AHC_SHARE_SCBS opt_aic7xxx.h AHC_SHARE_SCBS opt_aic7xxx.h
CLK_CALIBRATION_LOOP opt_clock.h CLK_CALIBRATION_LOOP opt_clock.h

5
sys/i386/conf/GENERIC
View File

@ -11,7 +11,7 @@
# device lines is present in the ./LINT configuration file. If you are # device lines is present in the ./LINT configuration file. If you are
# in doubt as to the purpose or necessity of a line, check first in LINT. # in doubt as to the purpose or necessity of a line, check first in LINT.
# #
# $Id: GENERIC,v 1.76 1996/09/11 19:53:28 phk Exp $ # $Id: GENERIC,v 1.77 1996/10/28 06:05:56 gibbs Exp $
machine "i386" machine "i386"
cpu "I386_CPU" cpu "I386_CPU"
@ -64,9 +64,6 @@ device wcd0 #IDE CD-ROM
controller ncr0 controller ncr0
controller ahb0 controller ahb0
controller ahc0 controller ahc0
options "AHC_FORCE_PIO" # Some motherboards choke on MemI/O,
# so use PIO in the ahc driver in the
# generic kernel.
controller bt0 at isa? port "IO_BT0" bio irq ? vector bt_isa_intr controller bt0 at isa? port "IO_BT0" bio irq ? vector bt_isa_intr
controller uha0 at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr controller uha0 at isa? port "IO_UHA0" bio irq ? drq 5 vector uhaintr

10
sys/i386/conf/LINT
View File

@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in # LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can. # as much of the source tree as it can.
# #
# $Id: LINT,v 1.293 1996/11/13 22:50:32 ache Exp $ # $Id: LINT,v 1.294 1996/11/15 18:36:21 jkh Exp $
# #
# NB: You probably don't want to try running a kernel built from this # 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 # file. Instead, you should start from GENERIC, and add options from
@ -903,10 +903,10 @@ options AHC_TAGENABLE
options AHC_SCBPAGING_ENABLE options AHC_SCBPAGING_ENABLE
# The aic7xxx driver will attempt to use memory mapped I/O for all PCI # The aic7xxx driver will attempt to use memory mapped I/O for all PCI
# controllers that have it configured. Unfortunately, this doesn't work # controllers that have it configured only if this option is set. Unfortunately,
# on some motherboards. This option will force the driver to use programmed # this doesn't work on some motherboards, which prevents it from being the
# I/O instead. # default.
options AHC_FORCE_PIO options AHC_ALLOW_MEMIO
# #
# PCI devices: # PCI devices:

10
sys/i386/conf/NOTES
View File

@ -2,7 +2,7 @@
# LINT -- config file for checking all the sources, tries to pull in # LINT -- config file for checking all the sources, tries to pull in
# as much of the source tree as it can. # as much of the source tree as it can.
# #
# $Id: LINT,v 1.293 1996/11/13 22:50:32 ache Exp $ # $Id: LINT,v 1.294 1996/11/15 18:36:21 jkh Exp $
# #
# NB: You probably don't want to try running a kernel built from this # 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 # file. Instead, you should start from GENERIC, and add options from
@ -903,10 +903,10 @@ options AHC_TAGENABLE
options AHC_SCBPAGING_ENABLE options AHC_SCBPAGING_ENABLE
# The aic7xxx driver will attempt to use memory mapped I/O for all PCI # The aic7xxx driver will attempt to use memory mapped I/O for all PCI
# controllers that have it configured. Unfortunately, this doesn't work # controllers that have it configured only if this option is set. Unfortunately,
# on some motherboards. This option will force the driver to use programmed # this doesn't work on some motherboards, which prevents it from being the
# I/O instead. # default.
options AHC_FORCE_PIO options AHC_ALLOW_MEMIO
# #
# PCI devices: # PCI devices:

4
sys/i386/conf/options.i386
View File

@ -1,4 +1,4 @@
# $Id: options.i386,v 1.29 1996/11/11 20:38:29 bde Exp $ # $Id: options.i386,v 1.30 1996/11/11 22:04:31 nate Exp $
BOUNCEPAGES opt_bounce.h BOUNCEPAGES opt_bounce.h
USER_LDT USER_LDT
MATH_EMULATE opt_math_emulate.h MATH_EMULATE opt_math_emulate.h
@ -30,7 +30,7 @@ XSERVER opt_pcvt.h
AHC_TAGENABLE opt_aic7xxx.h AHC_TAGENABLE opt_aic7xxx.h
AHC_SCBPAGING_ENABLE opt_aic7xxx.h AHC_SCBPAGING_ENABLE opt_aic7xxx.h
AHC_FORCE_PIO opt_aic7xxx.h AHC_ALLOW_MEMIO opt_aic7xxx.h
AHC_SHARE_SCBS opt_aic7xxx.h AHC_SHARE_SCBS opt_aic7xxx.h
CLK_CALIBRATION_LOOP opt_clock.h CLK_CALIBRATION_LOOP opt_clock.h