d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Deal with table parsing bugs caused by out-of-order record entries.

Browse Source 
Complain about out-of-order entries.  This fixes the 'mp extended
table HOSED!" report on the DL360 we have here with the "fixed" compaq
bios rom to fix the table length off-by-one error.
This commit is contained in:
Peter Wemm 2001-01-18 07:42:02 +00:00
parent 047efaadd5
commit 4a3e427f20
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=71209
1 changed files with 41 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
usr.sbin/mptable/mptable.c
View File

@ -669,9 +669,10 @@ MPConfigTableHeader( void* pap )
vm_offset_t paddr;
mpcth_t cth;
int x;
int totalSize, t;
int totalSize;
int count, c;
int type;
int oldtype, entrytype;
if ( pap == 0 ) {
printf( "MP Configuration Table Header MISSING!\n" );
@ -733,45 +734,54 @@ MPConfigTableHeader( void* pap )
napic = 0;
nintr = 0;
/* process all the CPUs */
printf( "--\nProcessors:\tAPIC ID\tVersion\tState"
"\t\tFamily\tModel\tStep\tFlags\n" );
for ( t = totalSize, c = count; c; c-- ) {
if ( readType() == 0 )
oldtype = -1;
for (c = count; c; c--) {
entrytype = readType();
if (entrytype != oldtype)
printf("--\n");
if (entrytype < oldtype)
printf("MPTABLE OUT OF ORDER!\n");
switch (entrytype) {
case 0:
if (oldtype != 0)
printf( "Processors:\tAPIC ID\tVersion\tState"
"\t\tFamily\tModel\tStep\tFlags\n" );
oldtype = 0;
processorEntry();
totalSize -= basetableEntryTypes[ 0 ].length;
}
break;
/* process all the busses */
printf( "--\nBus:\t\tBus ID\tType\n" );
for ( t = totalSize, c = count; c; c-- ) {
if ( readType() == 1 )
case 1:
if (oldtype != 1)
printf( "Bus:\t\tBus ID\tType\n" );
oldtype = 1;
busEntry();
totalSize -= basetableEntryTypes[ 1 ].length;
}
break;
/* process all the apics */
printf( "--\nI/O APICs:\tAPIC ID\tVersion\tState\t\tAddress\n" );
for ( t = totalSize, c = count; c; c-- ) {
if ( readType() == 2 )
case 2:
if (oldtype != 2)
printf( "I/O APICs:\tAPIC ID\tVersion\tState\t\tAddress\n" );
oldtype = 2;
ioApicEntry();
totalSize -= basetableEntryTypes[ 2 ].length;
}
break;
/* process all the I/O Ints */
printf( "--\nI/O Ints:\tType\tPolarity Trigger\tBus ID\t IRQ\tAPIC ID\tPIN#\n" );
for ( t = totalSize, c = count; c; c-- ) {
if ( readType() == 3 )
case 3:
if (oldtype != 3)
printf( "I/O Ints:\tType\tPolarity Trigger\tBus ID\t IRQ\tAPIC ID\tPIN#\n" );
oldtype = 3;
intEntry();
totalSize -= basetableEntryTypes[ 3 ].length;
}
break;
/* process all the Local Ints */
printf( "--\nLocal Ints:\tType\tPolarity Trigger\tBus ID\t IRQ\tAPIC ID\tPIN#\n" );
for ( t = totalSize, c = count; c; c-- ) {
if ( readType() == 4 )
case 4:
if (oldtype != 4)
printf( "Local Ints:\tType\tPolarity Trigger\tBus ID\t IRQ\tAPIC ID\tPIN#\n" );
oldtype = 4;
intEntry();
totalSize -= basetableEntryTypes[ 4 ].length;
break;
default:
printf("MPTABLE HOSED! record type = %d\n", entrytype);
exit(1);
}
}