mptable tool

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1817 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

2 files changed, 1329 insertions, 0 deletions

diff --git a/util/mptable/Makefile b/util/mptable/Makefile
new file mode 100644
index 0000000000..5f74b5082e
--- /dev/null
+++ b/util/mptable/Makefile
@@ -0,0 +1,6 @@
+CC=gcc
+
+mptable: mptable.o
+	$(CC) -o mptable mptable.o
+clean:
+	\rm *.o mptable
diff --git a/util/mptable/mptable.c b/util/mptable/mptable.c
new file mode 100644
index 0000000000..c6d50d4053
--- /dev/null
+++ b/util/mptable/mptable.c
@@ -0,0 +1,1323 @@
+/*
+ * Copyright (c) 1996, by Steve Passe
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. The name of the developer may NOT be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+/*
+ * mptable.c
+ */
+
+#ifndef lint
+static const char rcsid[] =
+	"$Id$";
+#endif /* not lint */
+
+#define VMAJOR			2
+#define VMINOR			0
+#define VDELTA			15
+
+/*
+ * this will cause the raw mp table to be dumped to /tmp/mpdump
+ *
+#define RAW_DUMP
+ */
+
+#define MP_SIG			0x5f504d5f	/* _MP_ */
+#define EXTENDED_PROCESSING_READY
+#define OEM_PROCESSING_READY_NOT
+
+#include <sys/types.h>
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+#define SEP_LINE \
+"\n-------------------------------------------------------------------------------\n"
+
+#define SEP_LINE2 \
+"\n===============================================================================\n"
+
+/* EBDA is @ 40:0e in real-mode terms */
+#define EBDA_POINTER		0x040e		/* location of EBDA pointer */
+
+/* CMOS 'top of mem' is @ 40:13 in real-mode terms */
+#define TOPOFMEM_POINTER	0x0413		/* BIOS: base memory size */
+
+#define DEFAULT_TOPOFMEM	0xa0000
+
+#define BIOS_BASE		0xf0000
+#define BIOS_BASE2		0xe0000
+#define BIOS_SIZE		0x10000
+#define ONE_KBYTE		1024
+
+#define GROPE_AREA1		0x80000
+#define GROPE_AREA2		0x90000
+#define GROPE_SIZE		0x10000
+
+#define PROCENTRY_FLAG_EN	0x01
+#define PROCENTRY_FLAG_BP	0x02
+#define IOAPICENTRY_FLAG_EN	0x01
+
+#define MAXPNSTR		132
+
+#define LINUXBIOS_MP_TABLE      0
+
+enum busTypes {
+    CBUS = 1,
+    CBUSII = 2,
+    EISA = 3,
+    ISA = 6,
+    PCI = 13,
+    XPRESS = 18,
+    MAX_BUSTYPE = 18,
+    UNKNOWN_BUSTYPE = 0xff
+};
+
+typedef struct BUSTYPENAME {
+    u_char	type;
+    char	name[ 7 ];
+} busTypeName;
+
+static busTypeName busTypeTable[] =
+{
+    { CBUS,		"CBUS"   },
+    { CBUSII,		"CBUSII" },
+    { EISA,		"EISA"   },
+    { UNKNOWN_BUSTYPE,	"---"    },
+    { UNKNOWN_BUSTYPE,	"---"    },
+    { ISA,		"ISA"    },
+    { UNKNOWN_BUSTYPE,	"---"    },
+    { UNKNOWN_BUSTYPE,	"---"    },
+    { UNKNOWN_BUSTYPE,	"---"    },
+    { UNKNOWN_BUSTYPE,	"---"    },
+    { UNKNOWN_BUSTYPE,	"---"    },
+    { UNKNOWN_BUSTYPE,	"---"    },
+    { PCI,		"PCI"    },
+    { UNKNOWN_BUSTYPE,	"---"    },
+    { UNKNOWN_BUSTYPE,	"---"    },
+    { UNKNOWN_BUSTYPE,	"---"    },
+    { UNKNOWN_BUSTYPE,	"---"    },
+    { UNKNOWN_BUSTYPE,	"---"    },
+    { UNKNOWN_BUSTYPE,	"---"    }
+};
+
+char* whereStrings[] = {
+    "Extended BIOS Data Area",
+    "BIOS top of memory",
+    "Default top of memory",
+    "BIOS",
+    "Extended BIOS",
+    "GROPE AREA #1",
+    "GROPE AREA #2"
+};
+
+typedef struct TABLE_ENTRY {
+    u_char	type;
+    u_char	length;
+    char	name[ 32 ];
+} tableEntry;
+
+tableEntry basetableEntryTypes[] =
+{
+    { 0, 20, "Processor" },
+    { 1,  8, "Bus" },
+    { 2,  8, "I/O APIC" },
+    { 3,  8, "I/O INT" },
+    { 4,  8, "Local INT" }
+};
+
+tableEntry extendedtableEntryTypes[] =
+{
+    { 128, 20, "System Address Space" },
+    { 129,  8, "Bus Heirarchy" },
+    { 130,  8, "Compatibility Bus Address" }
+};
+
+/* MP Floating Pointer Structure */
+typedef struct MPFPS {
+    char	signature[ 4 ];
+    void*	pap;
+    u_char	length;
+    u_char	spec_rev;
+    u_char	checksum;
+    u_char	mpfb1;
+    u_char	mpfb2;
+    u_char	mpfb3;
+    u_char	mpfb4;
+    u_char	mpfb5;
+} mpfps_t;
+
+/* MP Configuration Table Header */
+typedef struct MPCTH {
+    char	signature[ 4 ];
+    u_short	base_table_length;
+    u_char	spec_rev;
+    u_char	checksum;
+    u_char	oem_id[ 8 ];
+    u_char	product_id[ 12 ];
+    void*	oem_table_pointer;
+    u_short	oem_table_size;
+    u_short	entry_count;
+    void*	apic_address;
+    u_short	extended_table_length;
+    u_char	extended_table_checksum;
+    u_char	reserved;
+} mpcth_t;
+
+
+typedef struct PROCENTRY {
+    u_char	type;
+    u_char	apicID;
+    u_char	apicVersion;
+    u_char	cpuFlags;
+    u_long	cpuSignature;
+    u_long	featureFlags;
+    u_long	reserved1;
+    u_long	reserved2;
+} ProcEntry;
+
+typedef struct BUSENTRY {
+    u_char	type;
+    u_char	busID;
+    char	busType[ 6 ];
+} BusEntry;
+
+typedef struct IOAPICENTRY {
+    u_char	type;
+    u_char	apicID;
+    u_char	apicVersion;
+    u_char	apicFlags;
+    void*	apicAddress;
+} IOApicEntry;
+
+typedef struct INTENTRY {
+    u_char	type;
+    u_char	intType;
+    u_short	intFlags;
+    u_char	srcBusID;
+    u_char	srcBusIRQ;
+    u_char	dstApicID;
+    u_char	dstApicINT;
+} IntEntry;
+
+
+/*
+ * extended entry type structures
+ */
+
+typedef struct SASENTRY {
+    u_char	type;
+    u_char	length;
+    u_char	busID;
+    u_char	addressType;
+    u_int64_t	addressBase;
+    u_int64_t	addressLength;
+} SasEntry;
+
+
+typedef struct BHDENTRY {
+    u_char	type;
+    u_char	length;
+    u_char	busID;
+    u_char	busInfo;
+    u_char	busParent;
+    u_char	reserved[ 3 ];
+} BhdEntry;
+
+
+typedef struct CBASMENTRY {
+    u_char	type;
+    u_char	length;
+    u_char	busID;
+    u_char	addressMod;
+    u_int	predefinedRange;
+} CbasmEntry;
+
+
+typedef unsigned long vm_offset_t;
+
+static void apic_probe( vm_offset_t* paddr, int* where );
+
+static void MPConfigDefault( int featureByte );
+
+static void MPFloatingPointer( vm_offset_t paddr, int where, mpfps_t* mpfps );
+static void MPConfigTableHeader( void* pap );
+
+static int readType( void );
+static void seekEntry( vm_offset_t addr );
+static void readEntry( void* entry, int size );
+
+static void processorEntry( void );
+static void busEntry( void );
+static void ioApicEntry( void );
+static void intEntry( void );
+static void lintEntry( void );
+
+static void sasEntry( void );
+static void bhdEntry( void );
+static void cbasmEntry( void );
+
+static void doOptionList( void );
+static void doDmesg( void );
+static void pnstr( char* s, int c );
+
+/* global data */
+int	pfd;		/* physical /dev/mem fd */
+
+int	busses[ 16 ];
+int	apics[ 16 ];
+
+int	ncpu;
+int	nbus;
+int	napic;
+int	nintr;
+
+int	dmesg = 0;
+int	grope = 0;
+int	verbose = 0;
+int 	noisy = 0;
+/* preamble to the mptable. This is fixed for all linuxbioses */
+ 
+char *preamble[] = {
+"#include <arch/smp/mpspec.h>",
+"#include <string.h>",
+"#include <printk.h>",
+"#include <pci.h>",
+"#include <stdint.h>",
+"",
+"void *smp_write_config_table(void *v, unsigned long * processor_map)",
+"{",
+"        static const char sig[4] = \"PCMP\";",
+"        static const char oem[8] = \"LNXI    \";",
+"        static const char productid[12] = \"P4DPE       \";",
+"        struct mp_config_table *mc;",
+"",
+"        mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);",
+"        memset(mc, 0, sizeof(*mc));",
+"",
+"        memcpy(mc->mpc_signature, sig, sizeof(sig));",
+"        mc->mpc_length = sizeof(*mc); /* initially just the header */",
+"        mc->mpc_spec = 0x04;",
+"        mc->mpc_checksum = 0; /* not yet computed */",
+"        memcpy(mc->mpc_oem, oem, sizeof(oem));",
+"        memcpy(mc->mpc_productid, productid, sizeof(productid));",
+"        mc->mpc_oemptr = 0;",
+"        mc->mpc_oemsize = 0;",
+"        mc->mpc_entry_count = 0; /* No entries yet... */",
+"        mc->mpc_lapic = LAPIC_ADDR;",
+"        mc->mpe_length = 0;",
+"        mc->mpe_checksum = 0;",
+"        mc->reserved = 0;",
+"",
+"        smp_write_processors(mc, processor_map);",
+"",
+"",
+0
+};
+
+char *postamble[] = {
+"	/* There is no extension information... */",
+"",
+"	/* Compute the checksums */",
+"	mc->mpe_checksum = smp_compute_checksum(smp_next_mpc_entry(mc), mc->mpe_length);",
+"	mc->mpc_checksum = smp_compute_checksum(mc, mc->mpc_length);",
+"	printk_debug(\"Wrote the mp table end at: %p - %p\\n\",",
+"		mc, smp_next_mpe_entry(mc));",
+"	return smp_next_mpe_entry(mc);",
+"}",
+"",
+"unsigned long write_smp_table(unsigned long addr, unsigned long *processor_map)",
+"{",
+"	void *v;",
+"	v = smp_write_floating_table(addr);",
+"	return (unsigned long)smp_write_config_table(v, processor_map);",
+"}",
+0
+};
+
+char *ioapic_code[] = {
+"	smp_write_ioapic(mc, 2, 0x20, 0xfec00000);",
+"	{",
+"		struct pci_dev *dev;",
+"		uint32_t base;",
+"		dev = pci_find_slot(1, PCI_DEVFN(0x1e,0));",
+"		if (dev) {",
+"			pci_read_config_dword(dev, PCI_BASE_ADDRESS_0, &base);",
+"			base &= PCI_BASE_ADDRESS_MEM_MASK;",
+"			smp_write_ioapic(mc, 3, 0x20, base);",
+"		}",
+"		dev = pci_find_slot(1, PCI_DEVFN(0x1c,0));",
+"		if (dev) {",
+"			pci_read_config_dword(dev, PCI_BASE_ADDRESS_0, &base);",
+"			base &= PCI_BASE_ADDRESS_MEM_MASK;",
+"			smp_write_ioapic(mc, 4, 0x20, base);",
+"		}",
+"                dev = pci_find_slot(4, PCI_DEVFN(0x1e,0));",
+"                if (dev) {",
+"                        pci_read_config_dword(dev, PCI_BASE_ADDRESS_0, &base);",
+"                        base &= PCI_BASE_ADDRESS_MEM_MASK;",
+"                        smp_write_ioapic(mc, 5, 0x20, base);",
+"                }",
+"                dev = pci_find_slot(4, PCI_DEVFN(0x1c,0));",
+"                if (dev) {",
+"                        pci_read_config_dword(dev, PCI_BASE_ADDRESS_0, &base);",
+"                        base &= PCI_BASE_ADDRESS_MEM_MASK;",
+"                        smp_write_ioapic(mc, 8, 0x20, base);",
+"                }",
+"	}",
+0
+};
+static void
+usage( void )
+{
+    fprintf( stderr, "usage: mptable [-dmesg] [-verbose] [-grope] [-help]\n" );
+    exit( 0 );
+}
+
+void
+write_code(char **code)
+{
+  while (*code)
+	printf("%s\n", *code++);
+}
+/*
+ * 
+ */
+int
+main( int argc, char *argv[] )
+{
+    vm_offset_t	paddr;
+    int		where;
+    mpfps_t	mpfps;
+    int		defaultConfig;
+
+    extern int	optreset;
+    int		ch;
+
+    /* announce ourselves */
+    
+    if (verbose) puts( SEP_LINE2 );
+
+    printf( "/* generatred by MPTable, version %d.%d.%d*/\n", VMAJOR, VMINOR, VDELTA );
+    printf("/* as modified by RGM for LinuxBIOS */\n");
+    write_code(preamble);
+
+    /* Ron hates getopt() */
+
+    for(argc--, argv++; argc; argc--, argv++){
+      char *optarg = argv[0];
+      if ( strcmp( optarg, "-dmesg") == 0 ) {
+	dmesg = 1;
+      } else 
+	if ( strcmp( optarg, "-help") == 0 )
+	  {
+	    usage();
+	  } else
+	    if ( strcmp( optarg, "-grope") == 0 ){
+	      grope = 1;
+	    } else  if ( strcmp( optarg, "-verbose") == 0 )
+	      verbose = 1;
+	    else  if ( strcmp( optarg, "-noisy") == 0 )
+	      noisy = 1;
+	    else usage();
+    }
+
+    /* open physical memory for access to MP structures */
+    if ( (pfd = open( "/dev/mem", O_RDONLY )) < 0 )
+        err( 1, "mem open" );
+
+    /* probe for MP structures */
+    apic_probe( &paddr, &where );
+    if ( where <= 0 ) {
+        fprintf( stderr, "\n MP FPS NOT found,\n" );
+        fprintf( stderr, " suggest trying -grope option!!!\n\n" );
+        return 1;
+    }
+
+    if ( verbose )
+        printf( "\n MP FPS found in %s @ physical addr: 0x%08x\n",
+	      whereStrings[ where - 1 ], paddr );
+
+    if (verbose) puts( SEP_LINE );
+
+    /* analyze the MP Floating Pointer Structure */
+    MPFloatingPointer( paddr, where, &mpfps );
+
+    if (verbose) puts( SEP_LINE );
+
+    /* check whether an MP config table exists */
+    if ( (defaultConfig = mpfps.mpfb1) )
+        MPConfigDefault( defaultConfig );
+    else
+	MPConfigTableHeader( mpfps.pap );
+
+    /* build "options" entries for the kernel config file */
+    if (noisy)
+      doOptionList();
+
+    write_code(postamble);
+    /* do a dmesg output */
+    if ( dmesg )
+        doDmesg();
+
+    if (verbose) puts( SEP_LINE2 );
+
+    return 0;
+}
+
+
+/*
+ * set PHYSICAL address of MP floating pointer structure
+ */
+#define NEXT(X)		((X) += 4)
+static void
+apic_probe( vm_offset_t* paddr, int* where )
+{
+    /*
+     * c rewrite of apic_probe() by Jack F. Vogel
+     */
+
+    int		x;
+    u_short	segment;
+    vm_offset_t	target;
+    u_int	buffer[ BIOS_SIZE / sizeof( int ) ];
+
+    if ( verbose )
+        printf( "\n" );
+
+    /* search Extended Bios Data Area, if present */
+    if ( verbose )
+        printf( " looking for EBDA pointer @ 0x%04x, ", EBDA_POINTER );
+    seekEntry( (vm_offset_t)EBDA_POINTER );
+    readEntry( &segment, 2 );
+    if ( segment ) {		    /* search EBDA */
+        target = (vm_offset_t)segment << 4;
+	if ( verbose )
+	    printf( "found, searching EBDA @ 0x%08x\n", target );
+        seekEntry( target );
+        readEntry( buffer, ONE_KBYTE );
+
+        for ( x = 0; x < ONE_KBYTE / sizeof ( unsigned int ); NEXT(x) ) {
+            if ( buffer[ x ] == MP_SIG ) {
+                *where = 1;
+                *paddr = (x * sizeof( unsigned int )) + target;
+                return;
+            }
+        }
+    }
+    else {
+	if ( verbose )
+	    printf( "NOT found\n" );
+    }
+
+    target = 0;
+    segment = 0;
+    if ( verbose )
+        printf( " searching for LinuxBIOS MP table  @ 0x%08x (%dK)\n",
+	        target, segment );
+    seekEntry( target );
+    readEntry( buffer, ONE_KBYTE );
+
+    for ( x = 0; x < ONE_KBYTE / sizeof ( unsigned int ); NEXT(x) ) {
+        if ( buffer[ x ] == MP_SIG ) {
+            *where = 2;
+            *paddr = (x * sizeof( unsigned int )) + target;
+            return;
+        }
+    }
+
+
+    /* read CMOS for real top of mem */
+    seekEntry( (vm_offset_t)TOPOFMEM_POINTER );
+    readEntry( &segment, 2 );
+    --segment;						/* less ONE_KBYTE */
+    target = segment * 1024;
+    if ( verbose )
+        printf( " searching CMOS 'top of mem' @ 0x%08x (%dK)\n",
+	        target, segment );
+    seekEntry( target );
+    readEntry( buffer, ONE_KBYTE );
+
+    for ( x = 0; x < ONE_KBYTE / sizeof ( unsigned int ); NEXT(x) ) {
+        if ( buffer[ x ] == MP_SIG ) {
+            *where = 2;
+            *paddr = (x * sizeof( unsigned int )) + target;
+            return;
+        }
+    }
+
+    /* we don't necessarily believe CMOS, check base of the last 1K of 640K */
+    if ( target != (DEFAULT_TOPOFMEM - 1024)) {
+	target = (DEFAULT_TOPOFMEM - 1024);
+	if ( verbose )
+	    printf( " searching default 'top of mem' @ 0x%08x (%dK)\n",
+		    target, (target / 1024) );
+	seekEntry( target );
+	readEntry( buffer, ONE_KBYTE );
+
+	for ( x = 0; x < ONE_KBYTE / sizeof ( unsigned int ); NEXT(x) ) {
+	    if ( buffer[ x ] == MP_SIG ) {
+		*where = 3;
+		*paddr = (x * sizeof( unsigned int )) + target;
+		return;
+	    }
+	}
+    }
+
+    /* search the BIOS */
+    if ( verbose )
+        printf( " searching BIOS @ 0x%08x\n", BIOS_BASE );
+    seekEntry( BIOS_BASE );
+    readEntry( buffer, BIOS_SIZE );
+
+    for ( x = 0; x < BIOS_SIZE / sizeof( unsigned int ); NEXT(x) ) {
+        if ( buffer[ x ] == MP_SIG ) {
+            *where = 4;
+            *paddr = (x * sizeof( unsigned int )) + BIOS_BASE;
+            return;
+        }
+    }
+
+    /* search the extended BIOS */
+    if ( verbose )
+        printf( " searching extended BIOS @ 0x%08x\n", BIOS_BASE2 );
+    seekEntry( BIOS_BASE2 );
+    readEntry( buffer, BIOS_SIZE );
+
+    for ( x = 0; x < BIOS_SIZE / sizeof( unsigned int ); NEXT(x) ) {
+        if ( buffer[ x ] == MP_SIG ) {
+            *where = 5;
+            *paddr = (x * sizeof( unsigned int )) + BIOS_BASE2;
+            return;
+        }
+    }
+
+    if ( grope ) {
+	/* search additional memory */
+	target = GROPE_AREA1;
+	if ( verbose )
+	    printf( " groping memory @ 0x%08x\n", target );
+	seekEntry( target );
+	readEntry( buffer, GROPE_SIZE );
+
+	for ( x = 0; x < GROPE_SIZE / sizeof( unsigned int ); NEXT(x) ) {
+	    if ( buffer[ x ] == MP_SIG ) {
+		*where = 6;
+		*paddr = (x * sizeof( unsigned int )) + GROPE_AREA1;
+		return;
+	    }
+	}
+
+	target = GROPE_AREA2;
+	if ( verbose )
+	    printf( " groping memory @ 0x%08x\n", target );
+	seekEntry( target );
+	readEntry( buffer, GROPE_SIZE );
+
+	for ( x = 0; x < GROPE_SIZE / sizeof( unsigned int ); NEXT(x) ) {
+	    if ( buffer[ x ] == MP_SIG ) {
+		*where = 7;
+		*paddr = (x * sizeof( unsigned int )) + GROPE_AREA2;
+		return;
+	    }
+	}
+    }
+
+    *where = 0;
+    *paddr = (vm_offset_t)0;
+}
+
+
+/*
+ * 
+ */
+static void
+MPFloatingPointer( vm_offset_t paddr, int where, mpfps_t* mpfps )
+{
+
+    /* read in mpfps structure*/
+    seekEntry( paddr );
+    readEntry( mpfps, sizeof( mpfps_t ) );
+
+    /* show its contents */
+    if (verbose) {
+    printf( "MP Floating Pointer Structure:\n\n" );
+
+    printf( "  location:\t\t\t" );
+    switch ( where )
+    {
+    case 1:
+	printf( "EBDA\n" );
+	break;
+    case 2:
+	printf( "BIOS base memory\n" );
+	break;
+    case 3:
+	printf( "DEFAULT base memory (639K)\n" );
+	break;
+    case 4:
+	printf( "BIOS\n" );
+	break;
+    case 5:
+	printf( "Extended BIOS\n" );
+	break;
+
+    case 0:
+	printf( "NOT found!\n" );
+	exit( 1 );
+    default:
+	printf( "BOGUS!\n" );
+	exit( 1 );
+    }
+    printf( "  physical address:\t\t0x%08x\n", paddr );
+
+    printf( "  signature:\t\t\t'" );
+    pnstr( mpfps->signature, 4 );
+    printf( "'\n" );
+
+    printf( "  length:\t\t\t%d bytes\n", mpfps->length * 16 );
+    printf( "  version:\t\t\t1.%1d\n", mpfps->spec_rev );
+    printf( "  checksum:\t\t\t0x%02x\n", mpfps->checksum );
+
+    /* bits 0:6 are RESERVED */
+    if ( mpfps->mpfb2 & 0x7f ) {
+        printf( " warning, MP feature byte 2: 0x%02x\n", mpfps->mpfb2 );
+    }
+
+    /* bit 7 is IMCRP */
+    printf( "  mode:\t\t\t\t%s\n", (mpfps->mpfb2 & 0x80) ?
+            "PIC" : "Virtual Wire" );
+
+    /* MP feature bytes 3-5 are expected to be ZERO */
+    if ( mpfps->mpfb3 )
+        printf( " warning, MP feature byte 3 NONZERO!\n" );
+    if ( mpfps->mpfb4 )
+        printf( " warning, MP feature byte 4 NONZERO!\n" );
+    if ( mpfps->mpfb5 )
+        printf( " warning, MP feature byte 5 NONZERO!\n" );
+    }
+}
+
+
+/*
+ * 
+ */
+static void
+MPConfigDefault( int featureByte )
+{
+    printf( "  MP default config type: %d\n\n", featureByte );
+    switch ( featureByte ) {
+    case 1:
+	printf( "   bus: ISA, APIC: 82489DX\n" );
+	break;
+    case 2:
+	printf( "   bus: EISA, APIC: 82489DX\n" );
+	break;
+    case 3:
+	printf( "   bus: EISA, APIC: 82489DX\n" );
+	break;
+    case 4:
+	printf( "   bus: MCA, APIC: 82489DX\n" );
+	break;
+    case 5:
+	printf( "   bus: ISA+PCI, APIC: Integrated\n" );
+	break;
+    case 6:
+	printf( "   bus: EISA+PCI, APIC: Integrated\n" );
+	break;
+    case 7:
+	printf( "   bus: MCA+PCI, APIC: Integrated\n" );
+	break;
+    default:
+	printf( "   future type\n" );
+	break;
+    }
+
+    switch ( featureByte ) {
+    case 1:
+    case 2:
+    case 3:
+    case 4:
+	nbus = 1;
+	break;
+    case 5:
+    case 6:
+    case 7:
+	nbus = 2;
+	break;
+    default:
+	printf( "   future type\n" );
+	break;
+    }
+
+    ncpu = 2;
+    napic = 1;
+    nintr = 16;
+}
+
+
+/*
+ * 
+ */
+static void
+MPConfigTableHeader( void* pap )
+{
+    vm_offset_t paddr;
+    mpcth_t	cth;
+    int		x;
+    int		totalSize, t;
+    int		count, c;
+    int		type;
+
+    if ( pap == 0 ) {
+	printf( "MP Configuration Table Header MISSING!\n" );
+        exit( 1 );
+    }
+
+    /* convert physical address to virtual address */
+    paddr = (vm_offset_t)pap;
+
+    /* read in cth structure */
+    seekEntry( paddr );
+    readEntry( &cth, sizeof( cth ) );
+
+    if (verbose) {
+    printf( "MP Config Table Header:\n\n" );
+
+    printf( "  physical address:\t\t0x%08x\n", pap );
+
+    printf( "  signature:\t\t\t'" );
+    pnstr( cth.signature, 4 );
+    printf( "'\n" );
+
+    printf( "  base table length:\t\t%d\n", cth.base_table_length );
+
+    printf( "  version:\t\t\t1.%1d\n", cth.spec_rev );
+    printf( "  checksum:\t\t\t0x%02x\n", cth.checksum );
+
+    printf( "  OEM ID:\t\t\t'" );
+    pnstr( cth.oem_id, 8 );
+    printf( "'\n" );
+
+    printf( "  Product ID:\t\t\t'" );
+    pnstr( cth.product_id, 12 );
+    printf( "'\n" );
+
+    printf( "  OEM table pointer:\t\t0x%08x\n", cth.oem_table_pointer );
+    printf( "  OEM table size:\t\t%d\n", cth.oem_table_size );
+
+    printf( "  entry count:\t\t\t%d\n", cth.entry_count );
+
+    printf( "  local APIC address:\t\t0x%08x\n", cth.apic_address );
+
+    printf( "  extended table length:\t%d\n", cth.extended_table_length );
+    printf( "  extended table checksum:\t%d\n", cth.extended_table_checksum );
+    }
+
+    totalSize = cth.base_table_length - sizeof( struct MPCTH );
+    count = cth.entry_count;
+
+    if (verbose) {
+    if (verbose) puts( SEP_LINE );
+
+    printf( "MP Config Base Table Entries:\n\n" );
+    }
+
+    /* initialze tables */
+    for ( x = 0; x < 16; ++x ) {
+	busses[ x ] = apics[ x ] = 0xff;
+    }
+
+    ncpu = 0;
+    nbus = 0;
+    napic = 0;
+    nintr = 0;
+
+    /* process all the CPUs */
+    if (verbose) {
+    printf( "--\nProcessors:\tAPIC ID\tVersion\tState"
+	    "\t\tFamily\tModel\tStep\tFlags\n" );
+    }
+    for ( t = totalSize, c = count; c; c-- ) {
+	if ( readType() == 0 )
+	    processorEntry();
+        totalSize -= basetableEntryTypes[ 0 ].length;
+    }
+
+    /* process all the busses */
+    printf( "/*Bus:\t\tBus ID\tType*/\n" );
+    for ( t = totalSize, c = count; c; c-- ) {
+	if ( readType() == 1 )
+	    busEntry();
+        totalSize -= basetableEntryTypes[ 1 ].length;
+    }
+
+    /* process all the apics */
+    printf( "/*I/O APICs:\tAPIC ID\tVersion\tState\t\tAddress*/\n" );
+    for ( t = totalSize, c = count; c; c-- ) {
+	if ( readType() == 2 )
+	    ioApicEntry();
+        totalSize -= basetableEntryTypes[ 2 ].length;
+    }
+
+    write_code(ioapic_code);
+
+    /* process all the I/O Ints */
+    printf( "/*I/O Ints:\tType\tPolarity    Trigger\tBus ID\t IRQ\tAPIC ID\tPIN#\n*/" );
+    for ( t = totalSize, c = count; c; c-- ) {
+	if ( readType() == 3 )
+	    intEntry();
+        totalSize -= basetableEntryTypes[ 3 ].length;
+    }
+
+    /* process all the Local Ints */
+    printf( "/*Local Ints:\tType\tPolarity    Trigger\tBus ID\t IRQ\tAPIC ID\tPIN#*/\n" );
+    for ( t = totalSize, c = count; c; c-- ) {
+	if ( readType() == 4 )
+	    lintEntry();
+        totalSize -= basetableEntryTypes[ 4 ].length;
+    }
+
+
+#if defined( EXTENDED_PROCESSING_READY )
+    /* process any extended data */
+    if ( (totalSize = cth.extended_table_length) ) {
+	if (verbose) puts( SEP_LINE );
+
+        printf( "MP Config Extended Table Entries:\n\n" );
+
+        while ( totalSize > 0 ) {
+            switch ( type = readType() ) {
+            case 128:
+		sasEntry();
+		break;
+            case 129:
+		bhdEntry();
+		break;
+            case 130:
+		cbasmEntry();
+		break;
+            default:
+                printf( "Extended Table HOSED!\n" );
+                exit( 1 );
+            }
+
+            totalSize -= extendedtableEntryTypes[ type-128 ].length;
+        }
+    }
+#endif  /* EXTENDED_PROCESSING_READY */
+
+    /* process any OEM data */
+    if ( cth.oem_table_pointer && (cth.oem_table_size > 0) ) {
+#if defined( OEM_PROCESSING_READY )
+# error your on your own here!
+        /* convert OEM table pointer to virtual address */
+        poemtp = (vm_offset_t)cth.oem_table_pointer;
+
+        /* read in oem table structure */
+        if ( (oemdata = (void*)malloc( cth.oem_table_size )) == NULL )
+            err( 1, "oem malloc" );
+
+        seekEntry( poemtp );
+        readEntry( oemdata, cth.oem_table_size );
+
+        /** process it */
+
+        free( oemdata );
+#else
+        printf( "\nyou need to modify the source to handle OEM data!\n\n" );
+#endif  /* OEM_PROCESSING_READY */
+    }
+
+    fflush( stdout );
+
+#if defined( RAW_DUMP )
+{
+    int		ofd;
+    u_char	dumpbuf[ 4096 ];
+
+    ofd = open( "/tmp/mpdump", O_CREAT | O_RDWR );
+    seekEntry( paddr );
+    readEntry( dumpbuf, 1024 );
+    write( ofd, dumpbuf, 1024 );
+    close( ofd );
+}
+#endif /* RAW_DUMP */
+}
+
+
+/*
+ * 
+ */
+static int
+readType( void )
+{
+    u_char	type;
+
+    if ( read( pfd, &type, sizeof( u_char ) ) != sizeof( u_char ) )
+        err( 1, "type read; pfd: %d", pfd );
+
+    if ( lseek( pfd, -1, SEEK_CUR ) < 0 )
+        err( 1, "type seek" );
+
+    return (int)type;
+}
+
+
+/*
+ * 
+ */
+static void
+seekEntry( vm_offset_t addr )
+{
+    if ( lseek( pfd, (off_t)addr, SEEK_SET ) < 0 )
+        err( 1, "/dev/mem seek" );
+}
+
+
+/*
+ * 
+ */
+static void
+readEntry( void* entry, int size )
+{
+    if ( read( pfd, entry, size ) != size )
+        err( 1, "readEntry" );
+}
+
+
+static void
+processorEntry( void )
+{
+    ProcEntry	entry;
+
+    /* read it into local memory */
+    readEntry( &entry, sizeof( entry ) );
+
+    /* count it */
+    ++ncpu;
+    if (noisy) {
+    printf( "\t\t%2d", entry.apicID );
+    printf( "\t 0x%2x", entry.apicVersion );
+
+    printf( "\t %s, %s",
+            (entry.cpuFlags & PROCENTRY_FLAG_BP) ? "BSP" : "AP",
+            (entry.cpuFlags & PROCENTRY_FLAG_EN) ? "usable" : "unusable" );
+
+    printf( "\t %d\t %d\t %d",
+            (entry.cpuSignature >> 8) & 0x0f,
+            (entry.cpuSignature >> 4) & 0x0f,
+            entry.cpuSignature & 0x0f );
+
+    printf( "\t 0x%04x\n", entry.featureFlags );
+    }
+}
+
+
+/*
+ * 
+ */
+static int
+lookupBusType( char* name )
+{
+    int x;
+
+    for ( x = 0; x < MAX_BUSTYPE; ++x )
+	if ( strcmp( busTypeTable[ x ].name, name ) == 0 )
+	    return busTypeTable[ x ].type;
+
+    return UNKNOWN_BUSTYPE;
+}
+
+
+static void
+busEntry( void )
+{
+    int		x;
+    char	name[ 8 ];
+    char	c;
+    BusEntry	entry;
+
+    /* read it into local memory */
+    readEntry( &entry, sizeof( entry ) );
+
+    /* count it */
+    ++nbus;
+
+    if (verbose)  {
+    printf( "\t\t%2d", entry.busID );
+    printf( "\t " ); pnstr( entry.busType, 6 ); printf( "\n" );
+    }
+
+    for ( x = 0; x < 6; ++x ) {
+//	if ( (c = entry.busType[ x ]) == ' ' )
+	    //break;
+	name[ x ] = c;
+    }
+    name[ x ] = '\0';
+    busses[ entry.busID ] = lookupBusType( name );
+    printf("\tsmp_write_bus(mc, %d, \"", entry.busID);
+    pnstr( entry.busType, 6 );
+    printf("\");\n");
+}
+
+
+static void
+ioApicEntry( void )
+{
+    IOApicEntry	entry;
+
+    /* read it into local memory */
+    readEntry( &entry, sizeof( entry ) );
+
+    /* count it */
+    ++napic;
+
+    if (noisy) {
+    printf( "\t\t%2d", entry.apicID );
+    printf( "\t 0x%02x", entry.apicVersion );
+    printf( "\t %s",
+            (entry.apicFlags & IOAPICENTRY_FLAG_EN) ? "usable" : "unusable" );
+    printf( "\t\t 0x%x\n", entry.apicAddress );
+    }
+
+    apics[ entry.apicID ] = entry.apicID;
+
+    // the numbering and setup of ioapics is so irrational
+    // that for now we will punt. 
+#if 0
+    if (entry.apicFlags & IOAPICENTRY_FLAG_EN)
+      printf("\tsmp_write_ioapic(mc, 0x%x, 0x%x, 0x%x);\n",
+	     entry.apicID, entry.apicVersion, entry.apicAddress);
+#endif
+    
+}
+
+
+char* intTypes[] = {
+    "mp_INT", "mp_NMI", "mp_SMI", "mp_ExtINT"
+};
+
+char* polarityMode[] = {
+    "conforms", "MP_IRQ_POLARITY_HIGH", "reserved", "MP_IRQ_POLARITY_LOW"
+};
+char* triggerMode[] = {
+    "conforms", "MP_IRQ_TRIGGER_EDGE", "reserved", "MP_IRQ_TRIGGER_LEVEL"
+};
+
+static void
+intEntry( void )
+{
+    IntEntry	entry;
+
+    /* read it into local memory */
+    readEntry( &entry, sizeof( entry ) );
+
+    /* count it */
+    if ( (int)entry.type == 3 )
+	++nintr;
+
+    if (noisy) {
+    printf( "\n\t\t%s", intTypes[ (int)entry.intType ] );
+
+    printf( "\t%9s", polarityMode[ (int)entry.intFlags & 0x03 ] );
+    printf( "%12s", triggerMode[ ((int)entry.intFlags >> 2) & 0x03 ] );
+
+    printf( "\t %5d", (int)entry.srcBusID );
+    if ( busses[ (int)entry.srcBusID ] == PCI )
+	printf( "\t%2d:%c", 
+	        ((int)entry.srcBusIRQ >> 2) & 0x1f,
+	        ((int)entry.srcBusIRQ & 0x03) + 'A' );
+    else
+	printf( "\t 0x%x:0x%x(0x%x)", 
+				(int)entry.srcBusIRQ>>2,
+				(int)entry.srcBusIRQ & 3,
+				(int)entry.srcBusIRQ );
+    printf( "\t %6d", (int)entry.dstApicID );
+    printf( "\t %3d\n", (int)entry.dstApicINT );
+    }
+    printf("\tsmp_write_intsrc(mc, %s, %s|%s, 0x%x, 0x%x, 0x%x, 0x%x);\n",
+	   intTypes[ (int)entry.intType ],
+	   triggerMode[ ((int)entry.intFlags >> 2) & 0x03 ] ,
+	   polarityMode[ (int)entry.intFlags & 0x03 ],
+	   (int)entry.srcBusID,
+	   (int)entry.srcBusIRQ,
+	   (int)entry.dstApicID ,
+	   (int)entry.dstApicINT );
+	   
+}
+
+static void
+lintEntry( void )
+{
+    IntEntry	entry;
+
+    /* read it into local memory */
+    readEntry( &entry, sizeof( entry ) );
+
+    /* count it */
+    if ( (int)entry.type == 3 )
+	++nintr;
+
+    if (noisy) {
+    printf( "\t\t%s", intTypes[ (int)entry.intType ] );
+
+    printf( "\t%9s", polarityMode[ (int)entry.intFlags & 0x03 ] );
+    printf( "%12s", triggerMode[ ((int)entry.intFlags >> 2) & 0x03 ] );
+
+    printf( "\t %5d", (int)entry.srcBusID );
+    if ( busses[ (int)entry.srcBusID ] == PCI )
+	printf( "\t%2d:%c", 
+	        ((int)entry.srcBusIRQ >> 2) & 0x1f,
+	        ((int)entry.srcBusIRQ & 0x03) + 'A' );
+    else
+	printf( "\t %3d", (int)entry.srcBusIRQ );
+    printf( "\t %6d", (int)entry.dstApicID );
+    printf( "\t %3d\n", (int)entry.dstApicINT );
+    }
+    printf("\tsmp_write_intsrc(mc, %s, %s|%s, 0x%x, 0x%x, MP_APIC_ALL, 0x%x);\n",
+	   intTypes[ (int)entry.intType ],
+	   triggerMode[ ((int)entry.intFlags >> 2) & 0x03 ] ,
+	   polarityMode[ (int)entry.intFlags & 0x03 ],
+	   (int)entry.srcBusID,
+	   (int)entry.srcBusIRQ,
+	   (int)entry.dstApicINT );
+	   
+}
+
+
+static void
+sasEntry( void )
+{
+    SasEntry	entry;
+
+    /* read it into local memory */
+    readEntry( &entry, sizeof( entry ) );
+
+    printf( "--\n%s\n", extendedtableEntryTypes[ entry.type - 128 ].name );
+    printf( " bus ID: %d", entry.busID );
+    printf( " address type: " );
+    switch ( entry.addressType ) {
+    case 0:
+	printf( "I/O address\n" );
+	break;
+    case 1:
+	printf( "memory address\n" );
+	break;
+    case 2:
+	printf( "prefetch address\n" );
+	break;
+    default:
+	printf( "UNKNOWN type\n" );
+	break;
+    }
+
+    printf( " address base: 0x%qx\n", entry.addressBase );
+    printf( " address range: 0x%qx\n", entry.addressLength );
+}
+
+
+static void
+bhdEntry( void )
+{
+    BhdEntry	entry;
+
+    /* read it into local memory */
+    readEntry( &entry, sizeof( entry ) );
+
+    printf( "--\n%s\n", extendedtableEntryTypes[ entry.type - 128 ].name );
+    printf( " bus ID: %d", entry.busID );
+    printf( " bus info: 0x%02x", entry.busInfo );
+    printf( " parent bus ID: %d", entry.busParent );
+}
+
+
+static void
+cbasmEntry( void )
+{
+    CbasmEntry	entry;
+
+    /* read it into local memory */
+    readEntry( &entry, sizeof( entry ) );
+
+    printf( "--\n%s\n", extendedtableEntryTypes[ entry.type - 128 ].name );
+    printf( " bus ID: %d", entry.busID );
+    printf( " address modifier: %s\n", (entry.addressMod & 0x01) ?
+                                        "subtract" : "add" );
+    printf( " predefined range: 0x%08x", entry.predefinedRange );
+}
+
+
+/*
+ * do a dmesg output
+ */
+static void
+doDmesg( void )
+{
+    if (verbose) puts( SEP_LINE );
+
+    printf( "dmesg output:\n\n" );
+    fflush( stdout );
+    system( "dmesg" );
+}
+
+
+/*
+ *  build "options" entries for the kernel config file
+ */
+static void
+doOptionList( void )
+{
+    if (verbose) puts( SEP_LINE );
+
+    printf( "# SMP kernel config file options:\n\n" );
+    printf( "\n# Required:\n" );
+    printf( "options		SMP\t\t\t# Symmetric MultiProcessor Kernel\n" );
+    printf( "options		APIC_IO\t\t\t# Symmetric (APIC) I/O\n" );
+
+    printf( "\n# Optional (built-in defaults will work in most cases):\n" );
+    printf( "#options		NCPU=%d\t\t\t# number of CPUs\n", ncpu );
+    printf( "#options		NBUS=%d\t\t\t# number of busses\n", nbus );
+    printf( "#options		NAPIC=%d\t\t\t# number of IO APICs\n", napic );
+    printf( "#options		NINTR=%d\t\t# number of INTs\n",
+		(nintr < 24) ? 24 : nintr );
+}
+
+
+/*
+ * 
+ */
+static void
+pnstr( char* s, int c )
+{
+    char string[ MAXPNSTR + 1 ];
+
+    if ( c > MAXPNSTR )
+        c = MAXPNSTR;
+    strncpy( string, s, c );
+    string[ c ] = '\0';
+    printf( "%s", string );
+}