diff options
| author | Justin T. Gibbs <gibbs@FreeBSD.org> | 2000-01-08 00:32:08 +0000 |
|---|---|---|
| committer | Justin T. Gibbs <gibbs@FreeBSD.org> | 2000-01-08 00:32:08 +0000 |
| commit | c971c124a12ace0044767f1a5b3baee75bc79d9d (patch) | |
| tree | c67f41b685c7c27e29e2edfd23ae35dcde788ce3 | |
| parent | ba099011306acc5c21723708ac8b17e551a44703 (diff) | |
Notes
| -rw-r--r-- | sys/dev/aic7xxx/ahc_pci.c | 12 | ||||
| -rw-r--r-- | sys/pci/ahc_pci.c | 12 |
2 files changed, 18 insertions, 6 deletions
diff --git a/sys/dev/aic7xxx/ahc_pci.c b/sys/dev/aic7xxx/ahc_pci.c index 8ab16527e3e7..f803bb5334c8 100644 --- a/sys/dev/aic7xxx/ahc_pci.c +++ b/sys/dev/aic7xxx/ahc_pci.c @@ -868,8 +868,10 @@ ahc_ext_scbram_present(struct ahc_softc *ahc) if ((ahc->features & AHC_ULTRA2) != 0) ramps = (ahc_inb(ahc, DSCOMMAND0) & RAMPS) != 0; - else + else if ((ahc->chip & AHC_CHIPID_MASK) >= AHC_AIC7870) ramps = (devconfig & RAMPSM) != 0; + else + ramps = 0; if (ramps && single_user) return (1); @@ -898,9 +900,9 @@ ahc_ext_scbram_config(struct ahc_softc *ahc, int enable, int pcheck, int fast) dscommand0 = ahc_inb(ahc, DSCOMMAND0); if (enable) - dscommand0 |= INTSCBRAMSEL; - else dscommand0 &= ~INTSCBRAMSEL; + else + dscommand0 |= INTSCBRAMSEL; ahc_outb(ahc, DSCOMMAND0, dscommand0); } else { if (fast) @@ -958,6 +960,8 @@ ahc_probe_ext_scbram(struct ahc_softc *ahc) || (ahc_inb(ahc, ERROR) & MPARERR) == 0) pcheck = TRUE; + ahc_outb(ahc, CLRINT, CLRPARERR); + /* Now see if we can do fast timing */ ahc_ext_scbram_config(ahc, enable, pcheck, /*fast*/TRUE); test_num_scbs = ahc_probe_scbs(ahc); @@ -965,7 +969,9 @@ ahc_probe_ext_scbram(struct ahc_softc *ahc) && ((ahc_inb(ahc, INTSTAT) & BRKADRINT) == 0 || (ahc_inb(ahc, ERROR) & MPARERR) == 0)) fast = TRUE; + done: + ahc_outb(ahc, CLRINT, CLRPARERR); if (bootverbose && enable) { printf("%s: External SRAM, %dns access%s\n", ahc_name(ahc), fast ? 10 : 20, diff --git a/sys/pci/ahc_pci.c b/sys/pci/ahc_pci.c index 8ab16527e3e7..f803bb5334c8 100644 --- a/sys/pci/ahc_pci.c +++ b/sys/pci/ahc_pci.c @@ -868,8 +868,10 @@ ahc_ext_scbram_present(struct ahc_softc *ahc) if ((ahc->features & AHC_ULTRA2) != 0) ramps = (ahc_inb(ahc, DSCOMMAND0) & RAMPS) != 0; - else + else if ((ahc->chip & AHC_CHIPID_MASK) >= AHC_AIC7870) ramps = (devconfig & RAMPSM) != 0; + else + ramps = 0; if (ramps && single_user) return (1); @@ -898,9 +900,9 @@ ahc_ext_scbram_config(struct ahc_softc *ahc, int enable, int pcheck, int fast) dscommand0 = ahc_inb(ahc, DSCOMMAND0); if (enable) - dscommand0 |= INTSCBRAMSEL; - else dscommand0 &= ~INTSCBRAMSEL; + else + dscommand0 |= INTSCBRAMSEL; ahc_outb(ahc, DSCOMMAND0, dscommand0); } else { if (fast) @@ -958,6 +960,8 @@ ahc_probe_ext_scbram(struct ahc_softc *ahc) || (ahc_inb(ahc, ERROR) & MPARERR) == 0) pcheck = TRUE; + ahc_outb(ahc, CLRINT, CLRPARERR); + /* Now see if we can do fast timing */ ahc_ext_scbram_config(ahc, enable, pcheck, /*fast*/TRUE); test_num_scbs = ahc_probe_scbs(ahc); @@ -965,7 +969,9 @@ ahc_probe_ext_scbram(struct ahc_softc *ahc) && ((ahc_inb(ahc, INTSTAT) & BRKADRINT) == 0 || (ahc_inb(ahc, ERROR) & MPARERR) == 0)) fast = TRUE; + done: + ahc_outb(ahc, CLRINT, CLRPARERR); if (bootverbose && enable) { printf("%s: External SRAM, %dns access%s\n", ahc_name(ahc), fast ? 10 : 20, |