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

Be smarter about enabling memory mapped I/O. The AHC_ALLOW_MEMIO option

Browse Source 
should not be required anymore.

Turn on ULTRA for cards that don't have a BIOS or SEEPROM.
This commit is contained in:
Justin T. Gibbs 1997-01-22 18:07:15 +00:00
parent 71318ca3ea
commit 5ea6dc36ff
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=21949
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sys/pci/aic7870.c
View File

@ -321,6 +321,7 @@ ahc_pci_attach(parent, self, aux)
const char *intrstr;
#endif
u_int32_t id;
u_int32_t command;
struct scb_data *shared_scb_data;
int opri;
ahc_type ahc_t = AHC_NONE;
@ -336,12 +337,12 @@ ahc_pci_attach(parent, self, aux)
paddr = NULL;
#if defined(__FreeBSD__)
io_port = 0;
#ifdef AHC_ALLOW_MEMIO
if (pci_map_mem(config_id, PCI_BASEADR1, &vaddr, &paddr) == 0)
#endif
if (pci_map_port(config_id, PCI_BASEADR0, &io_port) == 0)
command = pci_conf_read(config_id, PCI_COMMAND_STATUS_REG);
if ((command & PCI_COMMAND_MEM_ENABLE) == 0
|| (pci_map_mem(config_id, PCI_BASEADR1, &vaddr, &paddr)) == 0)
if ((command & PCI_COMMAND_IO_ENABLE) == 0
|| (pci_map_port(config_id, PCI_BASEADR0, &io_port)) == 0)
return;
#elif defined(__NetBSD__)
/* XXX Memory mapped I/O?? */
if (bus_io_map(pa->pa_bc, iobase, iosize, &ioh))
@ -618,7 +619,8 @@ ahc_pci_attach(parent, self, aux)
/* In case we are a wide card */
ahc_outb(ahc, SCSICONF + 1, our_id);
if (!ultra_enb || (ahc->flags & AHC_USEDEFAULTS)) {
if (ultra_enb == 0
&& (ahc->flags & AHC_USEDEFAULTS) == 0) {
/*
* If there wasn't a BIOS or the board
* wasn't in this mode to begin with,