From c954d7368a8a5cd10792d9a338e8a972a742c7ec Mon Sep 17 00:00:00 2001 From: Doug Rabson Date: Sun, 5 Dec 1999 18:41:34 +0000 Subject: [PATCH] Don't use a bogus bus number for Ross host-pci bridges. PR: kern/15278 Submitted by: Ahmed Benani --- sys/amd64/pci/pci_bus.c | 2 ++ sys/amd64/pci/pci_cfgreg.c | 2 ++ sys/i386/isa/pcibus.c | 2 ++ sys/i386/pci/pci_bus.c | 2 ++ sys/i386/pci/pci_cfgreg.c | 2 ++ sys/i386/pci/pci_pir.c | 2 ++ 6 files changed, 12 insertions(+) diff --git a/sys/amd64/pci/pci_bus.c b/sys/amd64/pci/pci_bus.c index 609d41647d4a..7996bbfc13c0 100644 --- a/sys/amd64/pci/pci_bus.c +++ b/sys/amd64/pci/pci_bus.c @@ -395,7 +395,9 @@ nexus_pcib_is_host_bridge(pcicfgregs *cfg, case 0x00051166: s = "Ross (?) host to PCI bridge"; /* just guessing the secondary bus register number ... */ +#if 0 *busnum = pci_cfgread(cfg, 0x45, 1); +#endif break; /* Integrated Micro Solutions -- vendor 0x10e0 */ diff --git a/sys/amd64/pci/pci_cfgreg.c b/sys/amd64/pci/pci_cfgreg.c index 609d41647d4a..7996bbfc13c0 100644 --- a/sys/amd64/pci/pci_cfgreg.c +++ b/sys/amd64/pci/pci_cfgreg.c @@ -395,7 +395,9 @@ nexus_pcib_is_host_bridge(pcicfgregs *cfg, case 0x00051166: s = "Ross (?) host to PCI bridge"; /* just guessing the secondary bus register number ... */ +#if 0 *busnum = pci_cfgread(cfg, 0x45, 1); +#endif break; /* Integrated Micro Solutions -- vendor 0x10e0 */ diff --git a/sys/i386/isa/pcibus.c b/sys/i386/isa/pcibus.c index 609d41647d4a..7996bbfc13c0 100644 --- a/sys/i386/isa/pcibus.c +++ b/sys/i386/isa/pcibus.c @@ -395,7 +395,9 @@ nexus_pcib_is_host_bridge(pcicfgregs *cfg, case 0x00051166: s = "Ross (?) host to PCI bridge"; /* just guessing the secondary bus register number ... */ +#if 0 *busnum = pci_cfgread(cfg, 0x45, 1); +#endif break; /* Integrated Micro Solutions -- vendor 0x10e0 */ diff --git a/sys/i386/pci/pci_bus.c b/sys/i386/pci/pci_bus.c index 609d41647d4a..7996bbfc13c0 100644 --- a/sys/i386/pci/pci_bus.c +++ b/sys/i386/pci/pci_bus.c @@ -395,7 +395,9 @@ nexus_pcib_is_host_bridge(pcicfgregs *cfg, case 0x00051166: s = "Ross (?) host to PCI bridge"; /* just guessing the secondary bus register number ... */ +#if 0 *busnum = pci_cfgread(cfg, 0x45, 1); +#endif break; /* Integrated Micro Solutions -- vendor 0x10e0 */ diff --git a/sys/i386/pci/pci_cfgreg.c b/sys/i386/pci/pci_cfgreg.c index 609d41647d4a..7996bbfc13c0 100644 --- a/sys/i386/pci/pci_cfgreg.c +++ b/sys/i386/pci/pci_cfgreg.c @@ -395,7 +395,9 @@ nexus_pcib_is_host_bridge(pcicfgregs *cfg, case 0x00051166: s = "Ross (?) host to PCI bridge"; /* just guessing the secondary bus register number ... */ +#if 0 *busnum = pci_cfgread(cfg, 0x45, 1); +#endif break; /* Integrated Micro Solutions -- vendor 0x10e0 */ diff --git a/sys/i386/pci/pci_pir.c b/sys/i386/pci/pci_pir.c index 609d41647d4a..7996bbfc13c0 100644 --- a/sys/i386/pci/pci_pir.c +++ b/sys/i386/pci/pci_pir.c @@ -395,7 +395,9 @@ nexus_pcib_is_host_bridge(pcicfgregs *cfg, case 0x00051166: s = "Ross (?) host to PCI bridge"; /* just guessing the secondary bus register number ... */ +#if 0 *busnum = pci_cfgread(cfg, 0x45, 1); +#endif break; /* Integrated Micro Solutions -- vendor 0x10e0 */