x86: cleanup mpspec variants

Bring the mpspec variants into sync to prepare merging and
paravirt support.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

1 files changed, 50 insertions, 37 deletions

diff --git a/include/asm-x86/mpspec_def.h b/include/asm-x86/mpspec_def.h
index 13bafb16e7af..3504617fe648 100644
--- a/include/asm-x86/mpspec_def.h
+++ b/include/asm-x86/mpspec_def.h
@@ -8,52 +8,68 @@
 
 /*
  * This tag identifies where the SMP configuration
- * information is. 
+ * information is.
  */
- 
+
 #define SMP_MAGIC_IDENT (('_'<<24)|('P'<<16)|('M'<<8)|'_')
 
-#define MAX_MPC_ENTRY 1024
-#define MAX_APICS      256
+#ifdef CONFIG_X86_32
+# define MAX_MPC_ENTRY 1024
+# define MAX_APICS      256
+#else
+/*
+ * A maximum of 255 APICs with the current APIC ID architecture.
+ */
+# define MAX_APICS 255
+#endif
 
 struct intel_mp_floating
 {
-        char mpf_signature[4];          /* "_MP_"                       */
-        unsigned long mpf_physptr;      /* Configuration table address  */
+        char mpf_signature[4];          /* "_MP_"                       */
+        unsigned int mpf_physptr;       /* Configuration table address  */
         unsigned char mpf_length;       /* Our length (paragraphs)      */
         unsigned char mpf_specification;/* Specification version        */
         unsigned char mpf_checksum;     /* Checksum (makes sum 0)       */
-        unsigned char mpf_feature1;     /* Standard or configuration ?  */
+        unsigned char mpf_feature1;     /* Standard or configuration ?  */
         unsigned char mpf_feature2;     /* Bit7 set for IMCR|PIC        */
         unsigned char mpf_feature3;     /* Unused (0)                   */
         unsigned char mpf_feature4;     /* Unused (0)                   */
         unsigned char mpf_feature5;     /* Unused (0)                   */
 };
 
+#define MPC_SIGNATURE "PCMP"
+
 struct mp_config_table
 {
         char mpc_signature[4];
-#define MPC_SIGNATURE "PCMP"
         unsigned short mpc_length;      /* Size of table */
         char  mpc_spec;                 /* 0x01 */
         char  mpc_checksum;
         char  mpc_oem[8];
         char  mpc_productid[12];
-        unsigned long mpc_oemptr;       /* 0 if not present */
+        unsigned int mpc_oemptr;        /* 0 if not present */
         unsigned short mpc_oemsize;     /* 0 if not present */
         unsigned short mpc_oemcount;
-        unsigned long mpc_lapic;        /* APIC address */
-        unsigned long reserved;
+        unsigned int mpc_lapic; /* APIC address */
+        unsigned int reserved;
 };
 
 /* Followed by entries */
 
-#define MP_PROCESSOR    0
-#define MP_BUS          1
-#define MP_IOAPIC       2
-#define MP_INTSRC       3
-#define MP_LINTSRC      4
-#define MP_TRANSLATION  192  /* Used by IBM NUMA-Q to describe node locality */
+#define MP_PROCESSOR            0
+#define MP_BUS                  1
+#define MP_IOAPIC               2
+#define MP_INTSRC               3
+#define MP_LINTSRC              4
+/* Used by IBM NUMA-Q to describe node locality */
+#define MP_TRANSLATION          192
+
+#define CPU_ENABLED             1       /* Processor is available */
+#define CPU_BOOTPROCESSOR       2       /* Processor is the BP */
+
+#define CPU_STEPPING_MASK       0x000F
+#define CPU_MODEL_MASK          0x00F0
+#define CPU_FAMILY_MASK         0x0F00
 
 struct mpc_config_processor
 {
@@ -61,14 +77,9 @@ struct mpc_config_processor
         unsigned char mpc_apicid;       /* Local APIC number */
         unsigned char mpc_apicver;      /* Its versions */
         unsigned char mpc_cpuflag;
-#define CPU_ENABLED             1       /* Processor is available */
-#define CPU_BOOTPROCESSOR       2       /* Processor is the BP */
-        unsigned long mpc_cpufeature;           
-#define CPU_STEPPING_MASK 0x0F
-#define CPU_MODEL_MASK  0xF0
-#define CPU_FAMILY_MASK 0xF00
-        unsigned long mpc_featureflag;  /* CPUID feature value */
-        unsigned long mpc_reserved[2];
+        unsigned int mpc_cpufeature;
+        unsigned int mpc_featureflag;   /* CPUID feature value */
+        unsigned int mpc_reserved[2];
 };
 
 struct mpc_config_bus
@@ -98,14 +109,15 @@ struct mpc_config_bus
 #define BUSTYPE_VME     "VME"
 #define BUSTYPE_XPRESS  "XPRESS"
 
+#define MPC_APIC_USABLE         0x01
+
 struct mpc_config_ioapic
 {
         unsigned char mpc_type;
         unsigned char mpc_apicid;
         unsigned char mpc_apicver;
         unsigned char mpc_flags;
-#define MPC_APIC_USABLE         0x01
-        unsigned long mpc_apicaddr;
+        unsigned int mpc_apicaddr;
 };
 
 struct mpc_config_intsrc
@@ -130,6 +142,7 @@ enum mp_irq_source_types {
 #define MP_IRQDIR_HIGH          1
 #define MP_IRQDIR_LOW           3
 
+#define MP_APIC_ALL     0xFF
 
 struct mpc_config_lintsrc
 {
@@ -138,15 +151,15 @@ struct mpc_config_lintsrc
         unsigned short mpc_irqflag;
         unsigned char mpc_srcbusid;
         unsigned char mpc_srcbusirq;
-        unsigned char mpc_destapic;     
-#define MP_APIC_ALL     0xFF
+        unsigned char mpc_destapic;
         unsigned char mpc_destapiclint;
 };
 
+#define MPC_OEM_SIGNATURE "_OEM"
+
 struct mp_config_oemtable
 {
         char oem_signature[4];
-#define MPC_OEM_SIGNATURE "_OEM"
         unsigned short oem_length;      /* Size of table */
         char  oem_rev;                  /* 0x01 */
         char  oem_checksum;
@@ -155,13 +168,13 @@ struct mp_config_oemtable
 
 struct mpc_config_translation
 {
-        unsigned char mpc_type;
-        unsigned char trans_len;
-        unsigned char trans_type;
-        unsigned char trans_quad;
-        unsigned char trans_global;
-        unsigned char trans_local;
-        unsigned short trans_reserved;
+        unsigned char mpc_type;
+        unsigned char trans_len;
+        unsigned char trans_type;
+        unsigned char trans_quad;
+        unsigned char trans_global;
+        unsigned char trans_local;
+        unsigned short trans_reserved;
 };
 
 /*