diff options
| author | Chris Cappuccio <chris@cvs.openbsd.org> | 2000-07-31 23:39:44 +0000 |
|---|---|---|
| committer | Chris Cappuccio <chris@cvs.openbsd.org> | 2000-07-31 23:39:44 +0000 |
| commit | 18b19624fbc19b600ea1d34ff8bcd85c6d752d36 (patch) | |
| tree | 3430a3a25b144d7e6652f910358dc2d5211b08a8 /sys/dev/pci/pciide.c | |
| parent | 0eb4cfa493730045ca76968f9eb62bf17132901f (diff) | |
Fix PR 1341 -
Don't enable UDMA modes on VIA "82C586" with revision under 6
Diffstat (limited to 'sys/dev/pci/pciide.c')
| -rw-r--r-- | sys/dev/pci/pciide.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c index d8ba9d3ff53..9500559bafd 100644 --- a/sys/dev/pci/pciide.c +++ b/sys/dev/pci/pciide.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pciide.c,v 1.28 2000/07/07 19:07:21 chris Exp $ */ +/* $OpenBSD: pciide.c,v 1.29 2000/07/31 23:39:43 chris Exp $ */ /* $NetBSD: pciide.c,v 1.48 1999/11/28 20:05:18 bouyer Exp $ */ /* @@ -1815,8 +1815,10 @@ amd756_setup_channel(chp) struct ata_drive_datas *drvp; struct pciide_channel *cp = (struct pciide_channel*)chp; struct pciide_softc *sc = (struct pciide_softc *)cp->wdc_channel.wdc; +#ifndef PCIIDE_AMD756_ENABLEDMA int rev = PCI_REVISION( pci_conf_read(sc->sc_pc, sc->sc_tag, PCI_CLASS_REG)); +#endif idedma_ctl = 0; datatim_reg = pci_conf_read(sc->sc_pc, sc->sc_tag, AMD756_DATATIM); @@ -1908,8 +1910,8 @@ apollo_chip_map(sc, pa) struct pci_attach_args *pa; { struct pciide_channel *cp; - pcireg_t interface = PCI_INTERFACE(pci_conf_read(sc->sc_pc, - sc->sc_tag, PCI_CLASS_REG)); + pcireg_t interface = PCI_INTERFACE(pa->pa_class); + pcireg_t rev = PCI_REVISION(pa->pa_class); int channel; u_int32_t ideconf; bus_size_t cmdsize, ctlsize; @@ -1920,7 +1922,8 @@ apollo_chip_map(sc, pa) pciide_mapreg_dma(sc, pa); if (sc->sc_dma_ok) { sc->sc_wdcdev.cap |= WDC_CAPABILITY_DMA; - if (sc->sc_pp->ide_product == PCI_PRODUCT_VIATECH_VT82C586A_IDE) + if (sc->sc_pp->ide_product == PCI_PRODUCT_VIATECH_VT82C586A_IDE + && rev >= 6) sc->sc_wdcdev.cap |= WDC_CAPABILITY_UDMA; } sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA32 | WDC_CAPABILITY_MODE; |