[src/netbsd-1-5]: src/sys/arch/macppc/macppc Pullup 1.7 [tsubai, mycroft]:

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

details:   https://anonhg.NetBSD.org/src/rev/8ed1972976f2
branches:  netbsd-1-5
changeset: 490080:8ed1972976f2
user:      tv <tv%NetBSD.org@localhost>
date:      Wed Nov 01 16:26:36 2000 +0000

description:
Pullup 1.7 [tsubai, mycroft]:
Don't try to change subordinate bus number if pchb != grackle (for now).

diffstat:

 sys/arch/macppc/macppc/rbus_machdep.c |  14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diffs (28 lines):

diff -r a669186c02b2 -r 8ed1972976f2 sys/arch/macppc/macppc/rbus_machdep.c
--- a/sys/arch/macppc/macppc/rbus_machdep.c     Wed Nov 01 16:26:07 2000 +0000
+++ b/sys/arch/macppc/macppc/rbus_machdep.c     Wed Nov 01 16:26:36 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rbus_machdep.c,v 1.4 2000/02/03 19:27:45 tsubai Exp $  */
+/*     $NetBSD: rbus_machdep.c,v 1.4.4.1 2000/11/01 16:26:36 tv Exp $  */
 
 /*
  * Copyright (c) 1999
@@ -147,10 +147,14 @@
                x |= 0x02;
                pci_conf_write(pc, tag, 0x8c, x);
 
-               /* Set Subordinate bus number to 1 */
                tag = pci_make_tag(pc, 0, 0, 0);
-               x = pci_conf_read(pc, tag, 0x40);
-               x |= 1 << 8;
-               pci_conf_write(pc, tag, 0x40, x);
+               x = pci_conf_read(pc, tag, PCI_ID_REG);
+               if (PCI_VENDOR(x) == PCI_VENDOR_MOT &&
+                   PCI_PRODUCT(x) == PCI_PRODUCT_MOT_MPC106) {
+                       /* Set subordinate bus number to 1. */
+                       x = pci_conf_read(pc, tag, 0x40);
+                       x |= 1 << 8;
+                       pci_conf_write(pc, tag, 0x40, x);
+               }
        }
 }