diff options
Diffstat (limited to 'include/asm-x86/mpspec_def.h')
-rw-r--r-- | include/asm-x86/mpspec_def.h | 46 |
1 files changed, 13 insertions, 33 deletions
diff --git a/include/asm-x86/mpspec_def.h b/include/asm-x86/mpspec_def.h index 3504617fe648..dc6ef85e3624 100644 --- a/include/asm-x86/mpspec_def.h +++ b/include/asm-x86/mpspec_def.h | |||
@@ -11,7 +11,7 @@ | |||
11 | * information is. | 11 | * information is. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #define SMP_MAGIC_IDENT (('_'<<24)|('P'<<16)|('M'<<8)|'_') | 14 | #define SMP_MAGIC_IDENT (('_'<<24) | ('P'<<16) | ('M'<<8) | '_') |
15 | 15 | ||
16 | #ifdef CONFIG_X86_32 | 16 | #ifdef CONFIG_X86_32 |
17 | # define MAX_MPC_ENTRY 1024 | 17 | # define MAX_MPC_ENTRY 1024 |
@@ -23,8 +23,7 @@ | |||
23 | # define MAX_APICS 255 | 23 | # define MAX_APICS 255 |
24 | #endif | 24 | #endif |
25 | 25 | ||
26 | struct intel_mp_floating | 26 | struct intel_mp_floating { |
27 | { | ||
28 | char mpf_signature[4]; /* "_MP_" */ | 27 | char mpf_signature[4]; /* "_MP_" */ |
29 | unsigned int mpf_physptr; /* Configuration table address */ | 28 | unsigned int mpf_physptr; /* Configuration table address */ |
30 | unsigned char mpf_length; /* Our length (paragraphs) */ | 29 | unsigned char mpf_length; /* Our length (paragraphs) */ |
@@ -39,14 +38,13 @@ struct intel_mp_floating | |||
39 | 38 | ||
40 | #define MPC_SIGNATURE "PCMP" | 39 | #define MPC_SIGNATURE "PCMP" |
41 | 40 | ||
42 | struct mp_config_table | 41 | struct mp_config_table { |
43 | { | ||
44 | char mpc_signature[4]; | 42 | char mpc_signature[4]; |
45 | unsigned short mpc_length; /* Size of table */ | 43 | unsigned short mpc_length; /* Size of table */ |
46 | char mpc_spec; /* 0x01 */ | 44 | char mpc_spec; /* 0x01 */ |
47 | char mpc_checksum; | 45 | char mpc_checksum; |
48 | char mpc_oem[8]; | 46 | char mpc_oem[8]; |
49 | char mpc_productid[12]; | 47 | char mpc_productid[12]; |
50 | unsigned int mpc_oemptr; /* 0 if not present */ | 48 | unsigned int mpc_oemptr; /* 0 if not present */ |
51 | unsigned short mpc_oemsize; /* 0 if not present */ | 49 | unsigned short mpc_oemsize; /* 0 if not present */ |
52 | unsigned short mpc_oemcount; | 50 | unsigned short mpc_oemcount; |
@@ -71,8 +69,7 @@ struct mp_config_table | |||
71 | #define CPU_MODEL_MASK 0x00F0 | 69 | #define CPU_MODEL_MASK 0x00F0 |
72 | #define CPU_FAMILY_MASK 0x0F00 | 70 | #define CPU_FAMILY_MASK 0x0F00 |
73 | 71 | ||
74 | struct mpc_config_processor | 72 | struct mpc_config_processor { |
75 | { | ||
76 | unsigned char mpc_type; | 73 | unsigned char mpc_type; |
77 | unsigned char mpc_apicid; /* Local APIC number */ | 74 | unsigned char mpc_apicid; /* Local APIC number */ |
78 | unsigned char mpc_apicver; /* Its versions */ | 75 | unsigned char mpc_apicver; /* Its versions */ |
@@ -82,8 +79,7 @@ struct mpc_config_processor | |||
82 | unsigned int mpc_reserved[2]; | 79 | unsigned int mpc_reserved[2]; |
83 | }; | 80 | }; |
84 | 81 | ||
85 | struct mpc_config_bus | 82 | struct mpc_config_bus { |
86 | { | ||
87 | unsigned char mpc_type; | 83 | unsigned char mpc_type; |
88 | unsigned char mpc_busid; | 84 | unsigned char mpc_busid; |
89 | unsigned char mpc_bustype[6]; | 85 | unsigned char mpc_bustype[6]; |
@@ -111,8 +107,7 @@ struct mpc_config_bus | |||
111 | 107 | ||
112 | #define MPC_APIC_USABLE 0x01 | 108 | #define MPC_APIC_USABLE 0x01 |
113 | 109 | ||
114 | struct mpc_config_ioapic | 110 | struct mpc_config_ioapic { |
115 | { | ||
116 | unsigned char mpc_type; | 111 | unsigned char mpc_type; |
117 | unsigned char mpc_apicid; | 112 | unsigned char mpc_apicid; |
118 | unsigned char mpc_apicver; | 113 | unsigned char mpc_apicver; |
@@ -120,8 +115,7 @@ struct mpc_config_ioapic | |||
120 | unsigned int mpc_apicaddr; | 115 | unsigned int mpc_apicaddr; |
121 | }; | 116 | }; |
122 | 117 | ||
123 | struct mpc_config_intsrc | 118 | struct mpc_config_intsrc { |
124 | { | ||
125 | unsigned char mpc_type; | 119 | unsigned char mpc_type; |
126 | unsigned char mpc_irqtype; | 120 | unsigned char mpc_irqtype; |
127 | unsigned short mpc_irqflag; | 121 | unsigned short mpc_irqflag; |
@@ -144,8 +138,7 @@ enum mp_irq_source_types { | |||
144 | 138 | ||
145 | #define MP_APIC_ALL 0xFF | 139 | #define MP_APIC_ALL 0xFF |
146 | 140 | ||
147 | struct mpc_config_lintsrc | 141 | struct mpc_config_lintsrc { |
148 | { | ||
149 | unsigned char mpc_type; | 142 | unsigned char mpc_type; |
150 | unsigned char mpc_irqtype; | 143 | unsigned char mpc_irqtype; |
151 | unsigned short mpc_irqflag; | 144 | unsigned short mpc_irqflag; |
@@ -157,8 +150,7 @@ struct mpc_config_lintsrc | |||
157 | 150 | ||
158 | #define MPC_OEM_SIGNATURE "_OEM" | 151 | #define MPC_OEM_SIGNATURE "_OEM" |
159 | 152 | ||
160 | struct mp_config_oemtable | 153 | struct mp_config_oemtable { |
161 | { | ||
162 | char oem_signature[4]; | 154 | char oem_signature[4]; |
163 | unsigned short oem_length; /* Size of table */ | 155 | unsigned short oem_length; /* Size of table */ |
164 | char oem_rev; /* 0x01 */ | 156 | char oem_rev; /* 0x01 */ |
@@ -166,17 +158,6 @@ struct mp_config_oemtable | |||
166 | char mpc_oem[8]; | 158 | char mpc_oem[8]; |
167 | }; | 159 | }; |
168 | 160 | ||
169 | struct mpc_config_translation | ||
170 | { | ||
171 | unsigned char mpc_type; | ||
172 | unsigned char trans_len; | ||
173 | unsigned char trans_type; | ||
174 | unsigned char trans_quad; | ||
175 | unsigned char trans_global; | ||
176 | unsigned char trans_local; | ||
177 | unsigned short trans_reserved; | ||
178 | }; | ||
179 | |||
180 | /* | 161 | /* |
181 | * Default configurations | 162 | * Default configurations |
182 | * | 163 | * |
@@ -196,4 +177,3 @@ enum mp_bustype { | |||
196 | MP_BUS_MCA, | 177 | MP_BUS_MCA, |
197 | }; | 178 | }; |
198 | #endif | 179 | #endif |
199 | |||