From 9156026f0f0ecd328ad33c2e4be5df875f0a016d Mon Sep 17 00:00:00 2001
From: bouyer <bouyer@NetBSD.org>
Date: Sun, 16 Jan 2000 21:31:28 +0000
Subject: [PATCH] From chris@openbsd.org: "Don't enable UDMA modes for
 revisions of SiS 5513 < 0xd0 The only revisions I know which don't actually
 support UDMA are 0x09 and below.. But the only revision I know which does
 support UDMA is 0xd0 (and presumably above that)"

---
 sys/dev/pci/pciide.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/sys/dev/pci/pciide.c b/sys/dev/pci/pciide.c
index 8dcf137ecec1..012f4fcd09f1 100644
--- a/sys/dev/pci/pciide.c
+++ b/sys/dev/pci/pciide.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: pciide.c,v 1.50 1999/12/26 21:46:23 soren Exp $	*/
+/*	$NetBSD: pciide.c,v 1.51 2000/01/16 21:31:28 bouyer Exp $	*/
 
 
 /*
@@ -2135,6 +2135,7 @@ sis_chip_map(sc, pa)
 {
 	struct pciide_channel *cp;
 	int channel;
+	u_int32_t rev;
 	u_int8_t sis_ctr0 = pciide_pci_read(sc->sc_pc, sc->sc_tag, SIS_CTRL0);
 	pcireg_t interface = PCI_INTERFACE(pci_conf_read(sc->sc_pc,
 				    sc->sc_tag, PCI_CLASS_REG));
@@ -2146,14 +2147,20 @@ sis_chip_map(sc, pa)
 	    sc->sc_wdcdev.sc_dev.dv_xname);
 	pciide_mapreg_dma(sc, pa);
 	printf("\n");
-	if (sc->sc_dma_ok)
-		sc->sc_wdcdev.cap |= WDC_CAPABILITY_DMA | WDC_CAPABILITY_UDMA;
+	rev = pci_conf_read(sc->sc_pc, sc->sc_tag, PCI_CLASS_REG) & \
+	    PCI_REVISION_MASK;
+	if (sc->sc_dma_ok) {
+		sc->sc_wdcdev.cap |= WDC_CAPABILITY_DMA;
+		if (rev >= 0xd0)
+			sc->sc_wdcdev.cap |= WDC_CAPABILITY_UDMA;
+	}
 
 	sc->sc_wdcdev.cap |= WDC_CAPABILITY_DATA16 | WDC_CAPABILITY_DATA32 |
 	    WDC_CAPABILITY_MODE;
 	sc->sc_wdcdev.PIO_cap = 4;
 	sc->sc_wdcdev.DMA_cap = 2;
-	sc->sc_wdcdev.UDMA_cap = 2;
+	if (sc->sc_wdcdev.cap & WDC_CAPABILITY_UDMA)
+		sc->sc_wdcdev.UDMA_cap = 2;
 	sc->sc_wdcdev.set_modes = sis_setup_channel;
 
 	sc->sc_wdcdev.channels = sc->wdc_chanarray;