[src/trunk]: src/sys/dev/pci * Enable Ultra133 on the NVIDIA nForce 2.

[thorpej <thorpej%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/91a85b1df388
branches:  trunk
changeset: 542246:91a85b1df388
user:      thorpej <thorpej%NetBSD.org@localhost>
date:      Fri Jan 24 05:51:04 2003 +0000

description:
* Enable Ultra133 on the NVIDIA nForce 2.
* Make sure to test for PCI_VENDOR_AMD before testing for any
  AMD products.

diffstat:

 sys/dev/pci/pciide.c         |  9 +++++----
 sys/dev/pci/pciide_amd_reg.h |  4 ++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diffs (52 lines):

diff -r d495dd06e6af -r 91a85b1df388 sys/dev/pci/pciide.c
--- a/sys/dev/pci/pciide.c      Fri Jan 24 05:34:25 2003 +0000
+++ b/sys/dev/pci/pciide.c      Fri Jan 24 05:51:04 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide.c,v 1.177 2003/01/24 04:53:13 thorpej Exp $     */
+/*     $NetBSD: pciide.c,v 1.178 2003/01/24 05:51:04 thorpej Exp $     */
 
 
 /*
@@ -76,7 +76,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide.c,v 1.177 2003/01/24 04:53:13 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide.c,v 1.178 2003/01/24 05:51:04 thorpej Exp $");
 
 #ifndef WDCDEBUG
 #define WDCDEBUG
@@ -2056,7 +2056,7 @@
                        sc->sc_wdcdev.UDMA_cap = 5;
                        break;
                case PCI_PRODUCT_NVIDIA_NFORCE2_ATA133:
-                       sc->sc_wdcdev.UDMA_cap = 5;     /* XXX */
+                       sc->sc_wdcdev.UDMA_cap = 6;
                        break;
                }
                sc->sc_amd_regbase = AMD7X6_NVIDIA_REGBASE;
@@ -2154,7 +2154,8 @@
                         * PCIIDE_AMD756_ENABLEDMA. It causes a hard hang if
                         * triggered. 
                         */
-                       if (sc->sc_pp->ide_product ==
+                       if (sc->sc_pci_vendor == PCI_VENDOR_AMD &&
+                           sc->sc_pp->ide_product ==
                              PCI_PRODUCT_AMD_PBC756_IDE &&
                            AMD756_CHIPREV_DISABLEDMA(rev)) {
                                printf("%s:%d:%d: multi-word DMA disabled due "
diff -r d495dd06e6af -r 91a85b1df388 sys/dev/pci/pciide_amd_reg.h
--- a/sys/dev/pci/pciide_amd_reg.h      Fri Jan 24 05:34:25 2003 +0000
+++ b/sys/dev/pci/pciide_amd_reg.h      Fri Jan 24 05:51:04 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pciide_amd_reg.h,v 1.5 2003/01/24 04:53:14 thorpej Exp $       */
+/*     $NetBSD: pciide_amd_reg.h,v 1.6 2003/01/24 05:51:04 thorpej Exp $       */
 
 /*
  * Copyright (c) 2000 David Sainty.
@@ -87,4 +87,4 @@
        (((1 - (channel)) << 4) + ((1 - (drive)) << 3)))
 
 static const int8_t amd7x6_udma_tim[] __attribute__((__unused__)) =
-    {0x02, 0x01, 0x00, 0x04, 0x05, 0x06};
+    {0x02, 0x01, 0x00, 0x04, 0x05, 0x06, 0x07};