diff options
| author | tegge <tegge@FreeBSD.org> | 2000-08-10 17:33:24 +0000 |
|---|---|---|
| committer | tegge <tegge@FreeBSD.org> | 2000-08-10 17:33:24 +0000 |
| commit | 26b98557922be64225e7edc7aa2a1e3cf519475c (patch) | |
| tree | c9255e3936af32b6b452991393c727d658a1eee5 /sys/amd64 | |
| parent | d4ba157d9f0f1b12ba582a82dcc12eea9f72f8d8 (diff) | |
| download | FreeBSD-src-26b98557922be64225e7edc7aa2a1e3cf519475c.zip FreeBSD-src-26b98557922be64225e7edc7aa2a1e3cf519475c.tar.gz | |
Don't skip IOAPIC id conflict detection when only one pci bus is present.
PR: 20312
Reviewed by: Steve Roome <steve@sse0691.bri.hp.com>
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/mp_machdep.c | 10 | ||||
| -rw-r--r-- | sys/amd64/amd64/mptable.c | 10 | ||||
| -rw-r--r-- | sys/amd64/include/mptable.h | 10 |
3 files changed, 12 insertions, 18 deletions
diff --git a/sys/amd64/amd64/mp_machdep.c b/sys/amd64/amd64/mp_machdep.c index f8e77a1..50d1ce7 100644 --- a/sys/amd64/amd64/mp_machdep.c +++ b/sys/amd64/amd64/mp_machdep.c @@ -1155,12 +1155,10 @@ fix_mp_table(void) */ /* check the 1 PCI bus case for sanity */ - if (num_pci_bus == 1) { - - /* if it is number 0 all is well */ - if (bus_data[bus_pci].bus_id == 0) - return; - + /* if it is number 0 all is well */ + if (num_pci_bus == 1 && + bus_data[bus_pci].bus_id != 0) { + /* mis-numbered, swap with whichever bus uses slot 0 */ /* swap the bus entry types */ diff --git a/sys/amd64/amd64/mptable.c b/sys/amd64/amd64/mptable.c index f8e77a1..50d1ce7 100644 --- a/sys/amd64/amd64/mptable.c +++ b/sys/amd64/amd64/mptable.c @@ -1155,12 +1155,10 @@ fix_mp_table(void) */ /* check the 1 PCI bus case for sanity */ - if (num_pci_bus == 1) { - - /* if it is number 0 all is well */ - if (bus_data[bus_pci].bus_id == 0) - return; - + /* if it is number 0 all is well */ + if (num_pci_bus == 1 && + bus_data[bus_pci].bus_id != 0) { + /* mis-numbered, swap with whichever bus uses slot 0 */ /* swap the bus entry types */ diff --git a/sys/amd64/include/mptable.h b/sys/amd64/include/mptable.h index f8e77a1..50d1ce7 100644 --- a/sys/amd64/include/mptable.h +++ b/sys/amd64/include/mptable.h @@ -1155,12 +1155,10 @@ fix_mp_table(void) */ /* check the 1 PCI bus case for sanity */ - if (num_pci_bus == 1) { - - /* if it is number 0 all is well */ - if (bus_data[bus_pci].bus_id == 0) - return; - + /* if it is number 0 all is well */ + if (num_pci_bus == 1 && + bus_data[bus_pci].bus_id != 0) { + /* mis-numbered, swap with whichever bus uses slot 0 */ /* swap the bus entry types */ |
