mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-29 13:15:05 +00:00
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>
This commit is contained in:
parent
2368b03bf4
commit
4428d39d63
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=64494
|
@ -1155,11 +1155,9 @@ fix_mp_table(void)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* check the 1 PCI bus case for sanity */
|
/* check the 1 PCI bus case for sanity */
|
||||||
if (num_pci_bus == 1) {
|
/* if it is number 0 all is well */
|
||||||
|
if (num_pci_bus == 1 &&
|
||||||
/* if it is number 0 all is well */
|
bus_data[bus_pci].bus_id != 0) {
|
||||||
if (bus_data[bus_pci].bus_id == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
/* mis-numbered, swap with whichever bus uses slot 0 */
|
/* mis-numbered, swap with whichever bus uses slot 0 */
|
||||||
|
|
||||||
|
|
|
@ -1155,11 +1155,9 @@ fix_mp_table(void)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* check the 1 PCI bus case for sanity */
|
/* check the 1 PCI bus case for sanity */
|
||||||
if (num_pci_bus == 1) {
|
/* if it is number 0 all is well */
|
||||||
|
if (num_pci_bus == 1 &&
|
||||||
/* if it is number 0 all is well */
|
bus_data[bus_pci].bus_id != 0) {
|
||||||
if (bus_data[bus_pci].bus_id == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
/* mis-numbered, swap with whichever bus uses slot 0 */
|
/* mis-numbered, swap with whichever bus uses slot 0 */
|
||||||
|
|
||||||
|
|
|
@ -1155,11 +1155,9 @@ fix_mp_table(void)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* check the 1 PCI bus case for sanity */
|
/* check the 1 PCI bus case for sanity */
|
||||||
if (num_pci_bus == 1) {
|
/* if it is number 0 all is well */
|
||||||
|
if (num_pci_bus == 1 &&
|
||||||
/* if it is number 0 all is well */
|
bus_data[bus_pci].bus_id != 0) {
|
||||||
if (bus_data[bus_pci].bus_id == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
/* mis-numbered, swap with whichever bus uses slot 0 */
|
/* mis-numbered, swap with whichever bus uses slot 0 */
|
||||||
|
|
||||||
|
|
|
@ -1155,11 +1155,9 @@ fix_mp_table(void)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* check the 1 PCI bus case for sanity */
|
/* check the 1 PCI bus case for sanity */
|
||||||
if (num_pci_bus == 1) {
|
/* if it is number 0 all is well */
|
||||||
|
if (num_pci_bus == 1 &&
|
||||||
/* if it is number 0 all is well */
|
bus_data[bus_pci].bus_id != 0) {
|
||||||
if (bus_data[bus_pci].bus_id == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
/* mis-numbered, swap with whichever bus uses slot 0 */
|
/* mis-numbered, swap with whichever bus uses slot 0 */
|
||||||
|
|
||||||
|
|
|
@ -1155,11 +1155,9 @@ fix_mp_table(void)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* check the 1 PCI bus case for sanity */
|
/* check the 1 PCI bus case for sanity */
|
||||||
if (num_pci_bus == 1) {
|
/* if it is number 0 all is well */
|
||||||
|
if (num_pci_bus == 1 &&
|
||||||
/* if it is number 0 all is well */
|
bus_data[bus_pci].bus_id != 0) {
|
||||||
if (bus_data[bus_pci].bus_id == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
/* mis-numbered, swap with whichever bus uses slot 0 */
|
/* mis-numbered, swap with whichever bus uses slot 0 */
|
||||||
|
|
||||||
|
|
|
@ -1155,11 +1155,9 @@ fix_mp_table(void)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* check the 1 PCI bus case for sanity */
|
/* check the 1 PCI bus case for sanity */
|
||||||
if (num_pci_bus == 1) {
|
/* if it is number 0 all is well */
|
||||||
|
if (num_pci_bus == 1 &&
|
||||||
/* if it is number 0 all is well */
|
bus_data[bus_pci].bus_id != 0) {
|
||||||
if (bus_data[bus_pci].bus_id == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
/* mis-numbered, swap with whichever bus uses slot 0 */
|
/* mis-numbered, swap with whichever bus uses slot 0 */
|
||||||
|
|
||||||
|
|
|
@ -1155,11 +1155,9 @@ fix_mp_table(void)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* check the 1 PCI bus case for sanity */
|
/* check the 1 PCI bus case for sanity */
|
||||||
if (num_pci_bus == 1) {
|
/* if it is number 0 all is well */
|
||||||
|
if (num_pci_bus == 1 &&
|
||||||
/* if it is number 0 all is well */
|
bus_data[bus_pci].bus_id != 0) {
|
||||||
if (bus_data[bus_pci].bus_id == 0)
|
|
||||||
return;
|
|
||||||
|
|
||||||
/* mis-numbered, swap with whichever bus uses slot 0 */
|
/* mis-numbered, swap with whichever bus uses slot 0 */
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue