jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-02 23:43:25 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Allow SMP systems with an MCA bus to work properly.

Browse Source 
Reviewed by:	peter
This commit is contained in:
Matthew N. Dodd 2000-01-13 09:09:02 +00:00
parent 47a70d921b
commit de9cfdd736
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=55891
8 changed files with 43 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/amd64/amd64/mp_machdep.c
View File

@ -688,10 +688,10 @@ static bus_type_name bus_type_table[] =
{CBUS, "CBUS"},
{CBUSII, "CBUSII"},
{EISA, "EISA"},
{UNKNOWN_BUSTYPE, "---"},
{MCA, "MCA"},
{UNKNOWN_BUSTYPE, "---"},
{ISA, "ISA"},
{UNKNOWN_BUSTYPE, "---"},
{MCA, "MCA"},
{UNKNOWN_BUSTYPE, "---"},
{UNKNOWN_BUSTYPE, "---"},
{UNKNOWN_BUSTYPE, "---"},
@ -712,10 +712,10 @@ static int default_data[7][5] =
{1, 0, ISA, 255, 255},
{1, 0, EISA, 255, 255},
{1, 0, EISA, 255, 255},
{0, 255, 255, 255, 255},/* MCA not supported */
{1, 0, MCA, 255, 255},
{2, 0, ISA, 1, PCI},
{2, 0, EISA, 1, PCI},
{0, 255, 255, 255, 255} /* MCA not supported */
{2, 0, MCA, 1, PCI}
};
@ -1679,8 +1679,10 @@ default_mp_table(int type)
case 1:
case 2:
case 3:
case 4:
case 5:
case 6:
case 7:
bus_data[0].bus_id = default_data[type - 1][1];
bus_data[0].bus_type = default_data[type - 1][2];
bus_data[1].bus_id = default_data[type - 1][3];

10
sys/amd64/amd64/mptable.c
View File

@ -688,10 +688,10 @@ static bus_type_name bus_type_table[] =
{CBUS, "CBUS"},
{CBUSII, "CBUSII"},
{EISA, "EISA"},
{UNKNOWN_BUSTYPE, "---"},
{MCA, "MCA"},
{UNKNOWN_BUSTYPE, "---"},
{ISA, "ISA"},
{UNKNOWN_BUSTYPE, "---"},
{MCA, "MCA"},
{UNKNOWN_BUSTYPE, "---"},
{UNKNOWN_BUSTYPE, "---"},
{UNKNOWN_BUSTYPE, "---"},
@ -712,10 +712,10 @@ static int default_data[7][5] =
{1, 0, ISA, 255, 255},
{1, 0, EISA, 255, 255},
{1, 0, EISA, 255, 255},
{0, 255, 255, 255, 255},/* MCA not supported */
{1, 0, MCA, 255, 255},
{2, 0, ISA, 1, PCI},
{2, 0, EISA, 1, PCI},
{0, 255, 255, 255, 255} /* MCA not supported */
{2, 0, MCA, 1, PCI}
};
@ -1679,8 +1679,10 @@ default_mp_table(int type)
case 1:
case 2:
case 3:
case 4:
case 5:
case 6:
case 7:
bus_data[0].bus_id = default_data[type - 1][1];
bus_data[0].bus_type = default_data[type - 1][2];
bus_data[1].bus_id = default_data[type - 1][3];

10
sys/amd64/include/mptable.h
View File

@ -688,10 +688,10 @@ static bus_type_name bus_type_table[] =
{CBUS, "CBUS"},
{CBUSII, "CBUSII"},
{EISA, "EISA"},
{UNKNOWN_BUSTYPE, "---"},
{MCA, "MCA"},
{UNKNOWN_BUSTYPE, "---"},
{ISA, "ISA"},
{UNKNOWN_BUSTYPE, "---"},
{MCA, "MCA"},
{UNKNOWN_BUSTYPE, "---"},
{UNKNOWN_BUSTYPE, "---"},
{UNKNOWN_BUSTYPE, "---"},
@ -712,10 +712,10 @@ static int default_data[7][5] =
{1, 0, ISA, 255, 255},
{1, 0, EISA, 255, 255},
{1, 0, EISA, 255, 255},
{0, 255, 255, 255, 255},/* MCA not supported */
{1, 0, MCA, 255, 255},
{2, 0, ISA, 1, PCI},
{2, 0, EISA, 1, PCI},
{0, 255, 255, 255, 255} /* MCA not supported */
{2, 0, MCA, 1, PCI}
};
@ -1679,8 +1679,10 @@ default_mp_table(int type)
case 1:
case 2:
case 3:
case 4:
case 5:
case 6:
case 7:
bus_data[0].bus_id = default_data[type - 1][1];
bus_data[0].bus_type = default_data[type - 1][2];
bus_data[1].bus_id = default_data[type - 1][3];

10
sys/i386/i386/mp_machdep.c
View File

@ -688,10 +688,10 @@ static bus_type_name bus_type_table[] =
{CBUS, "CBUS"},
{CBUSII, "CBUSII"},
{EISA, "EISA"},
{UNKNOWN_BUSTYPE, "---"},
{MCA, "MCA"},
{UNKNOWN_BUSTYPE, "---"},
{ISA, "ISA"},
{UNKNOWN_BUSTYPE, "---"},
{MCA, "MCA"},
{UNKNOWN_BUSTYPE, "---"},
{UNKNOWN_BUSTYPE, "---"},
{UNKNOWN_BUSTYPE, "---"},
@ -712,10 +712,10 @@ static int default_data[7][5] =
{1, 0, ISA, 255, 255},
{1, 0, EISA, 255, 255},
{1, 0, EISA, 255, 255},
{0, 255, 255, 255, 255},/* MCA not supported */
{1, 0, MCA, 255, 255},
{2, 0, ISA, 1, PCI},
{2, 0, EISA, 1, PCI},
{0, 255, 255, 255, 255} /* MCA not supported */
{2, 0, MCA, 1, PCI}
};
@ -1679,8 +1679,10 @@ default_mp_table(int type)
case 1:
case 2:
case 3:
case 4:
case 5:
case 6:
case 7:
bus_data[0].bus_id = default_data[type - 1][1];
bus_data[0].bus_type = default_data[type - 1][2];
bus_data[1].bus_id = default_data[type - 1][3];

10
sys/i386/i386/mptable.c
View File

@ -688,10 +688,10 @@ static bus_type_name bus_type_table[] =
{CBUS, "CBUS"},
{CBUSII, "CBUSII"},
{EISA, "EISA"},
{UNKNOWN_BUSTYPE, "---"},
{MCA, "MCA"},
{UNKNOWN_BUSTYPE, "---"},
{ISA, "ISA"},
{UNKNOWN_BUSTYPE, "---"},
{MCA, "MCA"},
{UNKNOWN_BUSTYPE, "---"},
{UNKNOWN_BUSTYPE, "---"},
{UNKNOWN_BUSTYPE, "---"},
@ -712,10 +712,10 @@ static int default_data[7][5] =
{1, 0, ISA, 255, 255},
{1, 0, EISA, 255, 255},
{1, 0, EISA, 255, 255},
{0, 255, 255, 255, 255},/* MCA not supported */
{1, 0, MCA, 255, 255},
{2, 0, ISA, 1, PCI},
{2, 0, EISA, 1, PCI},
{0, 255, 255, 255, 255} /* MCA not supported */
{2, 0, MCA, 1, PCI}
};
@ -1679,8 +1679,10 @@ default_mp_table(int type)
case 1:
case 2:
case 3:
case 4:
case 5:
case 6:
case 7:
bus_data[0].bus_id = default_data[type - 1][1];
bus_data[0].bus_type = default_data[type - 1][2];
bus_data[1].bus_id = default_data[type - 1][3];

1
sys/i386/include/mpapic.h
View File

@ -54,6 +54,7 @@ enum busTypes {
CBUS = 1,
CBUSII = 2,
EISA = 3,
MCA = 4,
ISA = 6,
PCI = 13,
XPRESS = 18,

10
sys/i386/include/mptable.h
View File

@ -688,10 +688,10 @@ static bus_type_name bus_type_table[] =
{CBUS, "CBUS"},
{CBUSII, "CBUSII"},
{EISA, "EISA"},
{UNKNOWN_BUSTYPE, "---"},
{MCA, "MCA"},
{UNKNOWN_BUSTYPE, "---"},
{ISA, "ISA"},
{UNKNOWN_BUSTYPE, "---"},
{MCA, "MCA"},
{UNKNOWN_BUSTYPE, "---"},
{UNKNOWN_BUSTYPE, "---"},
{UNKNOWN_BUSTYPE, "---"},
@ -712,10 +712,10 @@ static int default_data[7][5] =
{1, 0, ISA, 255, 255},
{1, 0, EISA, 255, 255},
{1, 0, EISA, 255, 255},
{0, 255, 255, 255, 255},/* MCA not supported */
{1, 0, MCA, 255, 255},
{2, 0, ISA, 1, PCI},
{2, 0, EISA, 1, PCI},
{0, 255, 255, 255, 255} /* MCA not supported */
{2, 0, MCA, 1, PCI}
};
@ -1679,8 +1679,10 @@ default_mp_table(int type)
case 1:
case 2:
case 3:
case 4:
case 5:
case 6:
case 7:
bus_data[0].bus_id = default_data[type - 1][1];
bus_data[0].bus_type = default_data[type - 1][2];
bus_data[1].bus_id = default_data[type - 1][3];

10
sys/kern/subr_smp.c
View File

@ -688,10 +688,10 @@ static bus_type_name bus_type_table[] =
{CBUS, "CBUS"},
{CBUSII, "CBUSII"},
{EISA, "EISA"},
{UNKNOWN_BUSTYPE, "---"},
{MCA, "MCA"},
{UNKNOWN_BUSTYPE, "---"},
{ISA, "ISA"},
{UNKNOWN_BUSTYPE, "---"},
{MCA, "MCA"},
{UNKNOWN_BUSTYPE, "---"},
{UNKNOWN_BUSTYPE, "---"},
{UNKNOWN_BUSTYPE, "---"},
@ -712,10 +712,10 @@ static int default_data[7][5] =
{1, 0, ISA, 255, 255},
{1, 0, EISA, 255, 255},
{1, 0, EISA, 255, 255},
{0, 255, 255, 255, 255},/* MCA not supported */
{1, 0, MCA, 255, 255},
{2, 0, ISA, 1, PCI},
{2, 0, EISA, 1, PCI},
{0, 255, 255, 255, 255} /* MCA not supported */
{2, 0, MCA, 1, PCI}
};
@ -1679,8 +1679,10 @@ default_mp_table(int type)
case 1:
case 2:
case 3:
case 4:
case 5:
case 6:
case 7:
bus_data[0].bus_id = default_data[type - 1][1];
bus_data[0].bus_type = default_data[type - 1][2];
bus_data[1].bus_id = default_data[type - 1][3];