diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:49:38 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-13 03:49:38 -0500 |
commit | b1864e9a1afef41709886072c6e6248def0386f4 (patch) | |
tree | 2fe749209cf860c1dd10efd1bd2ad8df572bd66e /arch | |
parent | e9c4ffb11f0b19005b5b9dc8481687a3637e5887 (diff) | |
parent | 7032e8696726354d6180d8a2d17191f958cd93ae (diff) |
Merge branch 'x86/core' into perfcounters/core
Conflicts:
arch/x86/Kconfig
arch/x86/kernel/apic.c
arch/x86/kernel/setup_percpu.c
Diffstat (limited to 'arch')
209 files changed, 8103 insertions, 7527 deletions
diff --git a/arch/ia64/include/asm/percpu.h b/arch/ia64/include/asm/percpu.h index 77f30b664b4e..30cf46534dd2 100644 --- a/arch/ia64/include/asm/percpu.h +++ b/arch/ia64/include/asm/percpu.h | |||
@@ -27,12 +27,12 @@ extern void *per_cpu_init(void); | |||
27 | 27 | ||
28 | #else /* ! SMP */ | 28 | #else /* ! SMP */ |
29 | 29 | ||
30 | #define PER_CPU_ATTRIBUTES __attribute__((__section__(".data.percpu"))) | ||
31 | |||
32 | #define per_cpu_init() (__phys_per_cpu_start) | 30 | #define per_cpu_init() (__phys_per_cpu_start) |
33 | 31 | ||
34 | #endif /* SMP */ | 32 | #endif /* SMP */ |
35 | 33 | ||
34 | #define PER_CPU_BASE_SECTION ".data.percpu" | ||
35 | |||
36 | /* | 36 | /* |
37 | * Be extremely careful when taking the address of this variable! Due to virtual | 37 | * Be extremely careful when taking the address of this variable! Due to virtual |
38 | * remapping, it is different from the canonical address returned by __get_cpu_var(var)! | 38 | * remapping, it is different from the canonical address returned by __get_cpu_var(var)! |
diff --git a/arch/ia64/include/asm/uv/uv.h b/arch/ia64/include/asm/uv/uv.h new file mode 100644 index 000000000000..61b5bdfd980e --- /dev/null +++ b/arch/ia64/include/asm/uv/uv.h | |||
@@ -0,0 +1,13 @@ | |||
1 | #ifndef _ASM_IA64_UV_UV_H | ||
2 | #define _ASM_IA64_UV_UV_H | ||
3 | |||
4 | #include <asm/system.h> | ||
5 | #include <asm/sn/simulator.h> | ||
6 | |||
7 | static inline int is_uv_system(void) | ||
8 | { | ||
9 | /* temporary support for running on hardware simulator */ | ||
10 | return IS_MEDUSA() || ia64_platform_is("uv"); | ||
11 | } | ||
12 | |||
13 | #endif /* _ASM_IA64_UV_UV_H */ | ||
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c index d541671caf4a..2363ed173198 100644 --- a/arch/ia64/kernel/acpi.c +++ b/arch/ia64/kernel/acpi.c | |||
@@ -199,6 +199,10 @@ char *__init __acpi_map_table(unsigned long phys_addr, unsigned long size) | |||
199 | return __va(phys_addr); | 199 | return __va(phys_addr); |
200 | } | 200 | } |
201 | 201 | ||
202 | char *__init __acpi_unmap_table(unsigned long virt_addr, unsigned long size) | ||
203 | { | ||
204 | } | ||
205 | |||
202 | /* -------------------------------------------------------------------------- | 206 | /* -------------------------------------------------------------------------- |
203 | Boot-time Table Parsing | 207 | Boot-time Table Parsing |
204 | -------------------------------------------------------------------------- */ | 208 | -------------------------------------------------------------------------- */ |
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 97d3bd17b7df..f2d0d24c0b68 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -5,7 +5,7 @@ mainmenu "Linux Kernel Configuration for x86" | |||
5 | config 64BIT | 5 | config 64BIT |
6 | bool "64-bit kernel" if ARCH = "x86" | 6 | bool "64-bit kernel" if ARCH = "x86" |
7 | default ARCH = "x86_64" | 7 | default ARCH = "x86_64" |
8 | help | 8 | ---help--- |
9 | Say yes to build a 64-bit kernel - formerly known as x86_64 | 9 | Say yes to build a 64-bit kernel - formerly known as x86_64 |
10 | Say no to build a 32-bit kernel - formerly known as i386 | 10 | Say no to build a 32-bit kernel - formerly known as i386 |
11 | 11 | ||
@@ -34,8 +34,8 @@ config X86 | |||
34 | select HAVE_FUNCTION_TRACER | 34 | select HAVE_FUNCTION_TRACER |
35 | select HAVE_FUNCTION_GRAPH_TRACER | 35 | select HAVE_FUNCTION_GRAPH_TRACER |
36 | select HAVE_FUNCTION_TRACE_MCOUNT_TEST | 36 | select HAVE_FUNCTION_TRACE_MCOUNT_TEST |
37 | select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) | 37 | select HAVE_KVM |
38 | select HAVE_ARCH_KGDB if !X86_VOYAGER | 38 | select HAVE_ARCH_KGDB |
39 | select HAVE_ARCH_TRACEHOOK | 39 | select HAVE_ARCH_TRACEHOOK |
40 | select HAVE_GENERIC_DMA_COHERENT if X86_32 | 40 | select HAVE_GENERIC_DMA_COHERENT if X86_32 |
41 | select HAVE_EFFICIENT_UNALIGNED_ACCESS | 41 | select HAVE_EFFICIENT_UNALIGNED_ACCESS |
@@ -133,18 +133,16 @@ config ARCH_HAS_CACHE_LINE_SIZE | |||
133 | def_bool y | 133 | def_bool y |
134 | 134 | ||
135 | config HAVE_SETUP_PER_CPU_AREA | 135 | config HAVE_SETUP_PER_CPU_AREA |
136 | def_bool X86_64_SMP || (X86_SMP && !X86_VOYAGER) | 136 | def_bool y |
137 | 137 | ||
138 | config HAVE_CPUMASK_OF_CPU_MAP | 138 | config HAVE_CPUMASK_OF_CPU_MAP |
139 | def_bool X86_64_SMP | 139 | def_bool X86_64_SMP |
140 | 140 | ||
141 | config ARCH_HIBERNATION_POSSIBLE | 141 | config ARCH_HIBERNATION_POSSIBLE |
142 | def_bool y | 142 | def_bool y |
143 | depends on !SMP || !X86_VOYAGER | ||
144 | 143 | ||
145 | config ARCH_SUSPEND_POSSIBLE | 144 | config ARCH_SUSPEND_POSSIBLE |
146 | def_bool y | 145 | def_bool y |
147 | depends on !X86_VOYAGER | ||
148 | 146 | ||
149 | config ZONE_DMA32 | 147 | config ZONE_DMA32 |
150 | bool | 148 | bool |
@@ -174,11 +172,6 @@ config GENERIC_PENDING_IRQ | |||
174 | depends on GENERIC_HARDIRQS && SMP | 172 | depends on GENERIC_HARDIRQS && SMP |
175 | default y | 173 | default y |
176 | 174 | ||
177 | config X86_SMP | ||
178 | bool | ||
179 | depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64) | ||
180 | default y | ||
181 | |||
182 | config USE_GENERIC_SMP_HELPERS | 175 | config USE_GENERIC_SMP_HELPERS |
183 | def_bool y | 176 | def_bool y |
184 | depends on SMP | 177 | depends on SMP |
@@ -194,19 +187,17 @@ config X86_64_SMP | |||
194 | config X86_HT | 187 | config X86_HT |
195 | bool | 188 | bool |
196 | depends on SMP | 189 | depends on SMP |
197 | depends on (X86_32 && !X86_VOYAGER) || X86_64 | ||
198 | default y | ||
199 | |||
200 | config X86_BIOS_REBOOT | ||
201 | bool | ||
202 | depends on !X86_VOYAGER | ||
203 | default y | 190 | default y |
204 | 191 | ||
205 | config X86_TRAMPOLINE | 192 | config X86_TRAMPOLINE |
206 | bool | 193 | bool |
207 | depends on X86_SMP || (X86_VOYAGER && SMP) || (64BIT && ACPI_SLEEP) | 194 | depends on SMP || (64BIT && ACPI_SLEEP) |
208 | default y | 195 | default y |
209 | 196 | ||
197 | config X86_32_LAZY_GS | ||
198 | def_bool y | ||
199 | depends on X86_32 && !CC_STACKPROTECTOR | ||
200 | |||
210 | config KTIME_SCALAR | 201 | config KTIME_SCALAR |
211 | def_bool X86_32 | 202 | def_bool X86_32 |
212 | source "init/Kconfig" | 203 | source "init/Kconfig" |
@@ -244,14 +235,10 @@ config SMP | |||
244 | 235 | ||
245 | If you don't know what to do here, say N. | 236 | If you don't know what to do here, say N. |
246 | 237 | ||
247 | config X86_HAS_BOOT_CPU_ID | ||
248 | def_bool y | ||
249 | depends on X86_VOYAGER | ||
250 | |||
251 | config SPARSE_IRQ | 238 | config SPARSE_IRQ |
252 | bool "Support sparse irq numbering" | 239 | bool "Support sparse irq numbering" |
253 | depends on PCI_MSI || HT_IRQ | 240 | depends on PCI_MSI || HT_IRQ |
254 | help | 241 | ---help--- |
255 | This enables support for sparse irqs. This is useful for distro | 242 | This enables support for sparse irqs. This is useful for distro |
256 | kernels that want to define a high CONFIG_NR_CPUS value but still | 243 | kernels that want to define a high CONFIG_NR_CPUS value but still |
257 | want to have low kernel memory footprint on smaller machines. | 244 | want to have low kernel memory footprint on smaller machines. |
@@ -265,114 +252,114 @@ config NUMA_MIGRATE_IRQ_DESC | |||
265 | bool "Move irq desc when changing irq smp_affinity" | 252 | bool "Move irq desc when changing irq smp_affinity" |
266 | depends on SPARSE_IRQ && NUMA | 253 | depends on SPARSE_IRQ && NUMA |
267 | default n | 254 | default n |
268 | help | 255 | ---help--- |
269 | This enables moving irq_desc to cpu/node that irq will use handled. | 256 | This enables moving irq_desc to cpu/node that irq will use handled. |
270 | 257 | ||
271 | If you don't know what to do here, say N. | 258 | If you don't know what to do here, say N. |
272 | 259 | ||
273 | config X86_FIND_SMP_CONFIG | ||
274 | def_bool y | ||
275 | depends on X86_MPPARSE || X86_VOYAGER | ||
276 | |||
277 | config X86_MPPARSE | 260 | config X86_MPPARSE |
278 | bool "Enable MPS table" if ACPI | 261 | bool "Enable MPS table" if ACPI |
279 | default y | 262 | default y |
280 | depends on X86_LOCAL_APIC | 263 | depends on X86_LOCAL_APIC |
281 | help | 264 | ---help--- |
282 | For old smp systems that do not have proper acpi support. Newer systems | 265 | For old smp systems that do not have proper acpi support. Newer systems |
283 | (esp with 64bit cpus) with acpi support, MADT and DSDT will override it | 266 | (esp with 64bit cpus) with acpi support, MADT and DSDT will override it |
284 | 267 | ||
285 | choice | 268 | config X86_BIGSMP |
286 | prompt "Subarchitecture Type" | 269 | bool "Support for big SMP systems with more than 8 CPUs" |
287 | default X86_PC | 270 | depends on X86_32 && SMP |
271 | ---help--- | ||
272 | This option is needed for the systems that have more than 8 CPUs | ||
288 | 273 | ||
289 | config X86_PC | 274 | config X86_EXTENDED_PLATFORM |
290 | bool "PC-compatible" | 275 | bool "Support for extended (non-PC) x86 platforms" |
291 | help | 276 | default y |
292 | Choose this option if your computer is a standard PC or compatible. | 277 | ---help--- |
278 | If you disable this option then the kernel will only support | ||
279 | standard PC platforms. (which covers the vast majority of | ||
280 | systems out there.) | ||
281 | |||
282 | If you enable this option then you'll be able to select a number | ||
283 | of non-PC x86 platforms. | ||
284 | |||
285 | If you have one of these systems, or if you want to build a | ||
286 | generic distribution kernel, say Y here - otherwise say N. | ||
287 | |||
288 | # This is an alphabetically sorted list of 64 bit extended platforms | ||
289 | # Please maintain the alphabetic order if and when there are additions | ||
290 | |||
291 | config X86_VSMP | ||
292 | bool "ScaleMP vSMP" | ||
293 | select PARAVIRT | ||
294 | depends on X86_64 && PCI | ||
295 | depends on X86_EXTENDED_PLATFORM | ||
296 | ---help--- | ||
297 | Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is | ||
298 | supposed to run on these EM64T-based machines. Only choose this option | ||
299 | if you have one of these machines. | ||
300 | |||
301 | config X86_UV | ||
302 | bool "SGI Ultraviolet" | ||
303 | depends on X86_64 | ||
304 | depends on X86_EXTENDED_PLATFORM | ||
305 | ---help--- | ||
306 | This option is needed in order to support SGI Ultraviolet systems. | ||
307 | If you don't have one of these, you should say N here. | ||
308 | |||
309 | # Following is an alphabetically sorted list of 32 bit extended platforms | ||
310 | # Please maintain the alphabetic order if and when there are additions | ||
293 | 311 | ||
294 | config X86_ELAN | 312 | config X86_ELAN |
295 | bool "AMD Elan" | 313 | bool "AMD Elan" |
296 | depends on X86_32 | 314 | depends on X86_32 |
297 | help | 315 | depends on X86_EXTENDED_PLATFORM |
316 | ---help--- | ||
298 | Select this for an AMD Elan processor. | 317 | Select this for an AMD Elan processor. |
299 | 318 | ||
300 | Do not use this option for K6/Athlon/Opteron processors! | 319 | Do not use this option for K6/Athlon/Opteron processors! |
301 | 320 | ||
302 | If unsure, choose "PC-compatible" instead. | 321 | If unsure, choose "PC-compatible" instead. |
303 | 322 | ||
304 | config X86_VOYAGER | 323 | config X86_RDC321X |
305 | bool "Voyager (NCR)" | 324 | bool "RDC R-321x SoC" |
306 | depends on X86_32 && (SMP || BROKEN) && !PCI | ||
307 | help | ||
308 | Voyager is an MCA-based 32-way capable SMP architecture proprietary | ||
309 | to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based. | ||
310 | |||
311 | *** WARNING *** | ||
312 | |||
313 | If you do not specifically know you have a Voyager based machine, | ||
314 | say N here, otherwise the kernel you build will not be bootable. | ||
315 | |||
316 | config X86_GENERICARCH | ||
317 | bool "Generic architecture" | ||
318 | depends on X86_32 | 325 | depends on X86_32 |
319 | help | 326 | depends on X86_EXTENDED_PLATFORM |
320 | This option compiles in the NUMAQ, Summit, bigsmp, ES7000, default | 327 | select M486 |
328 | select X86_REBOOTFIXUPS | ||
329 | ---help--- | ||
330 | This option is needed for RDC R-321x system-on-chip, also known | ||
331 | as R-8610-(G). | ||
332 | If you don't have one of these chips, you should say N here. | ||
333 | |||
334 | config X86_32_NON_STANDARD | ||
335 | bool "Support non-standard 32-bit SMP architectures" | ||
336 | depends on X86_32 && SMP | ||
337 | depends on X86_EXTENDED_PLATFORM | ||
338 | ---help--- | ||
339 | This option compiles in the NUMAQ, Summit, bigsmp, ES7000, default | ||
321 | subarchitectures. It is intended for a generic binary kernel. | 340 | subarchitectures. It is intended for a generic binary kernel. |
322 | if you select them all, kernel will probe it one by one. and will | 341 | if you select them all, kernel will probe it one by one. and will |
323 | fallback to default. | 342 | fallback to default. |
324 | 343 | ||
325 | if X86_GENERICARCH | 344 | # Alphabetically sorted list of Non standard 32 bit platforms |
326 | 345 | ||
327 | config X86_NUMAQ | 346 | config X86_NUMAQ |
328 | bool "NUMAQ (IBM/Sequent)" | 347 | bool "NUMAQ (IBM/Sequent)" |
329 | depends on SMP && X86_32 && PCI && X86_MPPARSE | 348 | depends on X86_32_NON_STANDARD |
330 | select NUMA | 349 | select NUMA |
331 | help | 350 | select X86_MPPARSE |
351 | ---help--- | ||
332 | This option is used for getting Linux to run on a NUMAQ (IBM/Sequent) | 352 | This option is used for getting Linux to run on a NUMAQ (IBM/Sequent) |
333 | NUMA multiquad box. This changes the way that processors are | 353 | NUMA multiquad box. This changes the way that processors are |
334 | bootstrapped, and uses Clustered Logical APIC addressing mode instead | 354 | bootstrapped, and uses Clustered Logical APIC addressing mode instead |
335 | of Flat Logical. You will need a new lynxer.elf file to flash your | 355 | of Flat Logical. You will need a new lynxer.elf file to flash your |
336 | firmware with - send email to <Martin.Bligh@us.ibm.com>. | 356 | firmware with - send email to <Martin.Bligh@us.ibm.com>. |
337 | 357 | ||
338 | config X86_SUMMIT | ||
339 | bool "Summit/EXA (IBM x440)" | ||
340 | depends on X86_32 && SMP | ||
341 | help | ||
342 | This option is needed for IBM systems that use the Summit/EXA chipset. | ||
343 | In particular, it is needed for the x440. | ||
344 | |||
345 | config X86_ES7000 | ||
346 | bool "Support for Unisys ES7000 IA32 series" | ||
347 | depends on X86_32 && SMP | ||
348 | help | ||
349 | Support for Unisys ES7000 systems. Say 'Y' here if this kernel is | ||
350 | supposed to run on an IA32-based Unisys ES7000 system. | ||
351 | |||
352 | config X86_BIGSMP | ||
353 | bool "Support for big SMP systems with more than 8 CPUs" | ||
354 | depends on X86_32 && SMP | ||
355 | help | ||
356 | This option is needed for the systems that have more than 8 CPUs | ||
357 | and if the system is not of any sub-arch type above. | ||
358 | |||
359 | endif | ||
360 | |||
361 | config X86_VSMP | ||
362 | bool "Support for ScaleMP vSMP" | ||
363 | select PARAVIRT | ||
364 | depends on X86_64 && PCI | ||
365 | help | ||
366 | Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is | ||
367 | supposed to run on these EM64T-based machines. Only choose this option | ||
368 | if you have one of these machines. | ||
369 | |||
370 | endchoice | ||
371 | |||
372 | config X86_VISWS | 358 | config X86_VISWS |
373 | bool "SGI 320/540 (Visual Workstation)" | 359 | bool "SGI 320/540 (Visual Workstation)" |
374 | depends on X86_32 && PCI && !X86_VOYAGER && X86_MPPARSE && PCI_GODIRECT | 360 | depends on X86_32 && PCI && X86_MPPARSE && PCI_GODIRECT |
375 | help | 361 | depends on X86_32_NON_STANDARD |
362 | ---help--- | ||
376 | The SGI Visual Workstation series is an IA32-based workstation | 363 | The SGI Visual Workstation series is an IA32-based workstation |
377 | based on SGI systems chips with some legacy PC hardware attached. | 364 | based on SGI systems chips with some legacy PC hardware attached. |
378 | 365 | ||
@@ -381,28 +368,38 @@ config X86_VISWS | |||
381 | A kernel compiled for the Visual Workstation will run on general | 368 | A kernel compiled for the Visual Workstation will run on general |
382 | PCs as well. See <file:Documentation/sgi-visws.txt> for details. | 369 | PCs as well. See <file:Documentation/sgi-visws.txt> for details. |
383 | 370 | ||
384 | config X86_RDC321X | 371 | config X86_SUMMIT |
385 | bool "RDC R-321x SoC" | 372 | bool "Summit/EXA (IBM x440)" |
386 | depends on X86_32 | 373 | depends on X86_32_NON_STANDARD |
387 | select M486 | 374 | ---help--- |
388 | select X86_REBOOTFIXUPS | 375 | This option is needed for IBM systems that use the Summit/EXA chipset. |
389 | help | 376 | In particular, it is needed for the x440. |
390 | This option is needed for RDC R-321x system-on-chip, also known | ||
391 | as R-8610-(G). | ||
392 | If you don't have one of these chips, you should say N here. | ||
393 | 377 | ||
394 | config X86_UV | 378 | config X86_ES7000 |
395 | bool "SGI Ultraviolet" | 379 | bool "Unisys ES7000 IA32 series" |
396 | depends on X86_64 | 380 | depends on X86_32_NON_STANDARD && X86_BIGSMP |
397 | help | 381 | ---help--- |
398 | This option is needed in order to support SGI Ultraviolet systems. | 382 | Support for Unisys ES7000 systems. Say 'Y' here if this kernel is |
399 | If you don't have one of these, you should say N here. | 383 | supposed to run on an IA32-based Unisys ES7000 system. |
384 | |||
385 | config X86_VOYAGER | ||
386 | bool "Voyager (NCR)" | ||
387 | depends on SMP && !PCI && BROKEN | ||
388 | depends on X86_32_NON_STANDARD | ||
389 | ---help--- | ||
390 | Voyager is an MCA-based 32-way capable SMP architecture proprietary | ||
391 | to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based. | ||
392 | |||
393 | *** WARNING *** | ||
394 | |||
395 | If you do not specifically know you have a Voyager based machine, | ||
396 | say N here, otherwise the kernel you build will not be bootable. | ||
400 | 397 | ||
401 | config SCHED_OMIT_FRAME_POINTER | 398 | config SCHED_OMIT_FRAME_POINTER |
402 | def_bool y | 399 | def_bool y |
403 | prompt "Single-depth WCHAN output" | 400 | prompt "Single-depth WCHAN output" |
404 | depends on X86 | 401 | depends on X86 |
405 | help | 402 | ---help--- |
406 | Calculate simpler /proc/<PID>/wchan values. If this option | 403 | Calculate simpler /proc/<PID>/wchan values. If this option |
407 | is disabled then wchan values will recurse back to the | 404 | is disabled then wchan values will recurse back to the |
408 | caller function. This provides more accurate wchan values, | 405 | caller function. This provides more accurate wchan values, |
@@ -412,7 +409,7 @@ config SCHED_OMIT_FRAME_POINTER | |||
412 | 409 | ||
413 | menuconfig PARAVIRT_GUEST | 410 | menuconfig PARAVIRT_GUEST |
414 | bool "Paravirtualized guest support" | 411 | bool "Paravirtualized guest support" |
415 | help | 412 | ---help--- |
416 | Say Y here to get to see options related to running Linux under | 413 | Say Y here to get to see options related to running Linux under |
417 | various hypervisors. This option alone does not add any kernel code. | 414 | various hypervisors. This option alone does not add any kernel code. |
418 | 415 | ||
@@ -426,8 +423,7 @@ config VMI | |||
426 | bool "VMI Guest support" | 423 | bool "VMI Guest support" |
427 | select PARAVIRT | 424 | select PARAVIRT |
428 | depends on X86_32 | 425 | depends on X86_32 |
429 | depends on !X86_VOYAGER | 426 | ---help--- |
430 | help | ||
431 | VMI provides a paravirtualized interface to the VMware ESX server | 427 | VMI provides a paravirtualized interface to the VMware ESX server |
432 | (it could be used by other hypervisors in theory too, but is not | 428 | (it could be used by other hypervisors in theory too, but is not |
433 | at the moment), by linking the kernel to a GPL-ed ROM module | 429 | at the moment), by linking the kernel to a GPL-ed ROM module |
@@ -437,8 +433,7 @@ config KVM_CLOCK | |||
437 | bool "KVM paravirtualized clock" | 433 | bool "KVM paravirtualized clock" |
438 | select PARAVIRT | 434 | select PARAVIRT |
439 | select PARAVIRT_CLOCK | 435 | select PARAVIRT_CLOCK |
440 | depends on !X86_VOYAGER | 436 | ---help--- |
441 | help | ||
442 | Turning on this option will allow you to run a paravirtualized clock | 437 | Turning on this option will allow you to run a paravirtualized clock |
443 | when running over the KVM hypervisor. Instead of relying on a PIT | 438 | when running over the KVM hypervisor. Instead of relying on a PIT |
444 | (or probably other) emulation by the underlying device model, the host | 439 | (or probably other) emulation by the underlying device model, the host |
@@ -448,17 +443,15 @@ config KVM_CLOCK | |||
448 | config KVM_GUEST | 443 | config KVM_GUEST |
449 | bool "KVM Guest support" | 444 | bool "KVM Guest support" |
450 | select PARAVIRT | 445 | select PARAVIRT |
451 | depends on !X86_VOYAGER | 446 | ---help--- |
452 | help | 447 | This option enables various optimizations for running under the KVM |
453 | This option enables various optimizations for running under the KVM | 448 | hypervisor. |
454 | hypervisor. | ||
455 | 449 | ||
456 | source "arch/x86/lguest/Kconfig" | 450 | source "arch/x86/lguest/Kconfig" |
457 | 451 | ||
458 | config PARAVIRT | 452 | config PARAVIRT |
459 | bool "Enable paravirtualization code" | 453 | bool "Enable paravirtualization code" |
460 | depends on !X86_VOYAGER | 454 | ---help--- |
461 | help | ||
462 | This changes the kernel so it can modify itself when it is run | 455 | This changes the kernel so it can modify itself when it is run |
463 | under a hypervisor, potentially improving performance significantly | 456 | under a hypervisor, potentially improving performance significantly |
464 | over full virtualization. However, when run without a hypervisor | 457 | over full virtualization. However, when run without a hypervisor |
@@ -471,51 +464,51 @@ config PARAVIRT_CLOCK | |||
471 | endif | 464 | endif |
472 | 465 | ||
473 | config PARAVIRT_DEBUG | 466 | config PARAVIRT_DEBUG |
474 | bool "paravirt-ops debugging" | 467 | bool "paravirt-ops debugging" |
475 | depends on PARAVIRT && DEBUG_KERNEL | 468 | depends on PARAVIRT && DEBUG_KERNEL |
476 | help | 469 | ---help--- |
477 | Enable to debug paravirt_ops internals. Specifically, BUG if | 470 | Enable to debug paravirt_ops internals. Specifically, BUG if |
478 | a paravirt_op is missing when it is called. | 471 | a paravirt_op is missing when it is called. |
479 | 472 | ||
480 | config MEMTEST | 473 | config MEMTEST |
481 | bool "Memtest" | 474 | bool "Memtest" |
482 | help | 475 | ---help--- |
483 | This option adds a kernel parameter 'memtest', which allows memtest | 476 | This option adds a kernel parameter 'memtest', which allows memtest |
484 | to be set. | 477 | to be set. |
485 | memtest=0, mean disabled; -- default | 478 | memtest=0, mean disabled; -- default |
486 | memtest=1, mean do 1 test pattern; | 479 | memtest=1, mean do 1 test pattern; |
487 | ... | 480 | ... |
488 | memtest=4, mean do 4 test patterns. | 481 | memtest=4, mean do 4 test patterns. |
489 | If you are unsure how to answer this question, answer N. | 482 | If you are unsure how to answer this question, answer N. |
490 | 483 | ||
491 | config X86_SUMMIT_NUMA | 484 | config X86_SUMMIT_NUMA |
492 | def_bool y | 485 | def_bool y |
493 | depends on X86_32 && NUMA && X86_GENERICARCH | 486 | depends on X86_32 && NUMA && X86_32_NON_STANDARD |
494 | 487 | ||
495 | config X86_CYCLONE_TIMER | 488 | config X86_CYCLONE_TIMER |
496 | def_bool y | 489 | def_bool y |
497 | depends on X86_GENERICARCH | 490 | depends on X86_32_NON_STANDARD |
498 | 491 | ||
499 | source "arch/x86/Kconfig.cpu" | 492 | source "arch/x86/Kconfig.cpu" |
500 | 493 | ||
501 | config HPET_TIMER | 494 | config HPET_TIMER |
502 | def_bool X86_64 | 495 | def_bool X86_64 |
503 | prompt "HPET Timer Support" if X86_32 | 496 | prompt "HPET Timer Support" if X86_32 |
504 | help | 497 | ---help--- |
505 | Use the IA-PC HPET (High Precision Event Timer) to manage | 498 | Use the IA-PC HPET (High Precision Event Timer) to manage |
506 | time in preference to the PIT and RTC, if a HPET is | 499 | time in preference to the PIT and RTC, if a HPET is |
507 | present. | 500 | present. |
508 | HPET is the next generation timer replacing legacy 8254s. | 501 | HPET is the next generation timer replacing legacy 8254s. |
509 | The HPET provides a stable time base on SMP | 502 | The HPET provides a stable time base on SMP |
510 | systems, unlike the TSC, but it is more expensive to access, | 503 | systems, unlike the TSC, but it is more expensive to access, |
511 | as it is off-chip. You can find the HPET spec at | 504 | as it is off-chip. You can find the HPET spec at |
512 | <http://www.intel.com/hardwaredesign/hpetspec_1.pdf>. | 505 | <http://www.intel.com/hardwaredesign/hpetspec_1.pdf>. |
513 | 506 | ||
514 | You can safely choose Y here. However, HPET will only be | 507 | You can safely choose Y here. However, HPET will only be |
515 | activated if the platform and the BIOS support this feature. | 508 | activated if the platform and the BIOS support this feature. |
516 | Otherwise the 8254 will be used for timing services. | 509 | Otherwise the 8254 will be used for timing services. |
517 | 510 | ||
518 | Choose N to continue using the legacy 8254 timer. | 511 | Choose N to continue using the legacy 8254 timer. |
519 | 512 | ||
520 | config HPET_EMULATE_RTC | 513 | config HPET_EMULATE_RTC |
521 | def_bool y | 514 | def_bool y |
@@ -526,7 +519,7 @@ config HPET_EMULATE_RTC | |||
526 | config DMI | 519 | config DMI |
527 | default y | 520 | default y |
528 | bool "Enable DMI scanning" if EMBEDDED | 521 | bool "Enable DMI scanning" if EMBEDDED |
529 | help | 522 | ---help--- |
530 | Enabled scanning of DMI to identify machine quirks. Say Y | 523 | Enabled scanning of DMI to identify machine quirks. Say Y |
531 | here unless you have verified that your setup is not | 524 | here unless you have verified that your setup is not |
532 | affected by entries in the DMI blacklist. Required by PNP | 525 | affected by entries in the DMI blacklist. Required by PNP |
@@ -538,7 +531,7 @@ config GART_IOMMU | |||
538 | select SWIOTLB | 531 | select SWIOTLB |
539 | select AGP | 532 | select AGP |
540 | depends on X86_64 && PCI | 533 | depends on X86_64 && PCI |
541 | help | 534 | ---help--- |
542 | Support for full DMA access of devices with 32bit memory access only | 535 | Support for full DMA access of devices with 32bit memory access only |
543 | on systems with more than 3GB. This is usually needed for USB, | 536 | on systems with more than 3GB. This is usually needed for USB, |
544 | sound, many IDE/SATA chipsets and some other devices. | 537 | sound, many IDE/SATA chipsets and some other devices. |
@@ -553,7 +546,7 @@ config CALGARY_IOMMU | |||
553 | bool "IBM Calgary IOMMU support" | 546 | bool "IBM Calgary IOMMU support" |
554 | select SWIOTLB | 547 | select SWIOTLB |
555 | depends on X86_64 && PCI && EXPERIMENTAL | 548 | depends on X86_64 && PCI && EXPERIMENTAL |
556 | help | 549 | ---help--- |
557 | Support for hardware IOMMUs in IBM's xSeries x366 and x460 | 550 | Support for hardware IOMMUs in IBM's xSeries x366 and x460 |
558 | systems. Needed to run systems with more than 3GB of memory | 551 | systems. Needed to run systems with more than 3GB of memory |
559 | properly with 32-bit PCI devices that do not support DAC | 552 | properly with 32-bit PCI devices that do not support DAC |
@@ -571,7 +564,7 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT | |||
571 | def_bool y | 564 | def_bool y |
572 | prompt "Should Calgary be enabled by default?" | 565 | prompt "Should Calgary be enabled by default?" |
573 | depends on CALGARY_IOMMU | 566 | depends on CALGARY_IOMMU |
574 | help | 567 | ---help--- |
575 | Should Calgary be enabled by default? if you choose 'y', Calgary | 568 | Should Calgary be enabled by default? if you choose 'y', Calgary |
576 | will be used (if it exists). If you choose 'n', Calgary will not be | 569 | will be used (if it exists). If you choose 'n', Calgary will not be |
577 | used even if it exists. If you choose 'n' and would like to use | 570 | used even if it exists. If you choose 'n' and would like to use |
@@ -583,7 +576,7 @@ config AMD_IOMMU | |||
583 | select SWIOTLB | 576 | select SWIOTLB |
584 | select PCI_MSI | 577 | select PCI_MSI |
585 | depends on X86_64 && PCI && ACPI | 578 | depends on X86_64 && PCI && ACPI |
586 | help | 579 | ---help--- |
587 | With this option you can enable support for AMD IOMMU hardware in | 580 | With this option you can enable support for AMD IOMMU hardware in |
588 | your system. An IOMMU is a hardware component which provides | 581 | your system. An IOMMU is a hardware component which provides |
589 | remapping of DMA memory accesses from devices. With an AMD IOMMU you | 582 | remapping of DMA memory accesses from devices. With an AMD IOMMU you |
@@ -598,7 +591,7 @@ config AMD_IOMMU_STATS | |||
598 | bool "Export AMD IOMMU statistics to debugfs" | 591 | bool "Export AMD IOMMU statistics to debugfs" |
599 | depends on AMD_IOMMU | 592 | depends on AMD_IOMMU |
600 | select DEBUG_FS | 593 | select DEBUG_FS |
601 | help | 594 | ---help--- |
602 | This option enables code in the AMD IOMMU driver to collect various | 595 | This option enables code in the AMD IOMMU driver to collect various |
603 | statistics about whats happening in the driver and exports that | 596 | statistics about whats happening in the driver and exports that |
604 | information to userspace via debugfs. | 597 | information to userspace via debugfs. |
@@ -607,7 +600,7 @@ config AMD_IOMMU_STATS | |||
607 | # need this always selected by IOMMU for the VIA workaround | 600 | # need this always selected by IOMMU for the VIA workaround |
608 | config SWIOTLB | 601 | config SWIOTLB |
609 | def_bool y if X86_64 | 602 | def_bool y if X86_64 |
610 | help | 603 | ---help--- |
611 | Support for software bounce buffers used on x86-64 systems | 604 | Support for software bounce buffers used on x86-64 systems |
612 | which don't have a hardware IOMMU (e.g. the current generation | 605 | which don't have a hardware IOMMU (e.g. the current generation |
613 | of Intel's x86-64 CPUs). Using this PCI devices which can only | 606 | of Intel's x86-64 CPUs). Using this PCI devices which can only |
@@ -625,7 +618,7 @@ config MAXSMP | |||
625 | depends on X86_64 && SMP && DEBUG_KERNEL && EXPERIMENTAL | 618 | depends on X86_64 && SMP && DEBUG_KERNEL && EXPERIMENTAL |
626 | select CPUMASK_OFFSTACK | 619 | select CPUMASK_OFFSTACK |
627 | default n | 620 | default n |
628 | help | 621 | ---help--- |
629 | Configure maximum number of CPUS and NUMA Nodes for this architecture. | 622 | Configure maximum number of CPUS and NUMA Nodes for this architecture. |
630 | If unsure, say N. | 623 | If unsure, say N. |
631 | 624 | ||
@@ -636,7 +629,7 @@ config NR_CPUS | |||
636 | default "4096" if MAXSMP | 629 | default "4096" if MAXSMP |
637 | default "32" if SMP && (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000) | 630 | default "32" if SMP && (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000) |
638 | default "8" if SMP | 631 | default "8" if SMP |
639 | help | 632 | ---help--- |
640 | This allows you to specify the maximum number of CPUs which this | 633 | This allows you to specify the maximum number of CPUs which this |
641 | kernel will support. The maximum supported value is 512 and the | 634 | kernel will support. The maximum supported value is 512 and the |
642 | minimum value which makes sense is 2. | 635 | minimum value which makes sense is 2. |
@@ -647,7 +640,7 @@ config NR_CPUS | |||
647 | config SCHED_SMT | 640 | config SCHED_SMT |
648 | bool "SMT (Hyperthreading) scheduler support" | 641 | bool "SMT (Hyperthreading) scheduler support" |
649 | depends on X86_HT | 642 | depends on X86_HT |
650 | help | 643 | ---help--- |
651 | SMT scheduler support improves the CPU scheduler's decision making | 644 | SMT scheduler support improves the CPU scheduler's decision making |
652 | when dealing with Intel Pentium 4 chips with HyperThreading at a | 645 | when dealing with Intel Pentium 4 chips with HyperThreading at a |
653 | cost of slightly increased overhead in some places. If unsure say | 646 | cost of slightly increased overhead in some places. If unsure say |
@@ -657,7 +650,7 @@ config SCHED_MC | |||
657 | def_bool y | 650 | def_bool y |
658 | prompt "Multi-core scheduler support" | 651 | prompt "Multi-core scheduler support" |
659 | depends on X86_HT | 652 | depends on X86_HT |
660 | help | 653 | ---help--- |
661 | Multi-core scheduler support improves the CPU scheduler's decision | 654 | Multi-core scheduler support improves the CPU scheduler's decision |
662 | making when dealing with multi-core CPU chips at a cost of slightly | 655 | making when dealing with multi-core CPU chips at a cost of slightly |
663 | increased overhead in some places. If unsure say N here. | 656 | increased overhead in some places. If unsure say N here. |
@@ -666,8 +659,8 @@ source "kernel/Kconfig.preempt" | |||
666 | 659 | ||
667 | config X86_UP_APIC | 660 | config X86_UP_APIC |
668 | bool "Local APIC support on uniprocessors" | 661 | bool "Local APIC support on uniprocessors" |
669 | depends on X86_32 && !SMP && !(X86_VOYAGER || X86_GENERICARCH) | 662 | depends on X86_32 && !SMP && !X86_32_NON_STANDARD |
670 | help | 663 | ---help--- |
671 | A local APIC (Advanced Programmable Interrupt Controller) is an | 664 | A local APIC (Advanced Programmable Interrupt Controller) is an |
672 | integrated interrupt controller in the CPU. If you have a single-CPU | 665 | integrated interrupt controller in the CPU. If you have a single-CPU |
673 | system which has a processor with a local APIC, you can say Y here to | 666 | system which has a processor with a local APIC, you can say Y here to |
@@ -680,7 +673,7 @@ config X86_UP_APIC | |||
680 | config X86_UP_IOAPIC | 673 | config X86_UP_IOAPIC |
681 | bool "IO-APIC support on uniprocessors" | 674 | bool "IO-APIC support on uniprocessors" |
682 | depends on X86_UP_APIC | 675 | depends on X86_UP_APIC |
683 | help | 676 | ---help--- |
684 | An IO-APIC (I/O Advanced Programmable Interrupt Controller) is an | 677 | An IO-APIC (I/O Advanced Programmable Interrupt Controller) is an |
685 | SMP-capable replacement for PC-style interrupt controllers. Most | 678 | SMP-capable replacement for PC-style interrupt controllers. Most |
686 | SMP systems and many recent uniprocessor systems have one. | 679 | SMP systems and many recent uniprocessor systems have one. |
@@ -691,12 +684,12 @@ config X86_UP_IOAPIC | |||
691 | 684 | ||
692 | config X86_LOCAL_APIC | 685 | config X86_LOCAL_APIC |
693 | def_bool y | 686 | def_bool y |
694 | depends on X86_64 || (X86_32 && (X86_UP_APIC || (SMP && !X86_VOYAGER) || X86_GENERICARCH)) | 687 | depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC |
695 | select HAVE_PERF_COUNTERS if (!M386 && !M486) | 688 | select HAVE_PERF_COUNTERS if (!M386 && !M486) |
696 | 689 | ||
697 | config X86_IO_APIC | 690 | config X86_IO_APIC |
698 | def_bool y | 691 | def_bool y |
699 | depends on X86_64 || (X86_32 && (X86_UP_IOAPIC || (SMP && !X86_VOYAGER) || X86_GENERICARCH)) | 692 | depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC |
700 | 693 | ||
701 | config X86_VISWS_APIC | 694 | config X86_VISWS_APIC |
702 | def_bool y | 695 | def_bool y |
@@ -706,7 +699,7 @@ config X86_REROUTE_FOR_BROKEN_BOOT_IRQS | |||
706 | bool "Reroute for broken boot IRQs" | 699 | bool "Reroute for broken boot IRQs" |
707 | default n | 700 | default n |
708 | depends on X86_IO_APIC | 701 | depends on X86_IO_APIC |
709 | help | 702 | ---help--- |
710 | This option enables a workaround that fixes a source of | 703 | This option enables a workaround that fixes a source of |
711 | spurious interrupts. This is recommended when threaded | 704 | spurious interrupts. This is recommended when threaded |
712 | interrupt handling is used on systems where the generation of | 705 | interrupt handling is used on systems where the generation of |
@@ -728,7 +721,6 @@ config X86_REROUTE_FOR_BROKEN_BOOT_IRQS | |||
728 | 721 | ||
729 | config X86_MCE | 722 | config X86_MCE |
730 | bool "Machine Check Exception" | 723 | bool "Machine Check Exception" |
731 | depends on !X86_VOYAGER | ||
732 | ---help--- | 724 | ---help--- |
733 | Machine Check Exception support allows the processor to notify the | 725 | Machine Check Exception support allows the processor to notify the |
734 | kernel if it detects a problem (e.g. overheating, component failure). | 726 | kernel if it detects a problem (e.g. overheating, component failure). |
@@ -747,7 +739,7 @@ config X86_MCE_INTEL | |||
747 | def_bool y | 739 | def_bool y |
748 | prompt "Intel MCE features" | 740 | prompt "Intel MCE features" |
749 | depends on X86_64 && X86_MCE && X86_LOCAL_APIC | 741 | depends on X86_64 && X86_MCE && X86_LOCAL_APIC |
750 | help | 742 | ---help--- |
751 | Additional support for intel specific MCE features such as | 743 | Additional support for intel specific MCE features such as |
752 | the thermal monitor. | 744 | the thermal monitor. |
753 | 745 | ||
@@ -755,14 +747,14 @@ config X86_MCE_AMD | |||
755 | def_bool y | 747 | def_bool y |
756 | prompt "AMD MCE features" | 748 | prompt "AMD MCE features" |
757 | depends on X86_64 && X86_MCE && X86_LOCAL_APIC | 749 | depends on X86_64 && X86_MCE && X86_LOCAL_APIC |
758 | help | 750 | ---help--- |
759 | Additional support for AMD specific MCE features such as | 751 | Additional support for AMD specific MCE features such as |
760 | the DRAM Error Threshold. | 752 | the DRAM Error Threshold. |
761 | 753 | ||
762 | config X86_MCE_NONFATAL | 754 | config X86_MCE_NONFATAL |
763 | tristate "Check for non-fatal errors on AMD Athlon/Duron / Intel Pentium 4" | 755 | tristate "Check for non-fatal errors on AMD Athlon/Duron / Intel Pentium 4" |
764 | depends on X86_32 && X86_MCE | 756 | depends on X86_32 && X86_MCE |
765 | help | 757 | ---help--- |
766 | Enabling this feature starts a timer that triggers every 5 seconds which | 758 | Enabling this feature starts a timer that triggers every 5 seconds which |
767 | will look at the machine check registers to see if anything happened. | 759 | will look at the machine check registers to see if anything happened. |
768 | Non-fatal problems automatically get corrected (but still logged). | 760 | Non-fatal problems automatically get corrected (but still logged). |
@@ -775,7 +767,7 @@ config X86_MCE_NONFATAL | |||
775 | config X86_MCE_P4THERMAL | 767 | config X86_MCE_P4THERMAL |
776 | bool "check for P4 thermal throttling interrupt." | 768 | bool "check for P4 thermal throttling interrupt." |
777 | depends on X86_32 && X86_MCE && (X86_UP_APIC || SMP) | 769 | depends on X86_32 && X86_MCE && (X86_UP_APIC || SMP) |
778 | help | 770 | ---help--- |
779 | Enabling this feature will cause a message to be printed when the P4 | 771 | Enabling this feature will cause a message to be printed when the P4 |
780 | enters thermal throttling. | 772 | enters thermal throttling. |
781 | 773 | ||
@@ -783,11 +775,11 @@ config VM86 | |||
783 | bool "Enable VM86 support" if EMBEDDED | 775 | bool "Enable VM86 support" if EMBEDDED |
784 | default y | 776 | default y |
785 | depends on X86_32 | 777 | depends on X86_32 |
786 | help | 778 | ---help--- |
787 | This option is required by programs like DOSEMU to run 16-bit legacy | 779 | This option is required by programs like DOSEMU to run 16-bit legacy |
788 | code on X86 processors. It also may be needed by software like | 780 | code on X86 processors. It also may be needed by software like |
789 | XFree86 to initialize some video cards via BIOS. Disabling this | 781 | XFree86 to initialize some video cards via BIOS. Disabling this |
790 | option saves about 6k. | 782 | option saves about 6k. |
791 | 783 | ||
792 | config TOSHIBA | 784 | config TOSHIBA |
793 | tristate "Toshiba Laptop support" | 785 | tristate "Toshiba Laptop support" |
@@ -861,33 +853,33 @@ config MICROCODE | |||
861 | module will be called microcode. | 853 | module will be called microcode. |
862 | 854 | ||
863 | config MICROCODE_INTEL | 855 | config MICROCODE_INTEL |
864 | bool "Intel microcode patch loading support" | 856 | bool "Intel microcode patch loading support" |
865 | depends on MICROCODE | 857 | depends on MICROCODE |
866 | default MICROCODE | 858 | default MICROCODE |
867 | select FW_LOADER | 859 | select FW_LOADER |
868 | --help--- | 860 | ---help--- |
869 | This options enables microcode patch loading support for Intel | 861 | This options enables microcode patch loading support for Intel |
870 | processors. | 862 | processors. |
871 | 863 | ||
872 | For latest news and information on obtaining all the required | 864 | For latest news and information on obtaining all the required |
873 | Intel ingredients for this driver, check: | 865 | Intel ingredients for this driver, check: |
874 | <http://www.urbanmyth.org/microcode/>. | 866 | <http://www.urbanmyth.org/microcode/>. |
875 | 867 | ||
876 | config MICROCODE_AMD | 868 | config MICROCODE_AMD |
877 | bool "AMD microcode patch loading support" | 869 | bool "AMD microcode patch loading support" |
878 | depends on MICROCODE | 870 | depends on MICROCODE |
879 | select FW_LOADER | 871 | select FW_LOADER |
880 | --help--- | 872 | ---help--- |
881 | If you select this option, microcode patch loading support for AMD | 873 | If you select this option, microcode patch loading support for AMD |
882 | processors will be enabled. | 874 | processors will be enabled. |
883 | 875 | ||
884 | config MICROCODE_OLD_INTERFACE | 876 | config MICROCODE_OLD_INTERFACE |
885 | def_bool y | 877 | def_bool y |
886 | depends on MICROCODE | 878 | depends on MICROCODE |
887 | 879 | ||
888 | config X86_MSR | 880 | config X86_MSR |
889 | tristate "/dev/cpu/*/msr - Model-specific register support" | 881 | tristate "/dev/cpu/*/msr - Model-specific register support" |
890 | help | 882 | ---help--- |
891 | This device gives privileged processes access to the x86 | 883 | This device gives privileged processes access to the x86 |
892 | Model-Specific Registers (MSRs). It is a character device with | 884 | Model-Specific Registers (MSRs). It is a character device with |
893 | major 202 and minors 0 to 31 for /dev/cpu/0/msr to /dev/cpu/31/msr. | 885 | major 202 and minors 0 to 31 for /dev/cpu/0/msr to /dev/cpu/31/msr. |
@@ -896,7 +888,7 @@ config X86_MSR | |||
896 | 888 | ||
897 | config X86_CPUID | 889 | config X86_CPUID |
898 | tristate "/dev/cpu/*/cpuid - CPU information support" | 890 | tristate "/dev/cpu/*/cpuid - CPU information support" |
899 | help | 891 | ---help--- |
900 | This device gives processes access to the x86 CPUID instruction to | 892 | This device gives processes access to the x86 CPUID instruction to |
901 | be executed on a specific processor. It is a character device | 893 | be executed on a specific processor. It is a character device |
902 | with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to | 894 | with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to |
@@ -948,7 +940,7 @@ config NOHIGHMEM | |||
948 | config HIGHMEM4G | 940 | config HIGHMEM4G |
949 | bool "4GB" | 941 | bool "4GB" |
950 | depends on !X86_NUMAQ | 942 | depends on !X86_NUMAQ |
951 | help | 943 | ---help--- |
952 | Select this if you have a 32-bit processor and between 1 and 4 | 944 | Select this if you have a 32-bit processor and between 1 and 4 |
953 | gigabytes of physical RAM. | 945 | gigabytes of physical RAM. |
954 | 946 | ||
@@ -956,7 +948,7 @@ config HIGHMEM64G | |||
956 | bool "64GB" | 948 | bool "64GB" |
957 | depends on !M386 && !M486 | 949 | depends on !M386 && !M486 |
958 | select X86_PAE | 950 | select X86_PAE |
959 | help | 951 | ---help--- |
960 | Select this if you have a 32-bit processor and more than 4 | 952 | Select this if you have a 32-bit processor and more than 4 |
961 | gigabytes of physical RAM. | 953 | gigabytes of physical RAM. |
962 | 954 | ||
@@ -967,7 +959,7 @@ choice | |||
967 | prompt "Memory split" if EMBEDDED | 959 | prompt "Memory split" if EMBEDDED |
968 | default VMSPLIT_3G | 960 | default VMSPLIT_3G |
969 | depends on X86_32 | 961 | depends on X86_32 |
970 | help | 962 | ---help--- |
971 | Select the desired split between kernel and user memory. | 963 | Select the desired split between kernel and user memory. |
972 | 964 | ||
973 | If the address range available to the kernel is less than the | 965 | If the address range available to the kernel is less than the |
@@ -1013,20 +1005,20 @@ config HIGHMEM | |||
1013 | config X86_PAE | 1005 | config X86_PAE |
1014 | bool "PAE (Physical Address Extension) Support" | 1006 | bool "PAE (Physical Address Extension) Support" |
1015 | depends on X86_32 && !HIGHMEM4G | 1007 | depends on X86_32 && !HIGHMEM4G |
1016 | help | 1008 | ---help--- |
1017 | PAE is required for NX support, and furthermore enables | 1009 | PAE is required for NX support, and furthermore enables |
1018 | larger swapspace support for non-overcommit purposes. It | 1010 | larger swapspace support for non-overcommit purposes. It |
1019 | has the cost of more pagetable lookup overhead, and also | 1011 | has the cost of more pagetable lookup overhead, and also |
1020 | consumes more pagetable space per process. | 1012 | consumes more pagetable space per process. |
1021 | 1013 | ||
1022 | config ARCH_PHYS_ADDR_T_64BIT | 1014 | config ARCH_PHYS_ADDR_T_64BIT |
1023 | def_bool X86_64 || X86_PAE | 1015 | def_bool X86_64 || X86_PAE |
1024 | 1016 | ||
1025 | config DIRECT_GBPAGES | 1017 | config DIRECT_GBPAGES |
1026 | bool "Enable 1GB pages for kernel pagetables" if EMBEDDED | 1018 | bool "Enable 1GB pages for kernel pagetables" if EMBEDDED |
1027 | default y | 1019 | default y |
1028 | depends on X86_64 | 1020 | depends on X86_64 |
1029 | help | 1021 | ---help--- |
1030 | Allow the kernel linear mapping to use 1GB pages on CPUs that | 1022 | Allow the kernel linear mapping to use 1GB pages on CPUs that |
1031 | support it. This can improve the kernel's performance a tiny bit by | 1023 | support it. This can improve the kernel's performance a tiny bit by |
1032 | reducing TLB pressure. If in doubt, say "Y". | 1024 | reducing TLB pressure. If in doubt, say "Y". |
@@ -1036,9 +1028,8 @@ config NUMA | |||
1036 | bool "Numa Memory Allocation and Scheduler Support" | 1028 | bool "Numa Memory Allocation and Scheduler Support" |
1037 | depends on SMP | 1029 | depends on SMP |
1038 | depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && EXPERIMENTAL) | 1030 | depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && EXPERIMENTAL) |
1039 | default n if X86_PC | ||
1040 | default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP) | 1031 | default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP) |
1041 | help | 1032 | ---help--- |
1042 | Enable NUMA (Non Uniform Memory Access) support. | 1033 | Enable NUMA (Non Uniform Memory Access) support. |
1043 | 1034 | ||
1044 | The kernel will try to allocate memory used by a CPU on the | 1035 | The kernel will try to allocate memory used by a CPU on the |
@@ -1061,19 +1052,19 @@ config K8_NUMA | |||
1061 | def_bool y | 1052 | def_bool y |
1062 | prompt "Old style AMD Opteron NUMA detection" | 1053 | prompt "Old style AMD Opteron NUMA detection" |
1063 | depends on X86_64 && NUMA && PCI | 1054 | depends on X86_64 && NUMA && PCI |
1064 | help | 1055 | ---help--- |
1065 | Enable K8 NUMA node topology detection. You should say Y here if | 1056 | Enable K8 NUMA node topology detection. You should say Y here if |
1066 | you have a multi processor AMD K8 system. This uses an old | 1057 | you have a multi processor AMD K8 system. This uses an old |
1067 | method to read the NUMA configuration directly from the builtin | 1058 | method to read the NUMA configuration directly from the builtin |
1068 | Northbridge of Opteron. It is recommended to use X86_64_ACPI_NUMA | 1059 | Northbridge of Opteron. It is recommended to use X86_64_ACPI_NUMA |
1069 | instead, which also takes priority if both are compiled in. | 1060 | instead, which also takes priority if both are compiled in. |
1070 | 1061 | ||
1071 | config X86_64_ACPI_NUMA | 1062 | config X86_64_ACPI_NUMA |
1072 | def_bool y | 1063 | def_bool y |
1073 | prompt "ACPI NUMA detection" | 1064 | prompt "ACPI NUMA detection" |
1074 | depends on X86_64 && NUMA && ACPI && PCI | 1065 | depends on X86_64 && NUMA && ACPI && PCI |
1075 | select ACPI_NUMA | 1066 | select ACPI_NUMA |
1076 | help | 1067 | ---help--- |
1077 | Enable ACPI SRAT based node topology detection. | 1068 | Enable ACPI SRAT based node topology detection. |
1078 | 1069 | ||
1079 | # Some NUMA nodes have memory ranges that span | 1070 | # Some NUMA nodes have memory ranges that span |
@@ -1088,7 +1079,7 @@ config NODES_SPAN_OTHER_NODES | |||
1088 | config NUMA_EMU | 1079 | config NUMA_EMU |
1089 | bool "NUMA emulation" | 1080 | bool "NUMA emulation" |
1090 | depends on X86_64 && NUMA | 1081 | depends on X86_64 && NUMA |
1091 | help | 1082 | ---help--- |
1092 | Enable NUMA emulation. A flat machine will be split | 1083 | Enable NUMA emulation. A flat machine will be split |
1093 | into virtual nodes when booted with "numa=fake=N", where N is the | 1084 | into virtual nodes when booted with "numa=fake=N", where N is the |
1094 | number of nodes. This is only useful for debugging. | 1085 | number of nodes. This is only useful for debugging. |
@@ -1101,7 +1092,7 @@ config NODES_SHIFT | |||
1101 | default "4" if X86_NUMAQ | 1092 | default "4" if X86_NUMAQ |
1102 | default "3" | 1093 | default "3" |
1103 | depends on NEED_MULTIPLE_NODES | 1094 | depends on NEED_MULTIPLE_NODES |
1104 | help | 1095 | ---help--- |
1105 | Specify the maximum number of NUMA Nodes available on the target | 1096 | Specify the maximum number of NUMA Nodes available on the target |
1106 | system. Increases memory reserved to accomodate various tables. | 1097 | system. Increases memory reserved to accomodate various tables. |
1107 | 1098 | ||
@@ -1139,7 +1130,7 @@ config ARCH_SPARSEMEM_DEFAULT | |||
1139 | 1130 | ||
1140 | config ARCH_SPARSEMEM_ENABLE | 1131 | config ARCH_SPARSEMEM_ENABLE |
1141 | def_bool y | 1132 | def_bool y |
1142 | depends on X86_64 || NUMA || (EXPERIMENTAL && X86_PC) || X86_GENERICARCH | 1133 | depends on X86_64 || NUMA || (EXPERIMENTAL && X86_32) || X86_32_NON_STANDARD |
1143 | select SPARSEMEM_STATIC if X86_32 | 1134 | select SPARSEMEM_STATIC if X86_32 |
1144 | select SPARSEMEM_VMEMMAP_ENABLE if X86_64 | 1135 | select SPARSEMEM_VMEMMAP_ENABLE if X86_64 |
1145 | 1136 | ||
@@ -1156,61 +1147,61 @@ source "mm/Kconfig" | |||
1156 | config HIGHPTE | 1147 | config HIGHPTE |
1157 | bool "Allocate 3rd-level pagetables from highmem" | 1148 | bool "Allocate 3rd-level pagetables from highmem" |
1158 | depends on X86_32 && (HIGHMEM4G || HIGHMEM64G) | 1149 | depends on X86_32 && (HIGHMEM4G || HIGHMEM64G) |
1159 | help | 1150 | ---help--- |
1160 | The VM uses one page table entry for each page of physical memory. | 1151 | The VM uses one page table entry for each page of physical memory. |
1161 | For systems with a lot of RAM, this can be wasteful of precious | 1152 | For systems with a lot of RAM, this can be wasteful of precious |
1162 | low memory. Setting this option will put user-space page table | 1153 | low memory. Setting this option will put user-space page table |
1163 | entries in high memory. | 1154 | entries in high memory. |
1164 | 1155 | ||
1165 | config X86_CHECK_BIOS_CORRUPTION | 1156 | config X86_CHECK_BIOS_CORRUPTION |
1166 | bool "Check for low memory corruption" | 1157 | bool "Check for low memory corruption" |
1167 | help | 1158 | ---help--- |
1168 | Periodically check for memory corruption in low memory, which | 1159 | Periodically check for memory corruption in low memory, which |
1169 | is suspected to be caused by BIOS. Even when enabled in the | 1160 | is suspected to be caused by BIOS. Even when enabled in the |
1170 | configuration, it is disabled at runtime. Enable it by | 1161 | configuration, it is disabled at runtime. Enable it by |
1171 | setting "memory_corruption_check=1" on the kernel command | 1162 | setting "memory_corruption_check=1" on the kernel command |
1172 | line. By default it scans the low 64k of memory every 60 | 1163 | line. By default it scans the low 64k of memory every 60 |
1173 | seconds; see the memory_corruption_check_size and | 1164 | seconds; see the memory_corruption_check_size and |
1174 | memory_corruption_check_period parameters in | 1165 | memory_corruption_check_period parameters in |
1175 | Documentation/kernel-parameters.txt to adjust this. | 1166 | Documentation/kernel-parameters.txt to adjust this. |
1176 | 1167 | ||
1177 | When enabled with the default parameters, this option has | 1168 | When enabled with the default parameters, this option has |
1178 | almost no overhead, as it reserves a relatively small amount | 1169 | almost no overhead, as it reserves a relatively small amount |
1179 | of memory and scans it infrequently. It both detects corruption | 1170 | of memory and scans it infrequently. It both detects corruption |
1180 | and prevents it from affecting the running system. | 1171 | and prevents it from affecting the running system. |
1181 | 1172 | ||
1182 | It is, however, intended as a diagnostic tool; if repeatable | 1173 | It is, however, intended as a diagnostic tool; if repeatable |
1183 | BIOS-originated corruption always affects the same memory, | 1174 | BIOS-originated corruption always affects the same memory, |
1184 | you can use memmap= to prevent the kernel from using that | 1175 | you can use memmap= to prevent the kernel from using that |
1185 | memory. | 1176 | memory. |
1186 | 1177 | ||
1187 | config X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK | 1178 | config X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK |
1188 | bool "Set the default setting of memory_corruption_check" | 1179 | bool "Set the default setting of memory_corruption_check" |
1189 | depends on X86_CHECK_BIOS_CORRUPTION | 1180 | depends on X86_CHECK_BIOS_CORRUPTION |
1190 | default y | 1181 | default y |
1191 | help | 1182 | ---help--- |
1192 | Set whether the default state of memory_corruption_check is | 1183 | Set whether the default state of memory_corruption_check is |
1193 | on or off. | 1184 | on or off. |
1194 | 1185 | ||
1195 | config X86_RESERVE_LOW_64K | 1186 | config X86_RESERVE_LOW_64K |
1196 | bool "Reserve low 64K of RAM on AMI/Phoenix BIOSen" | 1187 | bool "Reserve low 64K of RAM on AMI/Phoenix BIOSen" |
1197 | default y | 1188 | default y |
1198 | help | 1189 | ---help--- |
1199 | Reserve the first 64K of physical RAM on BIOSes that are known | 1190 | Reserve the first 64K of physical RAM on BIOSes that are known |
1200 | to potentially corrupt that memory range. A numbers of BIOSes are | 1191 | to potentially corrupt that memory range. A numbers of BIOSes are |
1201 | known to utilize this area during suspend/resume, so it must not | 1192 | known to utilize this area during suspend/resume, so it must not |
1202 | be used by the kernel. | 1193 | be used by the kernel. |
1203 | 1194 | ||
1204 | Set this to N if you are absolutely sure that you trust the BIOS | 1195 | Set this to N if you are absolutely sure that you trust the BIOS |
1205 | to get all its memory reservations and usages right. | 1196 | to get all its memory reservations and usages right. |
1206 | 1197 | ||
1207 | If you have doubts about the BIOS (e.g. suspend/resume does not | 1198 | If you have doubts about the BIOS (e.g. suspend/resume does not |
1208 | work or there's kernel crashes after certain hardware hotplug | 1199 | work or there's kernel crashes after certain hardware hotplug |
1209 | events) and it's not AMI or Phoenix, then you might want to enable | 1200 | events) and it's not AMI or Phoenix, then you might want to enable |
1210 | X86_CHECK_BIOS_CORRUPTION=y to allow the kernel to check typical | 1201 | X86_CHECK_BIOS_CORRUPTION=y to allow the kernel to check typical |
1211 | corruption patterns. | 1202 | corruption patterns. |
1212 | 1203 | ||
1213 | Say Y if unsure. | 1204 | Say Y if unsure. |
1214 | 1205 | ||
1215 | config MATH_EMULATION | 1206 | config MATH_EMULATION |
1216 | bool | 1207 | bool |
@@ -1276,7 +1267,7 @@ config MTRR_SANITIZER | |||
1276 | def_bool y | 1267 | def_bool y |
1277 | prompt "MTRR cleanup support" | 1268 | prompt "MTRR cleanup support" |
1278 | depends on MTRR | 1269 | depends on MTRR |
1279 | help | 1270 | ---help--- |
1280 | Convert MTRR layout from continuous to discrete, so X drivers can | 1271 | Convert MTRR layout from continuous to discrete, so X drivers can |
1281 | add writeback entries. | 1272 | add writeback entries. |
1282 | 1273 | ||
@@ -1291,7 +1282,7 @@ config MTRR_SANITIZER_ENABLE_DEFAULT | |||
1291 | range 0 1 | 1282 | range 0 1 |
1292 | default "0" | 1283 | default "0" |
1293 | depends on MTRR_SANITIZER | 1284 | depends on MTRR_SANITIZER |
1294 | help | 1285 | ---help--- |
1295 | Enable mtrr cleanup default value | 1286 | Enable mtrr cleanup default value |
1296 | 1287 | ||
1297 | config MTRR_SANITIZER_SPARE_REG_NR_DEFAULT | 1288 | config MTRR_SANITIZER_SPARE_REG_NR_DEFAULT |
@@ -1299,7 +1290,7 @@ config MTRR_SANITIZER_SPARE_REG_NR_DEFAULT | |||
1299 | range 0 7 | 1290 | range 0 7 |
1300 | default "1" | 1291 | default "1" |
1301 | depends on MTRR_SANITIZER | 1292 | depends on MTRR_SANITIZER |
1302 | help | 1293 | ---help--- |
1303 | mtrr cleanup spare entries default, it can be changed via | 1294 | mtrr cleanup spare entries default, it can be changed via |
1304 | mtrr_spare_reg_nr=N on the kernel command line. | 1295 | mtrr_spare_reg_nr=N on the kernel command line. |
1305 | 1296 | ||
@@ -1307,7 +1298,7 @@ config X86_PAT | |||
1307 | bool | 1298 | bool |
1308 | prompt "x86 PAT support" | 1299 | prompt "x86 PAT support" |
1309 | depends on MTRR | 1300 | depends on MTRR |
1310 | help | 1301 | ---help--- |
1311 | Use PAT attributes to setup page level cache control. | 1302 | Use PAT attributes to setup page level cache control. |
1312 | 1303 | ||
1313 | PATs are the modern equivalents of MTRRs and are much more | 1304 | PATs are the modern equivalents of MTRRs and are much more |
@@ -1322,20 +1313,20 @@ config EFI | |||
1322 | bool "EFI runtime service support" | 1313 | bool "EFI runtime service support" |
1323 | depends on ACPI | 1314 | depends on ACPI |
1324 | ---help--- | 1315 | ---help--- |
1325 | This enables the kernel to use EFI runtime services that are | 1316 | This enables the kernel to use EFI runtime services that are |
1326 | available (such as the EFI variable services). | 1317 | available (such as the EFI variable services). |
1327 | 1318 | ||
1328 | This option is only useful on systems that have EFI firmware. | 1319 | This option is only useful on systems that have EFI firmware. |
1329 | In addition, you should use the latest ELILO loader available | 1320 | In addition, you should use the latest ELILO loader available |
1330 | at <http://elilo.sourceforge.net> in order to take advantage | 1321 | at <http://elilo.sourceforge.net> in order to take advantage |
1331 | of EFI runtime services. However, even with this option, the | 1322 | of EFI runtime services. However, even with this option, the |
1332 | resultant kernel should continue to boot on existing non-EFI | 1323 | resultant kernel should continue to boot on existing non-EFI |
1333 | platforms. | 1324 | platforms. |
1334 | 1325 | ||
1335 | config SECCOMP | 1326 | config SECCOMP |
1336 | def_bool y | 1327 | def_bool y |
1337 | prompt "Enable seccomp to safely compute untrusted bytecode" | 1328 | prompt "Enable seccomp to safely compute untrusted bytecode" |
1338 | help | 1329 | ---help--- |
1339 | This kernel feature is useful for number crunching applications | 1330 | This kernel feature is useful for number crunching applications |
1340 | that may need to compute untrusted bytecode during their | 1331 | that may need to compute untrusted bytecode during their |
1341 | execution. By using pipes or other transports made available to | 1332 | execution. By using pipes or other transports made available to |
@@ -1353,10 +1344,9 @@ config CC_STACKPROTECTOR_ALL | |||
1353 | 1344 | ||
1354 | config CC_STACKPROTECTOR | 1345 | config CC_STACKPROTECTOR |
1355 | bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)" | 1346 | bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)" |
1356 | depends on X86_64 | ||
1357 | select CC_STACKPROTECTOR_ALL | 1347 | select CC_STACKPROTECTOR_ALL |
1358 | help | 1348 | ---help--- |
1359 | This option turns on the -fstack-protector GCC feature. This | 1349 | This option turns on the -fstack-protector GCC feature. This |
1360 | feature puts, at the beginning of functions, a canary value on | 1350 | feature puts, at the beginning of functions, a canary value on |
1361 | the stack just before the return address, and validates | 1351 | the stack just before the return address, and validates |
1362 | the value just before actually returning. Stack based buffer | 1352 | the value just before actually returning. Stack based buffer |
@@ -1373,8 +1363,7 @@ source kernel/Kconfig.hz | |||
1373 | 1363 | ||
1374 | config KEXEC | 1364 | config KEXEC |
1375 | bool "kexec system call" | 1365 | bool "kexec system call" |
1376 | depends on X86_BIOS_REBOOT | 1366 | ---help--- |
1377 | help | ||
1378 | kexec is a system call that implements the ability to shutdown your | 1367 | kexec is a system call that implements the ability to shutdown your |
1379 | current kernel, and to start another kernel. It is like a reboot | 1368 | current kernel, and to start another kernel. It is like a reboot |
1380 | but it is independent of the system firmware. And like a reboot | 1369 | but it is independent of the system firmware. And like a reboot |
@@ -1391,7 +1380,7 @@ config KEXEC | |||
1391 | config CRASH_DUMP | 1380 | config CRASH_DUMP |
1392 | bool "kernel crash dumps" | 1381 | bool "kernel crash dumps" |
1393 | depends on X86_64 || (X86_32 && HIGHMEM) | 1382 | depends on X86_64 || (X86_32 && HIGHMEM) |
1394 | help | 1383 | ---help--- |
1395 | Generate crash dump after being started by kexec. | 1384 | Generate crash dump after being started by kexec. |
1396 | This should be normally only set in special crash dump kernels | 1385 | This should be normally only set in special crash dump kernels |
1397 | which are loaded in the main kernel with kexec-tools into | 1386 | which are loaded in the main kernel with kexec-tools into |
@@ -1406,7 +1395,7 @@ config KEXEC_JUMP | |||
1406 | bool "kexec jump (EXPERIMENTAL)" | 1395 | bool "kexec jump (EXPERIMENTAL)" |
1407 | depends on EXPERIMENTAL | 1396 | depends on EXPERIMENTAL |
1408 | depends on KEXEC && HIBERNATION && X86_32 | 1397 | depends on KEXEC && HIBERNATION && X86_32 |
1409 | help | 1398 | ---help--- |
1410 | Jump between original kernel and kexeced kernel and invoke | 1399 | Jump between original kernel and kexeced kernel and invoke |
1411 | code in physical address mode via KEXEC | 1400 | code in physical address mode via KEXEC |
1412 | 1401 | ||
@@ -1415,7 +1404,7 @@ config PHYSICAL_START | |||
1415 | default "0x1000000" if X86_NUMAQ | 1404 | default "0x1000000" if X86_NUMAQ |
1416 | default "0x200000" if X86_64 | 1405 | default "0x200000" if X86_64 |
1417 | default "0x100000" | 1406 | default "0x100000" |
1418 | help | 1407 | ---help--- |
1419 | This gives the physical address where the kernel is loaded. | 1408 | This gives the physical address where the kernel is loaded. |
1420 | 1409 | ||
1421 | If kernel is a not relocatable (CONFIG_RELOCATABLE=n) then | 1410 | If kernel is a not relocatable (CONFIG_RELOCATABLE=n) then |
@@ -1456,7 +1445,7 @@ config PHYSICAL_START | |||
1456 | config RELOCATABLE | 1445 | config RELOCATABLE |
1457 | bool "Build a relocatable kernel (EXPERIMENTAL)" | 1446 | bool "Build a relocatable kernel (EXPERIMENTAL)" |
1458 | depends on EXPERIMENTAL | 1447 | depends on EXPERIMENTAL |
1459 | help | 1448 | ---help--- |
1460 | This builds a kernel image that retains relocation information | 1449 | This builds a kernel image that retains relocation information |
1461 | so it can be loaded someplace besides the default 1MB. | 1450 | so it can be loaded someplace besides the default 1MB. |
1462 | The relocations tend to make the kernel binary about 10% larger, | 1451 | The relocations tend to make the kernel binary about 10% larger, |
@@ -1476,7 +1465,7 @@ config PHYSICAL_ALIGN | |||
1476 | default "0x100000" if X86_32 | 1465 | default "0x100000" if X86_32 |
1477 | default "0x200000" if X86_64 | 1466 | default "0x200000" if X86_64 |
1478 | range 0x2000 0x400000 | 1467 | range 0x2000 0x400000 |
1479 | help | 1468 | ---help--- |
1480 | This value puts the alignment restrictions on physical address | 1469 | This value puts the alignment restrictions on physical address |
1481 | where kernel is loaded and run from. Kernel is compiled for an | 1470 | where kernel is loaded and run from. Kernel is compiled for an |
1482 | address which meets above alignment restriction. | 1471 | address which meets above alignment restriction. |
@@ -1497,7 +1486,7 @@ config PHYSICAL_ALIGN | |||
1497 | 1486 | ||
1498 | config HOTPLUG_CPU | 1487 | config HOTPLUG_CPU |
1499 | bool "Support for hot-pluggable CPUs" | 1488 | bool "Support for hot-pluggable CPUs" |
1500 | depends on SMP && HOTPLUG && !X86_VOYAGER | 1489 | depends on SMP && HOTPLUG |
1501 | ---help--- | 1490 | ---help--- |
1502 | Say Y here to allow turning CPUs off and on. CPUs can be | 1491 | Say Y here to allow turning CPUs off and on. CPUs can be |
1503 | controlled through /sys/devices/system/cpu. | 1492 | controlled through /sys/devices/system/cpu. |
@@ -1509,7 +1498,7 @@ config COMPAT_VDSO | |||
1509 | def_bool y | 1498 | def_bool y |
1510 | prompt "Compat VDSO support" | 1499 | prompt "Compat VDSO support" |
1511 | depends on X86_32 || IA32_EMULATION | 1500 | depends on X86_32 || IA32_EMULATION |
1512 | help | 1501 | ---help--- |
1513 | Map the 32-bit VDSO to the predictable old-style address too. | 1502 | Map the 32-bit VDSO to the predictable old-style address too. |
1514 | ---help--- | 1503 | ---help--- |
1515 | Say N here if you are running a sufficiently recent glibc | 1504 | Say N here if you are running a sufficiently recent glibc |
@@ -1521,7 +1510,7 @@ config COMPAT_VDSO | |||
1521 | config CMDLINE_BOOL | 1510 | config CMDLINE_BOOL |
1522 | bool "Built-in kernel command line" | 1511 | bool "Built-in kernel command line" |
1523 | default n | 1512 | default n |
1524 | help | 1513 | ---help--- |
1525 | Allow for specifying boot arguments to the kernel at | 1514 | Allow for specifying boot arguments to the kernel at |
1526 | build time. On some systems (e.g. embedded ones), it is | 1515 | build time. On some systems (e.g. embedded ones), it is |
1527 | necessary or convenient to provide some or all of the | 1516 | necessary or convenient to provide some or all of the |
@@ -1539,7 +1528,7 @@ config CMDLINE | |||
1539 | string "Built-in kernel command string" | 1528 | string "Built-in kernel command string" |
1540 | depends on CMDLINE_BOOL | 1529 | depends on CMDLINE_BOOL |
1541 | default "" | 1530 | default "" |
1542 | help | 1531 | ---help--- |
1543 | Enter arguments here that should be compiled into the kernel | 1532 | Enter arguments here that should be compiled into the kernel |
1544 | image and used at boot time. If the boot loader provides a | 1533 | image and used at boot time. If the boot loader provides a |
1545 | command line at boot time, it is appended to this string to | 1534 | command line at boot time, it is appended to this string to |
@@ -1556,7 +1545,7 @@ config CMDLINE_OVERRIDE | |||
1556 | bool "Built-in command line overrides boot loader arguments" | 1545 | bool "Built-in command line overrides boot loader arguments" |
1557 | default n | 1546 | default n |
1558 | depends on CMDLINE_BOOL | 1547 | depends on CMDLINE_BOOL |
1559 | help | 1548 | ---help--- |
1560 | Set this option to 'Y' to have the kernel ignore the boot loader | 1549 | Set this option to 'Y' to have the kernel ignore the boot loader |
1561 | command line, and use ONLY the built-in command line. | 1550 | command line, and use ONLY the built-in command line. |
1562 | 1551 | ||
@@ -1578,7 +1567,6 @@ config HAVE_ARCH_EARLY_PFN_TO_NID | |||
1578 | depends on NUMA | 1567 | depends on NUMA |
1579 | 1568 | ||
1580 | menu "Power management and ACPI options" | 1569 | menu "Power management and ACPI options" |
1581 | depends on !X86_VOYAGER | ||
1582 | 1570 | ||
1583 | config ARCH_HIBERNATION_HEADER | 1571 | config ARCH_HIBERNATION_HEADER |
1584 | def_bool y | 1572 | def_bool y |
@@ -1656,7 +1644,7 @@ if APM | |||
1656 | 1644 | ||
1657 | config APM_IGNORE_USER_SUSPEND | 1645 | config APM_IGNORE_USER_SUSPEND |
1658 | bool "Ignore USER SUSPEND" | 1646 | bool "Ignore USER SUSPEND" |
1659 | help | 1647 | ---help--- |
1660 | This option will ignore USER SUSPEND requests. On machines with a | 1648 | This option will ignore USER SUSPEND requests. On machines with a |
1661 | compliant APM BIOS, you want to say N. However, on the NEC Versa M | 1649 | compliant APM BIOS, you want to say N. However, on the NEC Versa M |
1662 | series notebooks, it is necessary to say Y because of a BIOS bug. | 1650 | series notebooks, it is necessary to say Y because of a BIOS bug. |
@@ -1680,7 +1668,7 @@ config APM_DO_ENABLE | |||
1680 | 1668 | ||
1681 | config APM_CPU_IDLE | 1669 | config APM_CPU_IDLE |
1682 | bool "Make CPU Idle calls when idle" | 1670 | bool "Make CPU Idle calls when idle" |
1683 | help | 1671 | ---help--- |
1684 | Enable calls to APM CPU Idle/CPU Busy inside the kernel's idle loop. | 1672 | Enable calls to APM CPU Idle/CPU Busy inside the kernel's idle loop. |
1685 | On some machines, this can activate improved power savings, such as | 1673 | On some machines, this can activate improved power savings, such as |
1686 | a slowed CPU clock rate, when the machine is idle. These idle calls | 1674 | a slowed CPU clock rate, when the machine is idle. These idle calls |
@@ -1691,7 +1679,7 @@ config APM_CPU_IDLE | |||
1691 | 1679 | ||
1692 | config APM_DISPLAY_BLANK | 1680 | config APM_DISPLAY_BLANK |
1693 | bool "Enable console blanking using APM" | 1681 | bool "Enable console blanking using APM" |
1694 | help | 1682 | ---help--- |
1695 | Enable console blanking using the APM. Some laptops can use this to | 1683 | Enable console blanking using the APM. Some laptops can use this to |
1696 | turn off the LCD backlight when the screen blanker of the Linux | 1684 | turn off the LCD backlight when the screen blanker of the Linux |
1697 | virtual console blanks the screen. Note that this is only used by | 1685 | virtual console blanks the screen. Note that this is only used by |
@@ -1704,7 +1692,7 @@ config APM_DISPLAY_BLANK | |||
1704 | 1692 | ||
1705 | config APM_ALLOW_INTS | 1693 | config APM_ALLOW_INTS |
1706 | bool "Allow interrupts during APM BIOS calls" | 1694 | bool "Allow interrupts during APM BIOS calls" |
1707 | help | 1695 | ---help--- |
1708 | Normally we disable external interrupts while we are making calls to | 1696 | Normally we disable external interrupts while we are making calls to |
1709 | the APM BIOS as a measure to lessen the effects of a badly behaving | 1697 | the APM BIOS as a measure to lessen the effects of a badly behaving |
1710 | BIOS implementation. The BIOS should reenable interrupts if it | 1698 | BIOS implementation. The BIOS should reenable interrupts if it |
@@ -1729,7 +1717,7 @@ config PCI | |||
1729 | bool "PCI support" | 1717 | bool "PCI support" |
1730 | default y | 1718 | default y |
1731 | select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC) | 1719 | select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC) |
1732 | help | 1720 | ---help--- |
1733 | Find out whether you have a PCI motherboard. PCI is the name of a | 1721 | Find out whether you have a PCI motherboard. PCI is the name of a |
1734 | bus system, i.e. the way the CPU talks to the other stuff inside | 1722 | bus system, i.e. the way the CPU talks to the other stuff inside |
1735 | your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or | 1723 | your box. Other bus systems are ISA, EISA, MicroChannel (MCA) or |
@@ -1800,7 +1788,7 @@ config PCI_MMCONFIG | |||
1800 | config DMAR | 1788 | config DMAR |
1801 | bool "Support for DMA Remapping Devices (EXPERIMENTAL)" | 1789 | bool "Support for DMA Remapping Devices (EXPERIMENTAL)" |
1802 | depends on X86_64 && PCI_MSI && ACPI && EXPERIMENTAL | 1790 | depends on X86_64 && PCI_MSI && ACPI && EXPERIMENTAL |
1803 | help | 1791 | ---help--- |
1804 | DMA remapping (DMAR) devices support enables independent address | 1792 | DMA remapping (DMAR) devices support enables independent address |
1805 | translations for Direct Memory Access (DMA) from devices. | 1793 | translations for Direct Memory Access (DMA) from devices. |
1806 | These DMA remapping devices are reported via ACPI tables | 1794 | These DMA remapping devices are reported via ACPI tables |
@@ -1822,29 +1810,29 @@ config DMAR_GFX_WA | |||
1822 | def_bool y | 1810 | def_bool y |
1823 | prompt "Support for Graphics workaround" | 1811 | prompt "Support for Graphics workaround" |
1824 | depends on DMAR | 1812 | depends on DMAR |
1825 | help | 1813 | ---help--- |
1826 | Current Graphics drivers tend to use physical address | 1814 | Current Graphics drivers tend to use physical address |
1827 | for DMA and avoid using DMA APIs. Setting this config | 1815 | for DMA and avoid using DMA APIs. Setting this config |
1828 | option permits the IOMMU driver to set a unity map for | 1816 | option permits the IOMMU driver to set a unity map for |
1829 | all the OS-visible memory. Hence the driver can continue | 1817 | all the OS-visible memory. Hence the driver can continue |
1830 | to use physical addresses for DMA. | 1818 | to use physical addresses for DMA. |
1831 | 1819 | ||
1832 | config DMAR_FLOPPY_WA | 1820 | config DMAR_FLOPPY_WA |
1833 | def_bool y | 1821 | def_bool y |
1834 | depends on DMAR | 1822 | depends on DMAR |
1835 | help | 1823 | ---help--- |
1836 | Floppy disk drivers are know to bypass DMA API calls | 1824 | Floppy disk drivers are know to bypass DMA API calls |
1837 | thereby failing to work when IOMMU is enabled. This | 1825 | thereby failing to work when IOMMU is enabled. This |
1838 | workaround will setup a 1:1 mapping for the first | 1826 | workaround will setup a 1:1 mapping for the first |
1839 | 16M to make floppy (an ISA device) work. | 1827 | 16M to make floppy (an ISA device) work. |
1840 | 1828 | ||
1841 | config INTR_REMAP | 1829 | config INTR_REMAP |
1842 | bool "Support for Interrupt Remapping (EXPERIMENTAL)" | 1830 | bool "Support for Interrupt Remapping (EXPERIMENTAL)" |
1843 | depends on X86_64 && X86_IO_APIC && PCI_MSI && ACPI && EXPERIMENTAL | 1831 | depends on X86_64 && X86_IO_APIC && PCI_MSI && ACPI && EXPERIMENTAL |
1844 | help | 1832 | ---help--- |
1845 | Supports Interrupt remapping for IO-APIC and MSI devices. | 1833 | Supports Interrupt remapping for IO-APIC and MSI devices. |
1846 | To use x2apic mode in the CPU's which support x2APIC enhancements or | 1834 | To use x2apic mode in the CPU's which support x2APIC enhancements or |
1847 | to support platforms with CPU's having > 8 bit APIC ID, say Y. | 1835 | to support platforms with CPU's having > 8 bit APIC ID, say Y. |
1848 | 1836 | ||
1849 | source "drivers/pci/pcie/Kconfig" | 1837 | source "drivers/pci/pcie/Kconfig" |
1850 | 1838 | ||
@@ -1858,8 +1846,7 @@ if X86_32 | |||
1858 | 1846 | ||
1859 | config ISA | 1847 | config ISA |
1860 | bool "ISA support" | 1848 | bool "ISA support" |
1861 | depends on !X86_VOYAGER | 1849 | ---help--- |
1862 | help | ||
1863 | Find out whether you have ISA slots on your motherboard. ISA is the | 1850 | Find out whether you have ISA slots on your motherboard. ISA is the |
1864 | name of a bus system, i.e. the way the CPU talks to the other stuff | 1851 | name of a bus system, i.e. the way the CPU talks to the other stuff |
1865 | inside your box. Other bus systems are PCI, EISA, MicroChannel | 1852 | inside your box. Other bus systems are PCI, EISA, MicroChannel |
@@ -1885,9 +1872,8 @@ config EISA | |||
1885 | source "drivers/eisa/Kconfig" | 1872 | source "drivers/eisa/Kconfig" |
1886 | 1873 | ||
1887 | config MCA | 1874 | config MCA |
1888 | bool "MCA support" if !X86_VOYAGER | 1875 | bool "MCA support" |
1889 | default y if X86_VOYAGER | 1876 | ---help--- |
1890 | help | ||
1891 | MicroChannel Architecture is found in some IBM PS/2 machines and | 1877 | MicroChannel Architecture is found in some IBM PS/2 machines and |
1892 | laptops. It is a bus system similar to PCI or ISA. See | 1878 | laptops. It is a bus system similar to PCI or ISA. See |
1893 | <file:Documentation/mca.txt> (and especially the web page given | 1879 | <file:Documentation/mca.txt> (and especially the web page given |
@@ -1897,8 +1883,7 @@ source "drivers/mca/Kconfig" | |||
1897 | 1883 | ||
1898 | config SCx200 | 1884 | config SCx200 |
1899 | tristate "NatSemi SCx200 support" | 1885 | tristate "NatSemi SCx200 support" |
1900 | depends on !X86_VOYAGER | 1886 | ---help--- |
1901 | help | ||
1902 | This provides basic support for National Semiconductor's | 1887 | This provides basic support for National Semiconductor's |
1903 | (now AMD's) Geode processors. The driver probes for the | 1888 | (now AMD's) Geode processors. The driver probes for the |
1904 | PCI-IDs of several on-chip devices, so its a good dependency | 1889 | PCI-IDs of several on-chip devices, so its a good dependency |
@@ -1910,7 +1895,7 @@ config SCx200HR_TIMER | |||
1910 | tristate "NatSemi SCx200 27MHz High-Resolution Timer Support" | 1895 | tristate "NatSemi SCx200 27MHz High-Resolution Timer Support" |
1911 | depends on SCx200 && GENERIC_TIME | 1896 | depends on SCx200 && GENERIC_TIME |
1912 | default y | 1897 | default y |
1913 | help | 1898 | ---help--- |
1914 | This driver provides a clocksource built upon the on-chip | 1899 | This driver provides a clocksource built upon the on-chip |
1915 | 27MHz high-resolution timer. Its also a workaround for | 1900 | 27MHz high-resolution timer. Its also a workaround for |
1916 | NSC Geode SC-1100's buggy TSC, which loses time when the | 1901 | NSC Geode SC-1100's buggy TSC, which loses time when the |
@@ -1921,7 +1906,7 @@ config GEODE_MFGPT_TIMER | |||
1921 | def_bool y | 1906 | def_bool y |
1922 | prompt "Geode Multi-Function General Purpose Timer (MFGPT) events" | 1907 | prompt "Geode Multi-Function General Purpose Timer (MFGPT) events" |
1923 | depends on MGEODE_LX && GENERIC_TIME && GENERIC_CLOCKEVENTS | 1908 | depends on MGEODE_LX && GENERIC_TIME && GENERIC_CLOCKEVENTS |
1924 | help | 1909 | ---help--- |
1925 | This driver provides a clock event source based on the MFGPT | 1910 | This driver provides a clock event source based on the MFGPT |
1926 | timer(s) in the CS5535 and CS5536 companion chip for the geode. | 1911 | timer(s) in the CS5535 and CS5536 companion chip for the geode. |
1927 | MFGPTs have a better resolution and max interval than the | 1912 | MFGPTs have a better resolution and max interval than the |
@@ -1930,7 +1915,7 @@ config GEODE_MFGPT_TIMER | |||
1930 | config OLPC | 1915 | config OLPC |
1931 | bool "One Laptop Per Child support" | 1916 | bool "One Laptop Per Child support" |
1932 | default n | 1917 | default n |
1933 | help | 1918 | ---help--- |
1934 | Add support for detecting the unique features of the OLPC | 1919 | Add support for detecting the unique features of the OLPC |
1935 | XO hardware. | 1920 | XO hardware. |
1936 | 1921 | ||
@@ -1955,16 +1940,16 @@ config IA32_EMULATION | |||
1955 | bool "IA32 Emulation" | 1940 | bool "IA32 Emulation" |
1956 | depends on X86_64 | 1941 | depends on X86_64 |
1957 | select COMPAT_BINFMT_ELF | 1942 | select COMPAT_BINFMT_ELF |
1958 | help | 1943 | ---help--- |
1959 | Include code to run 32-bit programs under a 64-bit kernel. You should | 1944 | Include code to run 32-bit programs under a 64-bit kernel. You should |
1960 | likely turn this on, unless you're 100% sure that you don't have any | 1945 | likely turn this on, unless you're 100% sure that you don't have any |
1961 | 32-bit programs left. | 1946 | 32-bit programs left. |
1962 | 1947 | ||
1963 | config IA32_AOUT | 1948 | config IA32_AOUT |
1964 | tristate "IA32 a.out support" | 1949 | tristate "IA32 a.out support" |
1965 | depends on IA32_EMULATION | 1950 | depends on IA32_EMULATION |
1966 | help | 1951 | ---help--- |
1967 | Support old a.out binaries in the 32bit emulation. | 1952 | Support old a.out binaries in the 32bit emulation. |
1968 | 1953 | ||
1969 | config COMPAT | 1954 | config COMPAT |
1970 | def_bool y | 1955 | def_bool y |
diff --git a/arch/x86/Kconfig.cpu b/arch/x86/Kconfig.cpu index 085fef4d8660..a95eaf0e582a 100644 --- a/arch/x86/Kconfig.cpu +++ b/arch/x86/Kconfig.cpu | |||
@@ -50,7 +50,7 @@ config M386 | |||
50 | config M486 | 50 | config M486 |
51 | bool "486" | 51 | bool "486" |
52 | depends on X86_32 | 52 | depends on X86_32 |
53 | help | 53 | ---help--- |
54 | Select this for a 486 series processor, either Intel or one of the | 54 | Select this for a 486 series processor, either Intel or one of the |
55 | compatible processors from AMD, Cyrix, IBM, or Intel. Includes DX, | 55 | compatible processors from AMD, Cyrix, IBM, or Intel. Includes DX, |
56 | DX2, and DX4 variants; also SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or | 56 | DX2, and DX4 variants; also SL/SLC/SLC2/SLC3/SX/SX2 and UMC U5D or |
@@ -59,7 +59,7 @@ config M486 | |||
59 | config M586 | 59 | config M586 |
60 | bool "586/K5/5x86/6x86/6x86MX" | 60 | bool "586/K5/5x86/6x86/6x86MX" |
61 | depends on X86_32 | 61 | depends on X86_32 |
62 | help | 62 | ---help--- |
63 | Select this for an 586 or 686 series processor such as the AMD K5, | 63 | Select this for an 586 or 686 series processor such as the AMD K5, |
64 | the Cyrix 5x86, 6x86 and 6x86MX. This choice does not | 64 | the Cyrix 5x86, 6x86 and 6x86MX. This choice does not |
65 | assume the RDTSC (Read Time Stamp Counter) instruction. | 65 | assume the RDTSC (Read Time Stamp Counter) instruction. |
@@ -67,21 +67,21 @@ config M586 | |||
67 | config M586TSC | 67 | config M586TSC |
68 | bool "Pentium-Classic" | 68 | bool "Pentium-Classic" |
69 | depends on X86_32 | 69 | depends on X86_32 |
70 | help | 70 | ---help--- |
71 | Select this for a Pentium Classic processor with the RDTSC (Read | 71 | Select this for a Pentium Classic processor with the RDTSC (Read |
72 | Time Stamp Counter) instruction for benchmarking. | 72 | Time Stamp Counter) instruction for benchmarking. |
73 | 73 | ||
74 | config M586MMX | 74 | config M586MMX |
75 | bool "Pentium-MMX" | 75 | bool "Pentium-MMX" |
76 | depends on X86_32 | 76 | depends on X86_32 |
77 | help | 77 | ---help--- |
78 | Select this for a Pentium with the MMX graphics/multimedia | 78 | Select this for a Pentium with the MMX graphics/multimedia |
79 | extended instructions. | 79 | extended instructions. |
80 | 80 | ||
81 | config M686 | 81 | config M686 |
82 | bool "Pentium-Pro" | 82 | bool "Pentium-Pro" |
83 | depends on X86_32 | 83 | depends on X86_32 |
84 | help | 84 | ---help--- |
85 | Select this for Intel Pentium Pro chips. This enables the use of | 85 | Select this for Intel Pentium Pro chips. This enables the use of |
86 | Pentium Pro extended instructions, and disables the init-time guard | 86 | Pentium Pro extended instructions, and disables the init-time guard |
87 | against the f00f bug found in earlier Pentiums. | 87 | against the f00f bug found in earlier Pentiums. |
@@ -89,7 +89,7 @@ config M686 | |||
89 | config MPENTIUMII | 89 | config MPENTIUMII |
90 | bool "Pentium-II/Celeron(pre-Coppermine)" | 90 | bool "Pentium-II/Celeron(pre-Coppermine)" |
91 | depends on X86_32 | 91 | depends on X86_32 |
92 | help | 92 | ---help--- |
93 | Select this for Intel chips based on the Pentium-II and | 93 | Select this for Intel chips based on the Pentium-II and |
94 | pre-Coppermine Celeron core. This option enables an unaligned | 94 | pre-Coppermine Celeron core. This option enables an unaligned |
95 | copy optimization, compiles the kernel with optimization flags | 95 | copy optimization, compiles the kernel with optimization flags |
@@ -99,7 +99,7 @@ config MPENTIUMII | |||
99 | config MPENTIUMIII | 99 | config MPENTIUMIII |
100 | bool "Pentium-III/Celeron(Coppermine)/Pentium-III Xeon" | 100 | bool "Pentium-III/Celeron(Coppermine)/Pentium-III Xeon" |
101 | depends on X86_32 | 101 | depends on X86_32 |
102 | help | 102 | ---help--- |
103 | Select this for Intel chips based on the Pentium-III and | 103 | Select this for Intel chips based on the Pentium-III and |
104 | Celeron-Coppermine core. This option enables use of some | 104 | Celeron-Coppermine core. This option enables use of some |
105 | extended prefetch instructions in addition to the Pentium II | 105 | extended prefetch instructions in addition to the Pentium II |
@@ -108,14 +108,14 @@ config MPENTIUMIII | |||
108 | config MPENTIUMM | 108 | config MPENTIUMM |
109 | bool "Pentium M" | 109 | bool "Pentium M" |
110 | depends on X86_32 | 110 | depends on X86_32 |
111 | help | 111 | ---help--- |
112 | Select this for Intel Pentium M (not Pentium-4 M) | 112 | Select this for Intel Pentium M (not Pentium-4 M) |
113 | notebook chips. | 113 | notebook chips. |
114 | 114 | ||
115 | config MPENTIUM4 | 115 | config MPENTIUM4 |
116 | bool "Pentium-4/Celeron(P4-based)/Pentium-4 M/older Xeon" | 116 | bool "Pentium-4/Celeron(P4-based)/Pentium-4 M/older Xeon" |
117 | depends on X86_32 | 117 | depends on X86_32 |
118 | help | 118 | ---help--- |
119 | Select this for Intel Pentium 4 chips. This includes the | 119 | Select this for Intel Pentium 4 chips. This includes the |
120 | Pentium 4, Pentium D, P4-based Celeron and Xeon, and | 120 | Pentium 4, Pentium D, P4-based Celeron and Xeon, and |
121 | Pentium-4 M (not Pentium M) chips. This option enables compile | 121 | Pentium-4 M (not Pentium M) chips. This option enables compile |
@@ -151,7 +151,7 @@ config MPENTIUM4 | |||
151 | config MK6 | 151 | config MK6 |
152 | bool "K6/K6-II/K6-III" | 152 | bool "K6/K6-II/K6-III" |
153 | depends on X86_32 | 153 | depends on X86_32 |
154 | help | 154 | ---help--- |
155 | Select this for an AMD K6-family processor. Enables use of | 155 | Select this for an AMD K6-family processor. Enables use of |
156 | some extended instructions, and passes appropriate optimization | 156 | some extended instructions, and passes appropriate optimization |
157 | flags to GCC. | 157 | flags to GCC. |
@@ -159,14 +159,14 @@ config MK6 | |||
159 | config MK7 | 159 | config MK7 |
160 | bool "Athlon/Duron/K7" | 160 | bool "Athlon/Duron/K7" |
161 | depends on X86_32 | 161 | depends on X86_32 |
162 | help | 162 | ---help--- |
163 | Select this for an AMD Athlon K7-family processor. Enables use of | 163 | Select this for an AMD Athlon K7-family processor. Enables use of |
164 | some extended instructions, and passes appropriate optimization | 164 | some extended instructions, and passes appropriate optimization |
165 | flags to GCC. | 165 | flags to GCC. |
166 | 166 | ||
167 | config MK8 | 167 | config MK8 |
168 | bool "Opteron/Athlon64/Hammer/K8" | 168 | bool "Opteron/Athlon64/Hammer/K8" |
169 | help | 169 | ---help--- |
170 | Select this for an AMD Opteron or Athlon64 Hammer-family processor. | 170 | Select this for an AMD Opteron or Athlon64 Hammer-family processor. |
171 | Enables use of some extended instructions, and passes appropriate | 171 | Enables use of some extended instructions, and passes appropriate |
172 | optimization flags to GCC. | 172 | optimization flags to GCC. |
@@ -174,7 +174,7 @@ config MK8 | |||
174 | config MCRUSOE | 174 | config MCRUSOE |
175 | bool "Crusoe" | 175 | bool "Crusoe" |
176 | depends on X86_32 | 176 | depends on X86_32 |
177 | help | 177 | ---help--- |
178 | Select this for a Transmeta Crusoe processor. Treats the processor | 178 | Select this for a Transmeta Crusoe processor. Treats the processor |
179 | like a 586 with TSC, and sets some GCC optimization flags (like a | 179 | like a 586 with TSC, and sets some GCC optimization flags (like a |
180 | Pentium Pro with no alignment requirements). | 180 | Pentium Pro with no alignment requirements). |
@@ -182,13 +182,13 @@ config MCRUSOE | |||
182 | config MEFFICEON | 182 | config MEFFICEON |
183 | bool "Efficeon" | 183 | bool "Efficeon" |
184 | depends on X86_32 | 184 | depends on X86_32 |
185 | help | 185 | ---help--- |
186 | Select this for a Transmeta Efficeon processor. | 186 | Select this for a Transmeta Efficeon processor. |
187 | 187 | ||
188 | config MWINCHIPC6 | 188 | config MWINCHIPC6 |
189 | bool "Winchip-C6" | 189 | bool "Winchip-C6" |
190 | depends on X86_32 | 190 | depends on X86_32 |
191 | help | 191 | ---help--- |
192 | Select this for an IDT Winchip C6 chip. Linux and GCC | 192 | Select this for an IDT Winchip C6 chip. Linux and GCC |
193 | treat this chip as a 586TSC with some extended instructions | 193 | treat this chip as a 586TSC with some extended instructions |
194 | and alignment requirements. | 194 | and alignment requirements. |
@@ -196,7 +196,7 @@ config MWINCHIPC6 | |||
196 | config MWINCHIP3D | 196 | config MWINCHIP3D |
197 | bool "Winchip-2/Winchip-2A/Winchip-3" | 197 | bool "Winchip-2/Winchip-2A/Winchip-3" |
198 | depends on X86_32 | 198 | depends on X86_32 |
199 | help | 199 | ---help--- |
200 | Select this for an IDT Winchip-2, 2A or 3. Linux and GCC | 200 | Select this for an IDT Winchip-2, 2A or 3. Linux and GCC |
201 | treat this chip as a 586TSC with some extended instructions | 201 | treat this chip as a 586TSC with some extended instructions |
202 | and alignment requirements. Also enable out of order memory | 202 | and alignment requirements. Also enable out of order memory |
@@ -206,19 +206,19 @@ config MWINCHIP3D | |||
206 | config MGEODEGX1 | 206 | config MGEODEGX1 |
207 | bool "GeodeGX1" | 207 | bool "GeodeGX1" |
208 | depends on X86_32 | 208 | depends on X86_32 |
209 | help | 209 | ---help--- |
210 | Select this for a Geode GX1 (Cyrix MediaGX) chip. | 210 | Select this for a Geode GX1 (Cyrix MediaGX) chip. |
211 | 211 | ||
212 | config MGEODE_LX | 212 | config MGEODE_LX |
213 | bool "Geode GX/LX" | 213 | bool "Geode GX/LX" |
214 | depends on X86_32 | 214 | depends on X86_32 |
215 | help | 215 | ---help--- |
216 | Select this for AMD Geode GX and LX processors. | 216 | Select this for AMD Geode GX and LX processors. |
217 | 217 | ||
218 | config MCYRIXIII | 218 | config MCYRIXIII |
219 | bool "CyrixIII/VIA-C3" | 219 | bool "CyrixIII/VIA-C3" |
220 | depends on X86_32 | 220 | depends on X86_32 |
221 | help | 221 | ---help--- |
222 | Select this for a Cyrix III or C3 chip. Presently Linux and GCC | 222 | Select this for a Cyrix III or C3 chip. Presently Linux and GCC |
223 | treat this chip as a generic 586. Whilst the CPU is 686 class, | 223 | treat this chip as a generic 586. Whilst the CPU is 686 class, |
224 | it lacks the cmov extension which gcc assumes is present when | 224 | it lacks the cmov extension which gcc assumes is present when |
@@ -230,7 +230,7 @@ config MCYRIXIII | |||
230 | config MVIAC3_2 | 230 | config MVIAC3_2 |
231 | bool "VIA C3-2 (Nehemiah)" | 231 | bool "VIA C3-2 (Nehemiah)" |
232 | depends on X86_32 | 232 | depends on X86_32 |
233 | help | 233 | ---help--- |
234 | Select this for a VIA C3 "Nehemiah". Selecting this enables usage | 234 | Select this for a VIA C3 "Nehemiah". Selecting this enables usage |
235 | of SSE and tells gcc to treat the CPU as a 686. | 235 | of SSE and tells gcc to treat the CPU as a 686. |
236 | Note, this kernel will not boot on older (pre model 9) C3s. | 236 | Note, this kernel will not boot on older (pre model 9) C3s. |
@@ -238,14 +238,14 @@ config MVIAC3_2 | |||
238 | config MVIAC7 | 238 | config MVIAC7 |
239 | bool "VIA C7" | 239 | bool "VIA C7" |
240 | depends on X86_32 | 240 | depends on X86_32 |
241 | help | 241 | ---help--- |
242 | Select this for a VIA C7. Selecting this uses the correct cache | 242 | Select this for a VIA C7. Selecting this uses the correct cache |
243 | shift and tells gcc to treat the CPU as a 686. | 243 | shift and tells gcc to treat the CPU as a 686. |
244 | 244 | ||
245 | config MPSC | 245 | config MPSC |
246 | bool "Intel P4 / older Netburst based Xeon" | 246 | bool "Intel P4 / older Netburst based Xeon" |
247 | depends on X86_64 | 247 | depends on X86_64 |
248 | help | 248 | ---help--- |
249 | Optimize for Intel Pentium 4, Pentium D and older Nocona/Dempsey | 249 | Optimize for Intel Pentium 4, Pentium D and older Nocona/Dempsey |
250 | Xeon CPUs with Intel 64bit which is compatible with x86-64. | 250 | Xeon CPUs with Intel 64bit which is compatible with x86-64. |
251 | Note that the latest Xeons (Xeon 51xx and 53xx) are not based on the | 251 | Note that the latest Xeons (Xeon 51xx and 53xx) are not based on the |
@@ -255,7 +255,7 @@ config MPSC | |||
255 | 255 | ||
256 | config MCORE2 | 256 | config MCORE2 |
257 | bool "Core 2/newer Xeon" | 257 | bool "Core 2/newer Xeon" |
258 | help | 258 | ---help--- |
259 | 259 | ||
260 | Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and | 260 | Select this for Intel Core 2 and newer Core 2 Xeons (Xeon 51xx and |
261 | 53xx) CPUs. You can distinguish newer from older Xeons by the CPU | 261 | 53xx) CPUs. You can distinguish newer from older Xeons by the CPU |
@@ -265,7 +265,7 @@ config MCORE2 | |||
265 | config GENERIC_CPU | 265 | config GENERIC_CPU |
266 | bool "Generic-x86-64" | 266 | bool "Generic-x86-64" |
267 | depends on X86_64 | 267 | depends on X86_64 |
268 | help | 268 | ---help--- |
269 | Generic x86-64 CPU. | 269 | Generic x86-64 CPU. |
270 | Run equally well on all x86-64 CPUs. | 270 | Run equally well on all x86-64 CPUs. |
271 | 271 | ||
@@ -274,7 +274,7 @@ endchoice | |||
274 | config X86_GENERIC | 274 | config X86_GENERIC |
275 | bool "Generic x86 support" | 275 | bool "Generic x86 support" |
276 | depends on X86_32 | 276 | depends on X86_32 |
277 | help | 277 | ---help--- |
278 | Instead of just including optimizations for the selected | 278 | Instead of just including optimizations for the selected |
279 | x86 variant (e.g. PII, Crusoe or Athlon), include some more | 279 | x86 variant (e.g. PII, Crusoe or Athlon), include some more |
280 | generic optimizations as well. This will make the kernel | 280 | generic optimizations as well. This will make the kernel |
@@ -319,7 +319,7 @@ config X86_XADD | |||
319 | config X86_PPRO_FENCE | 319 | config X86_PPRO_FENCE |
320 | bool "PentiumPro memory ordering errata workaround" | 320 | bool "PentiumPro memory ordering errata workaround" |
321 | depends on M686 || M586MMX || M586TSC || M586 || M486 || M386 || MGEODEGX1 | 321 | depends on M686 || M586MMX || M586TSC || M586 || M486 || M386 || MGEODEGX1 |
322 | help | 322 | ---help--- |
323 | Old PentiumPro multiprocessor systems had errata that could cause | 323 | Old PentiumPro multiprocessor systems had errata that could cause |
324 | memory operations to violate the x86 ordering standard in rare cases. | 324 | memory operations to violate the x86 ordering standard in rare cases. |
325 | Enabling this option will attempt to work around some (but not all) | 325 | Enabling this option will attempt to work around some (but not all) |
@@ -412,14 +412,14 @@ config X86_DEBUGCTLMSR | |||
412 | 412 | ||
413 | menuconfig PROCESSOR_SELECT | 413 | menuconfig PROCESSOR_SELECT |
414 | bool "Supported processor vendors" if EMBEDDED | 414 | bool "Supported processor vendors" if EMBEDDED |
415 | help | 415 | ---help--- |
416 | This lets you choose what x86 vendor support code your kernel | 416 | This lets you choose what x86 vendor support code your kernel |
417 | will include. | 417 | will include. |
418 | 418 | ||
419 | config CPU_SUP_INTEL | 419 | config CPU_SUP_INTEL |
420 | default y | 420 | default y |
421 | bool "Support Intel processors" if PROCESSOR_SELECT | 421 | bool "Support Intel processors" if PROCESSOR_SELECT |
422 | help | 422 | ---help--- |
423 | This enables detection, tunings and quirks for Intel processors | 423 | This enables detection, tunings and quirks for Intel processors |
424 | 424 | ||
425 | You need this enabled if you want your kernel to run on an | 425 | You need this enabled if you want your kernel to run on an |
@@ -433,7 +433,7 @@ config CPU_SUP_CYRIX_32 | |||
433 | default y | 433 | default y |
434 | bool "Support Cyrix processors" if PROCESSOR_SELECT | 434 | bool "Support Cyrix processors" if PROCESSOR_SELECT |
435 | depends on !64BIT | 435 | depends on !64BIT |
436 | help | 436 | ---help--- |
437 | This enables detection, tunings and quirks for Cyrix processors | 437 | This enables detection, tunings and quirks for Cyrix processors |
438 | 438 | ||
439 | You need this enabled if you want your kernel to run on a | 439 | You need this enabled if you want your kernel to run on a |
@@ -446,7 +446,7 @@ config CPU_SUP_CYRIX_32 | |||
446 | config CPU_SUP_AMD | 446 | config CPU_SUP_AMD |
447 | default y | 447 | default y |
448 | bool "Support AMD processors" if PROCESSOR_SELECT | 448 | bool "Support AMD processors" if PROCESSOR_SELECT |
449 | help | 449 | ---help--- |
450 | This enables detection, tunings and quirks for AMD processors | 450 | This enables detection, tunings and quirks for AMD processors |
451 | 451 | ||
452 | You need this enabled if you want your kernel to run on an | 452 | You need this enabled if you want your kernel to run on an |
@@ -460,7 +460,7 @@ config CPU_SUP_CENTAUR_32 | |||
460 | default y | 460 | default y |
461 | bool "Support Centaur processors" if PROCESSOR_SELECT | 461 | bool "Support Centaur processors" if PROCESSOR_SELECT |
462 | depends on !64BIT | 462 | depends on !64BIT |
463 | help | 463 | ---help--- |
464 | This enables detection, tunings and quirks for Centaur processors | 464 | This enables detection, tunings and quirks for Centaur processors |
465 | 465 | ||
466 | You need this enabled if you want your kernel to run on a | 466 | You need this enabled if you want your kernel to run on a |
@@ -474,7 +474,7 @@ config CPU_SUP_CENTAUR_64 | |||
474 | default y | 474 | default y |
475 | bool "Support Centaur processors" if PROCESSOR_SELECT | 475 | bool "Support Centaur processors" if PROCESSOR_SELECT |
476 | depends on 64BIT | 476 | depends on 64BIT |
477 | help | 477 | ---help--- |
478 | This enables detection, tunings and quirks for Centaur processors | 478 | This enables detection, tunings and quirks for Centaur processors |
479 | 479 | ||
480 | You need this enabled if you want your kernel to run on a | 480 | You need this enabled if you want your kernel to run on a |
@@ -488,7 +488,7 @@ config CPU_SUP_TRANSMETA_32 | |||
488 | default y | 488 | default y |
489 | bool "Support Transmeta processors" if PROCESSOR_SELECT | 489 | bool "Support Transmeta processors" if PROCESSOR_SELECT |
490 | depends on !64BIT | 490 | depends on !64BIT |
491 | help | 491 | ---help--- |
492 | This enables detection, tunings and quirks for Transmeta processors | 492 | This enables detection, tunings and quirks for Transmeta processors |
493 | 493 | ||
494 | You need this enabled if you want your kernel to run on a | 494 | You need this enabled if you want your kernel to run on a |
@@ -502,7 +502,7 @@ config CPU_SUP_UMC_32 | |||
502 | default y | 502 | default y |
503 | bool "Support UMC processors" if PROCESSOR_SELECT | 503 | bool "Support UMC processors" if PROCESSOR_SELECT |
504 | depends on !64BIT | 504 | depends on !64BIT |
505 | help | 505 | ---help--- |
506 | This enables detection, tunings and quirks for UMC processors | 506 | This enables detection, tunings and quirks for UMC processors |
507 | 507 | ||
508 | You need this enabled if you want your kernel to run on a | 508 | You need this enabled if you want your kernel to run on a |
@@ -521,7 +521,7 @@ config X86_PTRACE_BTS | |||
521 | bool "Branch Trace Store" | 521 | bool "Branch Trace Store" |
522 | default y | 522 | default y |
523 | depends on X86_DEBUGCTLMSR | 523 | depends on X86_DEBUGCTLMSR |
524 | help | 524 | ---help--- |
525 | This adds a ptrace interface to the hardware's branch trace store. | 525 | This adds a ptrace interface to the hardware's branch trace store. |
526 | 526 | ||
527 | Debuggers may use it to collect an execution trace of the debugged | 527 | Debuggers may use it to collect an execution trace of the debugged |
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug index 28f111461ca8..ba4781b93890 100644 --- a/arch/x86/Kconfig.debug +++ b/arch/x86/Kconfig.debug | |||
@@ -7,7 +7,7 @@ source "lib/Kconfig.debug" | |||
7 | 7 | ||
8 | config STRICT_DEVMEM | 8 | config STRICT_DEVMEM |
9 | bool "Filter access to /dev/mem" | 9 | bool "Filter access to /dev/mem" |
10 | help | 10 | ---help--- |
11 | If this option is disabled, you allow userspace (root) access to all | 11 | If this option is disabled, you allow userspace (root) access to all |
12 | of memory, including kernel and userspace memory. Accidental | 12 | of memory, including kernel and userspace memory. Accidental |
13 | access to this is obviously disastrous, but specific access can | 13 | access to this is obviously disastrous, but specific access can |
@@ -25,7 +25,7 @@ config STRICT_DEVMEM | |||
25 | config X86_VERBOSE_BOOTUP | 25 | config X86_VERBOSE_BOOTUP |
26 | bool "Enable verbose x86 bootup info messages" | 26 | bool "Enable verbose x86 bootup info messages" |
27 | default y | 27 | default y |
28 | help | 28 | ---help--- |
29 | Enables the informational output from the decompression stage | 29 | Enables the informational output from the decompression stage |
30 | (e.g. bzImage) of the boot. If you disable this you will still | 30 | (e.g. bzImage) of the boot. If you disable this you will still |
31 | see errors. Disable this if you want silent bootup. | 31 | see errors. Disable this if you want silent bootup. |
@@ -33,7 +33,7 @@ config X86_VERBOSE_BOOTUP | |||
33 | config EARLY_PRINTK | 33 | config EARLY_PRINTK |
34 | bool "Early printk" if EMBEDDED | 34 | bool "Early printk" if EMBEDDED |
35 | default y | 35 | default y |
36 | help | 36 | ---help--- |
37 | Write kernel log output directly into the VGA buffer or to a serial | 37 | Write kernel log output directly into the VGA buffer or to a serial |
38 | port. | 38 | port. |
39 | 39 | ||
@@ -47,7 +47,7 @@ config EARLY_PRINTK_DBGP | |||
47 | bool "Early printk via EHCI debug port" | 47 | bool "Early printk via EHCI debug port" |
48 | default n | 48 | default n |
49 | depends on EARLY_PRINTK && PCI | 49 | depends on EARLY_PRINTK && PCI |
50 | help | 50 | ---help--- |
51 | Write kernel log output directly into the EHCI debug port. | 51 | Write kernel log output directly into the EHCI debug port. |
52 | 52 | ||
53 | This is useful for kernel debugging when your machine crashes very | 53 | This is useful for kernel debugging when your machine crashes very |
@@ -59,14 +59,14 @@ config EARLY_PRINTK_DBGP | |||
59 | config DEBUG_STACKOVERFLOW | 59 | config DEBUG_STACKOVERFLOW |
60 | bool "Check for stack overflows" | 60 | bool "Check for stack overflows" |
61 | depends on DEBUG_KERNEL | 61 | depends on DEBUG_KERNEL |
62 | help | 62 | ---help--- |
63 | This option will cause messages to be printed if free stack space | 63 | This option will cause messages to be printed if free stack space |
64 | drops below a certain limit. | 64 | drops below a certain limit. |
65 | 65 | ||
66 | config DEBUG_STACK_USAGE | 66 | config DEBUG_STACK_USAGE |
67 | bool "Stack utilization instrumentation" | 67 | bool "Stack utilization instrumentation" |
68 | depends on DEBUG_KERNEL | 68 | depends on DEBUG_KERNEL |
69 | help | 69 | ---help--- |
70 | Enables the display of the minimum amount of free stack which each | 70 | Enables the display of the minimum amount of free stack which each |
71 | task has ever had available in the sysrq-T and sysrq-P debug output. | 71 | task has ever had available in the sysrq-T and sysrq-P debug output. |
72 | 72 | ||
@@ -75,7 +75,7 @@ config DEBUG_STACK_USAGE | |||
75 | config DEBUG_PAGEALLOC | 75 | config DEBUG_PAGEALLOC |
76 | bool "Debug page memory allocations" | 76 | bool "Debug page memory allocations" |
77 | depends on DEBUG_KERNEL | 77 | depends on DEBUG_KERNEL |
78 | help | 78 | ---help--- |
79 | Unmap pages from the kernel linear mapping after free_pages(). | 79 | Unmap pages from the kernel linear mapping after free_pages(). |
80 | This results in a large slowdown, but helps to find certain types | 80 | This results in a large slowdown, but helps to find certain types |
81 | of memory corruptions. | 81 | of memory corruptions. |
@@ -83,9 +83,9 @@ config DEBUG_PAGEALLOC | |||
83 | config DEBUG_PER_CPU_MAPS | 83 | config DEBUG_PER_CPU_MAPS |
84 | bool "Debug access to per_cpu maps" | 84 | bool "Debug access to per_cpu maps" |
85 | depends on DEBUG_KERNEL | 85 | depends on DEBUG_KERNEL |
86 | depends on X86_SMP | 86 | depends on SMP |
87 | default n | 87 | default n |
88 | help | 88 | ---help--- |
89 | Say Y to verify that the per_cpu map being accessed has | 89 | Say Y to verify that the per_cpu map being accessed has |
90 | been setup. Adds a fair amount of code to kernel memory | 90 | been setup. Adds a fair amount of code to kernel memory |
91 | and decreases performance. | 91 | and decreases performance. |
@@ -96,7 +96,7 @@ config X86_PTDUMP | |||
96 | bool "Export kernel pagetable layout to userspace via debugfs" | 96 | bool "Export kernel pagetable layout to userspace via debugfs" |
97 | depends on DEBUG_KERNEL | 97 | depends on DEBUG_KERNEL |
98 | select DEBUG_FS | 98 | select DEBUG_FS |
99 | help | 99 | ---help--- |
100 | Say Y here if you want to show the kernel pagetable layout in a | 100 | Say Y here if you want to show the kernel pagetable layout in a |
101 | debugfs file. This information is only useful for kernel developers | 101 | debugfs file. This information is only useful for kernel developers |
102 | who are working in architecture specific areas of the kernel. | 102 | who are working in architecture specific areas of the kernel. |
@@ -108,7 +108,7 @@ config DEBUG_RODATA | |||
108 | bool "Write protect kernel read-only data structures" | 108 | bool "Write protect kernel read-only data structures" |
109 | default y | 109 | default y |
110 | depends on DEBUG_KERNEL | 110 | depends on DEBUG_KERNEL |
111 | help | 111 | ---help--- |
112 | Mark the kernel read-only data as write-protected in the pagetables, | 112 | Mark the kernel read-only data as write-protected in the pagetables, |
113 | in order to catch accidental (and incorrect) writes to such const | 113 | in order to catch accidental (and incorrect) writes to such const |
114 | data. This is recommended so that we can catch kernel bugs sooner. | 114 | data. This is recommended so that we can catch kernel bugs sooner. |
@@ -118,7 +118,7 @@ config DEBUG_RODATA_TEST | |||
118 | bool "Testcase for the DEBUG_RODATA feature" | 118 | bool "Testcase for the DEBUG_RODATA feature" |
119 | depends on DEBUG_RODATA | 119 | depends on DEBUG_RODATA |
120 | default y | 120 | default y |
121 | help | 121 | ---help--- |
122 | This option enables a testcase for the DEBUG_RODATA | 122 | This option enables a testcase for the DEBUG_RODATA |
123 | feature as well as for the change_page_attr() infrastructure. | 123 | feature as well as for the change_page_attr() infrastructure. |
124 | If in doubt, say "N" | 124 | If in doubt, say "N" |
@@ -126,7 +126,7 @@ config DEBUG_RODATA_TEST | |||
126 | config DEBUG_NX_TEST | 126 | config DEBUG_NX_TEST |
127 | tristate "Testcase for the NX non-executable stack feature" | 127 | tristate "Testcase for the NX non-executable stack feature" |
128 | depends on DEBUG_KERNEL && m | 128 | depends on DEBUG_KERNEL && m |
129 | help | 129 | ---help--- |
130 | This option enables a testcase for the CPU NX capability | 130 | This option enables a testcase for the CPU NX capability |
131 | and the software setup of this feature. | 131 | and the software setup of this feature. |
132 | If in doubt, say "N" | 132 | If in doubt, say "N" |
@@ -134,7 +134,7 @@ config DEBUG_NX_TEST | |||
134 | config 4KSTACKS | 134 | config 4KSTACKS |
135 | bool "Use 4Kb for kernel stacks instead of 8Kb" | 135 | bool "Use 4Kb for kernel stacks instead of 8Kb" |
136 | depends on X86_32 | 136 | depends on X86_32 |
137 | help | 137 | ---help--- |
138 | If you say Y here the kernel will use a 4Kb stacksize for the | 138 | If you say Y here the kernel will use a 4Kb stacksize for the |
139 | kernel stack attached to each process/thread. This facilitates | 139 | kernel stack attached to each process/thread. This facilitates |
140 | running more threads on a system and also reduces the pressure | 140 | running more threads on a system and also reduces the pressure |
@@ -145,7 +145,7 @@ config DOUBLEFAULT | |||
145 | default y | 145 | default y |
146 | bool "Enable doublefault exception handler" if EMBEDDED | 146 | bool "Enable doublefault exception handler" if EMBEDDED |
147 | depends on X86_32 | 147 | depends on X86_32 |
148 | help | 148 | ---help--- |
149 | This option allows trapping of rare doublefault exceptions that | 149 | This option allows trapping of rare doublefault exceptions that |
150 | would otherwise cause a system to silently reboot. Disabling this | 150 | would otherwise cause a system to silently reboot. Disabling this |
151 | option saves about 4k and might cause you much additional grey | 151 | option saves about 4k and might cause you much additional grey |
@@ -155,7 +155,7 @@ config IOMMU_DEBUG | |||
155 | bool "Enable IOMMU debugging" | 155 | bool "Enable IOMMU debugging" |
156 | depends on GART_IOMMU && DEBUG_KERNEL | 156 | depends on GART_IOMMU && DEBUG_KERNEL |
157 | depends on X86_64 | 157 | depends on X86_64 |
158 | help | 158 | ---help--- |
159 | Force the IOMMU to on even when you have less than 4GB of | 159 | Force the IOMMU to on even when you have less than 4GB of |
160 | memory and add debugging code. On overflow always panic. And | 160 | memory and add debugging code. On overflow always panic. And |
161 | allow to enable IOMMU leak tracing. Can be disabled at boot | 161 | allow to enable IOMMU leak tracing. Can be disabled at boot |
@@ -171,7 +171,7 @@ config IOMMU_LEAK | |||
171 | bool "IOMMU leak tracing" | 171 | bool "IOMMU leak tracing" |
172 | depends on DEBUG_KERNEL | 172 | depends on DEBUG_KERNEL |
173 | depends on IOMMU_DEBUG | 173 | depends on IOMMU_DEBUG |
174 | help | 174 | ---help--- |
175 | Add a simple leak tracer to the IOMMU code. This is useful when you | 175 | Add a simple leak tracer to the IOMMU code. This is useful when you |
176 | are debugging a buggy device driver that leaks IOMMU mappings. | 176 | are debugging a buggy device driver that leaks IOMMU mappings. |
177 | 177 | ||
@@ -224,25 +224,25 @@ choice | |||
224 | 224 | ||
225 | config IO_DELAY_0X80 | 225 | config IO_DELAY_0X80 |
226 | bool "port 0x80 based port-IO delay [recommended]" | 226 | bool "port 0x80 based port-IO delay [recommended]" |
227 | help | 227 | ---help--- |
228 | This is the traditional Linux IO delay used for in/out_p. | 228 | This is the traditional Linux IO delay used for in/out_p. |
229 | It is the most tested hence safest selection here. | 229 | It is the most tested hence safest selection here. |
230 | 230 | ||
231 | config IO_DELAY_0XED | 231 | config IO_DELAY_0XED |
232 | bool "port 0xed based port-IO delay" | 232 | bool "port 0xed based port-IO delay" |
233 | help | 233 | ---help--- |
234 | Use port 0xed as the IO delay. This frees up port 0x80 which is | 234 | Use port 0xed as the IO delay. This frees up port 0x80 which is |
235 | often used as a hardware-debug port. | 235 | often used as a hardware-debug port. |
236 | 236 | ||
237 | config IO_DELAY_UDELAY | 237 | config IO_DELAY_UDELAY |
238 | bool "udelay based port-IO delay" | 238 | bool "udelay based port-IO delay" |
239 | help | 239 | ---help--- |
240 | Use udelay(2) as the IO delay method. This provides the delay | 240 | Use udelay(2) as the IO delay method. This provides the delay |
241 | while not having any side-effect on the IO port space. | 241 | while not having any side-effect on the IO port space. |
242 | 242 | ||
243 | config IO_DELAY_NONE | 243 | config IO_DELAY_NONE |
244 | bool "no port-IO delay" | 244 | bool "no port-IO delay" |
245 | help | 245 | ---help--- |
246 | No port-IO delay. Will break on old boxes that require port-IO | 246 | No port-IO delay. Will break on old boxes that require port-IO |
247 | delay for certain operations. Should work on most new machines. | 247 | delay for certain operations. Should work on most new machines. |
248 | 248 | ||
@@ -276,18 +276,18 @@ config DEBUG_BOOT_PARAMS | |||
276 | bool "Debug boot parameters" | 276 | bool "Debug boot parameters" |
277 | depends on DEBUG_KERNEL | 277 | depends on DEBUG_KERNEL |
278 | depends on DEBUG_FS | 278 | depends on DEBUG_FS |
279 | help | 279 | ---help--- |
280 | This option will cause struct boot_params to be exported via debugfs. | 280 | This option will cause struct boot_params to be exported via debugfs. |
281 | 281 | ||
282 | config CPA_DEBUG | 282 | config CPA_DEBUG |
283 | bool "CPA self-test code" | 283 | bool "CPA self-test code" |
284 | depends on DEBUG_KERNEL | 284 | depends on DEBUG_KERNEL |
285 | help | 285 | ---help--- |
286 | Do change_page_attr() self-tests every 30 seconds. | 286 | Do change_page_attr() self-tests every 30 seconds. |
287 | 287 | ||
288 | config OPTIMIZE_INLINING | 288 | config OPTIMIZE_INLINING |
289 | bool "Allow gcc to uninline functions marked 'inline'" | 289 | bool "Allow gcc to uninline functions marked 'inline'" |
290 | help | 290 | ---help--- |
291 | This option determines if the kernel forces gcc to inline the functions | 291 | This option determines if the kernel forces gcc to inline the functions |
292 | developers have marked 'inline'. Doing so takes away freedom from gcc to | 292 | developers have marked 'inline'. Doing so takes away freedom from gcc to |
293 | do what it thinks is best, which is desirable for the gcc 3.x series of | 293 | do what it thinks is best, which is desirable for the gcc 3.x series of |
@@ -300,4 +300,3 @@ config OPTIMIZE_INLINING | |||
300 | If unsure, say N. | 300 | If unsure, say N. |
301 | 301 | ||
302 | endmenu | 302 | endmenu |
303 | |||
diff --git a/arch/x86/Makefile b/arch/x86/Makefile index cacee981d166..1836191839ee 100644 --- a/arch/x86/Makefile +++ b/arch/x86/Makefile | |||
@@ -70,14 +70,17 @@ else | |||
70 | # this works around some issues with generating unwind tables in older gccs | 70 | # this works around some issues with generating unwind tables in older gccs |
71 | # newer gccs do it by default | 71 | # newer gccs do it by default |
72 | KBUILD_CFLAGS += -maccumulate-outgoing-args | 72 | KBUILD_CFLAGS += -maccumulate-outgoing-args |
73 | endif | ||
73 | 74 | ||
74 | stackp := $(CONFIG_SHELL) $(srctree)/scripts/gcc-x86_64-has-stack-protector.sh | 75 | ifdef CONFIG_CC_STACKPROTECTOR |
75 | stackp-$(CONFIG_CC_STACKPROTECTOR) := $(shell $(stackp) \ | 76 | cc_has_sp := $(srctree)/scripts/gcc-x86_$(BITS)-has-stack-protector.sh |
76 | "$(CC)" "-fstack-protector -DGCC_HAS_SP" ) | 77 | ifeq ($(shell $(CONFIG_SHELL) $(cc_has_sp) $(CC)),y) |
77 | stackp-$(CONFIG_CC_STACKPROTECTOR_ALL) += $(shell $(stackp) \ | 78 | stackp-y := -fstack-protector |
78 | "$(CC)" -fstack-protector-all ) | 79 | stackp-$(CONFIG_CC_STACKPROTECTOR_ALL) += -fstack-protector-all |
79 | 80 | KBUILD_CFLAGS += $(stackp-y) | |
80 | KBUILD_CFLAGS += $(stackp-y) | 81 | else |
82 | $(warning stack protector enabled but no compiler support) | ||
83 | endif | ||
81 | endif | 84 | endif |
82 | 85 | ||
83 | # Stackpointer is addressed different for 32 bit and 64 bit x86 | 86 | # Stackpointer is addressed different for 32 bit and 64 bit x86 |
@@ -102,29 +105,6 @@ KBUILD_CFLAGS += -fno-asynchronous-unwind-tables | |||
102 | # prevent gcc from generating any FP code by mistake | 105 | # prevent gcc from generating any FP code by mistake |
103 | KBUILD_CFLAGS += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,) | 106 | KBUILD_CFLAGS += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,) |
104 | 107 | ||
105 | ### | ||
106 | # Sub architecture support | ||
107 | # fcore-y is linked before mcore-y files. | ||
108 | |||
109 | # Default subarch .c files | ||
110 | mcore-y := arch/x86/mach-default/ | ||
111 | |||
112 | # Voyager subarch support | ||
113 | mflags-$(CONFIG_X86_VOYAGER) := -Iarch/x86/include/asm/mach-voyager | ||
114 | mcore-$(CONFIG_X86_VOYAGER) := arch/x86/mach-voyager/ | ||
115 | |||
116 | # generic subarchitecture | ||
117 | mflags-$(CONFIG_X86_GENERICARCH):= -Iarch/x86/include/asm/mach-generic | ||
118 | fcore-$(CONFIG_X86_GENERICARCH) += arch/x86/mach-generic/ | ||
119 | mcore-$(CONFIG_X86_GENERICARCH) := arch/x86/mach-default/ | ||
120 | |||
121 | # default subarch .h files | ||
122 | mflags-y += -Iarch/x86/include/asm/mach-default | ||
123 | |||
124 | # 64 bit does not support subarch support - clear sub arch variables | ||
125 | fcore-$(CONFIG_X86_64) := | ||
126 | mcore-$(CONFIG_X86_64) := | ||
127 | |||
128 | KBUILD_CFLAGS += $(mflags-y) | 108 | KBUILD_CFLAGS += $(mflags-y) |
129 | KBUILD_AFLAGS += $(mflags-y) | 109 | KBUILD_AFLAGS += $(mflags-y) |
130 | 110 | ||
@@ -150,9 +130,6 @@ core-$(CONFIG_LGUEST_GUEST) += arch/x86/lguest/ | |||
150 | core-y += arch/x86/kernel/ | 130 | core-y += arch/x86/kernel/ |
151 | core-y += arch/x86/mm/ | 131 | core-y += arch/x86/mm/ |
152 | 132 | ||
153 | # Remaining sub architecture files | ||
154 | core-y += $(mcore-y) | ||
155 | |||
156 | core-y += arch/x86/crypto/ | 133 | core-y += arch/x86/crypto/ |
157 | core-y += arch/x86/vdso/ | 134 | core-y += arch/x86/vdso/ |
158 | core-$(CONFIG_IA32_EMULATION) += arch/x86/ia32/ | 135 | core-$(CONFIG_IA32_EMULATION) += arch/x86/ia32/ |
diff --git a/arch/x86/boot/a20.c b/arch/x86/boot/a20.c index 4063d630deff..fba8e9c6a504 100644 --- a/arch/x86/boot/a20.c +++ b/arch/x86/boot/a20.c | |||
@@ -2,6 +2,7 @@ | |||
2 | * | 2 | * |
3 | * Copyright (C) 1991, 1992 Linus Torvalds | 3 | * Copyright (C) 1991, 1992 Linus Torvalds |
4 | * Copyright 2007-2008 rPath, Inc. - All Rights Reserved | 4 | * Copyright 2007-2008 rPath, Inc. - All Rights Reserved |
5 | * Copyright 2009 Intel Corporation | ||
5 | * | 6 | * |
6 | * This file is part of the Linux kernel, and is made available under | 7 | * This file is part of the Linux kernel, and is made available under |
7 | * the terms of the GNU General Public License version 2. | 8 | * the terms of the GNU General Public License version 2. |
@@ -15,16 +16,23 @@ | |||
15 | #include "boot.h" | 16 | #include "boot.h" |
16 | 17 | ||
17 | #define MAX_8042_LOOPS 100000 | 18 | #define MAX_8042_LOOPS 100000 |
19 | #define MAX_8042_FF 32 | ||
18 | 20 | ||
19 | static int empty_8042(void) | 21 | static int empty_8042(void) |
20 | { | 22 | { |
21 | u8 status; | 23 | u8 status; |
22 | int loops = MAX_8042_LOOPS; | 24 | int loops = MAX_8042_LOOPS; |
25 | int ffs = MAX_8042_FF; | ||
23 | 26 | ||
24 | while (loops--) { | 27 | while (loops--) { |
25 | io_delay(); | 28 | io_delay(); |
26 | 29 | ||
27 | status = inb(0x64); | 30 | status = inb(0x64); |
31 | if (status == 0xff) { | ||
32 | /* FF is a plausible, but very unlikely status */ | ||
33 | if (!--ffs) | ||
34 | return -1; /* Assume no KBC present */ | ||
35 | } | ||
28 | if (status & 1) { | 36 | if (status & 1) { |
29 | /* Read and discard input data */ | 37 | /* Read and discard input data */ |
30 | io_delay(); | 38 | io_delay(); |
@@ -118,44 +126,43 @@ static void enable_a20_fast(void) | |||
118 | 126 | ||
119 | int enable_a20(void) | 127 | int enable_a20(void) |
120 | { | 128 | { |
121 | #if defined(CONFIG_X86_ELAN) | 129 | #ifdef CONFIG_X86_VOYAGER |
122 | /* Elan croaks if we try to touch the KBC */ | ||
123 | enable_a20_fast(); | ||
124 | while (!a20_test_long()) | ||
125 | ; | ||
126 | return 0; | ||
127 | #elif defined(CONFIG_X86_VOYAGER) | ||
128 | /* On Voyager, a20_test() is unsafe? */ | 130 | /* On Voyager, a20_test() is unsafe? */ |
129 | enable_a20_kbc(); | 131 | enable_a20_kbc(); |
130 | return 0; | 132 | return 0; |
131 | #else | 133 | #else |
132 | int loops = A20_ENABLE_LOOPS; | 134 | int loops = A20_ENABLE_LOOPS; |
133 | while (loops--) { | 135 | int kbc_err; |
134 | /* First, check to see if A20 is already enabled | 136 | |
135 | (legacy free, etc.) */ | 137 | while (loops--) { |
136 | if (a20_test_short()) | 138 | /* First, check to see if A20 is already enabled |
137 | return 0; | 139 | (legacy free, etc.) */ |
138 | 140 | if (a20_test_short()) | |
139 | /* Next, try the BIOS (INT 0x15, AX=0x2401) */ | 141 | return 0; |
140 | enable_a20_bios(); | 142 | |
141 | if (a20_test_short()) | 143 | /* Next, try the BIOS (INT 0x15, AX=0x2401) */ |
142 | return 0; | 144 | enable_a20_bios(); |
143 | 145 | if (a20_test_short()) | |
144 | /* Try enabling A20 through the keyboard controller */ | 146 | return 0; |
145 | empty_8042(); | 147 | |
146 | if (a20_test_short()) | 148 | /* Try enabling A20 through the keyboard controller */ |
147 | return 0; /* BIOS worked, but with delayed reaction */ | 149 | kbc_err = empty_8042(); |
148 | 150 | ||
149 | enable_a20_kbc(); | 151 | if (a20_test_short()) |
150 | if (a20_test_long()) | 152 | return 0; /* BIOS worked, but with delayed reaction */ |
151 | return 0; | 153 | |
152 | 154 | if (!kbc_err) { | |
153 | /* Finally, try enabling the "fast A20 gate" */ | 155 | enable_a20_kbc(); |
154 | enable_a20_fast(); | 156 | if (a20_test_long()) |
155 | if (a20_test_long()) | 157 | return 0; |
156 | return 0; | 158 | } |
157 | } | 159 | |
158 | 160 | /* Finally, try enabling the "fast A20 gate" */ | |
159 | return -1; | 161 | enable_a20_fast(); |
162 | if (a20_test_long()) | ||
163 | return 0; | ||
164 | } | ||
165 | |||
166 | return -1; | ||
160 | #endif | 167 | #endif |
161 | } | 168 | } |
diff --git a/arch/x86/configs/i386_defconfig b/arch/x86/configs/i386_defconfig index edba00d98ac3..096dd5359cd9 100644 --- a/arch/x86/configs/i386_defconfig +++ b/arch/x86/configs/i386_defconfig | |||
@@ -1,14 +1,13 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.27-rc5 | 3 | # Linux kernel version: 2.6.29-rc4 |
4 | # Wed Sep 3 17:23:09 2008 | 4 | # Thu Feb 12 12:57:57 2009 |
5 | # | 5 | # |
6 | # CONFIG_64BIT is not set | 6 | # CONFIG_64BIT is not set |
7 | CONFIG_X86_32=y | 7 | CONFIG_X86_32=y |
8 | # CONFIG_X86_64 is not set | 8 | # CONFIG_X86_64 is not set |
9 | CONFIG_X86=y | 9 | CONFIG_X86=y |
10 | CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" | 10 | CONFIG_ARCH_DEFCONFIG="arch/x86/configs/i386_defconfig" |
11 | # CONFIG_GENERIC_LOCKBREAK is not set | ||
12 | CONFIG_GENERIC_TIME=y | 11 | CONFIG_GENERIC_TIME=y |
13 | CONFIG_GENERIC_CMOS_UPDATE=y | 12 | CONFIG_GENERIC_CMOS_UPDATE=y |
14 | CONFIG_CLOCKSOURCE_WATCHDOG=y | 13 | CONFIG_CLOCKSOURCE_WATCHDOG=y |
@@ -24,16 +23,14 @@ CONFIG_GENERIC_ISA_DMA=y | |||
24 | CONFIG_GENERIC_IOMAP=y | 23 | CONFIG_GENERIC_IOMAP=y |
25 | CONFIG_GENERIC_BUG=y | 24 | CONFIG_GENERIC_BUG=y |
26 | CONFIG_GENERIC_HWEIGHT=y | 25 | CONFIG_GENERIC_HWEIGHT=y |
27 | # CONFIG_GENERIC_GPIO is not set | ||
28 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 26 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
29 | # CONFIG_RWSEM_GENERIC_SPINLOCK is not set | 27 | # CONFIG_RWSEM_GENERIC_SPINLOCK is not set |
30 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y | 28 | CONFIG_RWSEM_XCHGADD_ALGORITHM=y |
31 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
32 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
33 | CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y | 29 | CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y |
34 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 30 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
35 | # CONFIG_GENERIC_TIME_VSYSCALL is not set | 31 | # CONFIG_GENERIC_TIME_VSYSCALL is not set |
36 | CONFIG_ARCH_HAS_CPU_RELAX=y | 32 | CONFIG_ARCH_HAS_CPU_RELAX=y |
33 | CONFIG_ARCH_HAS_DEFAULT_IDLE=y | ||
37 | CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y | 34 | CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y |
38 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 35 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
39 | # CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set | 36 | # CONFIG_HAVE_CPUMASK_OF_CPU_MAP is not set |
@@ -42,12 +39,12 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y | |||
42 | # CONFIG_ZONE_DMA32 is not set | 39 | # CONFIG_ZONE_DMA32 is not set |
43 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 40 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
44 | # CONFIG_AUDIT_ARCH is not set | 41 | # CONFIG_AUDIT_ARCH is not set |
45 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
46 | CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y | 42 | CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y |
47 | CONFIG_GENERIC_HARDIRQS=y | 43 | CONFIG_GENERIC_HARDIRQS=y |
48 | CONFIG_GENERIC_IRQ_PROBE=y | 44 | CONFIG_GENERIC_IRQ_PROBE=y |
49 | CONFIG_GENERIC_PENDING_IRQ=y | 45 | CONFIG_GENERIC_PENDING_IRQ=y |
50 | CONFIG_X86_SMP=y | 46 | CONFIG_X86_SMP=y |
47 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
51 | CONFIG_X86_32_SMP=y | 48 | CONFIG_X86_32_SMP=y |
52 | CONFIG_X86_HT=y | 49 | CONFIG_X86_HT=y |
53 | CONFIG_X86_BIOS_REBOOT=y | 50 | CONFIG_X86_BIOS_REBOOT=y |
@@ -76,30 +73,44 @@ CONFIG_TASK_IO_ACCOUNTING=y | |||
76 | CONFIG_AUDIT=y | 73 | CONFIG_AUDIT=y |
77 | CONFIG_AUDITSYSCALL=y | 74 | CONFIG_AUDITSYSCALL=y |
78 | CONFIG_AUDIT_TREE=y | 75 | CONFIG_AUDIT_TREE=y |
76 | |||
77 | # | ||
78 | # RCU Subsystem | ||
79 | # | ||
80 | # CONFIG_CLASSIC_RCU is not set | ||
81 | CONFIG_TREE_RCU=y | ||
82 | # CONFIG_PREEMPT_RCU is not set | ||
83 | # CONFIG_RCU_TRACE is not set | ||
84 | CONFIG_RCU_FANOUT=32 | ||
85 | # CONFIG_RCU_FANOUT_EXACT is not set | ||
86 | # CONFIG_TREE_RCU_TRACE is not set | ||
87 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
79 | # CONFIG_IKCONFIG is not set | 88 | # CONFIG_IKCONFIG is not set |
80 | CONFIG_LOG_BUF_SHIFT=18 | 89 | CONFIG_LOG_BUF_SHIFT=18 |
81 | CONFIG_CGROUPS=y | ||
82 | # CONFIG_CGROUP_DEBUG is not set | ||
83 | CONFIG_CGROUP_NS=y | ||
84 | # CONFIG_CGROUP_DEVICE is not set | ||
85 | CONFIG_CPUSETS=y | ||
86 | CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y | 90 | CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y |
87 | CONFIG_GROUP_SCHED=y | 91 | CONFIG_GROUP_SCHED=y |
88 | CONFIG_FAIR_GROUP_SCHED=y | 92 | CONFIG_FAIR_GROUP_SCHED=y |
89 | # CONFIG_RT_GROUP_SCHED is not set | 93 | # CONFIG_RT_GROUP_SCHED is not set |
90 | # CONFIG_USER_SCHED is not set | 94 | # CONFIG_USER_SCHED is not set |
91 | CONFIG_CGROUP_SCHED=y | 95 | CONFIG_CGROUP_SCHED=y |
96 | CONFIG_CGROUPS=y | ||
97 | # CONFIG_CGROUP_DEBUG is not set | ||
98 | CONFIG_CGROUP_NS=y | ||
99 | CONFIG_CGROUP_FREEZER=y | ||
100 | # CONFIG_CGROUP_DEVICE is not set | ||
101 | CONFIG_CPUSETS=y | ||
102 | CONFIG_PROC_PID_CPUSET=y | ||
92 | CONFIG_CGROUP_CPUACCT=y | 103 | CONFIG_CGROUP_CPUACCT=y |
93 | CONFIG_RESOURCE_COUNTERS=y | 104 | CONFIG_RESOURCE_COUNTERS=y |
94 | # CONFIG_CGROUP_MEM_RES_CTLR is not set | 105 | # CONFIG_CGROUP_MEM_RES_CTLR is not set |
95 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | 106 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
96 | CONFIG_PROC_PID_CPUSET=y | ||
97 | CONFIG_RELAY=y | 107 | CONFIG_RELAY=y |
98 | CONFIG_NAMESPACES=y | 108 | CONFIG_NAMESPACES=y |
99 | CONFIG_UTS_NS=y | 109 | CONFIG_UTS_NS=y |
100 | CONFIG_IPC_NS=y | 110 | CONFIG_IPC_NS=y |
101 | CONFIG_USER_NS=y | 111 | CONFIG_USER_NS=y |
102 | CONFIG_PID_NS=y | 112 | CONFIG_PID_NS=y |
113 | CONFIG_NET_NS=y | ||
103 | CONFIG_BLK_DEV_INITRD=y | 114 | CONFIG_BLK_DEV_INITRD=y |
104 | CONFIG_INITRAMFS_SOURCE="" | 115 | CONFIG_INITRAMFS_SOURCE="" |
105 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 116 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
@@ -124,12 +135,15 @@ CONFIG_SIGNALFD=y | |||
124 | CONFIG_TIMERFD=y | 135 | CONFIG_TIMERFD=y |
125 | CONFIG_EVENTFD=y | 136 | CONFIG_EVENTFD=y |
126 | CONFIG_SHMEM=y | 137 | CONFIG_SHMEM=y |
138 | CONFIG_AIO=y | ||
127 | CONFIG_VM_EVENT_COUNTERS=y | 139 | CONFIG_VM_EVENT_COUNTERS=y |
140 | CONFIG_PCI_QUIRKS=y | ||
128 | CONFIG_SLUB_DEBUG=y | 141 | CONFIG_SLUB_DEBUG=y |
129 | # CONFIG_SLAB is not set | 142 | # CONFIG_SLAB is not set |
130 | CONFIG_SLUB=y | 143 | CONFIG_SLUB=y |
131 | # CONFIG_SLOB is not set | 144 | # CONFIG_SLOB is not set |
132 | CONFIG_PROFILING=y | 145 | CONFIG_PROFILING=y |
146 | CONFIG_TRACEPOINTS=y | ||
133 | CONFIG_MARKERS=y | 147 | CONFIG_MARKERS=y |
134 | # CONFIG_OPROFILE is not set | 148 | # CONFIG_OPROFILE is not set |
135 | CONFIG_HAVE_OPROFILE=y | 149 | CONFIG_HAVE_OPROFILE=y |
@@ -139,15 +153,10 @@ CONFIG_KRETPROBES=y | |||
139 | CONFIG_HAVE_IOREMAP_PROT=y | 153 | CONFIG_HAVE_IOREMAP_PROT=y |
140 | CONFIG_HAVE_KPROBES=y | 154 | CONFIG_HAVE_KPROBES=y |
141 | CONFIG_HAVE_KRETPROBES=y | 155 | CONFIG_HAVE_KRETPROBES=y |
142 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | 156 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
143 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
144 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
145 | # CONFIG_HAVE_CLK is not set | ||
146 | CONFIG_PROC_PAGE_MONITOR=y | ||
147 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y | 157 | CONFIG_HAVE_GENERIC_DMA_COHERENT=y |
148 | CONFIG_SLABINFO=y | 158 | CONFIG_SLABINFO=y |
149 | CONFIG_RT_MUTEXES=y | 159 | CONFIG_RT_MUTEXES=y |
150 | # CONFIG_TINY_SHMEM is not set | ||
151 | CONFIG_BASE_SMALL=0 | 160 | CONFIG_BASE_SMALL=0 |
152 | CONFIG_MODULES=y | 161 | CONFIG_MODULES=y |
153 | # CONFIG_MODULE_FORCE_LOAD is not set | 162 | # CONFIG_MODULE_FORCE_LOAD is not set |
@@ -155,12 +164,10 @@ CONFIG_MODULE_UNLOAD=y | |||
155 | CONFIG_MODULE_FORCE_UNLOAD=y | 164 | CONFIG_MODULE_FORCE_UNLOAD=y |
156 | # CONFIG_MODVERSIONS is not set | 165 | # CONFIG_MODVERSIONS is not set |
157 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 166 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
158 | CONFIG_KMOD=y | ||
159 | CONFIG_STOP_MACHINE=y | 167 | CONFIG_STOP_MACHINE=y |
160 | CONFIG_BLOCK=y | 168 | CONFIG_BLOCK=y |
161 | # CONFIG_LBD is not set | 169 | # CONFIG_LBD is not set |
162 | CONFIG_BLK_DEV_IO_TRACE=y | 170 | CONFIG_BLK_DEV_IO_TRACE=y |
163 | # CONFIG_LSF is not set | ||
164 | CONFIG_BLK_DEV_BSG=y | 171 | CONFIG_BLK_DEV_BSG=y |
165 | # CONFIG_BLK_DEV_INTEGRITY is not set | 172 | # CONFIG_BLK_DEV_INTEGRITY is not set |
166 | 173 | ||
@@ -176,7 +183,7 @@ CONFIG_IOSCHED_CFQ=y | |||
176 | CONFIG_DEFAULT_CFQ=y | 183 | CONFIG_DEFAULT_CFQ=y |
177 | # CONFIG_DEFAULT_NOOP is not set | 184 | # CONFIG_DEFAULT_NOOP is not set |
178 | CONFIG_DEFAULT_IOSCHED="cfq" | 185 | CONFIG_DEFAULT_IOSCHED="cfq" |
179 | CONFIG_CLASSIC_RCU=y | 186 | CONFIG_FREEZER=y |
180 | 187 | ||
181 | # | 188 | # |
182 | # Processor type and features | 189 | # Processor type and features |
@@ -186,15 +193,15 @@ CONFIG_NO_HZ=y | |||
186 | CONFIG_HIGH_RES_TIMERS=y | 193 | CONFIG_HIGH_RES_TIMERS=y |
187 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 194 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
188 | CONFIG_SMP=y | 195 | CONFIG_SMP=y |
196 | CONFIG_SPARSE_IRQ=y | ||
189 | CONFIG_X86_FIND_SMP_CONFIG=y | 197 | CONFIG_X86_FIND_SMP_CONFIG=y |
190 | CONFIG_X86_MPPARSE=y | 198 | CONFIG_X86_MPPARSE=y |
191 | CONFIG_X86_PC=y | ||
192 | # CONFIG_X86_ELAN is not set | 199 | # CONFIG_X86_ELAN is not set |
193 | # CONFIG_X86_VOYAGER is not set | 200 | # CONFIG_X86_VOYAGER is not set |
194 | # CONFIG_X86_GENERICARCH is not set | 201 | # CONFIG_X86_GENERICARCH is not set |
195 | # CONFIG_X86_VSMP is not set | 202 | # CONFIG_X86_VSMP is not set |
196 | # CONFIG_X86_RDC321X is not set | 203 | # CONFIG_X86_RDC321X is not set |
197 | CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y | 204 | CONFIG_SCHED_OMIT_FRAME_POINTER=y |
198 | # CONFIG_PARAVIRT_GUEST is not set | 205 | # CONFIG_PARAVIRT_GUEST is not set |
199 | # CONFIG_MEMTEST is not set | 206 | # CONFIG_MEMTEST is not set |
200 | # CONFIG_M386 is not set | 207 | # CONFIG_M386 is not set |
@@ -238,10 +245,19 @@ CONFIG_X86_TSC=y | |||
238 | CONFIG_X86_CMOV=y | 245 | CONFIG_X86_CMOV=y |
239 | CONFIG_X86_MINIMUM_CPU_FAMILY=4 | 246 | CONFIG_X86_MINIMUM_CPU_FAMILY=4 |
240 | CONFIG_X86_DEBUGCTLMSR=y | 247 | CONFIG_X86_DEBUGCTLMSR=y |
248 | CONFIG_CPU_SUP_INTEL=y | ||
249 | CONFIG_CPU_SUP_CYRIX_32=y | ||
250 | CONFIG_CPU_SUP_AMD=y | ||
251 | CONFIG_CPU_SUP_CENTAUR_32=y | ||
252 | CONFIG_CPU_SUP_TRANSMETA_32=y | ||
253 | CONFIG_CPU_SUP_UMC_32=y | ||
254 | CONFIG_X86_DS=y | ||
255 | CONFIG_X86_PTRACE_BTS=y | ||
241 | CONFIG_HPET_TIMER=y | 256 | CONFIG_HPET_TIMER=y |
242 | CONFIG_HPET_EMULATE_RTC=y | 257 | CONFIG_HPET_EMULATE_RTC=y |
243 | CONFIG_DMI=y | 258 | CONFIG_DMI=y |
244 | # CONFIG_IOMMU_HELPER is not set | 259 | # CONFIG_IOMMU_HELPER is not set |
260 | # CONFIG_IOMMU_API is not set | ||
245 | CONFIG_NR_CPUS=64 | 261 | CONFIG_NR_CPUS=64 |
246 | CONFIG_SCHED_SMT=y | 262 | CONFIG_SCHED_SMT=y |
247 | CONFIG_SCHED_MC=y | 263 | CONFIG_SCHED_MC=y |
@@ -250,12 +266,15 @@ CONFIG_PREEMPT_VOLUNTARY=y | |||
250 | # CONFIG_PREEMPT is not set | 266 | # CONFIG_PREEMPT is not set |
251 | CONFIG_X86_LOCAL_APIC=y | 267 | CONFIG_X86_LOCAL_APIC=y |
252 | CONFIG_X86_IO_APIC=y | 268 | CONFIG_X86_IO_APIC=y |
269 | CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y | ||
253 | # CONFIG_X86_MCE is not set | 270 | # CONFIG_X86_MCE is not set |
254 | CONFIG_VM86=y | 271 | CONFIG_VM86=y |
255 | # CONFIG_TOSHIBA is not set | 272 | # CONFIG_TOSHIBA is not set |
256 | # CONFIG_I8K is not set | 273 | # CONFIG_I8K is not set |
257 | CONFIG_X86_REBOOTFIXUPS=y | 274 | CONFIG_X86_REBOOTFIXUPS=y |
258 | CONFIG_MICROCODE=y | 275 | CONFIG_MICROCODE=y |
276 | CONFIG_MICROCODE_INTEL=y | ||
277 | CONFIG_MICROCODE_AMD=y | ||
259 | CONFIG_MICROCODE_OLD_INTERFACE=y | 278 | CONFIG_MICROCODE_OLD_INTERFACE=y |
260 | CONFIG_X86_MSR=y | 279 | CONFIG_X86_MSR=y |
261 | CONFIG_X86_CPUID=y | 280 | CONFIG_X86_CPUID=y |
@@ -264,6 +283,7 @@ CONFIG_HIGHMEM4G=y | |||
264 | # CONFIG_HIGHMEM64G is not set | 283 | # CONFIG_HIGHMEM64G is not set |
265 | CONFIG_PAGE_OFFSET=0xC0000000 | 284 | CONFIG_PAGE_OFFSET=0xC0000000 |
266 | CONFIG_HIGHMEM=y | 285 | CONFIG_HIGHMEM=y |
286 | # CONFIG_ARCH_PHYS_ADDR_T_64BIT is not set | ||
267 | CONFIG_ARCH_FLATMEM_ENABLE=y | 287 | CONFIG_ARCH_FLATMEM_ENABLE=y |
268 | CONFIG_ARCH_SPARSEMEM_ENABLE=y | 288 | CONFIG_ARCH_SPARSEMEM_ENABLE=y |
269 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y | 289 | CONFIG_ARCH_SELECT_MEMORY_MODEL=y |
@@ -274,14 +294,17 @@ CONFIG_FLATMEM_MANUAL=y | |||
274 | CONFIG_FLATMEM=y | 294 | CONFIG_FLATMEM=y |
275 | CONFIG_FLAT_NODE_MEM_MAP=y | 295 | CONFIG_FLAT_NODE_MEM_MAP=y |
276 | CONFIG_SPARSEMEM_STATIC=y | 296 | CONFIG_SPARSEMEM_STATIC=y |
277 | # CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set | ||
278 | CONFIG_PAGEFLAGS_EXTENDED=y | 297 | CONFIG_PAGEFLAGS_EXTENDED=y |
279 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 298 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
280 | CONFIG_RESOURCES_64BIT=y | 299 | # CONFIG_PHYS_ADDR_T_64BIT is not set |
281 | CONFIG_ZONE_DMA_FLAG=1 | 300 | CONFIG_ZONE_DMA_FLAG=1 |
282 | CONFIG_BOUNCE=y | 301 | CONFIG_BOUNCE=y |
283 | CONFIG_VIRT_TO_BUS=y | 302 | CONFIG_VIRT_TO_BUS=y |
303 | CONFIG_UNEVICTABLE_LRU=y | ||
284 | CONFIG_HIGHPTE=y | 304 | CONFIG_HIGHPTE=y |
305 | CONFIG_X86_CHECK_BIOS_CORRUPTION=y | ||
306 | CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y | ||
307 | CONFIG_X86_RESERVE_LOW_64K=y | ||
285 | # CONFIG_MATH_EMULATION is not set | 308 | # CONFIG_MATH_EMULATION is not set |
286 | CONFIG_MTRR=y | 309 | CONFIG_MTRR=y |
287 | # CONFIG_MTRR_SANITIZER is not set | 310 | # CONFIG_MTRR_SANITIZER is not set |
@@ -302,10 +325,11 @@ CONFIG_PHYSICAL_START=0x1000000 | |||
302 | CONFIG_PHYSICAL_ALIGN=0x200000 | 325 | CONFIG_PHYSICAL_ALIGN=0x200000 |
303 | CONFIG_HOTPLUG_CPU=y | 326 | CONFIG_HOTPLUG_CPU=y |
304 | # CONFIG_COMPAT_VDSO is not set | 327 | # CONFIG_COMPAT_VDSO is not set |
328 | # CONFIG_CMDLINE_BOOL is not set | ||
305 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 329 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
306 | 330 | ||
307 | # | 331 | # |
308 | # Power management options | 332 | # Power management and ACPI options |
309 | # | 333 | # |
310 | CONFIG_PM=y | 334 | CONFIG_PM=y |
311 | CONFIG_PM_DEBUG=y | 335 | CONFIG_PM_DEBUG=y |
@@ -331,19 +355,13 @@ CONFIG_ACPI_BATTERY=y | |||
331 | CONFIG_ACPI_BUTTON=y | 355 | CONFIG_ACPI_BUTTON=y |
332 | CONFIG_ACPI_FAN=y | 356 | CONFIG_ACPI_FAN=y |
333 | CONFIG_ACPI_DOCK=y | 357 | CONFIG_ACPI_DOCK=y |
334 | # CONFIG_ACPI_BAY is not set | ||
335 | CONFIG_ACPI_PROCESSOR=y | 358 | CONFIG_ACPI_PROCESSOR=y |
336 | CONFIG_ACPI_HOTPLUG_CPU=y | 359 | CONFIG_ACPI_HOTPLUG_CPU=y |
337 | CONFIG_ACPI_THERMAL=y | 360 | CONFIG_ACPI_THERMAL=y |
338 | # CONFIG_ACPI_WMI is not set | ||
339 | # CONFIG_ACPI_ASUS is not set | ||
340 | # CONFIG_ACPI_TOSHIBA is not set | ||
341 | # CONFIG_ACPI_CUSTOM_DSDT is not set | 361 | # CONFIG_ACPI_CUSTOM_DSDT is not set |
342 | CONFIG_ACPI_BLACKLIST_YEAR=0 | 362 | CONFIG_ACPI_BLACKLIST_YEAR=0 |
343 | # CONFIG_ACPI_DEBUG is not set | 363 | # CONFIG_ACPI_DEBUG is not set |
344 | CONFIG_ACPI_EC=y | ||
345 | # CONFIG_ACPI_PCI_SLOT is not set | 364 | # CONFIG_ACPI_PCI_SLOT is not set |
346 | CONFIG_ACPI_POWER=y | ||
347 | CONFIG_ACPI_SYSTEM=y | 365 | CONFIG_ACPI_SYSTEM=y |
348 | CONFIG_X86_PM_TIMER=y | 366 | CONFIG_X86_PM_TIMER=y |
349 | CONFIG_ACPI_CONTAINER=y | 367 | CONFIG_ACPI_CONTAINER=y |
@@ -388,7 +406,6 @@ CONFIG_X86_ACPI_CPUFREQ=y | |||
388 | # | 406 | # |
389 | # shared options | 407 | # shared options |
390 | # | 408 | # |
391 | # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set | ||
392 | # CONFIG_X86_SPEEDSTEP_LIB is not set | 409 | # CONFIG_X86_SPEEDSTEP_LIB is not set |
393 | CONFIG_CPU_IDLE=y | 410 | CONFIG_CPU_IDLE=y |
394 | CONFIG_CPU_IDLE_GOV_LADDER=y | 411 | CONFIG_CPU_IDLE_GOV_LADDER=y |
@@ -415,6 +432,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
415 | CONFIG_PCI_MSI=y | 432 | CONFIG_PCI_MSI=y |
416 | # CONFIG_PCI_LEGACY is not set | 433 | # CONFIG_PCI_LEGACY is not set |
417 | # CONFIG_PCI_DEBUG is not set | 434 | # CONFIG_PCI_DEBUG is not set |
435 | # CONFIG_PCI_STUB is not set | ||
418 | CONFIG_HT_IRQ=y | 436 | CONFIG_HT_IRQ=y |
419 | CONFIG_ISA_DMA_API=y | 437 | CONFIG_ISA_DMA_API=y |
420 | # CONFIG_ISA is not set | 438 | # CONFIG_ISA is not set |
@@ -452,13 +470,17 @@ CONFIG_HOTPLUG_PCI=y | |||
452 | # Executable file formats / Emulations | 470 | # Executable file formats / Emulations |
453 | # | 471 | # |
454 | CONFIG_BINFMT_ELF=y | 472 | CONFIG_BINFMT_ELF=y |
473 | CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y | ||
474 | CONFIG_HAVE_AOUT=y | ||
455 | # CONFIG_BINFMT_AOUT is not set | 475 | # CONFIG_BINFMT_AOUT is not set |
456 | CONFIG_BINFMT_MISC=y | 476 | CONFIG_BINFMT_MISC=y |
477 | CONFIG_HAVE_ATOMIC_IOMAP=y | ||
457 | CONFIG_NET=y | 478 | CONFIG_NET=y |
458 | 479 | ||
459 | # | 480 | # |
460 | # Networking options | 481 | # Networking options |
461 | # | 482 | # |
483 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
462 | CONFIG_PACKET=y | 484 | CONFIG_PACKET=y |
463 | CONFIG_PACKET_MMAP=y | 485 | CONFIG_PACKET_MMAP=y |
464 | CONFIG_UNIX=y | 486 | CONFIG_UNIX=y |
@@ -519,7 +541,6 @@ CONFIG_DEFAULT_CUBIC=y | |||
519 | # CONFIG_DEFAULT_RENO is not set | 541 | # CONFIG_DEFAULT_RENO is not set |
520 | CONFIG_DEFAULT_TCP_CONG="cubic" | 542 | CONFIG_DEFAULT_TCP_CONG="cubic" |
521 | CONFIG_TCP_MD5SIG=y | 543 | CONFIG_TCP_MD5SIG=y |
522 | # CONFIG_IP_VS is not set | ||
523 | CONFIG_IPV6=y | 544 | CONFIG_IPV6=y |
524 | # CONFIG_IPV6_PRIVACY is not set | 545 | # CONFIG_IPV6_PRIVACY is not set |
525 | # CONFIG_IPV6_ROUTER_PREF is not set | 546 | # CONFIG_IPV6_ROUTER_PREF is not set |
@@ -557,19 +578,21 @@ CONFIG_NF_CONNTRACK_IRC=y | |||
557 | CONFIG_NF_CONNTRACK_SIP=y | 578 | CONFIG_NF_CONNTRACK_SIP=y |
558 | CONFIG_NF_CT_NETLINK=y | 579 | CONFIG_NF_CT_NETLINK=y |
559 | CONFIG_NETFILTER_XTABLES=y | 580 | CONFIG_NETFILTER_XTABLES=y |
581 | CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y | ||
560 | CONFIG_NETFILTER_XT_TARGET_MARK=y | 582 | CONFIG_NETFILTER_XT_TARGET_MARK=y |
561 | CONFIG_NETFILTER_XT_TARGET_NFLOG=y | 583 | CONFIG_NETFILTER_XT_TARGET_NFLOG=y |
562 | CONFIG_NETFILTER_XT_TARGET_SECMARK=y | 584 | CONFIG_NETFILTER_XT_TARGET_SECMARK=y |
563 | CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y | ||
564 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=y | 585 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=y |
565 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y | 586 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y |
566 | CONFIG_NETFILTER_XT_MATCH_MARK=y | 587 | CONFIG_NETFILTER_XT_MATCH_MARK=y |
567 | CONFIG_NETFILTER_XT_MATCH_POLICY=y | 588 | CONFIG_NETFILTER_XT_MATCH_POLICY=y |
568 | CONFIG_NETFILTER_XT_MATCH_STATE=y | 589 | CONFIG_NETFILTER_XT_MATCH_STATE=y |
590 | # CONFIG_IP_VS is not set | ||
569 | 591 | ||
570 | # | 592 | # |
571 | # IP: Netfilter Configuration | 593 | # IP: Netfilter Configuration |
572 | # | 594 | # |
595 | CONFIG_NF_DEFRAG_IPV4=y | ||
573 | CONFIG_NF_CONNTRACK_IPV4=y | 596 | CONFIG_NF_CONNTRACK_IPV4=y |
574 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 597 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
575 | CONFIG_IP_NF_IPTABLES=y | 598 | CONFIG_IP_NF_IPTABLES=y |
@@ -595,8 +618,8 @@ CONFIG_IP_NF_MANGLE=y | |||
595 | CONFIG_NF_CONNTRACK_IPV6=y | 618 | CONFIG_NF_CONNTRACK_IPV6=y |
596 | CONFIG_IP6_NF_IPTABLES=y | 619 | CONFIG_IP6_NF_IPTABLES=y |
597 | CONFIG_IP6_NF_MATCH_IPV6HEADER=y | 620 | CONFIG_IP6_NF_MATCH_IPV6HEADER=y |
598 | CONFIG_IP6_NF_FILTER=y | ||
599 | CONFIG_IP6_NF_TARGET_LOG=y | 621 | CONFIG_IP6_NF_TARGET_LOG=y |
622 | CONFIG_IP6_NF_FILTER=y | ||
600 | CONFIG_IP6_NF_TARGET_REJECT=y | 623 | CONFIG_IP6_NF_TARGET_REJECT=y |
601 | CONFIG_IP6_NF_MANGLE=y | 624 | CONFIG_IP6_NF_MANGLE=y |
602 | # CONFIG_IP_DCCP is not set | 625 | # CONFIG_IP_DCCP is not set |
@@ -604,6 +627,7 @@ CONFIG_IP6_NF_MANGLE=y | |||
604 | # CONFIG_TIPC is not set | 627 | # CONFIG_TIPC is not set |
605 | # CONFIG_ATM is not set | 628 | # CONFIG_ATM is not set |
606 | # CONFIG_BRIDGE is not set | 629 | # CONFIG_BRIDGE is not set |
630 | # CONFIG_NET_DSA is not set | ||
607 | # CONFIG_VLAN_8021Q is not set | 631 | # CONFIG_VLAN_8021Q is not set |
608 | # CONFIG_DECNET is not set | 632 | # CONFIG_DECNET is not set |
609 | CONFIG_LLC=y | 633 | CONFIG_LLC=y |
@@ -623,6 +647,7 @@ CONFIG_NET_SCHED=y | |||
623 | # CONFIG_NET_SCH_HTB is not set | 647 | # CONFIG_NET_SCH_HTB is not set |
624 | # CONFIG_NET_SCH_HFSC is not set | 648 | # CONFIG_NET_SCH_HFSC is not set |
625 | # CONFIG_NET_SCH_PRIO is not set | 649 | # CONFIG_NET_SCH_PRIO is not set |
650 | # CONFIG_NET_SCH_MULTIQ is not set | ||
626 | # CONFIG_NET_SCH_RED is not set | 651 | # CONFIG_NET_SCH_RED is not set |
627 | # CONFIG_NET_SCH_SFQ is not set | 652 | # CONFIG_NET_SCH_SFQ is not set |
628 | # CONFIG_NET_SCH_TEQL is not set | 653 | # CONFIG_NET_SCH_TEQL is not set |
@@ -630,6 +655,7 @@ CONFIG_NET_SCHED=y | |||
630 | # CONFIG_NET_SCH_GRED is not set | 655 | # CONFIG_NET_SCH_GRED is not set |
631 | # CONFIG_NET_SCH_DSMARK is not set | 656 | # CONFIG_NET_SCH_DSMARK is not set |
632 | # CONFIG_NET_SCH_NETEM is not set | 657 | # CONFIG_NET_SCH_NETEM is not set |
658 | # CONFIG_NET_SCH_DRR is not set | ||
633 | # CONFIG_NET_SCH_INGRESS is not set | 659 | # CONFIG_NET_SCH_INGRESS is not set |
634 | 660 | ||
635 | # | 661 | # |
@@ -644,6 +670,7 @@ CONFIG_NET_CLS=y | |||
644 | # CONFIG_NET_CLS_RSVP is not set | 670 | # CONFIG_NET_CLS_RSVP is not set |
645 | # CONFIG_NET_CLS_RSVP6 is not set | 671 | # CONFIG_NET_CLS_RSVP6 is not set |
646 | # CONFIG_NET_CLS_FLOW is not set | 672 | # CONFIG_NET_CLS_FLOW is not set |
673 | # CONFIG_NET_CLS_CGROUP is not set | ||
647 | CONFIG_NET_EMATCH=y | 674 | CONFIG_NET_EMATCH=y |
648 | CONFIG_NET_EMATCH_STACK=32 | 675 | CONFIG_NET_EMATCH_STACK=32 |
649 | # CONFIG_NET_EMATCH_CMP is not set | 676 | # CONFIG_NET_EMATCH_CMP is not set |
@@ -659,7 +686,9 @@ CONFIG_NET_CLS_ACT=y | |||
659 | # CONFIG_NET_ACT_NAT is not set | 686 | # CONFIG_NET_ACT_NAT is not set |
660 | # CONFIG_NET_ACT_PEDIT is not set | 687 | # CONFIG_NET_ACT_PEDIT is not set |
661 | # CONFIG_NET_ACT_SIMP is not set | 688 | # CONFIG_NET_ACT_SIMP is not set |
689 | # CONFIG_NET_ACT_SKBEDIT is not set | ||
662 | CONFIG_NET_SCH_FIFO=y | 690 | CONFIG_NET_SCH_FIFO=y |
691 | # CONFIG_DCB is not set | ||
663 | 692 | ||
664 | # | 693 | # |
665 | # Network testing | 694 | # Network testing |
@@ -676,29 +705,33 @@ CONFIG_HAMRADIO=y | |||
676 | # CONFIG_IRDA is not set | 705 | # CONFIG_IRDA is not set |
677 | # CONFIG_BT is not set | 706 | # CONFIG_BT is not set |
678 | # CONFIG_AF_RXRPC is not set | 707 | # CONFIG_AF_RXRPC is not set |
708 | # CONFIG_PHONET is not set | ||
679 | CONFIG_FIB_RULES=y | 709 | CONFIG_FIB_RULES=y |
680 | 710 | CONFIG_WIRELESS=y | |
681 | # | ||
682 | # Wireless | ||
683 | # | ||
684 | CONFIG_CFG80211=y | 711 | CONFIG_CFG80211=y |
712 | # CONFIG_CFG80211_REG_DEBUG is not set | ||
685 | CONFIG_NL80211=y | 713 | CONFIG_NL80211=y |
714 | CONFIG_WIRELESS_OLD_REGULATORY=y | ||
686 | CONFIG_WIRELESS_EXT=y | 715 | CONFIG_WIRELESS_EXT=y |
687 | CONFIG_WIRELESS_EXT_SYSFS=y | 716 | CONFIG_WIRELESS_EXT_SYSFS=y |
717 | # CONFIG_LIB80211 is not set | ||
688 | CONFIG_MAC80211=y | 718 | CONFIG_MAC80211=y |
689 | 719 | ||
690 | # | 720 | # |
691 | # Rate control algorithm selection | 721 | # Rate control algorithm selection |
692 | # | 722 | # |
693 | CONFIG_MAC80211_RC_PID=y | 723 | CONFIG_MAC80211_RC_MINSTREL=y |
694 | CONFIG_MAC80211_RC_DEFAULT_PID=y | 724 | # CONFIG_MAC80211_RC_DEFAULT_PID is not set |
695 | CONFIG_MAC80211_RC_DEFAULT="pid" | 725 | CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y |
726 | CONFIG_MAC80211_RC_DEFAULT="minstrel" | ||
696 | # CONFIG_MAC80211_MESH is not set | 727 | # CONFIG_MAC80211_MESH is not set |
697 | CONFIG_MAC80211_LEDS=y | 728 | CONFIG_MAC80211_LEDS=y |
698 | # CONFIG_MAC80211_DEBUGFS is not set | 729 | # CONFIG_MAC80211_DEBUGFS is not set |
699 | # CONFIG_MAC80211_DEBUG_MENU is not set | 730 | # CONFIG_MAC80211_DEBUG_MENU is not set |
700 | # CONFIG_IEEE80211 is not set | 731 | # CONFIG_WIMAX is not set |
701 | # CONFIG_RFKILL is not set | 732 | CONFIG_RFKILL=y |
733 | # CONFIG_RFKILL_INPUT is not set | ||
734 | CONFIG_RFKILL_LEDS=y | ||
702 | # CONFIG_NET_9P is not set | 735 | # CONFIG_NET_9P is not set |
703 | 736 | ||
704 | # | 737 | # |
@@ -722,7 +755,7 @@ CONFIG_PROC_EVENTS=y | |||
722 | # CONFIG_MTD is not set | 755 | # CONFIG_MTD is not set |
723 | # CONFIG_PARPORT is not set | 756 | # CONFIG_PARPORT is not set |
724 | CONFIG_PNP=y | 757 | CONFIG_PNP=y |
725 | # CONFIG_PNP_DEBUG is not set | 758 | CONFIG_PNP_DEBUG_MESSAGES=y |
726 | 759 | ||
727 | # | 760 | # |
728 | # Protocols | 761 | # Protocols |
@@ -750,20 +783,19 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 | |||
750 | CONFIG_MISC_DEVICES=y | 783 | CONFIG_MISC_DEVICES=y |
751 | # CONFIG_IBM_ASM is not set | 784 | # CONFIG_IBM_ASM is not set |
752 | # CONFIG_PHANTOM is not set | 785 | # CONFIG_PHANTOM is not set |
753 | # CONFIG_EEPROM_93CX6 is not set | ||
754 | # CONFIG_SGI_IOC4 is not set | 786 | # CONFIG_SGI_IOC4 is not set |
755 | # CONFIG_TIFM_CORE is not set | 787 | # CONFIG_TIFM_CORE is not set |
756 | # CONFIG_ACER_WMI is not set | 788 | # CONFIG_ICS932S401 is not set |
757 | # CONFIG_ASUS_LAPTOP is not set | ||
758 | # CONFIG_FUJITSU_LAPTOP is not set | ||
759 | # CONFIG_TC1100_WMI is not set | ||
760 | # CONFIG_MSI_LAPTOP is not set | ||
761 | # CONFIG_COMPAL_LAPTOP is not set | ||
762 | # CONFIG_SONY_LAPTOP is not set | ||
763 | # CONFIG_THINKPAD_ACPI is not set | ||
764 | # CONFIG_INTEL_MENLOW is not set | ||
765 | # CONFIG_ENCLOSURE_SERVICES is not set | 789 | # CONFIG_ENCLOSURE_SERVICES is not set |
766 | # CONFIG_HP_ILO is not set | 790 | # CONFIG_HP_ILO is not set |
791 | # CONFIG_C2PORT is not set | ||
792 | |||
793 | # | ||
794 | # EEPROM support | ||
795 | # | ||
796 | # CONFIG_EEPROM_AT24 is not set | ||
797 | # CONFIG_EEPROM_LEGACY is not set | ||
798 | # CONFIG_EEPROM_93CX6 is not set | ||
767 | CONFIG_HAVE_IDE=y | 799 | CONFIG_HAVE_IDE=y |
768 | # CONFIG_IDE is not set | 800 | # CONFIG_IDE is not set |
769 | 801 | ||
@@ -802,7 +834,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
802 | # | 834 | # |
803 | CONFIG_SCSI_SPI_ATTRS=y | 835 | CONFIG_SCSI_SPI_ATTRS=y |
804 | # CONFIG_SCSI_FC_ATTRS is not set | 836 | # CONFIG_SCSI_FC_ATTRS is not set |
805 | CONFIG_SCSI_ISCSI_ATTRS=y | 837 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
806 | # CONFIG_SCSI_SAS_ATTRS is not set | 838 | # CONFIG_SCSI_SAS_ATTRS is not set |
807 | # CONFIG_SCSI_SAS_LIBSAS is not set | 839 | # CONFIG_SCSI_SAS_LIBSAS is not set |
808 | # CONFIG_SCSI_SRP_ATTRS is not set | 840 | # CONFIG_SCSI_SRP_ATTRS is not set |
@@ -875,6 +907,7 @@ CONFIG_PATA_OLDPIIX=y | |||
875 | CONFIG_PATA_SCH=y | 907 | CONFIG_PATA_SCH=y |
876 | CONFIG_MD=y | 908 | CONFIG_MD=y |
877 | CONFIG_BLK_DEV_MD=y | 909 | CONFIG_BLK_DEV_MD=y |
910 | CONFIG_MD_AUTODETECT=y | ||
878 | # CONFIG_MD_LINEAR is not set | 911 | # CONFIG_MD_LINEAR is not set |
879 | # CONFIG_MD_RAID0 is not set | 912 | # CONFIG_MD_RAID0 is not set |
880 | # CONFIG_MD_RAID1 is not set | 913 | # CONFIG_MD_RAID1 is not set |
@@ -930,6 +963,9 @@ CONFIG_PHYLIB=y | |||
930 | # CONFIG_BROADCOM_PHY is not set | 963 | # CONFIG_BROADCOM_PHY is not set |
931 | # CONFIG_ICPLUS_PHY is not set | 964 | # CONFIG_ICPLUS_PHY is not set |
932 | # CONFIG_REALTEK_PHY is not set | 965 | # CONFIG_REALTEK_PHY is not set |
966 | # CONFIG_NATIONAL_PHY is not set | ||
967 | # CONFIG_STE10XP is not set | ||
968 | # CONFIG_LSI_ET1011C_PHY is not set | ||
933 | # CONFIG_FIXED_PHY is not set | 969 | # CONFIG_FIXED_PHY is not set |
934 | # CONFIG_MDIO_BITBANG is not set | 970 | # CONFIG_MDIO_BITBANG is not set |
935 | CONFIG_NET_ETHERNET=y | 971 | CONFIG_NET_ETHERNET=y |
@@ -953,6 +989,9 @@ CONFIG_NET_TULIP=y | |||
953 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 989 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
954 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 990 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
955 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 991 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
992 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
993 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
994 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
956 | CONFIG_NET_PCI=y | 995 | CONFIG_NET_PCI=y |
957 | # CONFIG_PCNET32 is not set | 996 | # CONFIG_PCNET32 is not set |
958 | # CONFIG_AMD8111_ETH is not set | 997 | # CONFIG_AMD8111_ETH is not set |
@@ -960,7 +999,6 @@ CONFIG_NET_PCI=y | |||
960 | # CONFIG_B44 is not set | 999 | # CONFIG_B44 is not set |
961 | CONFIG_FORCEDETH=y | 1000 | CONFIG_FORCEDETH=y |
962 | # CONFIG_FORCEDETH_NAPI is not set | 1001 | # CONFIG_FORCEDETH_NAPI is not set |
963 | # CONFIG_EEPRO100 is not set | ||
964 | CONFIG_E100=y | 1002 | CONFIG_E100=y |
965 | # CONFIG_FEALNX is not set | 1003 | # CONFIG_FEALNX is not set |
966 | # CONFIG_NATSEMI is not set | 1004 | # CONFIG_NATSEMI is not set |
@@ -974,15 +1012,16 @@ CONFIG_8139TOO=y | |||
974 | # CONFIG_R6040 is not set | 1012 | # CONFIG_R6040 is not set |
975 | # CONFIG_SIS900 is not set | 1013 | # CONFIG_SIS900 is not set |
976 | # CONFIG_EPIC100 is not set | 1014 | # CONFIG_EPIC100 is not set |
1015 | # CONFIG_SMSC9420 is not set | ||
977 | # CONFIG_SUNDANCE is not set | 1016 | # CONFIG_SUNDANCE is not set |
978 | # CONFIG_TLAN is not set | 1017 | # CONFIG_TLAN is not set |
979 | # CONFIG_VIA_RHINE is not set | 1018 | # CONFIG_VIA_RHINE is not set |
980 | # CONFIG_SC92031 is not set | 1019 | # CONFIG_SC92031 is not set |
1020 | # CONFIG_ATL2 is not set | ||
981 | CONFIG_NETDEV_1000=y | 1021 | CONFIG_NETDEV_1000=y |
982 | # CONFIG_ACENIC is not set | 1022 | # CONFIG_ACENIC is not set |
983 | # CONFIG_DL2K is not set | 1023 | # CONFIG_DL2K is not set |
984 | CONFIG_E1000=y | 1024 | CONFIG_E1000=y |
985 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
986 | CONFIG_E1000E=y | 1025 | CONFIG_E1000E=y |
987 | # CONFIG_IP1000 is not set | 1026 | # CONFIG_IP1000 is not set |
988 | # CONFIG_IGB is not set | 1027 | # CONFIG_IGB is not set |
@@ -1000,18 +1039,23 @@ CONFIG_BNX2=y | |||
1000 | # CONFIG_QLA3XXX is not set | 1039 | # CONFIG_QLA3XXX is not set |
1001 | # CONFIG_ATL1 is not set | 1040 | # CONFIG_ATL1 is not set |
1002 | # CONFIG_ATL1E is not set | 1041 | # CONFIG_ATL1E is not set |
1042 | # CONFIG_JME is not set | ||
1003 | CONFIG_NETDEV_10000=y | 1043 | CONFIG_NETDEV_10000=y |
1004 | # CONFIG_CHELSIO_T1 is not set | 1044 | # CONFIG_CHELSIO_T1 is not set |
1045 | CONFIG_CHELSIO_T3_DEPENDS=y | ||
1005 | # CONFIG_CHELSIO_T3 is not set | 1046 | # CONFIG_CHELSIO_T3 is not set |
1047 | # CONFIG_ENIC is not set | ||
1006 | # CONFIG_IXGBE is not set | 1048 | # CONFIG_IXGBE is not set |
1007 | # CONFIG_IXGB is not set | 1049 | # CONFIG_IXGB is not set |
1008 | # CONFIG_S2IO is not set | 1050 | # CONFIG_S2IO is not set |
1009 | # CONFIG_MYRI10GE is not set | 1051 | # CONFIG_MYRI10GE is not set |
1010 | # CONFIG_NETXEN_NIC is not set | 1052 | # CONFIG_NETXEN_NIC is not set |
1011 | # CONFIG_NIU is not set | 1053 | # CONFIG_NIU is not set |
1054 | # CONFIG_MLX4_EN is not set | ||
1012 | # CONFIG_MLX4_CORE is not set | 1055 | # CONFIG_MLX4_CORE is not set |
1013 | # CONFIG_TEHUTI is not set | 1056 | # CONFIG_TEHUTI is not set |
1014 | # CONFIG_BNX2X is not set | 1057 | # CONFIG_BNX2X is not set |
1058 | # CONFIG_QLGE is not set | ||
1015 | # CONFIG_SFC is not set | 1059 | # CONFIG_SFC is not set |
1016 | CONFIG_TR=y | 1060 | CONFIG_TR=y |
1017 | # CONFIG_IBMOL is not set | 1061 | # CONFIG_IBMOL is not set |
@@ -1025,9 +1069,8 @@ CONFIG_TR=y | |||
1025 | # CONFIG_WLAN_PRE80211 is not set | 1069 | # CONFIG_WLAN_PRE80211 is not set |
1026 | CONFIG_WLAN_80211=y | 1070 | CONFIG_WLAN_80211=y |
1027 | # CONFIG_PCMCIA_RAYCS is not set | 1071 | # CONFIG_PCMCIA_RAYCS is not set |
1028 | # CONFIG_IPW2100 is not set | ||
1029 | # CONFIG_IPW2200 is not set | ||
1030 | # CONFIG_LIBERTAS is not set | 1072 | # CONFIG_LIBERTAS is not set |
1073 | # CONFIG_LIBERTAS_THINFIRM is not set | ||
1031 | # CONFIG_AIRO is not set | 1074 | # CONFIG_AIRO is not set |
1032 | # CONFIG_HERMES is not set | 1075 | # CONFIG_HERMES is not set |
1033 | # CONFIG_ATMEL is not set | 1076 | # CONFIG_ATMEL is not set |
@@ -1044,6 +1087,8 @@ CONFIG_WLAN_80211=y | |||
1044 | CONFIG_ATH5K=y | 1087 | CONFIG_ATH5K=y |
1045 | # CONFIG_ATH5K_DEBUG is not set | 1088 | # CONFIG_ATH5K_DEBUG is not set |
1046 | # CONFIG_ATH9K is not set | 1089 | # CONFIG_ATH9K is not set |
1090 | # CONFIG_IPW2100 is not set | ||
1091 | # CONFIG_IPW2200 is not set | ||
1047 | # CONFIG_IWLCORE is not set | 1092 | # CONFIG_IWLCORE is not set |
1048 | # CONFIG_IWLWIFI_LEDS is not set | 1093 | # CONFIG_IWLWIFI_LEDS is not set |
1049 | # CONFIG_IWLAGN is not set | 1094 | # CONFIG_IWLAGN is not set |
@@ -1055,6 +1100,10 @@ CONFIG_ATH5K=y | |||
1055 | # CONFIG_RT2X00 is not set | 1100 | # CONFIG_RT2X00 is not set |
1056 | 1101 | ||
1057 | # | 1102 | # |
1103 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
1104 | # | ||
1105 | |||
1106 | # | ||
1058 | # USB Network Adapters | 1107 | # USB Network Adapters |
1059 | # | 1108 | # |
1060 | # CONFIG_USB_CATC is not set | 1109 | # CONFIG_USB_CATC is not set |
@@ -1062,6 +1111,7 @@ CONFIG_ATH5K=y | |||
1062 | # CONFIG_USB_PEGASUS is not set | 1111 | # CONFIG_USB_PEGASUS is not set |
1063 | # CONFIG_USB_RTL8150 is not set | 1112 | # CONFIG_USB_RTL8150 is not set |
1064 | # CONFIG_USB_USBNET is not set | 1113 | # CONFIG_USB_USBNET is not set |
1114 | # CONFIG_USB_HSO is not set | ||
1065 | CONFIG_NET_PCMCIA=y | 1115 | CONFIG_NET_PCMCIA=y |
1066 | # CONFIG_PCMCIA_3C589 is not set | 1116 | # CONFIG_PCMCIA_3C589 is not set |
1067 | # CONFIG_PCMCIA_3C574 is not set | 1117 | # CONFIG_PCMCIA_3C574 is not set |
@@ -1123,6 +1173,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
1123 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 1173 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
1124 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 1174 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
1125 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 1175 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
1176 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
1126 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 1177 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
1127 | # CONFIG_MOUSE_SERIAL is not set | 1178 | # CONFIG_MOUSE_SERIAL is not set |
1128 | # CONFIG_MOUSE_APPLETOUCH is not set | 1179 | # CONFIG_MOUSE_APPLETOUCH is not set |
@@ -1160,15 +1211,16 @@ CONFIG_INPUT_TOUCHSCREEN=y | |||
1160 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | 1211 | # CONFIG_TOUCHSCREEN_FUJITSU is not set |
1161 | # CONFIG_TOUCHSCREEN_GUNZE is not set | 1212 | # CONFIG_TOUCHSCREEN_GUNZE is not set |
1162 | # CONFIG_TOUCHSCREEN_ELO is not set | 1213 | # CONFIG_TOUCHSCREEN_ELO is not set |
1214 | # CONFIG_TOUCHSCREEN_WACOM_W8001 is not set | ||
1163 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | 1215 | # CONFIG_TOUCHSCREEN_MTOUCH is not set |
1164 | # CONFIG_TOUCHSCREEN_INEXIO is not set | 1216 | # CONFIG_TOUCHSCREEN_INEXIO is not set |
1165 | # CONFIG_TOUCHSCREEN_MK712 is not set | 1217 | # CONFIG_TOUCHSCREEN_MK712 is not set |
1166 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | 1218 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set |
1167 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | 1219 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set |
1168 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | 1220 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set |
1169 | # CONFIG_TOUCHSCREEN_UCB1400 is not set | ||
1170 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | 1221 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set |
1171 | # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set | 1222 | # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set |
1223 | # CONFIG_TOUCHSCREEN_TSC2007 is not set | ||
1172 | CONFIG_INPUT_MISC=y | 1224 | CONFIG_INPUT_MISC=y |
1173 | # CONFIG_INPUT_PCSPKR is not set | 1225 | # CONFIG_INPUT_PCSPKR is not set |
1174 | # CONFIG_INPUT_APANEL is not set | 1226 | # CONFIG_INPUT_APANEL is not set |
@@ -1179,6 +1231,7 @@ CONFIG_INPUT_MISC=y | |||
1179 | # CONFIG_INPUT_KEYSPAN_REMOTE is not set | 1231 | # CONFIG_INPUT_KEYSPAN_REMOTE is not set |
1180 | # CONFIG_INPUT_POWERMATE is not set | 1232 | # CONFIG_INPUT_POWERMATE is not set |
1181 | # CONFIG_INPUT_YEALINK is not set | 1233 | # CONFIG_INPUT_YEALINK is not set |
1234 | # CONFIG_INPUT_CM109 is not set | ||
1182 | # CONFIG_INPUT_UINPUT is not set | 1235 | # CONFIG_INPUT_UINPUT is not set |
1183 | 1236 | ||
1184 | # | 1237 | # |
@@ -1245,6 +1298,7 @@ CONFIG_SERIAL_CORE=y | |||
1245 | CONFIG_SERIAL_CORE_CONSOLE=y | 1298 | CONFIG_SERIAL_CORE_CONSOLE=y |
1246 | # CONFIG_SERIAL_JSM is not set | 1299 | # CONFIG_SERIAL_JSM is not set |
1247 | CONFIG_UNIX98_PTYS=y | 1300 | CONFIG_UNIX98_PTYS=y |
1301 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
1248 | # CONFIG_LEGACY_PTYS is not set | 1302 | # CONFIG_LEGACY_PTYS is not set |
1249 | # CONFIG_IPMI_HANDLER is not set | 1303 | # CONFIG_IPMI_HANDLER is not set |
1250 | CONFIG_HW_RANDOM=y | 1304 | CONFIG_HW_RANDOM=y |
@@ -1279,6 +1333,7 @@ CONFIG_I2C=y | |||
1279 | CONFIG_I2C_BOARDINFO=y | 1333 | CONFIG_I2C_BOARDINFO=y |
1280 | # CONFIG_I2C_CHARDEV is not set | 1334 | # CONFIG_I2C_CHARDEV is not set |
1281 | CONFIG_I2C_HELPER_AUTO=y | 1335 | CONFIG_I2C_HELPER_AUTO=y |
1336 | CONFIG_I2C_ALGOBIT=y | ||
1282 | 1337 | ||
1283 | # | 1338 | # |
1284 | # I2C Hardware Bus support | 1339 | # I2C Hardware Bus support |
@@ -1331,8 +1386,6 @@ CONFIG_I2C_I801=y | |||
1331 | # Miscellaneous I2C Chip support | 1386 | # Miscellaneous I2C Chip support |
1332 | # | 1387 | # |
1333 | # CONFIG_DS1682 is not set | 1388 | # CONFIG_DS1682 is not set |
1334 | # CONFIG_EEPROM_AT24 is not set | ||
1335 | # CONFIG_EEPROM_LEGACY is not set | ||
1336 | # CONFIG_SENSORS_PCF8574 is not set | 1389 | # CONFIG_SENSORS_PCF8574 is not set |
1337 | # CONFIG_PCF8575 is not set | 1390 | # CONFIG_PCF8575 is not set |
1338 | # CONFIG_SENSORS_PCA9539 is not set | 1391 | # CONFIG_SENSORS_PCA9539 is not set |
@@ -1351,8 +1404,78 @@ CONFIG_POWER_SUPPLY=y | |||
1351 | # CONFIG_POWER_SUPPLY_DEBUG is not set | 1404 | # CONFIG_POWER_SUPPLY_DEBUG is not set |
1352 | # CONFIG_PDA_POWER is not set | 1405 | # CONFIG_PDA_POWER is not set |
1353 | # CONFIG_BATTERY_DS2760 is not set | 1406 | # CONFIG_BATTERY_DS2760 is not set |
1354 | # CONFIG_HWMON is not set | 1407 | # CONFIG_BATTERY_BQ27x00 is not set |
1408 | CONFIG_HWMON=y | ||
1409 | # CONFIG_HWMON_VID is not set | ||
1410 | # CONFIG_SENSORS_ABITUGURU is not set | ||
1411 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
1412 | # CONFIG_SENSORS_AD7414 is not set | ||
1413 | # CONFIG_SENSORS_AD7418 is not set | ||
1414 | # CONFIG_SENSORS_ADM1021 is not set | ||
1415 | # CONFIG_SENSORS_ADM1025 is not set | ||
1416 | # CONFIG_SENSORS_ADM1026 is not set | ||
1417 | # CONFIG_SENSORS_ADM1029 is not set | ||
1418 | # CONFIG_SENSORS_ADM1031 is not set | ||
1419 | # CONFIG_SENSORS_ADM9240 is not set | ||
1420 | # CONFIG_SENSORS_ADT7462 is not set | ||
1421 | # CONFIG_SENSORS_ADT7470 is not set | ||
1422 | # CONFIG_SENSORS_ADT7473 is not set | ||
1423 | # CONFIG_SENSORS_ADT7475 is not set | ||
1424 | # CONFIG_SENSORS_K8TEMP is not set | ||
1425 | # CONFIG_SENSORS_ASB100 is not set | ||
1426 | # CONFIG_SENSORS_ATXP1 is not set | ||
1427 | # CONFIG_SENSORS_DS1621 is not set | ||
1428 | # CONFIG_SENSORS_I5K_AMB is not set | ||
1429 | # CONFIG_SENSORS_F71805F is not set | ||
1430 | # CONFIG_SENSORS_F71882FG is not set | ||
1431 | # CONFIG_SENSORS_F75375S is not set | ||
1432 | # CONFIG_SENSORS_FSCHER is not set | ||
1433 | # CONFIG_SENSORS_FSCPOS is not set | ||
1434 | # CONFIG_SENSORS_FSCHMD is not set | ||
1435 | # CONFIG_SENSORS_GL518SM is not set | ||
1436 | # CONFIG_SENSORS_GL520SM is not set | ||
1437 | # CONFIG_SENSORS_CORETEMP is not set | ||
1438 | # CONFIG_SENSORS_IT87 is not set | ||
1439 | # CONFIG_SENSORS_LM63 is not set | ||
1440 | # CONFIG_SENSORS_LM75 is not set | ||
1441 | # CONFIG_SENSORS_LM77 is not set | ||
1442 | # CONFIG_SENSORS_LM78 is not set | ||
1443 | # CONFIG_SENSORS_LM80 is not set | ||
1444 | # CONFIG_SENSORS_LM83 is not set | ||
1445 | # CONFIG_SENSORS_LM85 is not set | ||
1446 | # CONFIG_SENSORS_LM87 is not set | ||
1447 | # CONFIG_SENSORS_LM90 is not set | ||
1448 | # CONFIG_SENSORS_LM92 is not set | ||
1449 | # CONFIG_SENSORS_LM93 is not set | ||
1450 | # CONFIG_SENSORS_LTC4245 is not set | ||
1451 | # CONFIG_SENSORS_MAX1619 is not set | ||
1452 | # CONFIG_SENSORS_MAX6650 is not set | ||
1453 | # CONFIG_SENSORS_PC87360 is not set | ||
1454 | # CONFIG_SENSORS_PC87427 is not set | ||
1455 | # CONFIG_SENSORS_SIS5595 is not set | ||
1456 | # CONFIG_SENSORS_DME1737 is not set | ||
1457 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
1458 | # CONFIG_SENSORS_SMSC47M192 is not set | ||
1459 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
1460 | # CONFIG_SENSORS_ADS7828 is not set | ||
1461 | # CONFIG_SENSORS_THMC50 is not set | ||
1462 | # CONFIG_SENSORS_VIA686A is not set | ||
1463 | # CONFIG_SENSORS_VT1211 is not set | ||
1464 | # CONFIG_SENSORS_VT8231 is not set | ||
1465 | # CONFIG_SENSORS_W83781D is not set | ||
1466 | # CONFIG_SENSORS_W83791D is not set | ||
1467 | # CONFIG_SENSORS_W83792D is not set | ||
1468 | # CONFIG_SENSORS_W83793 is not set | ||
1469 | # CONFIG_SENSORS_W83L785TS is not set | ||
1470 | # CONFIG_SENSORS_W83L786NG is not set | ||
1471 | # CONFIG_SENSORS_W83627HF is not set | ||
1472 | # CONFIG_SENSORS_W83627EHF is not set | ||
1473 | # CONFIG_SENSORS_HDAPS is not set | ||
1474 | # CONFIG_SENSORS_LIS3LV02D is not set | ||
1475 | # CONFIG_SENSORS_APPLESMC is not set | ||
1476 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
1355 | CONFIG_THERMAL=y | 1477 | CONFIG_THERMAL=y |
1478 | # CONFIG_THERMAL_HWMON is not set | ||
1356 | CONFIG_WATCHDOG=y | 1479 | CONFIG_WATCHDOG=y |
1357 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 1480 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
1358 | 1481 | ||
@@ -1372,6 +1495,7 @@ CONFIG_WATCHDOG=y | |||
1372 | # CONFIG_I6300ESB_WDT is not set | 1495 | # CONFIG_I6300ESB_WDT is not set |
1373 | # CONFIG_ITCO_WDT is not set | 1496 | # CONFIG_ITCO_WDT is not set |
1374 | # CONFIG_IT8712F_WDT is not set | 1497 | # CONFIG_IT8712F_WDT is not set |
1498 | # CONFIG_IT87_WDT is not set | ||
1375 | # CONFIG_HP_WATCHDOG is not set | 1499 | # CONFIG_HP_WATCHDOG is not set |
1376 | # CONFIG_SC1200_WDT is not set | 1500 | # CONFIG_SC1200_WDT is not set |
1377 | # CONFIG_PC87413_WDT is not set | 1501 | # CONFIG_PC87413_WDT is not set |
@@ -1379,9 +1503,11 @@ CONFIG_WATCHDOG=y | |||
1379 | # CONFIG_SBC8360_WDT is not set | 1503 | # CONFIG_SBC8360_WDT is not set |
1380 | # CONFIG_SBC7240_WDT is not set | 1504 | # CONFIG_SBC7240_WDT is not set |
1381 | # CONFIG_CPU5_WDT is not set | 1505 | # CONFIG_CPU5_WDT is not set |
1506 | # CONFIG_SMSC_SCH311X_WDT is not set | ||
1382 | # CONFIG_SMSC37B787_WDT is not set | 1507 | # CONFIG_SMSC37B787_WDT is not set |
1383 | # CONFIG_W83627HF_WDT is not set | 1508 | # CONFIG_W83627HF_WDT is not set |
1384 | # CONFIG_W83697HF_WDT is not set | 1509 | # CONFIG_W83697HF_WDT is not set |
1510 | # CONFIG_W83697UG_WDT is not set | ||
1385 | # CONFIG_W83877F_WDT is not set | 1511 | # CONFIG_W83877F_WDT is not set |
1386 | # CONFIG_W83977F_WDT is not set | 1512 | # CONFIG_W83977F_WDT is not set |
1387 | # CONFIG_MACHZ_WDT is not set | 1513 | # CONFIG_MACHZ_WDT is not set |
@@ -1397,11 +1523,11 @@ CONFIG_WATCHDOG=y | |||
1397 | # USB-based Watchdog Cards | 1523 | # USB-based Watchdog Cards |
1398 | # | 1524 | # |
1399 | # CONFIG_USBPCWATCHDOG is not set | 1525 | # CONFIG_USBPCWATCHDOG is not set |
1526 | CONFIG_SSB_POSSIBLE=y | ||
1400 | 1527 | ||
1401 | # | 1528 | # |
1402 | # Sonics Silicon Backplane | 1529 | # Sonics Silicon Backplane |
1403 | # | 1530 | # |
1404 | CONFIG_SSB_POSSIBLE=y | ||
1405 | # CONFIG_SSB is not set | 1531 | # CONFIG_SSB is not set |
1406 | 1532 | ||
1407 | # | 1533 | # |
@@ -1410,7 +1536,13 @@ CONFIG_SSB_POSSIBLE=y | |||
1410 | # CONFIG_MFD_CORE is not set | 1536 | # CONFIG_MFD_CORE is not set |
1411 | # CONFIG_MFD_SM501 is not set | 1537 | # CONFIG_MFD_SM501 is not set |
1412 | # CONFIG_HTC_PASIC3 is not set | 1538 | # CONFIG_HTC_PASIC3 is not set |
1539 | # CONFIG_TWL4030_CORE is not set | ||
1413 | # CONFIG_MFD_TMIO is not set | 1540 | # CONFIG_MFD_TMIO is not set |
1541 | # CONFIG_PMIC_DA903X is not set | ||
1542 | # CONFIG_MFD_WM8400 is not set | ||
1543 | # CONFIG_MFD_WM8350_I2C is not set | ||
1544 | # CONFIG_MFD_PCF50633 is not set | ||
1545 | # CONFIG_REGULATOR is not set | ||
1414 | 1546 | ||
1415 | # | 1547 | # |
1416 | # Multimedia devices | 1548 | # Multimedia devices |
@@ -1450,6 +1582,7 @@ CONFIG_DRM=y | |||
1450 | # CONFIG_DRM_I810 is not set | 1582 | # CONFIG_DRM_I810 is not set |
1451 | # CONFIG_DRM_I830 is not set | 1583 | # CONFIG_DRM_I830 is not set |
1452 | CONFIG_DRM_I915=y | 1584 | CONFIG_DRM_I915=y |
1585 | # CONFIG_DRM_I915_KMS is not set | ||
1453 | # CONFIG_DRM_MGA is not set | 1586 | # CONFIG_DRM_MGA is not set |
1454 | # CONFIG_DRM_SIS is not set | 1587 | # CONFIG_DRM_SIS is not set |
1455 | # CONFIG_DRM_VIA is not set | 1588 | # CONFIG_DRM_VIA is not set |
@@ -1459,6 +1592,7 @@ CONFIG_DRM_I915=y | |||
1459 | CONFIG_FB=y | 1592 | CONFIG_FB=y |
1460 | # CONFIG_FIRMWARE_EDID is not set | 1593 | # CONFIG_FIRMWARE_EDID is not set |
1461 | # CONFIG_FB_DDC is not set | 1594 | # CONFIG_FB_DDC is not set |
1595 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
1462 | CONFIG_FB_CFB_FILLRECT=y | 1596 | CONFIG_FB_CFB_FILLRECT=y |
1463 | CONFIG_FB_CFB_COPYAREA=y | 1597 | CONFIG_FB_CFB_COPYAREA=y |
1464 | CONFIG_FB_CFB_IMAGEBLIT=y | 1598 | CONFIG_FB_CFB_IMAGEBLIT=y |
@@ -1487,7 +1621,6 @@ CONFIG_FB_TILEBLITTING=y | |||
1487 | # CONFIG_FB_UVESA is not set | 1621 | # CONFIG_FB_UVESA is not set |
1488 | # CONFIG_FB_VESA is not set | 1622 | # CONFIG_FB_VESA is not set |
1489 | CONFIG_FB_EFI=y | 1623 | CONFIG_FB_EFI=y |
1490 | # CONFIG_FB_IMAC is not set | ||
1491 | # CONFIG_FB_N411 is not set | 1624 | # CONFIG_FB_N411 is not set |
1492 | # CONFIG_FB_HGA is not set | 1625 | # CONFIG_FB_HGA is not set |
1493 | # CONFIG_FB_S1D13XXX is not set | 1626 | # CONFIG_FB_S1D13XXX is not set |
@@ -1503,6 +1636,7 @@ CONFIG_FB_EFI=y | |||
1503 | # CONFIG_FB_S3 is not set | 1636 | # CONFIG_FB_S3 is not set |
1504 | # CONFIG_FB_SAVAGE is not set | 1637 | # CONFIG_FB_SAVAGE is not set |
1505 | # CONFIG_FB_SIS is not set | 1638 | # CONFIG_FB_SIS is not set |
1639 | # CONFIG_FB_VIA is not set | ||
1506 | # CONFIG_FB_NEOMAGIC is not set | 1640 | # CONFIG_FB_NEOMAGIC is not set |
1507 | # CONFIG_FB_KYRO is not set | 1641 | # CONFIG_FB_KYRO is not set |
1508 | # CONFIG_FB_3DFX is not set | 1642 | # CONFIG_FB_3DFX is not set |
@@ -1515,12 +1649,15 @@ CONFIG_FB_EFI=y | |||
1515 | # CONFIG_FB_CARMINE is not set | 1649 | # CONFIG_FB_CARMINE is not set |
1516 | # CONFIG_FB_GEODE is not set | 1650 | # CONFIG_FB_GEODE is not set |
1517 | # CONFIG_FB_VIRTUAL is not set | 1651 | # CONFIG_FB_VIRTUAL is not set |
1652 | # CONFIG_FB_METRONOME is not set | ||
1653 | # CONFIG_FB_MB862XX is not set | ||
1518 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 1654 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
1519 | # CONFIG_LCD_CLASS_DEVICE is not set | 1655 | # CONFIG_LCD_CLASS_DEVICE is not set |
1520 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 1656 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
1521 | # CONFIG_BACKLIGHT_CORGI is not set | 1657 | CONFIG_BACKLIGHT_GENERIC=y |
1522 | # CONFIG_BACKLIGHT_PROGEAR is not set | 1658 | # CONFIG_BACKLIGHT_PROGEAR is not set |
1523 | # CONFIG_BACKLIGHT_MBP_NVIDIA is not set | 1659 | # CONFIG_BACKLIGHT_MBP_NVIDIA is not set |
1660 | # CONFIG_BACKLIGHT_SAHARA is not set | ||
1524 | 1661 | ||
1525 | # | 1662 | # |
1526 | # Display device support | 1663 | # Display device support |
@@ -1540,10 +1677,12 @@ CONFIG_LOGO=y | |||
1540 | # CONFIG_LOGO_LINUX_VGA16 is not set | 1677 | # CONFIG_LOGO_LINUX_VGA16 is not set |
1541 | CONFIG_LOGO_LINUX_CLUT224=y | 1678 | CONFIG_LOGO_LINUX_CLUT224=y |
1542 | CONFIG_SOUND=y | 1679 | CONFIG_SOUND=y |
1680 | CONFIG_SOUND_OSS_CORE=y | ||
1543 | CONFIG_SND=y | 1681 | CONFIG_SND=y |
1544 | CONFIG_SND_TIMER=y | 1682 | CONFIG_SND_TIMER=y |
1545 | CONFIG_SND_PCM=y | 1683 | CONFIG_SND_PCM=y |
1546 | CONFIG_SND_HWDEP=y | 1684 | CONFIG_SND_HWDEP=y |
1685 | CONFIG_SND_JACK=y | ||
1547 | CONFIG_SND_SEQUENCER=y | 1686 | CONFIG_SND_SEQUENCER=y |
1548 | CONFIG_SND_SEQ_DUMMY=y | 1687 | CONFIG_SND_SEQ_DUMMY=y |
1549 | CONFIG_SND_OSSEMUL=y | 1688 | CONFIG_SND_OSSEMUL=y |
@@ -1551,6 +1690,8 @@ CONFIG_SND_MIXER_OSS=y | |||
1551 | CONFIG_SND_PCM_OSS=y | 1690 | CONFIG_SND_PCM_OSS=y |
1552 | CONFIG_SND_PCM_OSS_PLUGINS=y | 1691 | CONFIG_SND_PCM_OSS_PLUGINS=y |
1553 | CONFIG_SND_SEQUENCER_OSS=y | 1692 | CONFIG_SND_SEQUENCER_OSS=y |
1693 | CONFIG_SND_HRTIMER=y | ||
1694 | CONFIG_SND_SEQ_HRTIMER_DEFAULT=y | ||
1554 | CONFIG_SND_DYNAMIC_MINORS=y | 1695 | CONFIG_SND_DYNAMIC_MINORS=y |
1555 | CONFIG_SND_SUPPORT_OLD_API=y | 1696 | CONFIG_SND_SUPPORT_OLD_API=y |
1556 | CONFIG_SND_VERBOSE_PROCFS=y | 1697 | CONFIG_SND_VERBOSE_PROCFS=y |
@@ -1605,11 +1746,16 @@ CONFIG_SND_PCI=y | |||
1605 | # CONFIG_SND_FM801 is not set | 1746 | # CONFIG_SND_FM801 is not set |
1606 | CONFIG_SND_HDA_INTEL=y | 1747 | CONFIG_SND_HDA_INTEL=y |
1607 | CONFIG_SND_HDA_HWDEP=y | 1748 | CONFIG_SND_HDA_HWDEP=y |
1749 | # CONFIG_SND_HDA_RECONFIG is not set | ||
1750 | # CONFIG_SND_HDA_INPUT_BEEP is not set | ||
1608 | CONFIG_SND_HDA_CODEC_REALTEK=y | 1751 | CONFIG_SND_HDA_CODEC_REALTEK=y |
1609 | CONFIG_SND_HDA_CODEC_ANALOG=y | 1752 | CONFIG_SND_HDA_CODEC_ANALOG=y |
1610 | CONFIG_SND_HDA_CODEC_SIGMATEL=y | 1753 | CONFIG_SND_HDA_CODEC_SIGMATEL=y |
1611 | CONFIG_SND_HDA_CODEC_VIA=y | 1754 | CONFIG_SND_HDA_CODEC_VIA=y |
1612 | CONFIG_SND_HDA_CODEC_ATIHDMI=y | 1755 | CONFIG_SND_HDA_CODEC_ATIHDMI=y |
1756 | CONFIG_SND_HDA_CODEC_NVHDMI=y | ||
1757 | CONFIG_SND_HDA_CODEC_INTELHDMI=y | ||
1758 | CONFIG_SND_HDA_ELD=y | ||
1613 | CONFIG_SND_HDA_CODEC_CONEXANT=y | 1759 | CONFIG_SND_HDA_CODEC_CONEXANT=y |
1614 | CONFIG_SND_HDA_CODEC_CMEDIA=y | 1760 | CONFIG_SND_HDA_CODEC_CMEDIA=y |
1615 | CONFIG_SND_HDA_CODEC_SI3054=y | 1761 | CONFIG_SND_HDA_CODEC_SI3054=y |
@@ -1643,6 +1789,7 @@ CONFIG_SND_USB=y | |||
1643 | # CONFIG_SND_USB_AUDIO is not set | 1789 | # CONFIG_SND_USB_AUDIO is not set |
1644 | # CONFIG_SND_USB_USX2Y is not set | 1790 | # CONFIG_SND_USB_USX2Y is not set |
1645 | # CONFIG_SND_USB_CAIAQ is not set | 1791 | # CONFIG_SND_USB_CAIAQ is not set |
1792 | # CONFIG_SND_USB_US122L is not set | ||
1646 | CONFIG_SND_PCMCIA=y | 1793 | CONFIG_SND_PCMCIA=y |
1647 | # CONFIG_SND_VXPOCKET is not set | 1794 | # CONFIG_SND_VXPOCKET is not set |
1648 | # CONFIG_SND_PDAUDIOCF is not set | 1795 | # CONFIG_SND_PDAUDIOCF is not set |
@@ -1657,15 +1804,37 @@ CONFIG_HIDRAW=y | |||
1657 | # USB Input Devices | 1804 | # USB Input Devices |
1658 | # | 1805 | # |
1659 | CONFIG_USB_HID=y | 1806 | CONFIG_USB_HID=y |
1660 | CONFIG_USB_HIDINPUT_POWERBOOK=y | ||
1661 | CONFIG_HID_FF=y | ||
1662 | CONFIG_HID_PID=y | 1807 | CONFIG_HID_PID=y |
1808 | CONFIG_USB_HIDDEV=y | ||
1809 | |||
1810 | # | ||
1811 | # Special HID drivers | ||
1812 | # | ||
1813 | CONFIG_HID_COMPAT=y | ||
1814 | CONFIG_HID_A4TECH=y | ||
1815 | CONFIG_HID_APPLE=y | ||
1816 | CONFIG_HID_BELKIN=y | ||
1817 | CONFIG_HID_CHERRY=y | ||
1818 | CONFIG_HID_CHICONY=y | ||
1819 | CONFIG_HID_CYPRESS=y | ||
1820 | CONFIG_HID_EZKEY=y | ||
1821 | CONFIG_HID_GYRATION=y | ||
1822 | CONFIG_HID_LOGITECH=y | ||
1663 | CONFIG_LOGITECH_FF=y | 1823 | CONFIG_LOGITECH_FF=y |
1664 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | 1824 | # CONFIG_LOGIRUMBLEPAD2_FF is not set |
1825 | CONFIG_HID_MICROSOFT=y | ||
1826 | CONFIG_HID_MONTEREY=y | ||
1827 | CONFIG_HID_NTRIG=y | ||
1828 | CONFIG_HID_PANTHERLORD=y | ||
1665 | CONFIG_PANTHERLORD_FF=y | 1829 | CONFIG_PANTHERLORD_FF=y |
1830 | CONFIG_HID_PETALYNX=y | ||
1831 | CONFIG_HID_SAMSUNG=y | ||
1832 | CONFIG_HID_SONY=y | ||
1833 | CONFIG_HID_SUNPLUS=y | ||
1834 | # CONFIG_GREENASIA_FF is not set | ||
1835 | CONFIG_HID_TOPSEED=y | ||
1666 | CONFIG_THRUSTMASTER_FF=y | 1836 | CONFIG_THRUSTMASTER_FF=y |
1667 | CONFIG_ZEROPLUS_FF=y | 1837 | CONFIG_ZEROPLUS_FF=y |
1668 | CONFIG_USB_HIDDEV=y | ||
1669 | CONFIG_USB_SUPPORT=y | 1838 | CONFIG_USB_SUPPORT=y |
1670 | CONFIG_USB_ARCH_HAS_HCD=y | 1839 | CONFIG_USB_ARCH_HAS_HCD=y |
1671 | CONFIG_USB_ARCH_HAS_OHCI=y | 1840 | CONFIG_USB_ARCH_HAS_OHCI=y |
@@ -1683,6 +1852,8 @@ CONFIG_USB_DEVICEFS=y | |||
1683 | CONFIG_USB_SUSPEND=y | 1852 | CONFIG_USB_SUSPEND=y |
1684 | # CONFIG_USB_OTG is not set | 1853 | # CONFIG_USB_OTG is not set |
1685 | CONFIG_USB_MON=y | 1854 | CONFIG_USB_MON=y |
1855 | # CONFIG_USB_WUSB is not set | ||
1856 | # CONFIG_USB_WUSB_CBAF is not set | ||
1686 | 1857 | ||
1687 | # | 1858 | # |
1688 | # USB Host Controller Drivers | 1859 | # USB Host Controller Drivers |
@@ -1691,6 +1862,7 @@ CONFIG_USB_MON=y | |||
1691 | CONFIG_USB_EHCI_HCD=y | 1862 | CONFIG_USB_EHCI_HCD=y |
1692 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1863 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1693 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1864 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
1865 | # CONFIG_USB_OXU210HP_HCD is not set | ||
1694 | # CONFIG_USB_ISP116X_HCD is not set | 1866 | # CONFIG_USB_ISP116X_HCD is not set |
1695 | # CONFIG_USB_ISP1760_HCD is not set | 1867 | # CONFIG_USB_ISP1760_HCD is not set |
1696 | CONFIG_USB_OHCI_HCD=y | 1868 | CONFIG_USB_OHCI_HCD=y |
@@ -1700,6 +1872,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
1700 | CONFIG_USB_UHCI_HCD=y | 1872 | CONFIG_USB_UHCI_HCD=y |
1701 | # CONFIG_USB_SL811_HCD is not set | 1873 | # CONFIG_USB_SL811_HCD is not set |
1702 | # CONFIG_USB_R8A66597_HCD is not set | 1874 | # CONFIG_USB_R8A66597_HCD is not set |
1875 | # CONFIG_USB_WHCI_HCD is not set | ||
1876 | # CONFIG_USB_HWA_HCD is not set | ||
1703 | 1877 | ||
1704 | # | 1878 | # |
1705 | # USB Device Class drivers | 1879 | # USB Device Class drivers |
@@ -1707,20 +1881,20 @@ CONFIG_USB_UHCI_HCD=y | |||
1707 | # CONFIG_USB_ACM is not set | 1881 | # CONFIG_USB_ACM is not set |
1708 | CONFIG_USB_PRINTER=y | 1882 | CONFIG_USB_PRINTER=y |
1709 | # CONFIG_USB_WDM is not set | 1883 | # CONFIG_USB_WDM is not set |
1884 | # CONFIG_USB_TMC is not set | ||
1710 | 1885 | ||
1711 | # | 1886 | # |
1712 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1887 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
1713 | # | 1888 | # |
1714 | 1889 | ||
1715 | # | 1890 | # |
1716 | # may also be needed; see USB_STORAGE Help for more information | 1891 | # see USB_STORAGE Help for more information |
1717 | # | 1892 | # |
1718 | CONFIG_USB_STORAGE=y | 1893 | CONFIG_USB_STORAGE=y |
1719 | # CONFIG_USB_STORAGE_DEBUG is not set | 1894 | # CONFIG_USB_STORAGE_DEBUG is not set |
1720 | # CONFIG_USB_STORAGE_DATAFAB is not set | 1895 | # CONFIG_USB_STORAGE_DATAFAB is not set |
1721 | # CONFIG_USB_STORAGE_FREECOM is not set | 1896 | # CONFIG_USB_STORAGE_FREECOM is not set |
1722 | # CONFIG_USB_STORAGE_ISD200 is not set | 1897 | # CONFIG_USB_STORAGE_ISD200 is not set |
1723 | # CONFIG_USB_STORAGE_DPCM is not set | ||
1724 | # CONFIG_USB_STORAGE_USBAT is not set | 1898 | # CONFIG_USB_STORAGE_USBAT is not set |
1725 | # CONFIG_USB_STORAGE_SDDR09 is not set | 1899 | # CONFIG_USB_STORAGE_SDDR09 is not set |
1726 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1900 | # CONFIG_USB_STORAGE_SDDR55 is not set |
@@ -1728,7 +1902,6 @@ CONFIG_USB_STORAGE=y | |||
1728 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1902 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1729 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1903 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
1730 | # CONFIG_USB_STORAGE_KARMA is not set | 1904 | # CONFIG_USB_STORAGE_KARMA is not set |
1731 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
1732 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1905 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
1733 | CONFIG_USB_LIBUSUAL=y | 1906 | CONFIG_USB_LIBUSUAL=y |
1734 | 1907 | ||
@@ -1749,6 +1922,7 @@ CONFIG_USB_LIBUSUAL=y | |||
1749 | # CONFIG_USB_EMI62 is not set | 1922 | # CONFIG_USB_EMI62 is not set |
1750 | # CONFIG_USB_EMI26 is not set | 1923 | # CONFIG_USB_EMI26 is not set |
1751 | # CONFIG_USB_ADUTUX is not set | 1924 | # CONFIG_USB_ADUTUX is not set |
1925 | # CONFIG_USB_SEVSEG is not set | ||
1752 | # CONFIG_USB_RIO500 is not set | 1926 | # CONFIG_USB_RIO500 is not set |
1753 | # CONFIG_USB_LEGOTOWER is not set | 1927 | # CONFIG_USB_LEGOTOWER is not set |
1754 | # CONFIG_USB_LCD is not set | 1928 | # CONFIG_USB_LCD is not set |
@@ -1766,7 +1940,13 @@ CONFIG_USB_LIBUSUAL=y | |||
1766 | # CONFIG_USB_IOWARRIOR is not set | 1940 | # CONFIG_USB_IOWARRIOR is not set |
1767 | # CONFIG_USB_TEST is not set | 1941 | # CONFIG_USB_TEST is not set |
1768 | # CONFIG_USB_ISIGHTFW is not set | 1942 | # CONFIG_USB_ISIGHTFW is not set |
1943 | # CONFIG_USB_VST is not set | ||
1769 | # CONFIG_USB_GADGET is not set | 1944 | # CONFIG_USB_GADGET is not set |
1945 | |||
1946 | # | ||
1947 | # OTG and related infrastructure | ||
1948 | # | ||
1949 | # CONFIG_UWB is not set | ||
1770 | # CONFIG_MMC is not set | 1950 | # CONFIG_MMC is not set |
1771 | # CONFIG_MEMSTICK is not set | 1951 | # CONFIG_MEMSTICK is not set |
1772 | CONFIG_NEW_LEDS=y | 1952 | CONFIG_NEW_LEDS=y |
@@ -1775,6 +1955,7 @@ CONFIG_LEDS_CLASS=y | |||
1775 | # | 1955 | # |
1776 | # LED drivers | 1956 | # LED drivers |
1777 | # | 1957 | # |
1958 | # CONFIG_LEDS_ALIX2 is not set | ||
1778 | # CONFIG_LEDS_PCA9532 is not set | 1959 | # CONFIG_LEDS_PCA9532 is not set |
1779 | # CONFIG_LEDS_CLEVO_MAIL is not set | 1960 | # CONFIG_LEDS_CLEVO_MAIL is not set |
1780 | # CONFIG_LEDS_PCA955X is not set | 1961 | # CONFIG_LEDS_PCA955X is not set |
@@ -1785,6 +1966,7 @@ CONFIG_LEDS_CLASS=y | |||
1785 | CONFIG_LEDS_TRIGGERS=y | 1966 | CONFIG_LEDS_TRIGGERS=y |
1786 | # CONFIG_LEDS_TRIGGER_TIMER is not set | 1967 | # CONFIG_LEDS_TRIGGER_TIMER is not set |
1787 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set | 1968 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set |
1969 | # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set | ||
1788 | # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set | 1970 | # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set |
1789 | # CONFIG_ACCESSIBILITY is not set | 1971 | # CONFIG_ACCESSIBILITY is not set |
1790 | # CONFIG_INFINIBAND is not set | 1972 | # CONFIG_INFINIBAND is not set |
@@ -1824,6 +2006,7 @@ CONFIG_RTC_INTF_DEV=y | |||
1824 | # CONFIG_RTC_DRV_M41T80 is not set | 2006 | # CONFIG_RTC_DRV_M41T80 is not set |
1825 | # CONFIG_RTC_DRV_S35390A is not set | 2007 | # CONFIG_RTC_DRV_S35390A is not set |
1826 | # CONFIG_RTC_DRV_FM3130 is not set | 2008 | # CONFIG_RTC_DRV_FM3130 is not set |
2009 | # CONFIG_RTC_DRV_RX8581 is not set | ||
1827 | 2010 | ||
1828 | # | 2011 | # |
1829 | # SPI RTC drivers | 2012 | # SPI RTC drivers |
@@ -1833,12 +2016,15 @@ CONFIG_RTC_INTF_DEV=y | |||
1833 | # Platform RTC drivers | 2016 | # Platform RTC drivers |
1834 | # | 2017 | # |
1835 | CONFIG_RTC_DRV_CMOS=y | 2018 | CONFIG_RTC_DRV_CMOS=y |
2019 | # CONFIG_RTC_DRV_DS1286 is not set | ||
1836 | # CONFIG_RTC_DRV_DS1511 is not set | 2020 | # CONFIG_RTC_DRV_DS1511 is not set |
1837 | # CONFIG_RTC_DRV_DS1553 is not set | 2021 | # CONFIG_RTC_DRV_DS1553 is not set |
1838 | # CONFIG_RTC_DRV_DS1742 is not set | 2022 | # CONFIG_RTC_DRV_DS1742 is not set |
1839 | # CONFIG_RTC_DRV_STK17TA8 is not set | 2023 | # CONFIG_RTC_DRV_STK17TA8 is not set |
1840 | # CONFIG_RTC_DRV_M48T86 is not set | 2024 | # CONFIG_RTC_DRV_M48T86 is not set |
2025 | # CONFIG_RTC_DRV_M48T35 is not set | ||
1841 | # CONFIG_RTC_DRV_M48T59 is not set | 2026 | # CONFIG_RTC_DRV_M48T59 is not set |
2027 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
1842 | # CONFIG_RTC_DRV_V3020 is not set | 2028 | # CONFIG_RTC_DRV_V3020 is not set |
1843 | 2029 | ||
1844 | # | 2030 | # |
@@ -1851,6 +2037,22 @@ CONFIG_DMADEVICES=y | |||
1851 | # | 2037 | # |
1852 | # CONFIG_INTEL_IOATDMA is not set | 2038 | # CONFIG_INTEL_IOATDMA is not set |
1853 | # CONFIG_UIO is not set | 2039 | # CONFIG_UIO is not set |
2040 | # CONFIG_STAGING is not set | ||
2041 | CONFIG_X86_PLATFORM_DEVICES=y | ||
2042 | # CONFIG_ACER_WMI is not set | ||
2043 | # CONFIG_ASUS_LAPTOP is not set | ||
2044 | # CONFIG_FUJITSU_LAPTOP is not set | ||
2045 | # CONFIG_TC1100_WMI is not set | ||
2046 | # CONFIG_MSI_LAPTOP is not set | ||
2047 | # CONFIG_PANASONIC_LAPTOP is not set | ||
2048 | # CONFIG_COMPAL_LAPTOP is not set | ||
2049 | # CONFIG_SONY_LAPTOP is not set | ||
2050 | # CONFIG_THINKPAD_ACPI is not set | ||
2051 | # CONFIG_INTEL_MENLOW is not set | ||
2052 | CONFIG_EEEPC_LAPTOP=y | ||
2053 | # CONFIG_ACPI_WMI is not set | ||
2054 | # CONFIG_ACPI_ASUS is not set | ||
2055 | # CONFIG_ACPI_TOSHIBA is not set | ||
1854 | 2056 | ||
1855 | # | 2057 | # |
1856 | # Firmware Drivers | 2058 | # Firmware Drivers |
@@ -1861,8 +2063,7 @@ CONFIG_EFI_VARS=y | |||
1861 | # CONFIG_DELL_RBU is not set | 2063 | # CONFIG_DELL_RBU is not set |
1862 | # CONFIG_DCDBAS is not set | 2064 | # CONFIG_DCDBAS is not set |
1863 | CONFIG_DMIID=y | 2065 | CONFIG_DMIID=y |
1864 | CONFIG_ISCSI_IBFT_FIND=y | 2066 | # CONFIG_ISCSI_IBFT_FIND is not set |
1865 | CONFIG_ISCSI_IBFT=y | ||
1866 | 2067 | ||
1867 | # | 2068 | # |
1868 | # File systems | 2069 | # File systems |
@@ -1872,21 +2073,24 @@ CONFIG_EXT3_FS=y | |||
1872 | CONFIG_EXT3_FS_XATTR=y | 2073 | CONFIG_EXT3_FS_XATTR=y |
1873 | CONFIG_EXT3_FS_POSIX_ACL=y | 2074 | CONFIG_EXT3_FS_POSIX_ACL=y |
1874 | CONFIG_EXT3_FS_SECURITY=y | 2075 | CONFIG_EXT3_FS_SECURITY=y |
1875 | # CONFIG_EXT4DEV_FS is not set | 2076 | # CONFIG_EXT4_FS is not set |
1876 | CONFIG_JBD=y | 2077 | CONFIG_JBD=y |
1877 | # CONFIG_JBD_DEBUG is not set | 2078 | # CONFIG_JBD_DEBUG is not set |
1878 | CONFIG_FS_MBCACHE=y | 2079 | CONFIG_FS_MBCACHE=y |
1879 | # CONFIG_REISERFS_FS is not set | 2080 | # CONFIG_REISERFS_FS is not set |
1880 | # CONFIG_JFS_FS is not set | 2081 | # CONFIG_JFS_FS is not set |
1881 | CONFIG_FS_POSIX_ACL=y | 2082 | CONFIG_FS_POSIX_ACL=y |
2083 | CONFIG_FILE_LOCKING=y | ||
1882 | # CONFIG_XFS_FS is not set | 2084 | # CONFIG_XFS_FS is not set |
1883 | # CONFIG_OCFS2_FS is not set | 2085 | # CONFIG_OCFS2_FS is not set |
2086 | # CONFIG_BTRFS_FS is not set | ||
1884 | CONFIG_DNOTIFY=y | 2087 | CONFIG_DNOTIFY=y |
1885 | CONFIG_INOTIFY=y | 2088 | CONFIG_INOTIFY=y |
1886 | CONFIG_INOTIFY_USER=y | 2089 | CONFIG_INOTIFY_USER=y |
1887 | CONFIG_QUOTA=y | 2090 | CONFIG_QUOTA=y |
1888 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 2091 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
1889 | # CONFIG_PRINT_QUOTA_WARNING is not set | 2092 | # CONFIG_PRINT_QUOTA_WARNING is not set |
2093 | CONFIG_QUOTA_TREE=y | ||
1890 | # CONFIG_QFMT_V1 is not set | 2094 | # CONFIG_QFMT_V1 is not set |
1891 | CONFIG_QFMT_V2=y | 2095 | CONFIG_QFMT_V2=y |
1892 | CONFIG_QUOTACTL=y | 2096 | CONFIG_QUOTACTL=y |
@@ -1920,16 +2124,14 @@ CONFIG_PROC_FS=y | |||
1920 | CONFIG_PROC_KCORE=y | 2124 | CONFIG_PROC_KCORE=y |
1921 | CONFIG_PROC_VMCORE=y | 2125 | CONFIG_PROC_VMCORE=y |
1922 | CONFIG_PROC_SYSCTL=y | 2126 | CONFIG_PROC_SYSCTL=y |
2127 | CONFIG_PROC_PAGE_MONITOR=y | ||
1923 | CONFIG_SYSFS=y | 2128 | CONFIG_SYSFS=y |
1924 | CONFIG_TMPFS=y | 2129 | CONFIG_TMPFS=y |
1925 | CONFIG_TMPFS_POSIX_ACL=y | 2130 | CONFIG_TMPFS_POSIX_ACL=y |
1926 | CONFIG_HUGETLBFS=y | 2131 | CONFIG_HUGETLBFS=y |
1927 | CONFIG_HUGETLB_PAGE=y | 2132 | CONFIG_HUGETLB_PAGE=y |
1928 | # CONFIG_CONFIGFS_FS is not set | 2133 | # CONFIG_CONFIGFS_FS is not set |
1929 | 2134 | CONFIG_MISC_FILESYSTEMS=y | |
1930 | # | ||
1931 | # Miscellaneous filesystems | ||
1932 | # | ||
1933 | # CONFIG_ADFS_FS is not set | 2135 | # CONFIG_ADFS_FS is not set |
1934 | # CONFIG_AFFS_FS is not set | 2136 | # CONFIG_AFFS_FS is not set |
1935 | # CONFIG_ECRYPT_FS is not set | 2137 | # CONFIG_ECRYPT_FS is not set |
@@ -1939,6 +2141,7 @@ CONFIG_HUGETLB_PAGE=y | |||
1939 | # CONFIG_BFS_FS is not set | 2141 | # CONFIG_BFS_FS is not set |
1940 | # CONFIG_EFS_FS is not set | 2142 | # CONFIG_EFS_FS is not set |
1941 | # CONFIG_CRAMFS is not set | 2143 | # CONFIG_CRAMFS is not set |
2144 | # CONFIG_SQUASHFS is not set | ||
1942 | # CONFIG_VXFS_FS is not set | 2145 | # CONFIG_VXFS_FS is not set |
1943 | # CONFIG_MINIX_FS is not set | 2146 | # CONFIG_MINIX_FS is not set |
1944 | # CONFIG_OMFS_FS is not set | 2147 | # CONFIG_OMFS_FS is not set |
@@ -1960,6 +2163,7 @@ CONFIG_NFS_ACL_SUPPORT=y | |||
1960 | CONFIG_NFS_COMMON=y | 2163 | CONFIG_NFS_COMMON=y |
1961 | CONFIG_SUNRPC=y | 2164 | CONFIG_SUNRPC=y |
1962 | CONFIG_SUNRPC_GSS=y | 2165 | CONFIG_SUNRPC_GSS=y |
2166 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
1963 | CONFIG_RPCSEC_GSS_KRB5=y | 2167 | CONFIG_RPCSEC_GSS_KRB5=y |
1964 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 2168 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1965 | # CONFIG_SMB_FS is not set | 2169 | # CONFIG_SMB_FS is not set |
@@ -2036,7 +2240,7 @@ CONFIG_NLS_UTF8=y | |||
2036 | # | 2240 | # |
2037 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 2241 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
2038 | CONFIG_PRINTK_TIME=y | 2242 | CONFIG_PRINTK_TIME=y |
2039 | CONFIG_ENABLE_WARN_DEPRECATED=y | 2243 | # CONFIG_ENABLE_WARN_DEPRECATED is not set |
2040 | CONFIG_ENABLE_MUST_CHECK=y | 2244 | CONFIG_ENABLE_MUST_CHECK=y |
2041 | CONFIG_FRAME_WARN=2048 | 2245 | CONFIG_FRAME_WARN=2048 |
2042 | CONFIG_MAGIC_SYSRQ=y | 2246 | CONFIG_MAGIC_SYSRQ=y |
@@ -2066,33 +2270,54 @@ CONFIG_TIMER_STATS=y | |||
2066 | CONFIG_DEBUG_BUGVERBOSE=y | 2270 | CONFIG_DEBUG_BUGVERBOSE=y |
2067 | # CONFIG_DEBUG_INFO is not set | 2271 | # CONFIG_DEBUG_INFO is not set |
2068 | # CONFIG_DEBUG_VM is not set | 2272 | # CONFIG_DEBUG_VM is not set |
2273 | # CONFIG_DEBUG_VIRTUAL is not set | ||
2069 | # CONFIG_DEBUG_WRITECOUNT is not set | 2274 | # CONFIG_DEBUG_WRITECOUNT is not set |
2070 | CONFIG_DEBUG_MEMORY_INIT=y | 2275 | CONFIG_DEBUG_MEMORY_INIT=y |
2071 | # CONFIG_DEBUG_LIST is not set | 2276 | # CONFIG_DEBUG_LIST is not set |
2072 | # CONFIG_DEBUG_SG is not set | 2277 | # CONFIG_DEBUG_SG is not set |
2278 | # CONFIG_DEBUG_NOTIFIERS is not set | ||
2279 | CONFIG_ARCH_WANT_FRAME_POINTERS=y | ||
2073 | CONFIG_FRAME_POINTER=y | 2280 | CONFIG_FRAME_POINTER=y |
2074 | # CONFIG_BOOT_PRINTK_DELAY is not set | 2281 | # CONFIG_BOOT_PRINTK_DELAY is not set |
2075 | # CONFIG_RCU_TORTURE_TEST is not set | 2282 | # CONFIG_RCU_TORTURE_TEST is not set |
2283 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
2076 | # CONFIG_KPROBES_SANITY_TEST is not set | 2284 | # CONFIG_KPROBES_SANITY_TEST is not set |
2077 | # CONFIG_BACKTRACE_SELF_TEST is not set | 2285 | # CONFIG_BACKTRACE_SELF_TEST is not set |
2286 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
2078 | # CONFIG_LKDTM is not set | 2287 | # CONFIG_LKDTM is not set |
2079 | # CONFIG_FAULT_INJECTION is not set | 2288 | # CONFIG_FAULT_INJECTION is not set |
2080 | # CONFIG_LATENCYTOP is not set | 2289 | # CONFIG_LATENCYTOP is not set |
2081 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 2290 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
2082 | CONFIG_HAVE_FTRACE=y | 2291 | CONFIG_USER_STACKTRACE_SUPPORT=y |
2292 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
2293 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
2294 | CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y | ||
2083 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 2295 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
2084 | # CONFIG_FTRACE is not set | 2296 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
2297 | CONFIG_HAVE_HW_BRANCH_TRACER=y | ||
2298 | |||
2299 | # | ||
2300 | # Tracers | ||
2301 | # | ||
2302 | # CONFIG_FUNCTION_TRACER is not set | ||
2085 | # CONFIG_IRQSOFF_TRACER is not set | 2303 | # CONFIG_IRQSOFF_TRACER is not set |
2086 | # CONFIG_SYSPROF_TRACER is not set | 2304 | # CONFIG_SYSPROF_TRACER is not set |
2087 | # CONFIG_SCHED_TRACER is not set | 2305 | # CONFIG_SCHED_TRACER is not set |
2088 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 2306 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
2307 | # CONFIG_BOOT_TRACER is not set | ||
2308 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
2309 | # CONFIG_POWER_TRACER is not set | ||
2310 | # CONFIG_STACK_TRACER is not set | ||
2311 | # CONFIG_HW_BRANCH_TRACER is not set | ||
2089 | CONFIG_PROVIDE_OHCI1394_DMA_INIT=y | 2312 | CONFIG_PROVIDE_OHCI1394_DMA_INIT=y |
2313 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
2090 | # CONFIG_SAMPLES is not set | 2314 | # CONFIG_SAMPLES is not set |
2091 | CONFIG_HAVE_ARCH_KGDB=y | 2315 | CONFIG_HAVE_ARCH_KGDB=y |
2092 | # CONFIG_KGDB is not set | 2316 | # CONFIG_KGDB is not set |
2093 | # CONFIG_STRICT_DEVMEM is not set | 2317 | # CONFIG_STRICT_DEVMEM is not set |
2094 | CONFIG_X86_VERBOSE_BOOTUP=y | 2318 | CONFIG_X86_VERBOSE_BOOTUP=y |
2095 | CONFIG_EARLY_PRINTK=y | 2319 | CONFIG_EARLY_PRINTK=y |
2320 | CONFIG_EARLY_PRINTK_DBGP=y | ||
2096 | CONFIG_DEBUG_STACKOVERFLOW=y | 2321 | CONFIG_DEBUG_STACKOVERFLOW=y |
2097 | CONFIG_DEBUG_STACK_USAGE=y | 2322 | CONFIG_DEBUG_STACK_USAGE=y |
2098 | # CONFIG_DEBUG_PAGEALLOC is not set | 2323 | # CONFIG_DEBUG_PAGEALLOC is not set |
@@ -2123,8 +2348,10 @@ CONFIG_OPTIMIZE_INLINING=y | |||
2123 | CONFIG_KEYS=y | 2348 | CONFIG_KEYS=y |
2124 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | 2349 | CONFIG_KEYS_DEBUG_PROC_KEYS=y |
2125 | CONFIG_SECURITY=y | 2350 | CONFIG_SECURITY=y |
2351 | # CONFIG_SECURITYFS is not set | ||
2126 | CONFIG_SECURITY_NETWORK=y | 2352 | CONFIG_SECURITY_NETWORK=y |
2127 | # CONFIG_SECURITY_NETWORK_XFRM is not set | 2353 | # CONFIG_SECURITY_NETWORK_XFRM is not set |
2354 | # CONFIG_SECURITY_PATH is not set | ||
2128 | CONFIG_SECURITY_FILE_CAPABILITIES=y | 2355 | CONFIG_SECURITY_FILE_CAPABILITIES=y |
2129 | # CONFIG_SECURITY_ROOTPLUG is not set | 2356 | # CONFIG_SECURITY_ROOTPLUG is not set |
2130 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536 | 2357 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536 |
@@ -2135,7 +2362,6 @@ CONFIG_SECURITY_SELINUX_DISABLE=y | |||
2135 | CONFIG_SECURITY_SELINUX_DEVELOP=y | 2362 | CONFIG_SECURITY_SELINUX_DEVELOP=y |
2136 | CONFIG_SECURITY_SELINUX_AVC_STATS=y | 2363 | CONFIG_SECURITY_SELINUX_AVC_STATS=y |
2137 | CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 | 2364 | CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 |
2138 | # CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set | ||
2139 | # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set | 2365 | # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set |
2140 | # CONFIG_SECURITY_SMACK is not set | 2366 | # CONFIG_SECURITY_SMACK is not set |
2141 | CONFIG_CRYPTO=y | 2367 | CONFIG_CRYPTO=y |
@@ -2143,11 +2369,18 @@ CONFIG_CRYPTO=y | |||
2143 | # | 2369 | # |
2144 | # Crypto core or helper | 2370 | # Crypto core or helper |
2145 | # | 2371 | # |
2372 | # CONFIG_CRYPTO_FIPS is not set | ||
2146 | CONFIG_CRYPTO_ALGAPI=y | 2373 | CONFIG_CRYPTO_ALGAPI=y |
2374 | CONFIG_CRYPTO_ALGAPI2=y | ||
2147 | CONFIG_CRYPTO_AEAD=y | 2375 | CONFIG_CRYPTO_AEAD=y |
2376 | CONFIG_CRYPTO_AEAD2=y | ||
2148 | CONFIG_CRYPTO_BLKCIPHER=y | 2377 | CONFIG_CRYPTO_BLKCIPHER=y |
2378 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
2149 | CONFIG_CRYPTO_HASH=y | 2379 | CONFIG_CRYPTO_HASH=y |
2380 | CONFIG_CRYPTO_HASH2=y | ||
2381 | CONFIG_CRYPTO_RNG2=y | ||
2150 | CONFIG_CRYPTO_MANAGER=y | 2382 | CONFIG_CRYPTO_MANAGER=y |
2383 | CONFIG_CRYPTO_MANAGER2=y | ||
2151 | # CONFIG_CRYPTO_GF128MUL is not set | 2384 | # CONFIG_CRYPTO_GF128MUL is not set |
2152 | # CONFIG_CRYPTO_NULL is not set | 2385 | # CONFIG_CRYPTO_NULL is not set |
2153 | # CONFIG_CRYPTO_CRYPTD is not set | 2386 | # CONFIG_CRYPTO_CRYPTD is not set |
@@ -2182,6 +2415,7 @@ CONFIG_CRYPTO_HMAC=y | |||
2182 | # Digest | 2415 | # Digest |
2183 | # | 2416 | # |
2184 | # CONFIG_CRYPTO_CRC32C is not set | 2417 | # CONFIG_CRYPTO_CRC32C is not set |
2418 | # CONFIG_CRYPTO_CRC32C_INTEL is not set | ||
2185 | # CONFIG_CRYPTO_MD4 is not set | 2419 | # CONFIG_CRYPTO_MD4 is not set |
2186 | CONFIG_CRYPTO_MD5=y | 2420 | CONFIG_CRYPTO_MD5=y |
2187 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 2421 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
@@ -2222,6 +2456,11 @@ CONFIG_CRYPTO_DES=y | |||
2222 | # | 2456 | # |
2223 | # CONFIG_CRYPTO_DEFLATE is not set | 2457 | # CONFIG_CRYPTO_DEFLATE is not set |
2224 | # CONFIG_CRYPTO_LZO is not set | 2458 | # CONFIG_CRYPTO_LZO is not set |
2459 | |||
2460 | # | ||
2461 | # Random Number Generation | ||
2462 | # | ||
2463 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
2225 | CONFIG_CRYPTO_HW=y | 2464 | CONFIG_CRYPTO_HW=y |
2226 | # CONFIG_CRYPTO_DEV_PADLOCK is not set | 2465 | # CONFIG_CRYPTO_DEV_PADLOCK is not set |
2227 | # CONFIG_CRYPTO_DEV_GEODE is not set | 2466 | # CONFIG_CRYPTO_DEV_GEODE is not set |
@@ -2239,6 +2478,7 @@ CONFIG_VIRTUALIZATION=y | |||
2239 | CONFIG_BITREVERSE=y | 2478 | CONFIG_BITREVERSE=y |
2240 | CONFIG_GENERIC_FIND_FIRST_BIT=y | 2479 | CONFIG_GENERIC_FIND_FIRST_BIT=y |
2241 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 2480 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
2481 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
2242 | # CONFIG_CRC_CCITT is not set | 2482 | # CONFIG_CRC_CCITT is not set |
2243 | # CONFIG_CRC16 is not set | 2483 | # CONFIG_CRC16 is not set |
2244 | CONFIG_CRC_T10DIF=y | 2484 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig index 322dd2748fc9..2efb5d5063ff 100644 --- a/arch/x86/configs/x86_64_defconfig +++ b/arch/x86/configs/x86_64_defconfig | |||
@@ -1,14 +1,13 @@ | |||
1 | # | 1 | # |
2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
3 | # Linux kernel version: 2.6.27-rc5 | 3 | # Linux kernel version: 2.6.29-rc4 |
4 | # Wed Sep 3 17:13:39 2008 | 4 | # Thu Feb 12 12:57:29 2009 |
5 | # | 5 | # |
6 | CONFIG_64BIT=y | 6 | CONFIG_64BIT=y |
7 | # CONFIG_X86_32 is not set | 7 | # CONFIG_X86_32 is not set |
8 | CONFIG_X86_64=y | 8 | CONFIG_X86_64=y |
9 | CONFIG_X86=y | 9 | CONFIG_X86=y |
10 | CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" | 10 | CONFIG_ARCH_DEFCONFIG="arch/x86/configs/x86_64_defconfig" |
11 | # CONFIG_GENERIC_LOCKBREAK is not set | ||
12 | CONFIG_GENERIC_TIME=y | 11 | CONFIG_GENERIC_TIME=y |
13 | CONFIG_GENERIC_CMOS_UPDATE=y | 12 | CONFIG_GENERIC_CMOS_UPDATE=y |
14 | CONFIG_CLOCKSOURCE_WATCHDOG=y | 13 | CONFIG_CLOCKSOURCE_WATCHDOG=y |
@@ -23,17 +22,16 @@ CONFIG_ZONE_DMA=y | |||
23 | CONFIG_GENERIC_ISA_DMA=y | 22 | CONFIG_GENERIC_ISA_DMA=y |
24 | CONFIG_GENERIC_IOMAP=y | 23 | CONFIG_GENERIC_IOMAP=y |
25 | CONFIG_GENERIC_BUG=y | 24 | CONFIG_GENERIC_BUG=y |
25 | CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y | ||
26 | CONFIG_GENERIC_HWEIGHT=y | 26 | CONFIG_GENERIC_HWEIGHT=y |
27 | # CONFIG_GENERIC_GPIO is not set | ||
28 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y | 27 | CONFIG_ARCH_MAY_HAVE_PC_FDC=y |
29 | CONFIG_RWSEM_GENERIC_SPINLOCK=y | 28 | CONFIG_RWSEM_GENERIC_SPINLOCK=y |
30 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set | 29 | # CONFIG_RWSEM_XCHGADD_ALGORITHM is not set |
31 | # CONFIG_ARCH_HAS_ILOG2_U32 is not set | ||
32 | # CONFIG_ARCH_HAS_ILOG2_U64 is not set | ||
33 | CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y | 30 | CONFIG_ARCH_HAS_CPU_IDLE_WAIT=y |
34 | CONFIG_GENERIC_CALIBRATE_DELAY=y | 31 | CONFIG_GENERIC_CALIBRATE_DELAY=y |
35 | CONFIG_GENERIC_TIME_VSYSCALL=y | 32 | CONFIG_GENERIC_TIME_VSYSCALL=y |
36 | CONFIG_ARCH_HAS_CPU_RELAX=y | 33 | CONFIG_ARCH_HAS_CPU_RELAX=y |
34 | CONFIG_ARCH_HAS_DEFAULT_IDLE=y | ||
37 | CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y | 35 | CONFIG_ARCH_HAS_CACHE_LINE_SIZE=y |
38 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y | 36 | CONFIG_HAVE_SETUP_PER_CPU_AREA=y |
39 | CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y | 37 | CONFIG_HAVE_CPUMASK_OF_CPU_MAP=y |
@@ -42,12 +40,12 @@ CONFIG_ARCH_SUSPEND_POSSIBLE=y | |||
42 | CONFIG_ZONE_DMA32=y | 40 | CONFIG_ZONE_DMA32=y |
43 | CONFIG_ARCH_POPULATES_NODE_MAP=y | 41 | CONFIG_ARCH_POPULATES_NODE_MAP=y |
44 | CONFIG_AUDIT_ARCH=y | 42 | CONFIG_AUDIT_ARCH=y |
45 | CONFIG_ARCH_SUPPORTS_AOUT=y | ||
46 | CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y | 43 | CONFIG_ARCH_SUPPORTS_OPTIMIZED_INLINING=y |
47 | CONFIG_GENERIC_HARDIRQS=y | 44 | CONFIG_GENERIC_HARDIRQS=y |
48 | CONFIG_GENERIC_IRQ_PROBE=y | 45 | CONFIG_GENERIC_IRQ_PROBE=y |
49 | CONFIG_GENERIC_PENDING_IRQ=y | 46 | CONFIG_GENERIC_PENDING_IRQ=y |
50 | CONFIG_X86_SMP=y | 47 | CONFIG_X86_SMP=y |
48 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
51 | CONFIG_X86_64_SMP=y | 49 | CONFIG_X86_64_SMP=y |
52 | CONFIG_X86_HT=y | 50 | CONFIG_X86_HT=y |
53 | CONFIG_X86_BIOS_REBOOT=y | 51 | CONFIG_X86_BIOS_REBOOT=y |
@@ -76,30 +74,44 @@ CONFIG_TASK_IO_ACCOUNTING=y | |||
76 | CONFIG_AUDIT=y | 74 | CONFIG_AUDIT=y |
77 | CONFIG_AUDITSYSCALL=y | 75 | CONFIG_AUDITSYSCALL=y |
78 | CONFIG_AUDIT_TREE=y | 76 | CONFIG_AUDIT_TREE=y |
77 | |||
78 | # | ||
79 | # RCU Subsystem | ||
80 | # | ||
81 | # CONFIG_CLASSIC_RCU is not set | ||
82 | CONFIG_TREE_RCU=y | ||
83 | # CONFIG_PREEMPT_RCU is not set | ||
84 | # CONFIG_RCU_TRACE is not set | ||
85 | CONFIG_RCU_FANOUT=64 | ||
86 | # CONFIG_RCU_FANOUT_EXACT is not set | ||
87 | # CONFIG_TREE_RCU_TRACE is not set | ||
88 | # CONFIG_PREEMPT_RCU_TRACE is not set | ||
79 | # CONFIG_IKCONFIG is not set | 89 | # CONFIG_IKCONFIG is not set |
80 | CONFIG_LOG_BUF_SHIFT=18 | 90 | CONFIG_LOG_BUF_SHIFT=18 |
81 | CONFIG_CGROUPS=y | ||
82 | # CONFIG_CGROUP_DEBUG is not set | ||
83 | CONFIG_CGROUP_NS=y | ||
84 | # CONFIG_CGROUP_DEVICE is not set | ||
85 | CONFIG_CPUSETS=y | ||
86 | CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y | 91 | CONFIG_HAVE_UNSTABLE_SCHED_CLOCK=y |
87 | CONFIG_GROUP_SCHED=y | 92 | CONFIG_GROUP_SCHED=y |
88 | CONFIG_FAIR_GROUP_SCHED=y | 93 | CONFIG_FAIR_GROUP_SCHED=y |
89 | # CONFIG_RT_GROUP_SCHED is not set | 94 | # CONFIG_RT_GROUP_SCHED is not set |
90 | # CONFIG_USER_SCHED is not set | 95 | # CONFIG_USER_SCHED is not set |
91 | CONFIG_CGROUP_SCHED=y | 96 | CONFIG_CGROUP_SCHED=y |
97 | CONFIG_CGROUPS=y | ||
98 | # CONFIG_CGROUP_DEBUG is not set | ||
99 | CONFIG_CGROUP_NS=y | ||
100 | CONFIG_CGROUP_FREEZER=y | ||
101 | # CONFIG_CGROUP_DEVICE is not set | ||
102 | CONFIG_CPUSETS=y | ||
103 | CONFIG_PROC_PID_CPUSET=y | ||
92 | CONFIG_CGROUP_CPUACCT=y | 104 | CONFIG_CGROUP_CPUACCT=y |
93 | CONFIG_RESOURCE_COUNTERS=y | 105 | CONFIG_RESOURCE_COUNTERS=y |
94 | # CONFIG_CGROUP_MEM_RES_CTLR is not set | 106 | # CONFIG_CGROUP_MEM_RES_CTLR is not set |
95 | # CONFIG_SYSFS_DEPRECATED_V2 is not set | 107 | # CONFIG_SYSFS_DEPRECATED_V2 is not set |
96 | CONFIG_PROC_PID_CPUSET=y | ||
97 | CONFIG_RELAY=y | 108 | CONFIG_RELAY=y |
98 | CONFIG_NAMESPACES=y | 109 | CONFIG_NAMESPACES=y |
99 | CONFIG_UTS_NS=y | 110 | CONFIG_UTS_NS=y |
100 | CONFIG_IPC_NS=y | 111 | CONFIG_IPC_NS=y |
101 | CONFIG_USER_NS=y | 112 | CONFIG_USER_NS=y |
102 | CONFIG_PID_NS=y | 113 | CONFIG_PID_NS=y |
114 | CONFIG_NET_NS=y | ||
103 | CONFIG_BLK_DEV_INITRD=y | 115 | CONFIG_BLK_DEV_INITRD=y |
104 | CONFIG_INITRAMFS_SOURCE="" | 116 | CONFIG_INITRAMFS_SOURCE="" |
105 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y | 117 | CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
@@ -124,12 +136,15 @@ CONFIG_SIGNALFD=y | |||
124 | CONFIG_TIMERFD=y | 136 | CONFIG_TIMERFD=y |
125 | CONFIG_EVENTFD=y | 137 | CONFIG_EVENTFD=y |
126 | CONFIG_SHMEM=y | 138 | CONFIG_SHMEM=y |
139 | CONFIG_AIO=y | ||
127 | CONFIG_VM_EVENT_COUNTERS=y | 140 | CONFIG_VM_EVENT_COUNTERS=y |
141 | CONFIG_PCI_QUIRKS=y | ||
128 | CONFIG_SLUB_DEBUG=y | 142 | CONFIG_SLUB_DEBUG=y |
129 | # CONFIG_SLAB is not set | 143 | # CONFIG_SLAB is not set |
130 | CONFIG_SLUB=y | 144 | CONFIG_SLUB=y |
131 | # CONFIG_SLOB is not set | 145 | # CONFIG_SLOB is not set |
132 | CONFIG_PROFILING=y | 146 | CONFIG_PROFILING=y |
147 | CONFIG_TRACEPOINTS=y | ||
133 | CONFIG_MARKERS=y | 148 | CONFIG_MARKERS=y |
134 | # CONFIG_OPROFILE is not set | 149 | # CONFIG_OPROFILE is not set |
135 | CONFIG_HAVE_OPROFILE=y | 150 | CONFIG_HAVE_OPROFILE=y |
@@ -139,15 +154,10 @@ CONFIG_KRETPROBES=y | |||
139 | CONFIG_HAVE_IOREMAP_PROT=y | 154 | CONFIG_HAVE_IOREMAP_PROT=y |
140 | CONFIG_HAVE_KPROBES=y | 155 | CONFIG_HAVE_KPROBES=y |
141 | CONFIG_HAVE_KRETPROBES=y | 156 | CONFIG_HAVE_KRETPROBES=y |
142 | # CONFIG_HAVE_ARCH_TRACEHOOK is not set | 157 | CONFIG_HAVE_ARCH_TRACEHOOK=y |
143 | # CONFIG_HAVE_DMA_ATTRS is not set | ||
144 | CONFIG_USE_GENERIC_SMP_HELPERS=y | ||
145 | # CONFIG_HAVE_CLK is not set | ||
146 | CONFIG_PROC_PAGE_MONITOR=y | ||
147 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set | 158 | # CONFIG_HAVE_GENERIC_DMA_COHERENT is not set |
148 | CONFIG_SLABINFO=y | 159 | CONFIG_SLABINFO=y |
149 | CONFIG_RT_MUTEXES=y | 160 | CONFIG_RT_MUTEXES=y |
150 | # CONFIG_TINY_SHMEM is not set | ||
151 | CONFIG_BASE_SMALL=0 | 161 | CONFIG_BASE_SMALL=0 |
152 | CONFIG_MODULES=y | 162 | CONFIG_MODULES=y |
153 | # CONFIG_MODULE_FORCE_LOAD is not set | 163 | # CONFIG_MODULE_FORCE_LOAD is not set |
@@ -155,7 +165,6 @@ CONFIG_MODULE_UNLOAD=y | |||
155 | CONFIG_MODULE_FORCE_UNLOAD=y | 165 | CONFIG_MODULE_FORCE_UNLOAD=y |
156 | # CONFIG_MODVERSIONS is not set | 166 | # CONFIG_MODVERSIONS is not set |
157 | # CONFIG_MODULE_SRCVERSION_ALL is not set | 167 | # CONFIG_MODULE_SRCVERSION_ALL is not set |
158 | CONFIG_KMOD=y | ||
159 | CONFIG_STOP_MACHINE=y | 168 | CONFIG_STOP_MACHINE=y |
160 | CONFIG_BLOCK=y | 169 | CONFIG_BLOCK=y |
161 | CONFIG_BLK_DEV_IO_TRACE=y | 170 | CONFIG_BLK_DEV_IO_TRACE=y |
@@ -175,7 +184,7 @@ CONFIG_IOSCHED_CFQ=y | |||
175 | CONFIG_DEFAULT_CFQ=y | 184 | CONFIG_DEFAULT_CFQ=y |
176 | # CONFIG_DEFAULT_NOOP is not set | 185 | # CONFIG_DEFAULT_NOOP is not set |
177 | CONFIG_DEFAULT_IOSCHED="cfq" | 186 | CONFIG_DEFAULT_IOSCHED="cfq" |
178 | CONFIG_CLASSIC_RCU=y | 187 | CONFIG_FREEZER=y |
179 | 188 | ||
180 | # | 189 | # |
181 | # Processor type and features | 190 | # Processor type and features |
@@ -185,13 +194,15 @@ CONFIG_NO_HZ=y | |||
185 | CONFIG_HIGH_RES_TIMERS=y | 194 | CONFIG_HIGH_RES_TIMERS=y |
186 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y | 195 | CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
187 | CONFIG_SMP=y | 196 | CONFIG_SMP=y |
197 | CONFIG_SPARSE_IRQ=y | ||
198 | # CONFIG_NUMA_MIGRATE_IRQ_DESC is not set | ||
188 | CONFIG_X86_FIND_SMP_CONFIG=y | 199 | CONFIG_X86_FIND_SMP_CONFIG=y |
189 | CONFIG_X86_MPPARSE=y | 200 | CONFIG_X86_MPPARSE=y |
190 | CONFIG_X86_PC=y | ||
191 | # CONFIG_X86_ELAN is not set | 201 | # CONFIG_X86_ELAN is not set |
192 | # CONFIG_X86_VOYAGER is not set | 202 | # CONFIG_X86_VOYAGER is not set |
193 | # CONFIG_X86_GENERICARCH is not set | 203 | # CONFIG_X86_GENERICARCH is not set |
194 | # CONFIG_X86_VSMP is not set | 204 | # CONFIG_X86_VSMP is not set |
205 | CONFIG_SCHED_OMIT_FRAME_POINTER=y | ||
195 | # CONFIG_PARAVIRT_GUEST is not set | 206 | # CONFIG_PARAVIRT_GUEST is not set |
196 | # CONFIG_MEMTEST is not set | 207 | # CONFIG_MEMTEST is not set |
197 | # CONFIG_M386 is not set | 208 | # CONFIG_M386 is not set |
@@ -230,6 +241,11 @@ CONFIG_X86_CMPXCHG64=y | |||
230 | CONFIG_X86_CMOV=y | 241 | CONFIG_X86_CMOV=y |
231 | CONFIG_X86_MINIMUM_CPU_FAMILY=64 | 242 | CONFIG_X86_MINIMUM_CPU_FAMILY=64 |
232 | CONFIG_X86_DEBUGCTLMSR=y | 243 | CONFIG_X86_DEBUGCTLMSR=y |
244 | CONFIG_CPU_SUP_INTEL=y | ||
245 | CONFIG_CPU_SUP_AMD=y | ||
246 | CONFIG_CPU_SUP_CENTAUR_64=y | ||
247 | CONFIG_X86_DS=y | ||
248 | CONFIG_X86_PTRACE_BTS=y | ||
233 | CONFIG_HPET_TIMER=y | 249 | CONFIG_HPET_TIMER=y |
234 | CONFIG_HPET_EMULATE_RTC=y | 250 | CONFIG_HPET_EMULATE_RTC=y |
235 | CONFIG_DMI=y | 251 | CONFIG_DMI=y |
@@ -237,8 +253,11 @@ CONFIG_GART_IOMMU=y | |||
237 | CONFIG_CALGARY_IOMMU=y | 253 | CONFIG_CALGARY_IOMMU=y |
238 | CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y | 254 | CONFIG_CALGARY_IOMMU_ENABLED_BY_DEFAULT=y |
239 | CONFIG_AMD_IOMMU=y | 255 | CONFIG_AMD_IOMMU=y |
256 | CONFIG_AMD_IOMMU_STATS=y | ||
240 | CONFIG_SWIOTLB=y | 257 | CONFIG_SWIOTLB=y |
241 | CONFIG_IOMMU_HELPER=y | 258 | CONFIG_IOMMU_HELPER=y |
259 | CONFIG_IOMMU_API=y | ||
260 | # CONFIG_MAXSMP is not set | ||
242 | CONFIG_NR_CPUS=64 | 261 | CONFIG_NR_CPUS=64 |
243 | CONFIG_SCHED_SMT=y | 262 | CONFIG_SCHED_SMT=y |
244 | CONFIG_SCHED_MC=y | 263 | CONFIG_SCHED_MC=y |
@@ -247,12 +266,17 @@ CONFIG_PREEMPT_VOLUNTARY=y | |||
247 | # CONFIG_PREEMPT is not set | 266 | # CONFIG_PREEMPT is not set |
248 | CONFIG_X86_LOCAL_APIC=y | 267 | CONFIG_X86_LOCAL_APIC=y |
249 | CONFIG_X86_IO_APIC=y | 268 | CONFIG_X86_IO_APIC=y |
269 | CONFIG_X86_REROUTE_FOR_BROKEN_BOOT_IRQS=y | ||
250 | # CONFIG_X86_MCE is not set | 270 | # CONFIG_X86_MCE is not set |
251 | # CONFIG_I8K is not set | 271 | # CONFIG_I8K is not set |
252 | CONFIG_MICROCODE=y | 272 | CONFIG_MICROCODE=y |
273 | CONFIG_MICROCODE_INTEL=y | ||
274 | CONFIG_MICROCODE_AMD=y | ||
253 | CONFIG_MICROCODE_OLD_INTERFACE=y | 275 | CONFIG_MICROCODE_OLD_INTERFACE=y |
254 | CONFIG_X86_MSR=y | 276 | CONFIG_X86_MSR=y |
255 | CONFIG_X86_CPUID=y | 277 | CONFIG_X86_CPUID=y |
278 | CONFIG_ARCH_PHYS_ADDR_T_64BIT=y | ||
279 | CONFIG_DIRECT_GBPAGES=y | ||
256 | CONFIG_NUMA=y | 280 | CONFIG_NUMA=y |
257 | CONFIG_K8_NUMA=y | 281 | CONFIG_K8_NUMA=y |
258 | CONFIG_X86_64_ACPI_NUMA=y | 282 | CONFIG_X86_64_ACPI_NUMA=y |
@@ -269,7 +293,6 @@ CONFIG_SPARSEMEM_MANUAL=y | |||
269 | CONFIG_SPARSEMEM=y | 293 | CONFIG_SPARSEMEM=y |
270 | CONFIG_NEED_MULTIPLE_NODES=y | 294 | CONFIG_NEED_MULTIPLE_NODES=y |
271 | CONFIG_HAVE_MEMORY_PRESENT=y | 295 | CONFIG_HAVE_MEMORY_PRESENT=y |
272 | # CONFIG_SPARSEMEM_STATIC is not set | ||
273 | CONFIG_SPARSEMEM_EXTREME=y | 296 | CONFIG_SPARSEMEM_EXTREME=y |
274 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y | 297 | CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y |
275 | CONFIG_SPARSEMEM_VMEMMAP=y | 298 | CONFIG_SPARSEMEM_VMEMMAP=y |
@@ -280,10 +303,14 @@ CONFIG_SPARSEMEM_VMEMMAP=y | |||
280 | CONFIG_PAGEFLAGS_EXTENDED=y | 303 | CONFIG_PAGEFLAGS_EXTENDED=y |
281 | CONFIG_SPLIT_PTLOCK_CPUS=4 | 304 | CONFIG_SPLIT_PTLOCK_CPUS=4 |
282 | CONFIG_MIGRATION=y | 305 | CONFIG_MIGRATION=y |
283 | CONFIG_RESOURCES_64BIT=y | 306 | CONFIG_PHYS_ADDR_T_64BIT=y |
284 | CONFIG_ZONE_DMA_FLAG=1 | 307 | CONFIG_ZONE_DMA_FLAG=1 |
285 | CONFIG_BOUNCE=y | 308 | CONFIG_BOUNCE=y |
286 | CONFIG_VIRT_TO_BUS=y | 309 | CONFIG_VIRT_TO_BUS=y |
310 | CONFIG_UNEVICTABLE_LRU=y | ||
311 | CONFIG_X86_CHECK_BIOS_CORRUPTION=y | ||
312 | CONFIG_X86_BOOTPARAM_MEMORY_CORRUPTION_CHECK=y | ||
313 | CONFIG_X86_RESERVE_LOW_64K=y | ||
287 | CONFIG_MTRR=y | 314 | CONFIG_MTRR=y |
288 | # CONFIG_MTRR_SANITIZER is not set | 315 | # CONFIG_MTRR_SANITIZER is not set |
289 | CONFIG_X86_PAT=y | 316 | CONFIG_X86_PAT=y |
@@ -302,11 +329,12 @@ CONFIG_PHYSICAL_START=0x1000000 | |||
302 | CONFIG_PHYSICAL_ALIGN=0x200000 | 329 | CONFIG_PHYSICAL_ALIGN=0x200000 |
303 | CONFIG_HOTPLUG_CPU=y | 330 | CONFIG_HOTPLUG_CPU=y |
304 | # CONFIG_COMPAT_VDSO is not set | 331 | # CONFIG_COMPAT_VDSO is not set |
332 | # CONFIG_CMDLINE_BOOL is not set | ||
305 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y | 333 | CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y |
306 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y | 334 | CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y |
307 | 335 | ||
308 | # | 336 | # |
309 | # Power management options | 337 | # Power management and ACPI options |
310 | # | 338 | # |
311 | CONFIG_ARCH_HIBERNATION_HEADER=y | 339 | CONFIG_ARCH_HIBERNATION_HEADER=y |
312 | CONFIG_PM=y | 340 | CONFIG_PM=y |
@@ -333,20 +361,14 @@ CONFIG_ACPI_BATTERY=y | |||
333 | CONFIG_ACPI_BUTTON=y | 361 | CONFIG_ACPI_BUTTON=y |
334 | CONFIG_ACPI_FAN=y | 362 | CONFIG_ACPI_FAN=y |
335 | CONFIG_ACPI_DOCK=y | 363 | CONFIG_ACPI_DOCK=y |
336 | # CONFIG_ACPI_BAY is not set | ||
337 | CONFIG_ACPI_PROCESSOR=y | 364 | CONFIG_ACPI_PROCESSOR=y |
338 | CONFIG_ACPI_HOTPLUG_CPU=y | 365 | CONFIG_ACPI_HOTPLUG_CPU=y |
339 | CONFIG_ACPI_THERMAL=y | 366 | CONFIG_ACPI_THERMAL=y |
340 | CONFIG_ACPI_NUMA=y | 367 | CONFIG_ACPI_NUMA=y |
341 | # CONFIG_ACPI_WMI is not set | ||
342 | # CONFIG_ACPI_ASUS is not set | ||
343 | # CONFIG_ACPI_TOSHIBA is not set | ||
344 | # CONFIG_ACPI_CUSTOM_DSDT is not set | 368 | # CONFIG_ACPI_CUSTOM_DSDT is not set |
345 | CONFIG_ACPI_BLACKLIST_YEAR=0 | 369 | CONFIG_ACPI_BLACKLIST_YEAR=0 |
346 | # CONFIG_ACPI_DEBUG is not set | 370 | # CONFIG_ACPI_DEBUG is not set |
347 | CONFIG_ACPI_EC=y | ||
348 | # CONFIG_ACPI_PCI_SLOT is not set | 371 | # CONFIG_ACPI_PCI_SLOT is not set |
349 | CONFIG_ACPI_POWER=y | ||
350 | CONFIG_ACPI_SYSTEM=y | 372 | CONFIG_ACPI_SYSTEM=y |
351 | CONFIG_X86_PM_TIMER=y | 373 | CONFIG_X86_PM_TIMER=y |
352 | CONFIG_ACPI_CONTAINER=y | 374 | CONFIG_ACPI_CONTAINER=y |
@@ -381,13 +403,17 @@ CONFIG_X86_ACPI_CPUFREQ=y | |||
381 | # | 403 | # |
382 | # shared options | 404 | # shared options |
383 | # | 405 | # |
384 | # CONFIG_X86_ACPI_CPUFREQ_PROC_INTF is not set | ||
385 | # CONFIG_X86_SPEEDSTEP_LIB is not set | 406 | # CONFIG_X86_SPEEDSTEP_LIB is not set |
386 | CONFIG_CPU_IDLE=y | 407 | CONFIG_CPU_IDLE=y |
387 | CONFIG_CPU_IDLE_GOV_LADDER=y | 408 | CONFIG_CPU_IDLE_GOV_LADDER=y |
388 | CONFIG_CPU_IDLE_GOV_MENU=y | 409 | CONFIG_CPU_IDLE_GOV_MENU=y |
389 | 410 | ||
390 | # | 411 | # |
412 | # Memory power savings | ||
413 | # | ||
414 | # CONFIG_I7300_IDLE is not set | ||
415 | |||
416 | # | ||
391 | # Bus options (PCI etc.) | 417 | # Bus options (PCI etc.) |
392 | # | 418 | # |
393 | CONFIG_PCI=y | 419 | CONFIG_PCI=y |
@@ -395,8 +421,10 @@ CONFIG_PCI_DIRECT=y | |||
395 | CONFIG_PCI_MMCONFIG=y | 421 | CONFIG_PCI_MMCONFIG=y |
396 | CONFIG_PCI_DOMAINS=y | 422 | CONFIG_PCI_DOMAINS=y |
397 | CONFIG_DMAR=y | 423 | CONFIG_DMAR=y |
424 | # CONFIG_DMAR_DEFAULT_ON is not set | ||
398 | CONFIG_DMAR_GFX_WA=y | 425 | CONFIG_DMAR_GFX_WA=y |
399 | CONFIG_DMAR_FLOPPY_WA=y | 426 | CONFIG_DMAR_FLOPPY_WA=y |
427 | # CONFIG_INTR_REMAP is not set | ||
400 | CONFIG_PCIEPORTBUS=y | 428 | CONFIG_PCIEPORTBUS=y |
401 | # CONFIG_HOTPLUG_PCI_PCIE is not set | 429 | # CONFIG_HOTPLUG_PCI_PCIE is not set |
402 | CONFIG_PCIEAER=y | 430 | CONFIG_PCIEAER=y |
@@ -405,6 +433,7 @@ CONFIG_ARCH_SUPPORTS_MSI=y | |||
405 | CONFIG_PCI_MSI=y | 433 | CONFIG_PCI_MSI=y |
406 | # CONFIG_PCI_LEGACY is not set | 434 | # CONFIG_PCI_LEGACY is not set |
407 | # CONFIG_PCI_DEBUG is not set | 435 | # CONFIG_PCI_DEBUG is not set |
436 | # CONFIG_PCI_STUB is not set | ||
408 | CONFIG_HT_IRQ=y | 437 | CONFIG_HT_IRQ=y |
409 | CONFIG_ISA_DMA_API=y | 438 | CONFIG_ISA_DMA_API=y |
410 | CONFIG_K8_NB=y | 439 | CONFIG_K8_NB=y |
@@ -438,6 +467,8 @@ CONFIG_HOTPLUG_PCI=y | |||
438 | # | 467 | # |
439 | CONFIG_BINFMT_ELF=y | 468 | CONFIG_BINFMT_ELF=y |
440 | CONFIG_COMPAT_BINFMT_ELF=y | 469 | CONFIG_COMPAT_BINFMT_ELF=y |
470 | CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS=y | ||
471 | # CONFIG_HAVE_AOUT is not set | ||
441 | CONFIG_BINFMT_MISC=y | 472 | CONFIG_BINFMT_MISC=y |
442 | CONFIG_IA32_EMULATION=y | 473 | CONFIG_IA32_EMULATION=y |
443 | # CONFIG_IA32_AOUT is not set | 474 | # CONFIG_IA32_AOUT is not set |
@@ -449,6 +480,7 @@ CONFIG_NET=y | |||
449 | # | 480 | # |
450 | # Networking options | 481 | # Networking options |
451 | # | 482 | # |
483 | CONFIG_COMPAT_NET_DEV_OPS=y | ||
452 | CONFIG_PACKET=y | 484 | CONFIG_PACKET=y |
453 | CONFIG_PACKET_MMAP=y | 485 | CONFIG_PACKET_MMAP=y |
454 | CONFIG_UNIX=y | 486 | CONFIG_UNIX=y |
@@ -509,7 +541,6 @@ CONFIG_DEFAULT_CUBIC=y | |||
509 | # CONFIG_DEFAULT_RENO is not set | 541 | # CONFIG_DEFAULT_RENO is not set |
510 | CONFIG_DEFAULT_TCP_CONG="cubic" | 542 | CONFIG_DEFAULT_TCP_CONG="cubic" |
511 | CONFIG_TCP_MD5SIG=y | 543 | CONFIG_TCP_MD5SIG=y |
512 | # CONFIG_IP_VS is not set | ||
513 | CONFIG_IPV6=y | 544 | CONFIG_IPV6=y |
514 | # CONFIG_IPV6_PRIVACY is not set | 545 | # CONFIG_IPV6_PRIVACY is not set |
515 | # CONFIG_IPV6_ROUTER_PREF is not set | 546 | # CONFIG_IPV6_ROUTER_PREF is not set |
@@ -547,19 +578,21 @@ CONFIG_NF_CONNTRACK_IRC=y | |||
547 | CONFIG_NF_CONNTRACK_SIP=y | 578 | CONFIG_NF_CONNTRACK_SIP=y |
548 | CONFIG_NF_CT_NETLINK=y | 579 | CONFIG_NF_CT_NETLINK=y |
549 | CONFIG_NETFILTER_XTABLES=y | 580 | CONFIG_NETFILTER_XTABLES=y |
581 | CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y | ||
550 | CONFIG_NETFILTER_XT_TARGET_MARK=y | 582 | CONFIG_NETFILTER_XT_TARGET_MARK=y |
551 | CONFIG_NETFILTER_XT_TARGET_NFLOG=y | 583 | CONFIG_NETFILTER_XT_TARGET_NFLOG=y |
552 | CONFIG_NETFILTER_XT_TARGET_SECMARK=y | 584 | CONFIG_NETFILTER_XT_TARGET_SECMARK=y |
553 | CONFIG_NETFILTER_XT_TARGET_CONNSECMARK=y | ||
554 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=y | 585 | CONFIG_NETFILTER_XT_TARGET_TCPMSS=y |
555 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y | 586 | CONFIG_NETFILTER_XT_MATCH_CONNTRACK=y |
556 | CONFIG_NETFILTER_XT_MATCH_MARK=y | 587 | CONFIG_NETFILTER_XT_MATCH_MARK=y |
557 | CONFIG_NETFILTER_XT_MATCH_POLICY=y | 588 | CONFIG_NETFILTER_XT_MATCH_POLICY=y |
558 | CONFIG_NETFILTER_XT_MATCH_STATE=y | 589 | CONFIG_NETFILTER_XT_MATCH_STATE=y |
590 | # CONFIG_IP_VS is not set | ||
559 | 591 | ||
560 | # | 592 | # |
561 | # IP: Netfilter Configuration | 593 | # IP: Netfilter Configuration |
562 | # | 594 | # |
595 | CONFIG_NF_DEFRAG_IPV4=y | ||
563 | CONFIG_NF_CONNTRACK_IPV4=y | 596 | CONFIG_NF_CONNTRACK_IPV4=y |
564 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y | 597 | CONFIG_NF_CONNTRACK_PROC_COMPAT=y |
565 | CONFIG_IP_NF_IPTABLES=y | 598 | CONFIG_IP_NF_IPTABLES=y |
@@ -585,8 +618,8 @@ CONFIG_IP_NF_MANGLE=y | |||
585 | CONFIG_NF_CONNTRACK_IPV6=y | 618 | CONFIG_NF_CONNTRACK_IPV6=y |
586 | CONFIG_IP6_NF_IPTABLES=y | 619 | CONFIG_IP6_NF_IPTABLES=y |
587 | CONFIG_IP6_NF_MATCH_IPV6HEADER=y | 620 | CONFIG_IP6_NF_MATCH_IPV6HEADER=y |
588 | CONFIG_IP6_NF_FILTER=y | ||
589 | CONFIG_IP6_NF_TARGET_LOG=y | 621 | CONFIG_IP6_NF_TARGET_LOG=y |
622 | CONFIG_IP6_NF_FILTER=y | ||
590 | CONFIG_IP6_NF_TARGET_REJECT=y | 623 | CONFIG_IP6_NF_TARGET_REJECT=y |
591 | CONFIG_IP6_NF_MANGLE=y | 624 | CONFIG_IP6_NF_MANGLE=y |
592 | # CONFIG_IP_DCCP is not set | 625 | # CONFIG_IP_DCCP is not set |
@@ -594,6 +627,7 @@ CONFIG_IP6_NF_MANGLE=y | |||
594 | # CONFIG_TIPC is not set | 627 | # CONFIG_TIPC is not set |
595 | # CONFIG_ATM is not set | 628 | # CONFIG_ATM is not set |
596 | # CONFIG_BRIDGE is not set | 629 | # CONFIG_BRIDGE is not set |
630 | # CONFIG_NET_DSA is not set | ||
597 | # CONFIG_VLAN_8021Q is not set | 631 | # CONFIG_VLAN_8021Q is not set |
598 | # CONFIG_DECNET is not set | 632 | # CONFIG_DECNET is not set |
599 | CONFIG_LLC=y | 633 | CONFIG_LLC=y |
@@ -613,6 +647,7 @@ CONFIG_NET_SCHED=y | |||
613 | # CONFIG_NET_SCH_HTB is not set | 647 | # CONFIG_NET_SCH_HTB is not set |
614 | # CONFIG_NET_SCH_HFSC is not set | 648 | # CONFIG_NET_SCH_HFSC is not set |
615 | # CONFIG_NET_SCH_PRIO is not set | 649 | # CONFIG_NET_SCH_PRIO is not set |
650 | # CONFIG_NET_SCH_MULTIQ is not set | ||
616 | # CONFIG_NET_SCH_RED is not set | 651 | # CONFIG_NET_SCH_RED is not set |
617 | # CONFIG_NET_SCH_SFQ is not set | 652 | # CONFIG_NET_SCH_SFQ is not set |
618 | # CONFIG_NET_SCH_TEQL is not set | 653 | # CONFIG_NET_SCH_TEQL is not set |
@@ -620,6 +655,7 @@ CONFIG_NET_SCHED=y | |||
620 | # CONFIG_NET_SCH_GRED is not set | 655 | # CONFIG_NET_SCH_GRED is not set |
621 | # CONFIG_NET_SCH_DSMARK is not set | 656 | # CONFIG_NET_SCH_DSMARK is not set |
622 | # CONFIG_NET_SCH_NETEM is not set | 657 | # CONFIG_NET_SCH_NETEM is not set |
658 | # CONFIG_NET_SCH_DRR is not set | ||
623 | # CONFIG_NET_SCH_INGRESS is not set | 659 | # CONFIG_NET_SCH_INGRESS is not set |
624 | 660 | ||
625 | # | 661 | # |
@@ -634,6 +670,7 @@ CONFIG_NET_CLS=y | |||
634 | # CONFIG_NET_CLS_RSVP is not set | 670 | # CONFIG_NET_CLS_RSVP is not set |
635 | # CONFIG_NET_CLS_RSVP6 is not set | 671 | # CONFIG_NET_CLS_RSVP6 is not set |
636 | # CONFIG_NET_CLS_FLOW is not set | 672 | # CONFIG_NET_CLS_FLOW is not set |
673 | # CONFIG_NET_CLS_CGROUP is not set | ||
637 | CONFIG_NET_EMATCH=y | 674 | CONFIG_NET_EMATCH=y |
638 | CONFIG_NET_EMATCH_STACK=32 | 675 | CONFIG_NET_EMATCH_STACK=32 |
639 | # CONFIG_NET_EMATCH_CMP is not set | 676 | # CONFIG_NET_EMATCH_CMP is not set |
@@ -649,7 +686,9 @@ CONFIG_NET_CLS_ACT=y | |||
649 | # CONFIG_NET_ACT_NAT is not set | 686 | # CONFIG_NET_ACT_NAT is not set |
650 | # CONFIG_NET_ACT_PEDIT is not set | 687 | # CONFIG_NET_ACT_PEDIT is not set |
651 | # CONFIG_NET_ACT_SIMP is not set | 688 | # CONFIG_NET_ACT_SIMP is not set |
689 | # CONFIG_NET_ACT_SKBEDIT is not set | ||
652 | CONFIG_NET_SCH_FIFO=y | 690 | CONFIG_NET_SCH_FIFO=y |
691 | # CONFIG_DCB is not set | ||
653 | 692 | ||
654 | # | 693 | # |
655 | # Network testing | 694 | # Network testing |
@@ -666,29 +705,33 @@ CONFIG_HAMRADIO=y | |||
666 | # CONFIG_IRDA is not set | 705 | # CONFIG_IRDA is not set |
667 | # CONFIG_BT is not set | 706 | # CONFIG_BT is not set |
668 | # CONFIG_AF_RXRPC is not set | 707 | # CONFIG_AF_RXRPC is not set |
708 | # CONFIG_PHONET is not set | ||
669 | CONFIG_FIB_RULES=y | 709 | CONFIG_FIB_RULES=y |
670 | 710 | CONFIG_WIRELESS=y | |
671 | # | ||
672 | # Wireless | ||
673 | # | ||
674 | CONFIG_CFG80211=y | 711 | CONFIG_CFG80211=y |
712 | # CONFIG_CFG80211_REG_DEBUG is not set | ||
675 | CONFIG_NL80211=y | 713 | CONFIG_NL80211=y |
714 | CONFIG_WIRELESS_OLD_REGULATORY=y | ||
676 | CONFIG_WIRELESS_EXT=y | 715 | CONFIG_WIRELESS_EXT=y |
677 | CONFIG_WIRELESS_EXT_SYSFS=y | 716 | CONFIG_WIRELESS_EXT_SYSFS=y |
717 | # CONFIG_LIB80211 is not set | ||
678 | CONFIG_MAC80211=y | 718 | CONFIG_MAC80211=y |
679 | 719 | ||
680 | # | 720 | # |
681 | # Rate control algorithm selection | 721 | # Rate control algorithm selection |
682 | # | 722 | # |
683 | CONFIG_MAC80211_RC_PID=y | 723 | CONFIG_MAC80211_RC_MINSTREL=y |
684 | CONFIG_MAC80211_RC_DEFAULT_PID=y | 724 | # CONFIG_MAC80211_RC_DEFAULT_PID is not set |
685 | CONFIG_MAC80211_RC_DEFAULT="pid" | 725 | CONFIG_MAC80211_RC_DEFAULT_MINSTREL=y |
726 | CONFIG_MAC80211_RC_DEFAULT="minstrel" | ||
686 | # CONFIG_MAC80211_MESH is not set | 727 | # CONFIG_MAC80211_MESH is not set |
687 | CONFIG_MAC80211_LEDS=y | 728 | CONFIG_MAC80211_LEDS=y |
688 | # CONFIG_MAC80211_DEBUGFS is not set | 729 | # CONFIG_MAC80211_DEBUGFS is not set |
689 | # CONFIG_MAC80211_DEBUG_MENU is not set | 730 | # CONFIG_MAC80211_DEBUG_MENU is not set |
690 | # CONFIG_IEEE80211 is not set | 731 | # CONFIG_WIMAX is not set |
691 | # CONFIG_RFKILL is not set | 732 | CONFIG_RFKILL=y |
733 | # CONFIG_RFKILL_INPUT is not set | ||
734 | CONFIG_RFKILL_LEDS=y | ||
692 | # CONFIG_NET_9P is not set | 735 | # CONFIG_NET_9P is not set |
693 | 736 | ||
694 | # | 737 | # |
@@ -712,7 +755,7 @@ CONFIG_PROC_EVENTS=y | |||
712 | # CONFIG_MTD is not set | 755 | # CONFIG_MTD is not set |
713 | # CONFIG_PARPORT is not set | 756 | # CONFIG_PARPORT is not set |
714 | CONFIG_PNP=y | 757 | CONFIG_PNP=y |
715 | # CONFIG_PNP_DEBUG is not set | 758 | CONFIG_PNP_DEBUG_MESSAGES=y |
716 | 759 | ||
717 | # | 760 | # |
718 | # Protocols | 761 | # Protocols |
@@ -740,21 +783,21 @@ CONFIG_BLK_DEV_RAM_SIZE=16384 | |||
740 | CONFIG_MISC_DEVICES=y | 783 | CONFIG_MISC_DEVICES=y |
741 | # CONFIG_IBM_ASM is not set | 784 | # CONFIG_IBM_ASM is not set |
742 | # CONFIG_PHANTOM is not set | 785 | # CONFIG_PHANTOM is not set |
743 | # CONFIG_EEPROM_93CX6 is not set | ||
744 | # CONFIG_SGI_IOC4 is not set | 786 | # CONFIG_SGI_IOC4 is not set |
745 | # CONFIG_TIFM_CORE is not set | 787 | # CONFIG_TIFM_CORE is not set |
746 | # CONFIG_ACER_WMI is not set | 788 | # CONFIG_ICS932S401 is not set |
747 | # CONFIG_ASUS_LAPTOP is not set | ||
748 | # CONFIG_FUJITSU_LAPTOP is not set | ||
749 | # CONFIG_MSI_LAPTOP is not set | ||
750 | # CONFIG_COMPAL_LAPTOP is not set | ||
751 | # CONFIG_SONY_LAPTOP is not set | ||
752 | # CONFIG_THINKPAD_ACPI is not set | ||
753 | # CONFIG_INTEL_MENLOW is not set | ||
754 | # CONFIG_ENCLOSURE_SERVICES is not set | 789 | # CONFIG_ENCLOSURE_SERVICES is not set |
755 | # CONFIG_SGI_XP is not set | 790 | # CONFIG_SGI_XP is not set |
756 | # CONFIG_HP_ILO is not set | 791 | # CONFIG_HP_ILO is not set |
757 | # CONFIG_SGI_GRU is not set | 792 | # CONFIG_SGI_GRU is not set |
793 | # CONFIG_C2PORT is not set | ||
794 | |||
795 | # | ||
796 | # EEPROM support | ||
797 | # | ||
798 | # CONFIG_EEPROM_AT24 is not set | ||
799 | # CONFIG_EEPROM_LEGACY is not set | ||
800 | # CONFIG_EEPROM_93CX6 is not set | ||
758 | CONFIG_HAVE_IDE=y | 801 | CONFIG_HAVE_IDE=y |
759 | # CONFIG_IDE is not set | 802 | # CONFIG_IDE is not set |
760 | 803 | ||
@@ -793,7 +836,7 @@ CONFIG_SCSI_WAIT_SCAN=m | |||
793 | # | 836 | # |
794 | CONFIG_SCSI_SPI_ATTRS=y | 837 | CONFIG_SCSI_SPI_ATTRS=y |
795 | # CONFIG_SCSI_FC_ATTRS is not set | 838 | # CONFIG_SCSI_FC_ATTRS is not set |
796 | CONFIG_SCSI_ISCSI_ATTRS=y | 839 | # CONFIG_SCSI_ISCSI_ATTRS is not set |
797 | # CONFIG_SCSI_SAS_ATTRS is not set | 840 | # CONFIG_SCSI_SAS_ATTRS is not set |
798 | # CONFIG_SCSI_SAS_LIBSAS is not set | 841 | # CONFIG_SCSI_SAS_LIBSAS is not set |
799 | # CONFIG_SCSI_SRP_ATTRS is not set | 842 | # CONFIG_SCSI_SRP_ATTRS is not set |
@@ -864,6 +907,7 @@ CONFIG_PATA_OLDPIIX=y | |||
864 | CONFIG_PATA_SCH=y | 907 | CONFIG_PATA_SCH=y |
865 | CONFIG_MD=y | 908 | CONFIG_MD=y |
866 | CONFIG_BLK_DEV_MD=y | 909 | CONFIG_BLK_DEV_MD=y |
910 | CONFIG_MD_AUTODETECT=y | ||
867 | # CONFIG_MD_LINEAR is not set | 911 | # CONFIG_MD_LINEAR is not set |
868 | # CONFIG_MD_RAID0 is not set | 912 | # CONFIG_MD_RAID0 is not set |
869 | # CONFIG_MD_RAID1 is not set | 913 | # CONFIG_MD_RAID1 is not set |
@@ -919,6 +963,9 @@ CONFIG_PHYLIB=y | |||
919 | # CONFIG_BROADCOM_PHY is not set | 963 | # CONFIG_BROADCOM_PHY is not set |
920 | # CONFIG_ICPLUS_PHY is not set | 964 | # CONFIG_ICPLUS_PHY is not set |
921 | # CONFIG_REALTEK_PHY is not set | 965 | # CONFIG_REALTEK_PHY is not set |
966 | # CONFIG_NATIONAL_PHY is not set | ||
967 | # CONFIG_STE10XP is not set | ||
968 | # CONFIG_LSI_ET1011C_PHY is not set | ||
922 | # CONFIG_FIXED_PHY is not set | 969 | # CONFIG_FIXED_PHY is not set |
923 | # CONFIG_MDIO_BITBANG is not set | 970 | # CONFIG_MDIO_BITBANG is not set |
924 | CONFIG_NET_ETHERNET=y | 971 | CONFIG_NET_ETHERNET=y |
@@ -942,6 +989,9 @@ CONFIG_NET_TULIP=y | |||
942 | # CONFIG_IBM_NEW_EMAC_RGMII is not set | 989 | # CONFIG_IBM_NEW_EMAC_RGMII is not set |
943 | # CONFIG_IBM_NEW_EMAC_TAH is not set | 990 | # CONFIG_IBM_NEW_EMAC_TAH is not set |
944 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set | 991 | # CONFIG_IBM_NEW_EMAC_EMAC4 is not set |
992 | # CONFIG_IBM_NEW_EMAC_NO_FLOW_CTRL is not set | ||
993 | # CONFIG_IBM_NEW_EMAC_MAL_CLR_ICINTSTAT is not set | ||
994 | # CONFIG_IBM_NEW_EMAC_MAL_COMMON_ERR is not set | ||
945 | CONFIG_NET_PCI=y | 995 | CONFIG_NET_PCI=y |
946 | # CONFIG_PCNET32 is not set | 996 | # CONFIG_PCNET32 is not set |
947 | # CONFIG_AMD8111_ETH is not set | 997 | # CONFIG_AMD8111_ETH is not set |
@@ -949,7 +999,6 @@ CONFIG_NET_PCI=y | |||
949 | # CONFIG_B44 is not set | 999 | # CONFIG_B44 is not set |
950 | CONFIG_FORCEDETH=y | 1000 | CONFIG_FORCEDETH=y |
951 | # CONFIG_FORCEDETH_NAPI is not set | 1001 | # CONFIG_FORCEDETH_NAPI is not set |
952 | # CONFIG_EEPRO100 is not set | ||
953 | CONFIG_E100=y | 1002 | CONFIG_E100=y |
954 | # CONFIG_FEALNX is not set | 1003 | # CONFIG_FEALNX is not set |
955 | # CONFIG_NATSEMI is not set | 1004 | # CONFIG_NATSEMI is not set |
@@ -963,15 +1012,16 @@ CONFIG_8139TOO_PIO=y | |||
963 | # CONFIG_R6040 is not set | 1012 | # CONFIG_R6040 is not set |
964 | # CONFIG_SIS900 is not set | 1013 | # CONFIG_SIS900 is not set |
965 | # CONFIG_EPIC100 is not set | 1014 | # CONFIG_EPIC100 is not set |
1015 | # CONFIG_SMSC9420 is not set | ||
966 | # CONFIG_SUNDANCE is not set | 1016 | # CONFIG_SUNDANCE is not set |
967 | # CONFIG_TLAN is not set | 1017 | # CONFIG_TLAN is not set |
968 | # CONFIG_VIA_RHINE is not set | 1018 | # CONFIG_VIA_RHINE is not set |
969 | # CONFIG_SC92031 is not set | 1019 | # CONFIG_SC92031 is not set |
1020 | # CONFIG_ATL2 is not set | ||
970 | CONFIG_NETDEV_1000=y | 1021 | CONFIG_NETDEV_1000=y |
971 | # CONFIG_ACENIC is not set | 1022 | # CONFIG_ACENIC is not set |
972 | # CONFIG_DL2K is not set | 1023 | # CONFIG_DL2K is not set |
973 | CONFIG_E1000=y | 1024 | CONFIG_E1000=y |
974 | # CONFIG_E1000_DISABLE_PACKET_SPLIT is not set | ||
975 | # CONFIG_E1000E is not set | 1025 | # CONFIG_E1000E is not set |
976 | # CONFIG_IP1000 is not set | 1026 | # CONFIG_IP1000 is not set |
977 | # CONFIG_IGB is not set | 1027 | # CONFIG_IGB is not set |
@@ -989,18 +1039,23 @@ CONFIG_TIGON3=y | |||
989 | # CONFIG_QLA3XXX is not set | 1039 | # CONFIG_QLA3XXX is not set |
990 | # CONFIG_ATL1 is not set | 1040 | # CONFIG_ATL1 is not set |
991 | # CONFIG_ATL1E is not set | 1041 | # CONFIG_ATL1E is not set |
1042 | # CONFIG_JME is not set | ||
992 | CONFIG_NETDEV_10000=y | 1043 | CONFIG_NETDEV_10000=y |
993 | # CONFIG_CHELSIO_T1 is not set | 1044 | # CONFIG_CHELSIO_T1 is not set |
1045 | CONFIG_CHELSIO_T3_DEPENDS=y | ||
994 | # CONFIG_CHELSIO_T3 is not set | 1046 | # CONFIG_CHELSIO_T3 is not set |
1047 | # CONFIG_ENIC is not set | ||
995 | # CONFIG_IXGBE is not set | 1048 | # CONFIG_IXGBE is not set |
996 | # CONFIG_IXGB is not set | 1049 | # CONFIG_IXGB is not set |
997 | # CONFIG_S2IO is not set | 1050 | # CONFIG_S2IO is not set |
998 | # CONFIG_MYRI10GE is not set | 1051 | # CONFIG_MYRI10GE is not set |
999 | # CONFIG_NETXEN_NIC is not set | 1052 | # CONFIG_NETXEN_NIC is not set |
1000 | # CONFIG_NIU is not set | 1053 | # CONFIG_NIU is not set |
1054 | # CONFIG_MLX4_EN is not set | ||
1001 | # CONFIG_MLX4_CORE is not set | 1055 | # CONFIG_MLX4_CORE is not set |
1002 | # CONFIG_TEHUTI is not set | 1056 | # CONFIG_TEHUTI is not set |
1003 | # CONFIG_BNX2X is not set | 1057 | # CONFIG_BNX2X is not set |
1058 | # CONFIG_QLGE is not set | ||
1004 | # CONFIG_SFC is not set | 1059 | # CONFIG_SFC is not set |
1005 | CONFIG_TR=y | 1060 | CONFIG_TR=y |
1006 | # CONFIG_IBMOL is not set | 1061 | # CONFIG_IBMOL is not set |
@@ -1013,9 +1068,8 @@ CONFIG_TR=y | |||
1013 | # CONFIG_WLAN_PRE80211 is not set | 1068 | # CONFIG_WLAN_PRE80211 is not set |
1014 | CONFIG_WLAN_80211=y | 1069 | CONFIG_WLAN_80211=y |
1015 | # CONFIG_PCMCIA_RAYCS is not set | 1070 | # CONFIG_PCMCIA_RAYCS is not set |
1016 | # CONFIG_IPW2100 is not set | ||
1017 | # CONFIG_IPW2200 is not set | ||
1018 | # CONFIG_LIBERTAS is not set | 1071 | # CONFIG_LIBERTAS is not set |
1072 | # CONFIG_LIBERTAS_THINFIRM is not set | ||
1019 | # CONFIG_AIRO is not set | 1073 | # CONFIG_AIRO is not set |
1020 | # CONFIG_HERMES is not set | 1074 | # CONFIG_HERMES is not set |
1021 | # CONFIG_ATMEL is not set | 1075 | # CONFIG_ATMEL is not set |
@@ -1032,6 +1086,8 @@ CONFIG_WLAN_80211=y | |||
1032 | CONFIG_ATH5K=y | 1086 | CONFIG_ATH5K=y |
1033 | # CONFIG_ATH5K_DEBUG is not set | 1087 | # CONFIG_ATH5K_DEBUG is not set |
1034 | # CONFIG_ATH9K is not set | 1088 | # CONFIG_ATH9K is not set |
1089 | # CONFIG_IPW2100 is not set | ||
1090 | # CONFIG_IPW2200 is not set | ||
1035 | # CONFIG_IWLCORE is not set | 1091 | # CONFIG_IWLCORE is not set |
1036 | # CONFIG_IWLWIFI_LEDS is not set | 1092 | # CONFIG_IWLWIFI_LEDS is not set |
1037 | # CONFIG_IWLAGN is not set | 1093 | # CONFIG_IWLAGN is not set |
@@ -1043,6 +1099,10 @@ CONFIG_ATH5K=y | |||
1043 | # CONFIG_RT2X00 is not set | 1099 | # CONFIG_RT2X00 is not set |
1044 | 1100 | ||
1045 | # | 1101 | # |
1102 | # Enable WiMAX (Networking options) to see the WiMAX drivers | ||
1103 | # | ||
1104 | |||
1105 | # | ||
1046 | # USB Network Adapters | 1106 | # USB Network Adapters |
1047 | # | 1107 | # |
1048 | # CONFIG_USB_CATC is not set | 1108 | # CONFIG_USB_CATC is not set |
@@ -1050,6 +1110,7 @@ CONFIG_ATH5K=y | |||
1050 | # CONFIG_USB_PEGASUS is not set | 1110 | # CONFIG_USB_PEGASUS is not set |
1051 | # CONFIG_USB_RTL8150 is not set | 1111 | # CONFIG_USB_RTL8150 is not set |
1052 | # CONFIG_USB_USBNET is not set | 1112 | # CONFIG_USB_USBNET is not set |
1113 | # CONFIG_USB_HSO is not set | ||
1053 | CONFIG_NET_PCMCIA=y | 1114 | CONFIG_NET_PCMCIA=y |
1054 | # CONFIG_PCMCIA_3C589 is not set | 1115 | # CONFIG_PCMCIA_3C589 is not set |
1055 | # CONFIG_PCMCIA_3C574 is not set | 1116 | # CONFIG_PCMCIA_3C574 is not set |
@@ -1059,6 +1120,7 @@ CONFIG_NET_PCMCIA=y | |||
1059 | # CONFIG_PCMCIA_SMC91C92 is not set | 1120 | # CONFIG_PCMCIA_SMC91C92 is not set |
1060 | # CONFIG_PCMCIA_XIRC2PS is not set | 1121 | # CONFIG_PCMCIA_XIRC2PS is not set |
1061 | # CONFIG_PCMCIA_AXNET is not set | 1122 | # CONFIG_PCMCIA_AXNET is not set |
1123 | # CONFIG_PCMCIA_IBMTR is not set | ||
1062 | # CONFIG_WAN is not set | 1124 | # CONFIG_WAN is not set |
1063 | CONFIG_FDDI=y | 1125 | CONFIG_FDDI=y |
1064 | # CONFIG_DEFXX is not set | 1126 | # CONFIG_DEFXX is not set |
@@ -1110,6 +1172,7 @@ CONFIG_MOUSE_PS2_LOGIPS2PP=y | |||
1110 | CONFIG_MOUSE_PS2_SYNAPTICS=y | 1172 | CONFIG_MOUSE_PS2_SYNAPTICS=y |
1111 | CONFIG_MOUSE_PS2_LIFEBOOK=y | 1173 | CONFIG_MOUSE_PS2_LIFEBOOK=y |
1112 | CONFIG_MOUSE_PS2_TRACKPOINT=y | 1174 | CONFIG_MOUSE_PS2_TRACKPOINT=y |
1175 | # CONFIG_MOUSE_PS2_ELANTECH is not set | ||
1113 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set | 1176 | # CONFIG_MOUSE_PS2_TOUCHKIT is not set |
1114 | # CONFIG_MOUSE_SERIAL is not set | 1177 | # CONFIG_MOUSE_SERIAL is not set |
1115 | # CONFIG_MOUSE_APPLETOUCH is not set | 1178 | # CONFIG_MOUSE_APPLETOUCH is not set |
@@ -1147,15 +1210,16 @@ CONFIG_INPUT_TOUCHSCREEN=y | |||
1147 | # CONFIG_TOUCHSCREEN_FUJITSU is not set | 1210 | # CONFIG_TOUCHSCREEN_FUJITSU is not set |
1148 | # CONFIG_TOUCHSCREEN_GUNZE is not set | 1211 | # CONFIG_TOUCHSCREEN_GUNZE is not set |
1149 | # CONFIG_TOUCHSCREEN_ELO is not set | 1212 | # CONFIG_TOUCHSCREEN_ELO is not set |
1213 | # CONFIG_TOUCHSCREEN_WACOM_W8001 is not set | ||
1150 | # CONFIG_TOUCHSCREEN_MTOUCH is not set | 1214 | # CONFIG_TOUCHSCREEN_MTOUCH is not set |
1151 | # CONFIG_TOUCHSCREEN_INEXIO is not set | 1215 | # CONFIG_TOUCHSCREEN_INEXIO is not set |
1152 | # CONFIG_TOUCHSCREEN_MK712 is not set | 1216 | # CONFIG_TOUCHSCREEN_MK712 is not set |
1153 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set | 1217 | # CONFIG_TOUCHSCREEN_PENMOUNT is not set |
1154 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set | 1218 | # CONFIG_TOUCHSCREEN_TOUCHRIGHT is not set |
1155 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set | 1219 | # CONFIG_TOUCHSCREEN_TOUCHWIN is not set |
1156 | # CONFIG_TOUCHSCREEN_UCB1400 is not set | ||
1157 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set | 1220 | # CONFIG_TOUCHSCREEN_USB_COMPOSITE is not set |
1158 | # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set | 1221 | # CONFIG_TOUCHSCREEN_TOUCHIT213 is not set |
1222 | # CONFIG_TOUCHSCREEN_TSC2007 is not set | ||
1159 | CONFIG_INPUT_MISC=y | 1223 | CONFIG_INPUT_MISC=y |
1160 | # CONFIG_INPUT_PCSPKR is not set | 1224 | # CONFIG_INPUT_PCSPKR is not set |
1161 | # CONFIG_INPUT_APANEL is not set | 1225 | # CONFIG_INPUT_APANEL is not set |
@@ -1165,6 +1229,7 @@ CONFIG_INPUT_MISC=y | |||
1165 | # CONFIG_INPUT_KEYSPAN_REMOTE is not set | 1229 | # CONFIG_INPUT_KEYSPAN_REMOTE is not set |
1166 | # CONFIG_INPUT_POWERMATE is not set | 1230 | # CONFIG_INPUT_POWERMATE is not set |
1167 | # CONFIG_INPUT_YEALINK is not set | 1231 | # CONFIG_INPUT_YEALINK is not set |
1232 | # CONFIG_INPUT_CM109 is not set | ||
1168 | # CONFIG_INPUT_UINPUT is not set | 1233 | # CONFIG_INPUT_UINPUT is not set |
1169 | 1234 | ||
1170 | # | 1235 | # |
@@ -1231,6 +1296,7 @@ CONFIG_SERIAL_CORE=y | |||
1231 | CONFIG_SERIAL_CORE_CONSOLE=y | 1296 | CONFIG_SERIAL_CORE_CONSOLE=y |
1232 | # CONFIG_SERIAL_JSM is not set | 1297 | # CONFIG_SERIAL_JSM is not set |
1233 | CONFIG_UNIX98_PTYS=y | 1298 | CONFIG_UNIX98_PTYS=y |
1299 | # CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set | ||
1234 | # CONFIG_LEGACY_PTYS is not set | 1300 | # CONFIG_LEGACY_PTYS is not set |
1235 | # CONFIG_IPMI_HANDLER is not set | 1301 | # CONFIG_IPMI_HANDLER is not set |
1236 | CONFIG_HW_RANDOM=y | 1302 | CONFIG_HW_RANDOM=y |
@@ -1260,6 +1326,7 @@ CONFIG_I2C=y | |||
1260 | CONFIG_I2C_BOARDINFO=y | 1326 | CONFIG_I2C_BOARDINFO=y |
1261 | # CONFIG_I2C_CHARDEV is not set | 1327 | # CONFIG_I2C_CHARDEV is not set |
1262 | CONFIG_I2C_HELPER_AUTO=y | 1328 | CONFIG_I2C_HELPER_AUTO=y |
1329 | CONFIG_I2C_ALGOBIT=y | ||
1263 | 1330 | ||
1264 | # | 1331 | # |
1265 | # I2C Hardware Bus support | 1332 | # I2C Hardware Bus support |
@@ -1311,8 +1378,6 @@ CONFIG_I2C_I801=y | |||
1311 | # Miscellaneous I2C Chip support | 1378 | # Miscellaneous I2C Chip support |
1312 | # | 1379 | # |
1313 | # CONFIG_DS1682 is not set | 1380 | # CONFIG_DS1682 is not set |
1314 | # CONFIG_EEPROM_AT24 is not set | ||
1315 | # CONFIG_EEPROM_LEGACY is not set | ||
1316 | # CONFIG_SENSORS_PCF8574 is not set | 1381 | # CONFIG_SENSORS_PCF8574 is not set |
1317 | # CONFIG_PCF8575 is not set | 1382 | # CONFIG_PCF8575 is not set |
1318 | # CONFIG_SENSORS_PCA9539 is not set | 1383 | # CONFIG_SENSORS_PCA9539 is not set |
@@ -1331,8 +1396,78 @@ CONFIG_POWER_SUPPLY=y | |||
1331 | # CONFIG_POWER_SUPPLY_DEBUG is not set | 1396 | # CONFIG_POWER_SUPPLY_DEBUG is not set |
1332 | # CONFIG_PDA_POWER is not set | 1397 | # CONFIG_PDA_POWER is not set |
1333 | # CONFIG_BATTERY_DS2760 is not set | 1398 | # CONFIG_BATTERY_DS2760 is not set |
1334 | # CONFIG_HWMON is not set | 1399 | # CONFIG_BATTERY_BQ27x00 is not set |
1400 | CONFIG_HWMON=y | ||
1401 | # CONFIG_HWMON_VID is not set | ||
1402 | # CONFIG_SENSORS_ABITUGURU is not set | ||
1403 | # CONFIG_SENSORS_ABITUGURU3 is not set | ||
1404 | # CONFIG_SENSORS_AD7414 is not set | ||
1405 | # CONFIG_SENSORS_AD7418 is not set | ||
1406 | # CONFIG_SENSORS_ADM1021 is not set | ||
1407 | # CONFIG_SENSORS_ADM1025 is not set | ||
1408 | # CONFIG_SENSORS_ADM1026 is not set | ||
1409 | # CONFIG_SENSORS_ADM1029 is not set | ||
1410 | # CONFIG_SENSORS_ADM1031 is not set | ||
1411 | # CONFIG_SENSORS_ADM9240 is not set | ||
1412 | # CONFIG_SENSORS_ADT7462 is not set | ||
1413 | # CONFIG_SENSORS_ADT7470 is not set | ||
1414 | # CONFIG_SENSORS_ADT7473 is not set | ||
1415 | # CONFIG_SENSORS_ADT7475 is not set | ||
1416 | # CONFIG_SENSORS_K8TEMP is not set | ||
1417 | # CONFIG_SENSORS_ASB100 is not set | ||
1418 | # CONFIG_SENSORS_ATXP1 is not set | ||
1419 | # CONFIG_SENSORS_DS1621 is not set | ||
1420 | # CONFIG_SENSORS_I5K_AMB is not set | ||
1421 | # CONFIG_SENSORS_F71805F is not set | ||
1422 | # CONFIG_SENSORS_F71882FG is not set | ||
1423 | # CONFIG_SENSORS_F75375S is not set | ||
1424 | # CONFIG_SENSORS_FSCHER is not set | ||
1425 | # CONFIG_SENSORS_FSCPOS is not set | ||
1426 | # CONFIG_SENSORS_FSCHMD is not set | ||
1427 | # CONFIG_SENSORS_GL518SM is not set | ||
1428 | # CONFIG_SENSORS_GL520SM is not set | ||
1429 | # CONFIG_SENSORS_CORETEMP is not set | ||
1430 | # CONFIG_SENSORS_IT87 is not set | ||
1431 | # CONFIG_SENSORS_LM63 is not set | ||
1432 | # CONFIG_SENSORS_LM75 is not set | ||
1433 | # CONFIG_SENSORS_LM77 is not set | ||
1434 | # CONFIG_SENSORS_LM78 is not set | ||
1435 | # CONFIG_SENSORS_LM80 is not set | ||
1436 | # CONFIG_SENSORS_LM83 is not set | ||
1437 | # CONFIG_SENSORS_LM85 is not set | ||
1438 | # CONFIG_SENSORS_LM87 is not set | ||
1439 | # CONFIG_SENSORS_LM90 is not set | ||
1440 | # CONFIG_SENSORS_LM92 is not set | ||
1441 | # CONFIG_SENSORS_LM93 is not set | ||
1442 | # CONFIG_SENSORS_LTC4245 is not set | ||
1443 | # CONFIG_SENSORS_MAX1619 is not set | ||
1444 | # CONFIG_SENSORS_MAX6650 is not set | ||
1445 | # CONFIG_SENSORS_PC87360 is not set | ||
1446 | # CONFIG_SENSORS_PC87427 is not set | ||
1447 | # CONFIG_SENSORS_SIS5595 is not set | ||
1448 | # CONFIG_SENSORS_DME1737 is not set | ||
1449 | # CONFIG_SENSORS_SMSC47M1 is not set | ||
1450 | # CONFIG_SENSORS_SMSC47M192 is not set | ||
1451 | # CONFIG_SENSORS_SMSC47B397 is not set | ||
1452 | # CONFIG_SENSORS_ADS7828 is not set | ||
1453 | # CONFIG_SENSORS_THMC50 is not set | ||
1454 | # CONFIG_SENSORS_VIA686A is not set | ||
1455 | # CONFIG_SENSORS_VT1211 is not set | ||
1456 | # CONFIG_SENSORS_VT8231 is not set | ||
1457 | # CONFIG_SENSORS_W83781D is not set | ||
1458 | # CONFIG_SENSORS_W83791D is not set | ||
1459 | # CONFIG_SENSORS_W83792D is not set | ||
1460 | # CONFIG_SENSORS_W83793 is not set | ||
1461 | # CONFIG_SENSORS_W83L785TS is not set | ||
1462 | # CONFIG_SENSORS_W83L786NG is not set | ||
1463 | # CONFIG_SENSORS_W83627HF is not set | ||
1464 | # CONFIG_SENSORS_W83627EHF is not set | ||
1465 | # CONFIG_SENSORS_HDAPS is not set | ||
1466 | # CONFIG_SENSORS_LIS3LV02D is not set | ||
1467 | # CONFIG_SENSORS_APPLESMC is not set | ||
1468 | # CONFIG_HWMON_DEBUG_CHIP is not set | ||
1335 | CONFIG_THERMAL=y | 1469 | CONFIG_THERMAL=y |
1470 | # CONFIG_THERMAL_HWMON is not set | ||
1336 | CONFIG_WATCHDOG=y | 1471 | CONFIG_WATCHDOG=y |
1337 | # CONFIG_WATCHDOG_NOWAYOUT is not set | 1472 | # CONFIG_WATCHDOG_NOWAYOUT is not set |
1338 | 1473 | ||
@@ -1352,15 +1487,18 @@ CONFIG_WATCHDOG=y | |||
1352 | # CONFIG_I6300ESB_WDT is not set | 1487 | # CONFIG_I6300ESB_WDT is not set |
1353 | # CONFIG_ITCO_WDT is not set | 1488 | # CONFIG_ITCO_WDT is not set |
1354 | # CONFIG_IT8712F_WDT is not set | 1489 | # CONFIG_IT8712F_WDT is not set |
1490 | # CONFIG_IT87_WDT is not set | ||
1355 | # CONFIG_HP_WATCHDOG is not set | 1491 | # CONFIG_HP_WATCHDOG is not set |
1356 | # CONFIG_SC1200_WDT is not set | 1492 | # CONFIG_SC1200_WDT is not set |
1357 | # CONFIG_PC87413_WDT is not set | 1493 | # CONFIG_PC87413_WDT is not set |
1358 | # CONFIG_60XX_WDT is not set | 1494 | # CONFIG_60XX_WDT is not set |
1359 | # CONFIG_SBC8360_WDT is not set | 1495 | # CONFIG_SBC8360_WDT is not set |
1360 | # CONFIG_CPU5_WDT is not set | 1496 | # CONFIG_CPU5_WDT is not set |
1497 | # CONFIG_SMSC_SCH311X_WDT is not set | ||
1361 | # CONFIG_SMSC37B787_WDT is not set | 1498 | # CONFIG_SMSC37B787_WDT is not set |
1362 | # CONFIG_W83627HF_WDT is not set | 1499 | # CONFIG_W83627HF_WDT is not set |
1363 | # CONFIG_W83697HF_WDT is not set | 1500 | # CONFIG_W83697HF_WDT is not set |
1501 | # CONFIG_W83697UG_WDT is not set | ||
1364 | # CONFIG_W83877F_WDT is not set | 1502 | # CONFIG_W83877F_WDT is not set |
1365 | # CONFIG_W83977F_WDT is not set | 1503 | # CONFIG_W83977F_WDT is not set |
1366 | # CONFIG_MACHZ_WDT is not set | 1504 | # CONFIG_MACHZ_WDT is not set |
@@ -1376,11 +1514,11 @@ CONFIG_WATCHDOG=y | |||
1376 | # USB-based Watchdog Cards | 1514 | # USB-based Watchdog Cards |
1377 | # | 1515 | # |
1378 | # CONFIG_USBPCWATCHDOG is not set | 1516 | # CONFIG_USBPCWATCHDOG is not set |
1517 | CONFIG_SSB_POSSIBLE=y | ||
1379 | 1518 | ||
1380 | # | 1519 | # |
1381 | # Sonics Silicon Backplane | 1520 | # Sonics Silicon Backplane |
1382 | # | 1521 | # |
1383 | CONFIG_SSB_POSSIBLE=y | ||
1384 | # CONFIG_SSB is not set | 1522 | # CONFIG_SSB is not set |
1385 | 1523 | ||
1386 | # | 1524 | # |
@@ -1389,7 +1527,13 @@ CONFIG_SSB_POSSIBLE=y | |||
1389 | # CONFIG_MFD_CORE is not set | 1527 | # CONFIG_MFD_CORE is not set |
1390 | # CONFIG_MFD_SM501 is not set | 1528 | # CONFIG_MFD_SM501 is not set |
1391 | # CONFIG_HTC_PASIC3 is not set | 1529 | # CONFIG_HTC_PASIC3 is not set |
1530 | # CONFIG_TWL4030_CORE is not set | ||
1392 | # CONFIG_MFD_TMIO is not set | 1531 | # CONFIG_MFD_TMIO is not set |
1532 | # CONFIG_PMIC_DA903X is not set | ||
1533 | # CONFIG_MFD_WM8400 is not set | ||
1534 | # CONFIG_MFD_WM8350_I2C is not set | ||
1535 | # CONFIG_MFD_PCF50633 is not set | ||
1536 | # CONFIG_REGULATOR is not set | ||
1393 | 1537 | ||
1394 | # | 1538 | # |
1395 | # Multimedia devices | 1539 | # Multimedia devices |
@@ -1423,6 +1567,7 @@ CONFIG_DRM=y | |||
1423 | # CONFIG_DRM_I810 is not set | 1567 | # CONFIG_DRM_I810 is not set |
1424 | # CONFIG_DRM_I830 is not set | 1568 | # CONFIG_DRM_I830 is not set |
1425 | CONFIG_DRM_I915=y | 1569 | CONFIG_DRM_I915=y |
1570 | CONFIG_DRM_I915_KMS=y | ||
1426 | # CONFIG_DRM_MGA is not set | 1571 | # CONFIG_DRM_MGA is not set |
1427 | # CONFIG_DRM_SIS is not set | 1572 | # CONFIG_DRM_SIS is not set |
1428 | # CONFIG_DRM_VIA is not set | 1573 | # CONFIG_DRM_VIA is not set |
@@ -1432,6 +1577,7 @@ CONFIG_DRM_I915=y | |||
1432 | CONFIG_FB=y | 1577 | CONFIG_FB=y |
1433 | # CONFIG_FIRMWARE_EDID is not set | 1578 | # CONFIG_FIRMWARE_EDID is not set |
1434 | # CONFIG_FB_DDC is not set | 1579 | # CONFIG_FB_DDC is not set |
1580 | # CONFIG_FB_BOOT_VESA_SUPPORT is not set | ||
1435 | CONFIG_FB_CFB_FILLRECT=y | 1581 | CONFIG_FB_CFB_FILLRECT=y |
1436 | CONFIG_FB_CFB_COPYAREA=y | 1582 | CONFIG_FB_CFB_COPYAREA=y |
1437 | CONFIG_FB_CFB_IMAGEBLIT=y | 1583 | CONFIG_FB_CFB_IMAGEBLIT=y |
@@ -1460,7 +1606,6 @@ CONFIG_FB_TILEBLITTING=y | |||
1460 | # CONFIG_FB_UVESA is not set | 1606 | # CONFIG_FB_UVESA is not set |
1461 | # CONFIG_FB_VESA is not set | 1607 | # CONFIG_FB_VESA is not set |
1462 | CONFIG_FB_EFI=y | 1608 | CONFIG_FB_EFI=y |
1463 | # CONFIG_FB_IMAC is not set | ||
1464 | # CONFIG_FB_N411 is not set | 1609 | # CONFIG_FB_N411 is not set |
1465 | # CONFIG_FB_HGA is not set | 1610 | # CONFIG_FB_HGA is not set |
1466 | # CONFIG_FB_S1D13XXX is not set | 1611 | # CONFIG_FB_S1D13XXX is not set |
@@ -1475,6 +1620,7 @@ CONFIG_FB_EFI=y | |||
1475 | # CONFIG_FB_S3 is not set | 1620 | # CONFIG_FB_S3 is not set |
1476 | # CONFIG_FB_SAVAGE is not set | 1621 | # CONFIG_FB_SAVAGE is not set |
1477 | # CONFIG_FB_SIS is not set | 1622 | # CONFIG_FB_SIS is not set |
1623 | # CONFIG_FB_VIA is not set | ||
1478 | # CONFIG_FB_NEOMAGIC is not set | 1624 | # CONFIG_FB_NEOMAGIC is not set |
1479 | # CONFIG_FB_KYRO is not set | 1625 | # CONFIG_FB_KYRO is not set |
1480 | # CONFIG_FB_3DFX is not set | 1626 | # CONFIG_FB_3DFX is not set |
@@ -1486,12 +1632,15 @@ CONFIG_FB_EFI=y | |||
1486 | # CONFIG_FB_CARMINE is not set | 1632 | # CONFIG_FB_CARMINE is not set |
1487 | # CONFIG_FB_GEODE is not set | 1633 | # CONFIG_FB_GEODE is not set |
1488 | # CONFIG_FB_VIRTUAL is not set | 1634 | # CONFIG_FB_VIRTUAL is not set |
1635 | # CONFIG_FB_METRONOME is not set | ||
1636 | # CONFIG_FB_MB862XX is not set | ||
1489 | CONFIG_BACKLIGHT_LCD_SUPPORT=y | 1637 | CONFIG_BACKLIGHT_LCD_SUPPORT=y |
1490 | # CONFIG_LCD_CLASS_DEVICE is not set | 1638 | # CONFIG_LCD_CLASS_DEVICE is not set |
1491 | CONFIG_BACKLIGHT_CLASS_DEVICE=y | 1639 | CONFIG_BACKLIGHT_CLASS_DEVICE=y |
1492 | # CONFIG_BACKLIGHT_CORGI is not set | 1640 | CONFIG_BACKLIGHT_GENERIC=y |
1493 | # CONFIG_BACKLIGHT_PROGEAR is not set | 1641 | # CONFIG_BACKLIGHT_PROGEAR is not set |
1494 | # CONFIG_BACKLIGHT_MBP_NVIDIA is not set | 1642 | # CONFIG_BACKLIGHT_MBP_NVIDIA is not set |
1643 | # CONFIG_BACKLIGHT_SAHARA is not set | ||
1495 | 1644 | ||
1496 | # | 1645 | # |
1497 | # Display device support | 1646 | # Display device support |
@@ -1511,10 +1660,12 @@ CONFIG_LOGO=y | |||
1511 | # CONFIG_LOGO_LINUX_VGA16 is not set | 1660 | # CONFIG_LOGO_LINUX_VGA16 is not set |
1512 | CONFIG_LOGO_LINUX_CLUT224=y | 1661 | CONFIG_LOGO_LINUX_CLUT224=y |
1513 | CONFIG_SOUND=y | 1662 | CONFIG_SOUND=y |
1663 | CONFIG_SOUND_OSS_CORE=y | ||
1514 | CONFIG_SND=y | 1664 | CONFIG_SND=y |
1515 | CONFIG_SND_TIMER=y | 1665 | CONFIG_SND_TIMER=y |
1516 | CONFIG_SND_PCM=y | 1666 | CONFIG_SND_PCM=y |
1517 | CONFIG_SND_HWDEP=y | 1667 | CONFIG_SND_HWDEP=y |
1668 | CONFIG_SND_JACK=y | ||
1518 | CONFIG_SND_SEQUENCER=y | 1669 | CONFIG_SND_SEQUENCER=y |
1519 | CONFIG_SND_SEQ_DUMMY=y | 1670 | CONFIG_SND_SEQ_DUMMY=y |
1520 | CONFIG_SND_OSSEMUL=y | 1671 | CONFIG_SND_OSSEMUL=y |
@@ -1522,6 +1673,8 @@ CONFIG_SND_MIXER_OSS=y | |||
1522 | CONFIG_SND_PCM_OSS=y | 1673 | CONFIG_SND_PCM_OSS=y |
1523 | CONFIG_SND_PCM_OSS_PLUGINS=y | 1674 | CONFIG_SND_PCM_OSS_PLUGINS=y |
1524 | CONFIG_SND_SEQUENCER_OSS=y | 1675 | CONFIG_SND_SEQUENCER_OSS=y |
1676 | CONFIG_SND_HRTIMER=y | ||
1677 | CONFIG_SND_SEQ_HRTIMER_DEFAULT=y | ||
1525 | CONFIG_SND_DYNAMIC_MINORS=y | 1678 | CONFIG_SND_DYNAMIC_MINORS=y |
1526 | CONFIG_SND_SUPPORT_OLD_API=y | 1679 | CONFIG_SND_SUPPORT_OLD_API=y |
1527 | CONFIG_SND_VERBOSE_PROCFS=y | 1680 | CONFIG_SND_VERBOSE_PROCFS=y |
@@ -1575,11 +1728,16 @@ CONFIG_SND_PCI=y | |||
1575 | # CONFIG_SND_FM801 is not set | 1728 | # CONFIG_SND_FM801 is not set |
1576 | CONFIG_SND_HDA_INTEL=y | 1729 | CONFIG_SND_HDA_INTEL=y |
1577 | CONFIG_SND_HDA_HWDEP=y | 1730 | CONFIG_SND_HDA_HWDEP=y |
1731 | # CONFIG_SND_HDA_RECONFIG is not set | ||
1732 | # CONFIG_SND_HDA_INPUT_BEEP is not set | ||
1578 | CONFIG_SND_HDA_CODEC_REALTEK=y | 1733 | CONFIG_SND_HDA_CODEC_REALTEK=y |
1579 | CONFIG_SND_HDA_CODEC_ANALOG=y | 1734 | CONFIG_SND_HDA_CODEC_ANALOG=y |
1580 | CONFIG_SND_HDA_CODEC_SIGMATEL=y | 1735 | CONFIG_SND_HDA_CODEC_SIGMATEL=y |
1581 | CONFIG_SND_HDA_CODEC_VIA=y | 1736 | CONFIG_SND_HDA_CODEC_VIA=y |
1582 | CONFIG_SND_HDA_CODEC_ATIHDMI=y | 1737 | CONFIG_SND_HDA_CODEC_ATIHDMI=y |
1738 | CONFIG_SND_HDA_CODEC_NVHDMI=y | ||
1739 | CONFIG_SND_HDA_CODEC_INTELHDMI=y | ||
1740 | CONFIG_SND_HDA_ELD=y | ||
1583 | CONFIG_SND_HDA_CODEC_CONEXANT=y | 1741 | CONFIG_SND_HDA_CODEC_CONEXANT=y |
1584 | CONFIG_SND_HDA_CODEC_CMEDIA=y | 1742 | CONFIG_SND_HDA_CODEC_CMEDIA=y |
1585 | CONFIG_SND_HDA_CODEC_SI3054=y | 1743 | CONFIG_SND_HDA_CODEC_SI3054=y |
@@ -1612,6 +1770,7 @@ CONFIG_SND_USB=y | |||
1612 | # CONFIG_SND_USB_AUDIO is not set | 1770 | # CONFIG_SND_USB_AUDIO is not set |
1613 | # CONFIG_SND_USB_USX2Y is not set | 1771 | # CONFIG_SND_USB_USX2Y is not set |
1614 | # CONFIG_SND_USB_CAIAQ is not set | 1772 | # CONFIG_SND_USB_CAIAQ is not set |
1773 | # CONFIG_SND_USB_US122L is not set | ||
1615 | CONFIG_SND_PCMCIA=y | 1774 | CONFIG_SND_PCMCIA=y |
1616 | # CONFIG_SND_VXPOCKET is not set | 1775 | # CONFIG_SND_VXPOCKET is not set |
1617 | # CONFIG_SND_PDAUDIOCF is not set | 1776 | # CONFIG_SND_PDAUDIOCF is not set |
@@ -1626,15 +1785,37 @@ CONFIG_HIDRAW=y | |||
1626 | # USB Input Devices | 1785 | # USB Input Devices |
1627 | # | 1786 | # |
1628 | CONFIG_USB_HID=y | 1787 | CONFIG_USB_HID=y |
1629 | CONFIG_USB_HIDINPUT_POWERBOOK=y | ||
1630 | CONFIG_HID_FF=y | ||
1631 | CONFIG_HID_PID=y | 1788 | CONFIG_HID_PID=y |
1789 | CONFIG_USB_HIDDEV=y | ||
1790 | |||
1791 | # | ||
1792 | # Special HID drivers | ||
1793 | # | ||
1794 | CONFIG_HID_COMPAT=y | ||
1795 | CONFIG_HID_A4TECH=y | ||
1796 | CONFIG_HID_APPLE=y | ||
1797 | CONFIG_HID_BELKIN=y | ||
1798 | CONFIG_HID_CHERRY=y | ||
1799 | CONFIG_HID_CHICONY=y | ||
1800 | CONFIG_HID_CYPRESS=y | ||
1801 | CONFIG_HID_EZKEY=y | ||
1802 | CONFIG_HID_GYRATION=y | ||
1803 | CONFIG_HID_LOGITECH=y | ||
1632 | CONFIG_LOGITECH_FF=y | 1804 | CONFIG_LOGITECH_FF=y |
1633 | # CONFIG_LOGIRUMBLEPAD2_FF is not set | 1805 | # CONFIG_LOGIRUMBLEPAD2_FF is not set |
1806 | CONFIG_HID_MICROSOFT=y | ||
1807 | CONFIG_HID_MONTEREY=y | ||
1808 | CONFIG_HID_NTRIG=y | ||
1809 | CONFIG_HID_PANTHERLORD=y | ||
1634 | CONFIG_PANTHERLORD_FF=y | 1810 | CONFIG_PANTHERLORD_FF=y |
1811 | CONFIG_HID_PETALYNX=y | ||
1812 | CONFIG_HID_SAMSUNG=y | ||
1813 | CONFIG_HID_SONY=y | ||
1814 | CONFIG_HID_SUNPLUS=y | ||
1815 | # CONFIG_GREENASIA_FF is not set | ||
1816 | CONFIG_HID_TOPSEED=y | ||
1635 | CONFIG_THRUSTMASTER_FF=y | 1817 | CONFIG_THRUSTMASTER_FF=y |
1636 | CONFIG_ZEROPLUS_FF=y | 1818 | CONFIG_ZEROPLUS_FF=y |
1637 | CONFIG_USB_HIDDEV=y | ||
1638 | CONFIG_USB_SUPPORT=y | 1819 | CONFIG_USB_SUPPORT=y |
1639 | CONFIG_USB_ARCH_HAS_HCD=y | 1820 | CONFIG_USB_ARCH_HAS_HCD=y |
1640 | CONFIG_USB_ARCH_HAS_OHCI=y | 1821 | CONFIG_USB_ARCH_HAS_OHCI=y |
@@ -1652,6 +1833,8 @@ CONFIG_USB_DEVICEFS=y | |||
1652 | CONFIG_USB_SUSPEND=y | 1833 | CONFIG_USB_SUSPEND=y |
1653 | # CONFIG_USB_OTG is not set | 1834 | # CONFIG_USB_OTG is not set |
1654 | CONFIG_USB_MON=y | 1835 | CONFIG_USB_MON=y |
1836 | # CONFIG_USB_WUSB is not set | ||
1837 | # CONFIG_USB_WUSB_CBAF is not set | ||
1655 | 1838 | ||
1656 | # | 1839 | # |
1657 | # USB Host Controller Drivers | 1840 | # USB Host Controller Drivers |
@@ -1660,6 +1843,7 @@ CONFIG_USB_MON=y | |||
1660 | CONFIG_USB_EHCI_HCD=y | 1843 | CONFIG_USB_EHCI_HCD=y |
1661 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set | 1844 | # CONFIG_USB_EHCI_ROOT_HUB_TT is not set |
1662 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set | 1845 | # CONFIG_USB_EHCI_TT_NEWSCHED is not set |
1846 | # CONFIG_USB_OXU210HP_HCD is not set | ||
1663 | # CONFIG_USB_ISP116X_HCD is not set | 1847 | # CONFIG_USB_ISP116X_HCD is not set |
1664 | # CONFIG_USB_ISP1760_HCD is not set | 1848 | # CONFIG_USB_ISP1760_HCD is not set |
1665 | CONFIG_USB_OHCI_HCD=y | 1849 | CONFIG_USB_OHCI_HCD=y |
@@ -1669,6 +1853,8 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y | |||
1669 | CONFIG_USB_UHCI_HCD=y | 1853 | CONFIG_USB_UHCI_HCD=y |
1670 | # CONFIG_USB_SL811_HCD is not set | 1854 | # CONFIG_USB_SL811_HCD is not set |
1671 | # CONFIG_USB_R8A66597_HCD is not set | 1855 | # CONFIG_USB_R8A66597_HCD is not set |
1856 | # CONFIG_USB_WHCI_HCD is not set | ||
1857 | # CONFIG_USB_HWA_HCD is not set | ||
1672 | 1858 | ||
1673 | # | 1859 | # |
1674 | # USB Device Class drivers | 1860 | # USB Device Class drivers |
@@ -1676,20 +1862,20 @@ CONFIG_USB_UHCI_HCD=y | |||
1676 | # CONFIG_USB_ACM is not set | 1862 | # CONFIG_USB_ACM is not set |
1677 | CONFIG_USB_PRINTER=y | 1863 | CONFIG_USB_PRINTER=y |
1678 | # CONFIG_USB_WDM is not set | 1864 | # CONFIG_USB_WDM is not set |
1865 | # CONFIG_USB_TMC is not set | ||
1679 | 1866 | ||
1680 | # | 1867 | # |
1681 | # NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' | 1868 | # NOTE: USB_STORAGE depends on SCSI but BLK_DEV_SD may also be needed; |
1682 | # | 1869 | # |
1683 | 1870 | ||
1684 | # | 1871 | # |
1685 | # may also be needed; see USB_STORAGE Help for more information | 1872 | # see USB_STORAGE Help for more information |
1686 | # | 1873 | # |
1687 | CONFIG_USB_STORAGE=y | 1874 | CONFIG_USB_STORAGE=y |
1688 | # CONFIG_USB_STORAGE_DEBUG is not set | 1875 | # CONFIG_USB_STORAGE_DEBUG is not set |
1689 | # CONFIG_USB_STORAGE_DATAFAB is not set | 1876 | # CONFIG_USB_STORAGE_DATAFAB is not set |
1690 | # CONFIG_USB_STORAGE_FREECOM is not set | 1877 | # CONFIG_USB_STORAGE_FREECOM is not set |
1691 | # CONFIG_USB_STORAGE_ISD200 is not set | 1878 | # CONFIG_USB_STORAGE_ISD200 is not set |
1692 | # CONFIG_USB_STORAGE_DPCM is not set | ||
1693 | # CONFIG_USB_STORAGE_USBAT is not set | 1879 | # CONFIG_USB_STORAGE_USBAT is not set |
1694 | # CONFIG_USB_STORAGE_SDDR09 is not set | 1880 | # CONFIG_USB_STORAGE_SDDR09 is not set |
1695 | # CONFIG_USB_STORAGE_SDDR55 is not set | 1881 | # CONFIG_USB_STORAGE_SDDR55 is not set |
@@ -1697,7 +1883,6 @@ CONFIG_USB_STORAGE=y | |||
1697 | # CONFIG_USB_STORAGE_ALAUDA is not set | 1883 | # CONFIG_USB_STORAGE_ALAUDA is not set |
1698 | # CONFIG_USB_STORAGE_ONETOUCH is not set | 1884 | # CONFIG_USB_STORAGE_ONETOUCH is not set |
1699 | # CONFIG_USB_STORAGE_KARMA is not set | 1885 | # CONFIG_USB_STORAGE_KARMA is not set |
1700 | # CONFIG_USB_STORAGE_SIERRA is not set | ||
1701 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set | 1886 | # CONFIG_USB_STORAGE_CYPRESS_ATACB is not set |
1702 | CONFIG_USB_LIBUSUAL=y | 1887 | CONFIG_USB_LIBUSUAL=y |
1703 | 1888 | ||
@@ -1718,6 +1903,7 @@ CONFIG_USB_LIBUSUAL=y | |||
1718 | # CONFIG_USB_EMI62 is not set | 1903 | # CONFIG_USB_EMI62 is not set |
1719 | # CONFIG_USB_EMI26 is not set | 1904 | # CONFIG_USB_EMI26 is not set |
1720 | # CONFIG_USB_ADUTUX is not set | 1905 | # CONFIG_USB_ADUTUX is not set |
1906 | # CONFIG_USB_SEVSEG is not set | ||
1721 | # CONFIG_USB_RIO500 is not set | 1907 | # CONFIG_USB_RIO500 is not set |
1722 | # CONFIG_USB_LEGOTOWER is not set | 1908 | # CONFIG_USB_LEGOTOWER is not set |
1723 | # CONFIG_USB_LCD is not set | 1909 | # CONFIG_USB_LCD is not set |
@@ -1735,7 +1921,13 @@ CONFIG_USB_LIBUSUAL=y | |||
1735 | # CONFIG_USB_IOWARRIOR is not set | 1921 | # CONFIG_USB_IOWARRIOR is not set |
1736 | # CONFIG_USB_TEST is not set | 1922 | # CONFIG_USB_TEST is not set |
1737 | # CONFIG_USB_ISIGHTFW is not set | 1923 | # CONFIG_USB_ISIGHTFW is not set |
1924 | # CONFIG_USB_VST is not set | ||
1738 | # CONFIG_USB_GADGET is not set | 1925 | # CONFIG_USB_GADGET is not set |
1926 | |||
1927 | # | ||
1928 | # OTG and related infrastructure | ||
1929 | # | ||
1930 | # CONFIG_UWB is not set | ||
1739 | # CONFIG_MMC is not set | 1931 | # CONFIG_MMC is not set |
1740 | # CONFIG_MEMSTICK is not set | 1932 | # CONFIG_MEMSTICK is not set |
1741 | CONFIG_NEW_LEDS=y | 1933 | CONFIG_NEW_LEDS=y |
@@ -1744,6 +1936,7 @@ CONFIG_LEDS_CLASS=y | |||
1744 | # | 1936 | # |
1745 | # LED drivers | 1937 | # LED drivers |
1746 | # | 1938 | # |
1939 | # CONFIG_LEDS_ALIX2 is not set | ||
1747 | # CONFIG_LEDS_PCA9532 is not set | 1940 | # CONFIG_LEDS_PCA9532 is not set |
1748 | # CONFIG_LEDS_CLEVO_MAIL is not set | 1941 | # CONFIG_LEDS_CLEVO_MAIL is not set |
1749 | # CONFIG_LEDS_PCA955X is not set | 1942 | # CONFIG_LEDS_PCA955X is not set |
@@ -1754,6 +1947,7 @@ CONFIG_LEDS_CLASS=y | |||
1754 | CONFIG_LEDS_TRIGGERS=y | 1947 | CONFIG_LEDS_TRIGGERS=y |
1755 | # CONFIG_LEDS_TRIGGER_TIMER is not set | 1948 | # CONFIG_LEDS_TRIGGER_TIMER is not set |
1756 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set | 1949 | # CONFIG_LEDS_TRIGGER_HEARTBEAT is not set |
1950 | # CONFIG_LEDS_TRIGGER_BACKLIGHT is not set | ||
1757 | # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set | 1951 | # CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set |
1758 | # CONFIG_ACCESSIBILITY is not set | 1952 | # CONFIG_ACCESSIBILITY is not set |
1759 | # CONFIG_INFINIBAND is not set | 1953 | # CONFIG_INFINIBAND is not set |
@@ -1793,6 +1987,7 @@ CONFIG_RTC_INTF_DEV=y | |||
1793 | # CONFIG_RTC_DRV_M41T80 is not set | 1987 | # CONFIG_RTC_DRV_M41T80 is not set |
1794 | # CONFIG_RTC_DRV_S35390A is not set | 1988 | # CONFIG_RTC_DRV_S35390A is not set |
1795 | # CONFIG_RTC_DRV_FM3130 is not set | 1989 | # CONFIG_RTC_DRV_FM3130 is not set |
1990 | # CONFIG_RTC_DRV_RX8581 is not set | ||
1796 | 1991 | ||
1797 | # | 1992 | # |
1798 | # SPI RTC drivers | 1993 | # SPI RTC drivers |
@@ -1802,12 +1997,15 @@ CONFIG_RTC_INTF_DEV=y | |||
1802 | # Platform RTC drivers | 1997 | # Platform RTC drivers |
1803 | # | 1998 | # |
1804 | CONFIG_RTC_DRV_CMOS=y | 1999 | CONFIG_RTC_DRV_CMOS=y |
2000 | # CONFIG_RTC_DRV_DS1286 is not set | ||
1805 | # CONFIG_RTC_DRV_DS1511 is not set | 2001 | # CONFIG_RTC_DRV_DS1511 is not set |
1806 | # CONFIG_RTC_DRV_DS1553 is not set | 2002 | # CONFIG_RTC_DRV_DS1553 is not set |
1807 | # CONFIG_RTC_DRV_DS1742 is not set | 2003 | # CONFIG_RTC_DRV_DS1742 is not set |
1808 | # CONFIG_RTC_DRV_STK17TA8 is not set | 2004 | # CONFIG_RTC_DRV_STK17TA8 is not set |
1809 | # CONFIG_RTC_DRV_M48T86 is not set | 2005 | # CONFIG_RTC_DRV_M48T86 is not set |
2006 | # CONFIG_RTC_DRV_M48T35 is not set | ||
1810 | # CONFIG_RTC_DRV_M48T59 is not set | 2007 | # CONFIG_RTC_DRV_M48T59 is not set |
2008 | # CONFIG_RTC_DRV_BQ4802 is not set | ||
1811 | # CONFIG_RTC_DRV_V3020 is not set | 2009 | # CONFIG_RTC_DRV_V3020 is not set |
1812 | 2010 | ||
1813 | # | 2011 | # |
@@ -1820,6 +2018,21 @@ CONFIG_DMADEVICES=y | |||
1820 | # | 2018 | # |
1821 | # CONFIG_INTEL_IOATDMA is not set | 2019 | # CONFIG_INTEL_IOATDMA is not set |
1822 | # CONFIG_UIO is not set | 2020 | # CONFIG_UIO is not set |
2021 | # CONFIG_STAGING is not set | ||
2022 | CONFIG_X86_PLATFORM_DEVICES=y | ||
2023 | # CONFIG_ACER_WMI is not set | ||
2024 | # CONFIG_ASUS_LAPTOP is not set | ||
2025 | # CONFIG_FUJITSU_LAPTOP is not set | ||
2026 | # CONFIG_MSI_LAPTOP is not set | ||
2027 | # CONFIG_PANASONIC_LAPTOP is not set | ||
2028 | # CONFIG_COMPAL_LAPTOP is not set | ||
2029 | # CONFIG_SONY_LAPTOP is not set | ||
2030 | # CONFIG_THINKPAD_ACPI is not set | ||
2031 | # CONFIG_INTEL_MENLOW is not set | ||
2032 | CONFIG_EEEPC_LAPTOP=y | ||
2033 | # CONFIG_ACPI_WMI is not set | ||
2034 | # CONFIG_ACPI_ASUS is not set | ||
2035 | # CONFIG_ACPI_TOSHIBA is not set | ||
1823 | 2036 | ||
1824 | # | 2037 | # |
1825 | # Firmware Drivers | 2038 | # Firmware Drivers |
@@ -1830,8 +2043,7 @@ CONFIG_EFI_VARS=y | |||
1830 | # CONFIG_DELL_RBU is not set | 2043 | # CONFIG_DELL_RBU is not set |
1831 | # CONFIG_DCDBAS is not set | 2044 | # CONFIG_DCDBAS is not set |
1832 | CONFIG_DMIID=y | 2045 | CONFIG_DMIID=y |
1833 | CONFIG_ISCSI_IBFT_FIND=y | 2046 | # CONFIG_ISCSI_IBFT_FIND is not set |
1834 | CONFIG_ISCSI_IBFT=y | ||
1835 | 2047 | ||
1836 | # | 2048 | # |
1837 | # File systems | 2049 | # File systems |
@@ -1841,22 +2053,25 @@ CONFIG_EXT3_FS=y | |||
1841 | CONFIG_EXT3_FS_XATTR=y | 2053 | CONFIG_EXT3_FS_XATTR=y |
1842 | CONFIG_EXT3_FS_POSIX_ACL=y | 2054 | CONFIG_EXT3_FS_POSIX_ACL=y |
1843 | CONFIG_EXT3_FS_SECURITY=y | 2055 | CONFIG_EXT3_FS_SECURITY=y |
1844 | # CONFIG_EXT4DEV_FS is not set | 2056 | # CONFIG_EXT4_FS is not set |
1845 | CONFIG_JBD=y | 2057 | CONFIG_JBD=y |
1846 | # CONFIG_JBD_DEBUG is not set | 2058 | # CONFIG_JBD_DEBUG is not set |
1847 | CONFIG_FS_MBCACHE=y | 2059 | CONFIG_FS_MBCACHE=y |
1848 | # CONFIG_REISERFS_FS is not set | 2060 | # CONFIG_REISERFS_FS is not set |
1849 | # CONFIG_JFS_FS is not set | 2061 | # CONFIG_JFS_FS is not set |
1850 | CONFIG_FS_POSIX_ACL=y | 2062 | CONFIG_FS_POSIX_ACL=y |
2063 | CONFIG_FILE_LOCKING=y | ||
1851 | # CONFIG_XFS_FS is not set | 2064 | # CONFIG_XFS_FS is not set |
1852 | # CONFIG_GFS2_FS is not set | 2065 | # CONFIG_GFS2_FS is not set |
1853 | # CONFIG_OCFS2_FS is not set | 2066 | # CONFIG_OCFS2_FS is not set |
2067 | # CONFIG_BTRFS_FS is not set | ||
1854 | CONFIG_DNOTIFY=y | 2068 | CONFIG_DNOTIFY=y |
1855 | CONFIG_INOTIFY=y | 2069 | CONFIG_INOTIFY=y |
1856 | CONFIG_INOTIFY_USER=y | 2070 | CONFIG_INOTIFY_USER=y |
1857 | CONFIG_QUOTA=y | 2071 | CONFIG_QUOTA=y |
1858 | CONFIG_QUOTA_NETLINK_INTERFACE=y | 2072 | CONFIG_QUOTA_NETLINK_INTERFACE=y |
1859 | # CONFIG_PRINT_QUOTA_WARNING is not set | 2073 | # CONFIG_PRINT_QUOTA_WARNING is not set |
2074 | CONFIG_QUOTA_TREE=y | ||
1860 | # CONFIG_QFMT_V1 is not set | 2075 | # CONFIG_QFMT_V1 is not set |
1861 | CONFIG_QFMT_V2=y | 2076 | CONFIG_QFMT_V2=y |
1862 | CONFIG_QUOTACTL=y | 2077 | CONFIG_QUOTACTL=y |
@@ -1890,16 +2105,14 @@ CONFIG_PROC_FS=y | |||
1890 | CONFIG_PROC_KCORE=y | 2105 | CONFIG_PROC_KCORE=y |
1891 | CONFIG_PROC_VMCORE=y | 2106 | CONFIG_PROC_VMCORE=y |
1892 | CONFIG_PROC_SYSCTL=y | 2107 | CONFIG_PROC_SYSCTL=y |
2108 | CONFIG_PROC_PAGE_MONITOR=y | ||
1893 | CONFIG_SYSFS=y | 2109 | CONFIG_SYSFS=y |
1894 | CONFIG_TMPFS=y | 2110 | CONFIG_TMPFS=y |
1895 | CONFIG_TMPFS_POSIX_ACL=y | 2111 | CONFIG_TMPFS_POSIX_ACL=y |
1896 | CONFIG_HUGETLBFS=y | 2112 | CONFIG_HUGETLBFS=y |
1897 | CONFIG_HUGETLB_PAGE=y | 2113 | CONFIG_HUGETLB_PAGE=y |
1898 | # CONFIG_CONFIGFS_FS is not set | 2114 | # CONFIG_CONFIGFS_FS is not set |
1899 | 2115 | CONFIG_MISC_FILESYSTEMS=y | |
1900 | # | ||
1901 | # Miscellaneous filesystems | ||
1902 | # | ||
1903 | # CONFIG_ADFS_FS is not set | 2116 | # CONFIG_ADFS_FS is not set |
1904 | # CONFIG_AFFS_FS is not set | 2117 | # CONFIG_AFFS_FS is not set |
1905 | # CONFIG_ECRYPT_FS is not set | 2118 | # CONFIG_ECRYPT_FS is not set |
@@ -1909,6 +2122,7 @@ CONFIG_HUGETLB_PAGE=y | |||
1909 | # CONFIG_BFS_FS is not set | 2122 | # CONFIG_BFS_FS is not set |
1910 | # CONFIG_EFS_FS is not set | 2123 | # CONFIG_EFS_FS is not set |
1911 | # CONFIG_CRAMFS is not set | 2124 | # CONFIG_CRAMFS is not set |
2125 | # CONFIG_SQUASHFS is not set | ||
1912 | # CONFIG_VXFS_FS is not set | 2126 | # CONFIG_VXFS_FS is not set |
1913 | # CONFIG_MINIX_FS is not set | 2127 | # CONFIG_MINIX_FS is not set |
1914 | # CONFIG_OMFS_FS is not set | 2128 | # CONFIG_OMFS_FS is not set |
@@ -1930,6 +2144,7 @@ CONFIG_NFS_ACL_SUPPORT=y | |||
1930 | CONFIG_NFS_COMMON=y | 2144 | CONFIG_NFS_COMMON=y |
1931 | CONFIG_SUNRPC=y | 2145 | CONFIG_SUNRPC=y |
1932 | CONFIG_SUNRPC_GSS=y | 2146 | CONFIG_SUNRPC_GSS=y |
2147 | # CONFIG_SUNRPC_REGISTER_V4 is not set | ||
1933 | CONFIG_RPCSEC_GSS_KRB5=y | 2148 | CONFIG_RPCSEC_GSS_KRB5=y |
1934 | # CONFIG_RPCSEC_GSS_SPKM3 is not set | 2149 | # CONFIG_RPCSEC_GSS_SPKM3 is not set |
1935 | # CONFIG_SMB_FS is not set | 2150 | # CONFIG_SMB_FS is not set |
@@ -2006,7 +2221,7 @@ CONFIG_NLS_UTF8=y | |||
2006 | # | 2221 | # |
2007 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y | 2222 | CONFIG_TRACE_IRQFLAGS_SUPPORT=y |
2008 | CONFIG_PRINTK_TIME=y | 2223 | CONFIG_PRINTK_TIME=y |
2009 | CONFIG_ENABLE_WARN_DEPRECATED=y | 2224 | # CONFIG_ENABLE_WARN_DEPRECATED is not set |
2010 | CONFIG_ENABLE_MUST_CHECK=y | 2225 | CONFIG_ENABLE_MUST_CHECK=y |
2011 | CONFIG_FRAME_WARN=2048 | 2226 | CONFIG_FRAME_WARN=2048 |
2012 | CONFIG_MAGIC_SYSRQ=y | 2227 | CONFIG_MAGIC_SYSRQ=y |
@@ -2035,40 +2250,60 @@ CONFIG_TIMER_STATS=y | |||
2035 | CONFIG_DEBUG_BUGVERBOSE=y | 2250 | CONFIG_DEBUG_BUGVERBOSE=y |
2036 | # CONFIG_DEBUG_INFO is not set | 2251 | # CONFIG_DEBUG_INFO is not set |
2037 | # CONFIG_DEBUG_VM is not set | 2252 | # CONFIG_DEBUG_VM is not set |
2253 | # CONFIG_DEBUG_VIRTUAL is not set | ||
2038 | # CONFIG_DEBUG_WRITECOUNT is not set | 2254 | # CONFIG_DEBUG_WRITECOUNT is not set |
2039 | CONFIG_DEBUG_MEMORY_INIT=y | 2255 | CONFIG_DEBUG_MEMORY_INIT=y |
2040 | # CONFIG_DEBUG_LIST is not set | 2256 | # CONFIG_DEBUG_LIST is not set |
2041 | # CONFIG_DEBUG_SG is not set | 2257 | # CONFIG_DEBUG_SG is not set |
2258 | # CONFIG_DEBUG_NOTIFIERS is not set | ||
2259 | CONFIG_ARCH_WANT_FRAME_POINTERS=y | ||
2042 | CONFIG_FRAME_POINTER=y | 2260 | CONFIG_FRAME_POINTER=y |
2043 | # CONFIG_BOOT_PRINTK_DELAY is not set | 2261 | # CONFIG_BOOT_PRINTK_DELAY is not set |
2044 | # CONFIG_RCU_TORTURE_TEST is not set | 2262 | # CONFIG_RCU_TORTURE_TEST is not set |
2263 | # CONFIG_RCU_CPU_STALL_DETECTOR is not set | ||
2045 | # CONFIG_KPROBES_SANITY_TEST is not set | 2264 | # CONFIG_KPROBES_SANITY_TEST is not set |
2046 | # CONFIG_BACKTRACE_SELF_TEST is not set | 2265 | # CONFIG_BACKTRACE_SELF_TEST is not set |
2266 | # CONFIG_DEBUG_BLOCK_EXT_DEVT is not set | ||
2047 | # CONFIG_LKDTM is not set | 2267 | # CONFIG_LKDTM is not set |
2048 | # CONFIG_FAULT_INJECTION is not set | 2268 | # CONFIG_FAULT_INJECTION is not set |
2049 | # CONFIG_LATENCYTOP is not set | 2269 | # CONFIG_LATENCYTOP is not set |
2050 | CONFIG_SYSCTL_SYSCALL_CHECK=y | 2270 | CONFIG_SYSCTL_SYSCALL_CHECK=y |
2051 | CONFIG_HAVE_FTRACE=y | 2271 | CONFIG_USER_STACKTRACE_SUPPORT=y |
2272 | CONFIG_HAVE_FUNCTION_TRACER=y | ||
2273 | CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y | ||
2274 | CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y | ||
2052 | CONFIG_HAVE_DYNAMIC_FTRACE=y | 2275 | CONFIG_HAVE_DYNAMIC_FTRACE=y |
2053 | # CONFIG_FTRACE is not set | 2276 | CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
2277 | CONFIG_HAVE_HW_BRANCH_TRACER=y | ||
2278 | |||
2279 | # | ||
2280 | # Tracers | ||
2281 | # | ||
2282 | # CONFIG_FUNCTION_TRACER is not set | ||
2054 | # CONFIG_IRQSOFF_TRACER is not set | 2283 | # CONFIG_IRQSOFF_TRACER is not set |
2055 | # CONFIG_SYSPROF_TRACER is not set | 2284 | # CONFIG_SYSPROF_TRACER is not set |
2056 | # CONFIG_SCHED_TRACER is not set | 2285 | # CONFIG_SCHED_TRACER is not set |
2057 | # CONFIG_CONTEXT_SWITCH_TRACER is not set | 2286 | # CONFIG_CONTEXT_SWITCH_TRACER is not set |
2287 | # CONFIG_BOOT_TRACER is not set | ||
2288 | # CONFIG_TRACE_BRANCH_PROFILING is not set | ||
2289 | # CONFIG_POWER_TRACER is not set | ||
2290 | # CONFIG_STACK_TRACER is not set | ||
2291 | # CONFIG_HW_BRANCH_TRACER is not set | ||
2058 | CONFIG_PROVIDE_OHCI1394_DMA_INIT=y | 2292 | CONFIG_PROVIDE_OHCI1394_DMA_INIT=y |
2293 | # CONFIG_DYNAMIC_PRINTK_DEBUG is not set | ||
2059 | # CONFIG_SAMPLES is not set | 2294 | # CONFIG_SAMPLES is not set |
2060 | CONFIG_HAVE_ARCH_KGDB=y | 2295 | CONFIG_HAVE_ARCH_KGDB=y |
2061 | # CONFIG_KGDB is not set | 2296 | # CONFIG_KGDB is not set |
2062 | # CONFIG_STRICT_DEVMEM is not set | 2297 | # CONFIG_STRICT_DEVMEM is not set |
2063 | CONFIG_X86_VERBOSE_BOOTUP=y | 2298 | CONFIG_X86_VERBOSE_BOOTUP=y |
2064 | CONFIG_EARLY_PRINTK=y | 2299 | CONFIG_EARLY_PRINTK=y |
2300 | CONFIG_EARLY_PRINTK_DBGP=y | ||
2065 | CONFIG_DEBUG_STACKOVERFLOW=y | 2301 | CONFIG_DEBUG_STACKOVERFLOW=y |
2066 | CONFIG_DEBUG_STACK_USAGE=y | 2302 | CONFIG_DEBUG_STACK_USAGE=y |
2067 | # CONFIG_DEBUG_PAGEALLOC is not set | 2303 | # CONFIG_DEBUG_PAGEALLOC is not set |
2068 | # CONFIG_DEBUG_PER_CPU_MAPS is not set | 2304 | # CONFIG_DEBUG_PER_CPU_MAPS is not set |
2069 | # CONFIG_X86_PTDUMP is not set | 2305 | # CONFIG_X86_PTDUMP is not set |
2070 | CONFIG_DEBUG_RODATA=y | 2306 | CONFIG_DEBUG_RODATA=y |
2071 | # CONFIG_DIRECT_GBPAGES is not set | ||
2072 | # CONFIG_DEBUG_RODATA_TEST is not set | 2307 | # CONFIG_DEBUG_RODATA_TEST is not set |
2073 | CONFIG_DEBUG_NX_TEST=m | 2308 | CONFIG_DEBUG_NX_TEST=m |
2074 | # CONFIG_IOMMU_DEBUG is not set | 2309 | # CONFIG_IOMMU_DEBUG is not set |
@@ -2092,8 +2327,10 @@ CONFIG_OPTIMIZE_INLINING=y | |||
2092 | CONFIG_KEYS=y | 2327 | CONFIG_KEYS=y |
2093 | CONFIG_KEYS_DEBUG_PROC_KEYS=y | 2328 | CONFIG_KEYS_DEBUG_PROC_KEYS=y |
2094 | CONFIG_SECURITY=y | 2329 | CONFIG_SECURITY=y |
2330 | # CONFIG_SECURITYFS is not set | ||
2095 | CONFIG_SECURITY_NETWORK=y | 2331 | CONFIG_SECURITY_NETWORK=y |
2096 | # CONFIG_SECURITY_NETWORK_XFRM is not set | 2332 | # CONFIG_SECURITY_NETWORK_XFRM is not set |
2333 | # CONFIG_SECURITY_PATH is not set | ||
2097 | CONFIG_SECURITY_FILE_CAPABILITIES=y | 2334 | CONFIG_SECURITY_FILE_CAPABILITIES=y |
2098 | # CONFIG_SECURITY_ROOTPLUG is not set | 2335 | # CONFIG_SECURITY_ROOTPLUG is not set |
2099 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536 | 2336 | CONFIG_SECURITY_DEFAULT_MMAP_MIN_ADDR=65536 |
@@ -2104,7 +2341,6 @@ CONFIG_SECURITY_SELINUX_DISABLE=y | |||
2104 | CONFIG_SECURITY_SELINUX_DEVELOP=y | 2341 | CONFIG_SECURITY_SELINUX_DEVELOP=y |
2105 | CONFIG_SECURITY_SELINUX_AVC_STATS=y | 2342 | CONFIG_SECURITY_SELINUX_AVC_STATS=y |
2106 | CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 | 2343 | CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 |
2107 | # CONFIG_SECURITY_SELINUX_ENABLE_SECMARK_DEFAULT is not set | ||
2108 | # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set | 2344 | # CONFIG_SECURITY_SELINUX_POLICYDB_VERSION_MAX is not set |
2109 | # CONFIG_SECURITY_SMACK is not set | 2345 | # CONFIG_SECURITY_SMACK is not set |
2110 | CONFIG_CRYPTO=y | 2346 | CONFIG_CRYPTO=y |
@@ -2112,11 +2348,18 @@ CONFIG_CRYPTO=y | |||
2112 | # | 2348 | # |
2113 | # Crypto core or helper | 2349 | # Crypto core or helper |
2114 | # | 2350 | # |
2351 | # CONFIG_CRYPTO_FIPS is not set | ||
2115 | CONFIG_CRYPTO_ALGAPI=y | 2352 | CONFIG_CRYPTO_ALGAPI=y |
2353 | CONFIG_CRYPTO_ALGAPI2=y | ||
2116 | CONFIG_CRYPTO_AEAD=y | 2354 | CONFIG_CRYPTO_AEAD=y |
2355 | CONFIG_CRYPTO_AEAD2=y | ||
2117 | CONFIG_CRYPTO_BLKCIPHER=y | 2356 | CONFIG_CRYPTO_BLKCIPHER=y |
2357 | CONFIG_CRYPTO_BLKCIPHER2=y | ||
2118 | CONFIG_CRYPTO_HASH=y | 2358 | CONFIG_CRYPTO_HASH=y |
2359 | CONFIG_CRYPTO_HASH2=y | ||
2360 | CONFIG_CRYPTO_RNG2=y | ||
2119 | CONFIG_CRYPTO_MANAGER=y | 2361 | CONFIG_CRYPTO_MANAGER=y |
2362 | CONFIG_CRYPTO_MANAGER2=y | ||
2120 | # CONFIG_CRYPTO_GF128MUL is not set | 2363 | # CONFIG_CRYPTO_GF128MUL is not set |
2121 | # CONFIG_CRYPTO_NULL is not set | 2364 | # CONFIG_CRYPTO_NULL is not set |
2122 | # CONFIG_CRYPTO_CRYPTD is not set | 2365 | # CONFIG_CRYPTO_CRYPTD is not set |
@@ -2151,6 +2394,7 @@ CONFIG_CRYPTO_HMAC=y | |||
2151 | # Digest | 2394 | # Digest |
2152 | # | 2395 | # |
2153 | # CONFIG_CRYPTO_CRC32C is not set | 2396 | # CONFIG_CRYPTO_CRC32C is not set |
2397 | # CONFIG_CRYPTO_CRC32C_INTEL is not set | ||
2154 | # CONFIG_CRYPTO_MD4 is not set | 2398 | # CONFIG_CRYPTO_MD4 is not set |
2155 | CONFIG_CRYPTO_MD5=y | 2399 | CONFIG_CRYPTO_MD5=y |
2156 | # CONFIG_CRYPTO_MICHAEL_MIC is not set | 2400 | # CONFIG_CRYPTO_MICHAEL_MIC is not set |
@@ -2191,6 +2435,11 @@ CONFIG_CRYPTO_DES=y | |||
2191 | # | 2435 | # |
2192 | # CONFIG_CRYPTO_DEFLATE is not set | 2436 | # CONFIG_CRYPTO_DEFLATE is not set |
2193 | # CONFIG_CRYPTO_LZO is not set | 2437 | # CONFIG_CRYPTO_LZO is not set |
2438 | |||
2439 | # | ||
2440 | # Random Number Generation | ||
2441 | # | ||
2442 | # CONFIG_CRYPTO_ANSI_CPRNG is not set | ||
2194 | CONFIG_CRYPTO_HW=y | 2443 | CONFIG_CRYPTO_HW=y |
2195 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set | 2444 | # CONFIG_CRYPTO_DEV_HIFN_795X is not set |
2196 | CONFIG_HAVE_KVM=y | 2445 | CONFIG_HAVE_KVM=y |
@@ -2205,6 +2454,7 @@ CONFIG_VIRTUALIZATION=y | |||
2205 | CONFIG_BITREVERSE=y | 2454 | CONFIG_BITREVERSE=y |
2206 | CONFIG_GENERIC_FIND_FIRST_BIT=y | 2455 | CONFIG_GENERIC_FIND_FIRST_BIT=y |
2207 | CONFIG_GENERIC_FIND_NEXT_BIT=y | 2456 | CONFIG_GENERIC_FIND_NEXT_BIT=y |
2457 | CONFIG_GENERIC_FIND_LAST_BIT=y | ||
2208 | # CONFIG_CRC_CCITT is not set | 2458 | # CONFIG_CRC_CCITT is not set |
2209 | # CONFIG_CRC16 is not set | 2459 | # CONFIG_CRC16 is not set |
2210 | CONFIG_CRC_T10DIF=y | 2460 | CONFIG_CRC_T10DIF=y |
diff --git a/arch/x86/ia32/ia32_signal.c b/arch/x86/ia32/ia32_signal.c index 9dabd00e9805..dd77ac0cac46 100644 --- a/arch/x86/ia32/ia32_signal.c +++ b/arch/x86/ia32/ia32_signal.c | |||
@@ -46,78 +46,83 @@ void signal_fault(struct pt_regs *regs, void __user *frame, char *where); | |||
46 | 46 | ||
47 | int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from) | 47 | int copy_siginfo_to_user32(compat_siginfo_t __user *to, siginfo_t *from) |
48 | { | 48 | { |
49 | int err; | 49 | int err = 0; |
50 | 50 | ||
51 | if (!access_ok(VERIFY_WRITE, to, sizeof(compat_siginfo_t))) | 51 | if (!access_ok(VERIFY_WRITE, to, sizeof(compat_siginfo_t))) |
52 | return -EFAULT; | 52 | return -EFAULT; |
53 | 53 | ||
54 | /* If you change siginfo_t structure, please make sure that | 54 | put_user_try { |
55 | this code is fixed accordingly. | 55 | /* If you change siginfo_t structure, please make sure that |
56 | It should never copy any pad contained in the structure | 56 | this code is fixed accordingly. |
57 | to avoid security leaks, but must copy the generic | 57 | It should never copy any pad contained in the structure |
58 | 3 ints plus the relevant union member. */ | 58 | to avoid security leaks, but must copy the generic |
59 | err = __put_user(from->si_signo, &to->si_signo); | 59 | 3 ints plus the relevant union member. */ |
60 | err |= __put_user(from->si_errno, &to->si_errno); | 60 | put_user_ex(from->si_signo, &to->si_signo); |
61 | err |= __put_user((short)from->si_code, &to->si_code); | 61 | put_user_ex(from->si_errno, &to->si_errno); |
62 | 62 | put_user_ex((short)from->si_code, &to->si_code); | |
63 | if (from->si_code < 0) { | 63 | |
64 | err |= __put_user(from->si_pid, &to->si_pid); | 64 | if (from->si_code < 0) { |
65 | err |= __put_user(from->si_uid, &to->si_uid); | 65 | put_user_ex(from->si_pid, &to->si_pid); |
66 | err |= __put_user(ptr_to_compat(from->si_ptr), &to->si_ptr); | 66 | put_user_ex(from->si_uid, &to->si_uid); |
67 | } else { | 67 | put_user_ex(ptr_to_compat(from->si_ptr), &to->si_ptr); |
68 | /* | 68 | } else { |
69 | * First 32bits of unions are always present: | 69 | /* |
70 | * si_pid === si_band === si_tid === si_addr(LS half) | 70 | * First 32bits of unions are always present: |
71 | */ | 71 | * si_pid === si_band === si_tid === si_addr(LS half) |
72 | err |= __put_user(from->_sifields._pad[0], | 72 | */ |
73 | &to->_sifields._pad[0]); | 73 | put_user_ex(from->_sifields._pad[0], |
74 | switch (from->si_code >> 16) { | 74 | &to->_sifields._pad[0]); |
75 | case __SI_FAULT >> 16: | 75 | switch (from->si_code >> 16) { |
76 | break; | 76 | case __SI_FAULT >> 16: |
77 | case __SI_CHLD >> 16: | 77 | break; |
78 | err |= __put_user(from->si_utime, &to->si_utime); | 78 | case __SI_CHLD >> 16: |
79 | err |= __put_user(from->si_stime, &to->si_stime); | 79 | put_user_ex(from->si_utime, &to->si_utime); |
80 | err |= __put_user(from->si_status, &to->si_status); | 80 | put_user_ex(from->si_stime, &to->si_stime); |
81 | /* FALL THROUGH */ | 81 | put_user_ex(from->si_status, &to->si_status); |
82 | default: | 82 | /* FALL THROUGH */ |
83 | case __SI_KILL >> 16: | 83 | default: |
84 | err |= __put_user(from->si_uid, &to->si_uid); | 84 | case __SI_KILL >> 16: |
85 | break; | 85 | put_user_ex(from->si_uid, &to->si_uid); |
86 | case __SI_POLL >> 16: | 86 | break; |
87 | err |= __put_user(from->si_fd, &to->si_fd); | 87 | case __SI_POLL >> 16: |
88 | break; | 88 | put_user_ex(from->si_fd, &to->si_fd); |
89 | case __SI_TIMER >> 16: | 89 | break; |
90 | err |= __put_user(from->si_overrun, &to->si_overrun); | 90 | case __SI_TIMER >> 16: |
91 | err |= __put_user(ptr_to_compat(from->si_ptr), | 91 | put_user_ex(from->si_overrun, &to->si_overrun); |
92 | &to->si_ptr); | 92 | put_user_ex(ptr_to_compat(from->si_ptr), |
93 | break; | 93 | &to->si_ptr); |
94 | /* This is not generated by the kernel as of now. */ | 94 | break; |
95 | case __SI_RT >> 16: | 95 | /* This is not generated by the kernel as of now. */ |
96 | case __SI_MESGQ >> 16: | 96 | case __SI_RT >> 16: |
97 | err |= __put_user(from->si_uid, &to->si_uid); | 97 | case __SI_MESGQ >> 16: |
98 | err |= __put_user(from->si_int, &to->si_int); | 98 | put_user_ex(from->si_uid, &to->si_uid); |
99 | break; | 99 | put_user_ex(from->si_int, &to->si_int); |
100 | break; | ||
101 | } | ||
100 | } | 102 | } |
101 | } | 103 | } put_user_catch(err); |
104 | |||
102 | return err; | 105 | return err; |
103 | } | 106 | } |
104 | 107 | ||
105 | int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from) | 108 | int copy_siginfo_from_user32(siginfo_t *to, compat_siginfo_t __user *from) |
106 | { | 109 | { |
107 | int err; | 110 | int err = 0; |
108 | u32 ptr32; | 111 | u32 ptr32; |
109 | 112 | ||
110 | if (!access_ok(VERIFY_READ, from, sizeof(compat_siginfo_t))) | 113 | if (!access_ok(VERIFY_READ, from, sizeof(compat_siginfo_t))) |
111 | return -EFAULT; | 114 | return -EFAULT; |
112 | 115 | ||
113 | err = __get_user(to->si_signo, &from->si_signo); | 116 | get_user_try { |
114 | err |= __get_user(to->si_errno, &from->si_errno); | 117 | get_user_ex(to->si_signo, &from->si_signo); |
115 | err |= __get_user(to->si_code, &from->si_code); | 118 | get_user_ex(to->si_errno, &from->si_errno); |
119 | get_user_ex(to->si_code, &from->si_code); | ||
116 | 120 | ||
117 | err |= __get_user(to->si_pid, &from->si_pid); | 121 | get_user_ex(to->si_pid, &from->si_pid); |
118 | err |= __get_user(to->si_uid, &from->si_uid); | 122 | get_user_ex(to->si_uid, &from->si_uid); |
119 | err |= __get_user(ptr32, &from->si_ptr); | 123 | get_user_ex(ptr32, &from->si_ptr); |
120 | to->si_ptr = compat_ptr(ptr32); | 124 | to->si_ptr = compat_ptr(ptr32); |
125 | } get_user_catch(err); | ||
121 | 126 | ||
122 | return err; | 127 | return err; |
123 | } | 128 | } |
@@ -142,17 +147,23 @@ asmlinkage long sys32_sigaltstack(const stack_ia32_t __user *uss_ptr, | |||
142 | struct pt_regs *regs) | 147 | struct pt_regs *regs) |
143 | { | 148 | { |
144 | stack_t uss, uoss; | 149 | stack_t uss, uoss; |
145 | int ret; | 150 | int ret, err = 0; |
146 | mm_segment_t seg; | 151 | mm_segment_t seg; |
147 | 152 | ||
148 | if (uss_ptr) { | 153 | if (uss_ptr) { |
149 | u32 ptr; | 154 | u32 ptr; |
150 | 155 | ||
151 | memset(&uss, 0, sizeof(stack_t)); | 156 | memset(&uss, 0, sizeof(stack_t)); |
152 | if (!access_ok(VERIFY_READ, uss_ptr, sizeof(stack_ia32_t)) || | 157 | if (!access_ok(VERIFY_READ, uss_ptr, sizeof(stack_ia32_t))) |
153 | __get_user(ptr, &uss_ptr->ss_sp) || | 158 | return -EFAULT; |
154 | __get_user(uss.ss_flags, &uss_ptr->ss_flags) || | 159 | |
155 | __get_user(uss.ss_size, &uss_ptr->ss_size)) | 160 | get_user_try { |
161 | get_user_ex(ptr, &uss_ptr->ss_sp); | ||
162 | get_user_ex(uss.ss_flags, &uss_ptr->ss_flags); | ||
163 | get_user_ex(uss.ss_size, &uss_ptr->ss_size); | ||
164 | } get_user_catch(err); | ||
165 | |||
166 | if (err) | ||
156 | return -EFAULT; | 167 | return -EFAULT; |
157 | uss.ss_sp = compat_ptr(ptr); | 168 | uss.ss_sp = compat_ptr(ptr); |
158 | } | 169 | } |
@@ -161,10 +172,16 @@ asmlinkage long sys32_sigaltstack(const stack_ia32_t __user *uss_ptr, | |||
161 | ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, regs->sp); | 172 | ret = do_sigaltstack(uss_ptr ? &uss : NULL, &uoss, regs->sp); |
162 | set_fs(seg); | 173 | set_fs(seg); |
163 | if (ret >= 0 && uoss_ptr) { | 174 | if (ret >= 0 && uoss_ptr) { |
164 | if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(stack_ia32_t)) || | 175 | if (!access_ok(VERIFY_WRITE, uoss_ptr, sizeof(stack_ia32_t))) |
165 | __put_user(ptr_to_compat(uoss.ss_sp), &uoss_ptr->ss_sp) || | 176 | return -EFAULT; |
166 | __put_user(uoss.ss_flags, &uoss_ptr->ss_flags) || | 177 | |
167 | __put_user(uoss.ss_size, &uoss_ptr->ss_size)) | 178 | put_user_try { |
179 | put_user_ex(ptr_to_compat(uoss.ss_sp), &uoss_ptr->ss_sp); | ||
180 | put_user_ex(uoss.ss_flags, &uoss_ptr->ss_flags); | ||
181 | put_user_ex(uoss.ss_size, &uoss_ptr->ss_size); | ||
182 | } put_user_catch(err); | ||
183 | |||
184 | if (err) | ||
168 | ret = -EFAULT; | 185 | ret = -EFAULT; |
169 | } | 186 | } |
170 | return ret; | 187 | return ret; |
@@ -174,18 +191,18 @@ asmlinkage long sys32_sigaltstack(const stack_ia32_t __user *uss_ptr, | |||
174 | * Do a signal return; undo the signal stack. | 191 | * Do a signal return; undo the signal stack. |
175 | */ | 192 | */ |
176 | #define COPY(x) { \ | 193 | #define COPY(x) { \ |
177 | err |= __get_user(regs->x, &sc->x); \ | 194 | get_user_ex(regs->x, &sc->x); \ |
178 | } | 195 | } |
179 | 196 | ||
180 | #define COPY_SEG_CPL3(seg) { \ | 197 | #define COPY_SEG_CPL3(seg) { \ |
181 | unsigned short tmp; \ | 198 | unsigned short tmp; \ |
182 | err |= __get_user(tmp, &sc->seg); \ | 199 | get_user_ex(tmp, &sc->seg); \ |
183 | regs->seg = tmp | 3; \ | 200 | regs->seg = tmp | 3; \ |
184 | } | 201 | } |
185 | 202 | ||
186 | #define RELOAD_SEG(seg) { \ | 203 | #define RELOAD_SEG(seg) { \ |
187 | unsigned int cur, pre; \ | 204 | unsigned int cur, pre; \ |
188 | err |= __get_user(pre, &sc->seg); \ | 205 | get_user_ex(pre, &sc->seg); \ |
189 | savesegment(seg, cur); \ | 206 | savesegment(seg, cur); \ |
190 | pre |= 3; \ | 207 | pre |= 3; \ |
191 | if (pre != cur) \ | 208 | if (pre != cur) \ |
@@ -209,39 +226,42 @@ static int ia32_restore_sigcontext(struct pt_regs *regs, | |||
209 | sc, sc->err, sc->ip, sc->cs, sc->flags); | 226 | sc, sc->err, sc->ip, sc->cs, sc->flags); |
210 | #endif | 227 | #endif |
211 | 228 | ||
212 | /* | 229 | get_user_try { |
213 | * Reload fs and gs if they have changed in the signal | 230 | /* |
214 | * handler. This does not handle long fs/gs base changes in | 231 | * Reload fs and gs if they have changed in the signal |
215 | * the handler, but does not clobber them at least in the | 232 | * handler. This does not handle long fs/gs base changes in |
216 | * normal case. | 233 | * the handler, but does not clobber them at least in the |
217 | */ | 234 | * normal case. |
218 | err |= __get_user(gs, &sc->gs); | 235 | */ |
219 | gs |= 3; | 236 | get_user_ex(gs, &sc->gs); |
220 | savesegment(gs, oldgs); | 237 | gs |= 3; |
221 | if (gs != oldgs) | 238 | savesegment(gs, oldgs); |
222 | load_gs_index(gs); | 239 | if (gs != oldgs) |
223 | 240 | load_gs_index(gs); | |
224 | RELOAD_SEG(fs); | 241 | |
225 | RELOAD_SEG(ds); | 242 | RELOAD_SEG(fs); |
226 | RELOAD_SEG(es); | 243 | RELOAD_SEG(ds); |
227 | 244 | RELOAD_SEG(es); | |
228 | COPY(di); COPY(si); COPY(bp); COPY(sp); COPY(bx); | 245 | |
229 | COPY(dx); COPY(cx); COPY(ip); | 246 | COPY(di); COPY(si); COPY(bp); COPY(sp); COPY(bx); |
230 | /* Don't touch extended registers */ | 247 | COPY(dx); COPY(cx); COPY(ip); |
231 | 248 | /* Don't touch extended registers */ | |
232 | COPY_SEG_CPL3(cs); | 249 | |
233 | COPY_SEG_CPL3(ss); | 250 | COPY_SEG_CPL3(cs); |
234 | 251 | COPY_SEG_CPL3(ss); | |
235 | err |= __get_user(tmpflags, &sc->flags); | 252 | |
236 | regs->flags = (regs->flags & ~FIX_EFLAGS) | (tmpflags & FIX_EFLAGS); | 253 | get_user_ex(tmpflags, &sc->flags); |
237 | /* disable syscall checks */ | 254 | regs->flags = (regs->flags & ~FIX_EFLAGS) | (tmpflags & FIX_EFLAGS); |
238 | regs->orig_ax = -1; | 255 | /* disable syscall checks */ |
239 | 256 | regs->orig_ax = -1; | |
240 | err |= __get_user(tmp, &sc->fpstate); | 257 | |
241 | buf = compat_ptr(tmp); | 258 | get_user_ex(tmp, &sc->fpstate); |
242 | err |= restore_i387_xstate_ia32(buf); | 259 | buf = compat_ptr(tmp); |
243 | 260 | err |= restore_i387_xstate_ia32(buf); | |
244 | err |= __get_user(*pax, &sc->ax); | 261 | |
262 | get_user_ex(*pax, &sc->ax); | ||
263 | } get_user_catch(err); | ||
264 | |||
245 | return err; | 265 | return err; |
246 | } | 266 | } |
247 | 267 | ||
@@ -319,36 +339,38 @@ static int ia32_setup_sigcontext(struct sigcontext_ia32 __user *sc, | |||
319 | { | 339 | { |
320 | int tmp, err = 0; | 340 | int tmp, err = 0; |
321 | 341 | ||
322 | savesegment(gs, tmp); | 342 | put_user_try { |
323 | err |= __put_user(tmp, (unsigned int __user *)&sc->gs); | 343 | savesegment(gs, tmp); |
324 | savesegment(fs, tmp); | 344 | put_user_ex(tmp, (unsigned int __user *)&sc->gs); |
325 | err |= __put_user(tmp, (unsigned int __user *)&sc->fs); | 345 | savesegment(fs, tmp); |
326 | savesegment(ds, tmp); | 346 | put_user_ex(tmp, (unsigned int __user *)&sc->fs); |
327 | err |= __put_user(tmp, (unsigned int __user *)&sc->ds); | 347 | savesegment(ds, tmp); |
328 | savesegment(es, tmp); | 348 | put_user_ex(tmp, (unsigned int __user *)&sc->ds); |
329 | err |= __put_user(tmp, (unsigned int __user *)&sc->es); | 349 | savesegment(es, tmp); |
330 | 350 | put_user_ex(tmp, (unsigned int __user *)&sc->es); | |
331 | err |= __put_user(regs->di, &sc->di); | 351 | |
332 | err |= __put_user(regs->si, &sc->si); | 352 | put_user_ex(regs->di, &sc->di); |
333 | err |= __put_user(regs->bp, &sc->bp); | 353 | put_user_ex(regs->si, &sc->si); |
334 | err |= __put_user(regs->sp, &sc->sp); | 354 | put_user_ex(regs->bp, &sc->bp); |
335 | err |= __put_user(regs->bx, &sc->bx); | 355 | put_user_ex(regs->sp, &sc->sp); |
336 | err |= __put_user(regs->dx, &sc->dx); | 356 | put_user_ex(regs->bx, &sc->bx); |
337 | err |= __put_user(regs->cx, &sc->cx); | 357 | put_user_ex(regs->dx, &sc->dx); |
338 | err |= __put_user(regs->ax, &sc->ax); | 358 | put_user_ex(regs->cx, &sc->cx); |
339 | err |= __put_user(current->thread.trap_no, &sc->trapno); | 359 | put_user_ex(regs->ax, &sc->ax); |
340 | err |= __put_user(current->thread.error_code, &sc->err); | 360 | put_user_ex(current->thread.trap_no, &sc->trapno); |
341 | err |= __put_user(regs->ip, &sc->ip); | 361 | put_user_ex(current->thread.error_code, &sc->err); |
342 | err |= __put_user(regs->cs, (unsigned int __user *)&sc->cs); | 362 | put_user_ex(regs->ip, &sc->ip); |
343 | err |= __put_user(regs->flags, &sc->flags); | 363 | put_user_ex(regs->cs, (unsigned int __user *)&sc->cs); |
344 | err |= __put_user(regs->sp, &sc->sp_at_signal); | 364 | put_user_ex(regs->flags, &sc->flags); |
345 | err |= __put_user(regs->ss, (unsigned int __user *)&sc->ss); | 365 | put_user_ex(regs->sp, &sc->sp_at_signal); |
346 | 366 | put_user_ex(regs->ss, (unsigned int __user *)&sc->ss); | |
347 | err |= __put_user(ptr_to_compat(fpstate), &sc->fpstate); | 367 | |
348 | 368 | put_user_ex(ptr_to_compat(fpstate), &sc->fpstate); | |
349 | /* non-iBCS2 extensions.. */ | 369 | |
350 | err |= __put_user(mask, &sc->oldmask); | 370 | /* non-iBCS2 extensions.. */ |
351 | err |= __put_user(current->thread.cr2, &sc->cr2); | 371 | put_user_ex(mask, &sc->oldmask); |
372 | put_user_ex(current->thread.cr2, &sc->cr2); | ||
373 | } put_user_catch(err); | ||
352 | 374 | ||
353 | return err; | 375 | return err; |
354 | } | 376 | } |
@@ -437,13 +459,17 @@ int ia32_setup_frame(int sig, struct k_sigaction *ka, | |||
437 | else | 459 | else |
438 | restorer = &frame->retcode; | 460 | restorer = &frame->retcode; |
439 | } | 461 | } |
440 | err |= __put_user(ptr_to_compat(restorer), &frame->pretcode); | ||
441 | 462 | ||
442 | /* | 463 | put_user_try { |
443 | * These are actually not used anymore, but left because some | 464 | put_user_ex(ptr_to_compat(restorer), &frame->pretcode); |
444 | * gdb versions depend on them as a marker. | 465 | |
445 | */ | 466 | /* |
446 | err |= __put_user(*((u64 *)&code), (u64 *)frame->retcode); | 467 | * These are actually not used anymore, but left because some |
468 | * gdb versions depend on them as a marker. | ||
469 | */ | ||
470 | put_user_ex(*((u64 *)&code), (u64 *)frame->retcode); | ||
471 | } put_user_catch(err); | ||
472 | |||
447 | if (err) | 473 | if (err) |
448 | return -EFAULT; | 474 | return -EFAULT; |
449 | 475 | ||
@@ -496,41 +522,40 @@ int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, | |||
496 | if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame))) | 522 | if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame))) |
497 | return -EFAULT; | 523 | return -EFAULT; |
498 | 524 | ||
499 | err |= __put_user(sig, &frame->sig); | 525 | put_user_try { |
500 | err |= __put_user(ptr_to_compat(&frame->info), &frame->pinfo); | 526 | put_user_ex(sig, &frame->sig); |
501 | err |= __put_user(ptr_to_compat(&frame->uc), &frame->puc); | 527 | put_user_ex(ptr_to_compat(&frame->info), &frame->pinfo); |
502 | err |= copy_siginfo_to_user32(&frame->info, info); | 528 | put_user_ex(ptr_to_compat(&frame->uc), &frame->puc); |
503 | if (err) | 529 | err |= copy_siginfo_to_user32(&frame->info, info); |
504 | return -EFAULT; | ||
505 | 530 | ||
506 | /* Create the ucontext. */ | 531 | /* Create the ucontext. */ |
507 | if (cpu_has_xsave) | 532 | if (cpu_has_xsave) |
508 | err |= __put_user(UC_FP_XSTATE, &frame->uc.uc_flags); | 533 | put_user_ex(UC_FP_XSTATE, &frame->uc.uc_flags); |
509 | else | 534 | else |
510 | err |= __put_user(0, &frame->uc.uc_flags); | 535 | put_user_ex(0, &frame->uc.uc_flags); |
511 | err |= __put_user(0, &frame->uc.uc_link); | 536 | put_user_ex(0, &frame->uc.uc_link); |
512 | err |= __put_user(current->sas_ss_sp, &frame->uc.uc_stack.ss_sp); | 537 | put_user_ex(current->sas_ss_sp, &frame->uc.uc_stack.ss_sp); |
513 | err |= __put_user(sas_ss_flags(regs->sp), | 538 | put_user_ex(sas_ss_flags(regs->sp), |
514 | &frame->uc.uc_stack.ss_flags); | 539 | &frame->uc.uc_stack.ss_flags); |
515 | err |= __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size); | 540 | put_user_ex(current->sas_ss_size, &frame->uc.uc_stack.ss_size); |
516 | err |= ia32_setup_sigcontext(&frame->uc.uc_mcontext, fpstate, | 541 | err |= ia32_setup_sigcontext(&frame->uc.uc_mcontext, fpstate, |
517 | regs, set->sig[0]); | 542 | regs, set->sig[0]); |
518 | err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set)); | 543 | err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set)); |
519 | if (err) | 544 | |
520 | return -EFAULT; | 545 | if (ka->sa.sa_flags & SA_RESTORER) |
546 | restorer = ka->sa.sa_restorer; | ||
547 | else | ||
548 | restorer = VDSO32_SYMBOL(current->mm->context.vdso, | ||
549 | rt_sigreturn); | ||
550 | put_user_ex(ptr_to_compat(restorer), &frame->pretcode); | ||
551 | |||
552 | /* | ||
553 | * Not actually used anymore, but left because some gdb | ||
554 | * versions need it. | ||
555 | */ | ||
556 | put_user_ex(*((u64 *)&code), (u64 *)frame->retcode); | ||
557 | } put_user_catch(err); | ||
521 | 558 | ||
522 | if (ka->sa.sa_flags & SA_RESTORER) | ||
523 | restorer = ka->sa.sa_restorer; | ||
524 | else | ||
525 | restorer = VDSO32_SYMBOL(current->mm->context.vdso, | ||
526 | rt_sigreturn); | ||
527 | err |= __put_user(ptr_to_compat(restorer), &frame->pretcode); | ||
528 | |||
529 | /* | ||
530 | * Not actually used anymore, but left because some gdb | ||
531 | * versions need it. | ||
532 | */ | ||
533 | err |= __put_user(*((u64 *)&code), (u64 *)frame->retcode); | ||
534 | if (err) | 559 | if (err) |
535 | return -EFAULT; | 560 | return -EFAULT; |
536 | 561 | ||
diff --git a/arch/x86/include/asm/a.out-core.h b/arch/x86/include/asm/a.out-core.h index 3c601f8224be..bb70e397aa84 100644 --- a/arch/x86/include/asm/a.out-core.h +++ b/arch/x86/include/asm/a.out-core.h | |||
@@ -55,7 +55,7 @@ static inline void aout_dump_thread(struct pt_regs *regs, struct user *dump) | |||
55 | dump->regs.ds = (u16)regs->ds; | 55 | dump->regs.ds = (u16)regs->ds; |
56 | dump->regs.es = (u16)regs->es; | 56 | dump->regs.es = (u16)regs->es; |
57 | dump->regs.fs = (u16)regs->fs; | 57 | dump->regs.fs = (u16)regs->fs; |
58 | savesegment(gs, dump->regs.gs); | 58 | dump->regs.gs = get_user_gs(regs); |
59 | dump->regs.orig_ax = regs->orig_ax; | 59 | dump->regs.orig_ax = regs->orig_ax; |
60 | dump->regs.ip = regs->ip; | 60 | dump->regs.ip = regs->ip; |
61 | dump->regs.cs = (u16)regs->cs; | 61 | dump->regs.cs = (u16)regs->cs; |
diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h index 9830681446ad..4518dc500903 100644 --- a/arch/x86/include/asm/acpi.h +++ b/arch/x86/include/asm/acpi.h | |||
@@ -102,9 +102,6 @@ static inline void disable_acpi(void) | |||
102 | acpi_noirq = 1; | 102 | acpi_noirq = 1; |
103 | } | 103 | } |
104 | 104 | ||
105 | /* Fixmap pages to reserve for ACPI boot-time tables (see fixmap.h) */ | ||
106 | #define FIX_ACPI_PAGES 4 | ||
107 | |||
108 | extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq); | 105 | extern int acpi_gsi_to_irq(u32 gsi, unsigned int *irq); |
109 | 106 | ||
110 | static inline void acpi_noirq_set(void) { acpi_noirq = 1; } | 107 | static inline void acpi_noirq_set(void) { acpi_noirq = 1; } |
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index ab1d51a8855e..fba49f66228f 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h | |||
@@ -33,7 +33,13 @@ | |||
33 | } while (0) | 33 | } while (0) |
34 | 34 | ||
35 | 35 | ||
36 | #if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_X86_32) | ||
36 | extern void generic_apic_probe(void); | 37 | extern void generic_apic_probe(void); |
38 | #else | ||
39 | static inline void generic_apic_probe(void) | ||
40 | { | ||
41 | } | ||
42 | #endif | ||
37 | 43 | ||
38 | #ifdef CONFIG_X86_LOCAL_APIC | 44 | #ifdef CONFIG_X86_LOCAL_APIC |
39 | 45 | ||
@@ -41,6 +47,21 @@ extern unsigned int apic_verbosity; | |||
41 | extern int local_apic_timer_c2_ok; | 47 | extern int local_apic_timer_c2_ok; |
42 | 48 | ||
43 | extern int disable_apic; | 49 | extern int disable_apic; |
50 | |||
51 | #ifdef CONFIG_SMP | ||
52 | extern void __inquire_remote_apic(int apicid); | ||
53 | #else /* CONFIG_SMP */ | ||
54 | static inline void __inquire_remote_apic(int apicid) | ||
55 | { | ||
56 | } | ||
57 | #endif /* CONFIG_SMP */ | ||
58 | |||
59 | static inline void default_inquire_remote_apic(int apicid) | ||
60 | { | ||
61 | if (apic_verbosity >= APIC_DEBUG) | ||
62 | __inquire_remote_apic(apicid); | ||
63 | } | ||
64 | |||
44 | /* | 65 | /* |
45 | * Basic functions accessing APICs. | 66 | * Basic functions accessing APICs. |
46 | */ | 67 | */ |
@@ -124,12 +145,35 @@ struct apic_ops { | |||
124 | 145 | ||
125 | extern struct apic_ops *apic_ops; | 146 | extern struct apic_ops *apic_ops; |
126 | 147 | ||
127 | #define apic_read (apic_ops->read) | 148 | static inline u32 apic_read(u32 reg) |
128 | #define apic_write (apic_ops->write) | 149 | { |
129 | #define apic_icr_read (apic_ops->icr_read) | 150 | return apic_ops->read(reg); |
130 | #define apic_icr_write (apic_ops->icr_write) | 151 | } |
131 | #define apic_wait_icr_idle (apic_ops->wait_icr_idle) | 152 | |
132 | #define safe_apic_wait_icr_idle (apic_ops->safe_wait_icr_idle) | 153 | static inline void apic_write(u32 reg, u32 val) |
154 | { | ||
155 | apic_ops->write(reg, val); | ||
156 | } | ||
157 | |||
158 | static inline u64 apic_icr_read(void) | ||
159 | { | ||
160 | return apic_ops->icr_read(); | ||
161 | } | ||
162 | |||
163 | static inline void apic_icr_write(u32 low, u32 high) | ||
164 | { | ||
165 | apic_ops->icr_write(low, high); | ||
166 | } | ||
167 | |||
168 | static inline void apic_wait_icr_idle(void) | ||
169 | { | ||
170 | apic_ops->wait_icr_idle(); | ||
171 | } | ||
172 | |||
173 | static inline u32 safe_apic_wait_icr_idle(void) | ||
174 | { | ||
175 | return apic_ops->safe_wait_icr_idle(); | ||
176 | } | ||
133 | 177 | ||
134 | extern int get_physical_broadcast(void); | 178 | extern int get_physical_broadcast(void); |
135 | 179 | ||
@@ -196,4 +240,22 @@ static inline void disable_local_APIC(void) { } | |||
196 | 240 | ||
197 | #endif /* !CONFIG_X86_LOCAL_APIC */ | 241 | #endif /* !CONFIG_X86_LOCAL_APIC */ |
198 | 242 | ||
243 | #ifdef CONFIG_X86_64 | ||
244 | #define SET_APIC_ID(x) (apic->set_apic_id(x)) | ||
245 | #else | ||
246 | |||
247 | #ifdef CONFIG_X86_LOCAL_APIC | ||
248 | static inline unsigned default_get_apic_id(unsigned long x) | ||
249 | { | ||
250 | unsigned int ver = GET_APIC_VERSION(apic_read(APIC_LVR)); | ||
251 | |||
252 | if (APIC_XAPIC(ver)) | ||
253 | return (x >> 24) & 0xFF; | ||
254 | else | ||
255 | return (x >> 24) & 0x0F; | ||
256 | } | ||
257 | #endif | ||
258 | |||
259 | #endif | ||
260 | |||
199 | #endif /* _ASM_X86_APIC_H */ | 261 | #endif /* _ASM_X86_APIC_H */ |
diff --git a/arch/x86/include/asm/mach-default/apm.h b/arch/x86/include/asm/apm.h index 20370c6db74b..20370c6db74b 100644 --- a/arch/x86/include/asm/mach-default/apm.h +++ b/arch/x86/include/asm/apm.h | |||
diff --git a/arch/x86/include/asm/bigsmp/apic.h b/arch/x86/include/asm/bigsmp/apic.h deleted file mode 100644 index d8dd9f537911..000000000000 --- a/arch/x86/include/asm/bigsmp/apic.h +++ /dev/null | |||
@@ -1,155 +0,0 @@ | |||
1 | #ifndef __ASM_MACH_APIC_H | ||
2 | #define __ASM_MACH_APIC_H | ||
3 | |||
4 | #define xapic_phys_to_log_apicid(cpu) (per_cpu(x86_bios_cpu_apicid, cpu)) | ||
5 | #define esr_disable (1) | ||
6 | |||
7 | static inline int apic_id_registered(void) | ||
8 | { | ||
9 | return (1); | ||
10 | } | ||
11 | |||
12 | static inline const cpumask_t *target_cpus(void) | ||
13 | { | ||
14 | #ifdef CONFIG_SMP | ||
15 | return &cpu_online_map; | ||
16 | #else | ||
17 | return &cpumask_of_cpu(0); | ||
18 | #endif | ||
19 | } | ||
20 | |||
21 | #undef APIC_DEST_LOGICAL | ||
22 | #define APIC_DEST_LOGICAL 0 | ||
23 | #define APIC_DFR_VALUE (APIC_DFR_FLAT) | ||
24 | #define INT_DELIVERY_MODE (dest_Fixed) | ||
25 | #define INT_DEST_MODE (0) /* phys delivery to target proc */ | ||
26 | #define NO_BALANCE_IRQ (0) | ||
27 | |||
28 | static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid) | ||
29 | { | ||
30 | return (0); | ||
31 | } | ||
32 | |||
33 | static inline unsigned long check_apicid_present(int bit) | ||
34 | { | ||
35 | return (1); | ||
36 | } | ||
37 | |||
38 | static inline unsigned long calculate_ldr(int cpu) | ||
39 | { | ||
40 | unsigned long val, id; | ||
41 | val = apic_read(APIC_LDR) & ~APIC_LDR_MASK; | ||
42 | id = xapic_phys_to_log_apicid(cpu); | ||
43 | val |= SET_APIC_LOGICAL_ID(id); | ||
44 | return val; | ||
45 | } | ||
46 | |||
47 | /* | ||
48 | * Set up the logical destination ID. | ||
49 | * | ||
50 | * Intel recommends to set DFR, LDR and TPR before enabling | ||
51 | * an APIC. See e.g. "AP-388 82489DX User's Manual" (Intel | ||
52 | * document number 292116). So here it goes... | ||
53 | */ | ||
54 | static inline void init_apic_ldr(void) | ||
55 | { | ||
56 | unsigned long val; | ||
57 | int cpu = smp_processor_id(); | ||
58 | |||
59 | apic_write(APIC_DFR, APIC_DFR_VALUE); | ||
60 | val = calculate_ldr(cpu); | ||
61 | apic_write(APIC_LDR, val); | ||
62 | } | ||
63 | |||
64 | static inline void setup_apic_routing(void) | ||
65 | { | ||
66 | printk("Enabling APIC mode: %s. Using %d I/O APICs\n", | ||
67 | "Physflat", nr_ioapics); | ||
68 | } | ||
69 | |||
70 | static inline int multi_timer_check(int apic, int irq) | ||
71 | { | ||
72 | return (0); | ||
73 | } | ||
74 | |||
75 | static inline int apicid_to_node(int logical_apicid) | ||
76 | { | ||
77 | return apicid_2_node[hard_smp_processor_id()]; | ||
78 | } | ||
79 | |||
80 | static inline int cpu_present_to_apicid(int mps_cpu) | ||
81 | { | ||
82 | if (mps_cpu < nr_cpu_ids) | ||
83 | return (int) per_cpu(x86_bios_cpu_apicid, mps_cpu); | ||
84 | |||
85 | return BAD_APICID; | ||
86 | } | ||
87 | |||
88 | static inline physid_mask_t apicid_to_cpu_present(int phys_apicid) | ||
89 | { | ||
90 | return physid_mask_of_physid(phys_apicid); | ||
91 | } | ||
92 | |||
93 | extern u8 cpu_2_logical_apicid[]; | ||
94 | /* Mapping from cpu number to logical apicid */ | ||
95 | static inline int cpu_to_logical_apicid(int cpu) | ||
96 | { | ||
97 | if (cpu >= nr_cpu_ids) | ||
98 | return BAD_APICID; | ||
99 | return cpu_physical_id(cpu); | ||
100 | } | ||
101 | |||
102 | static inline physid_mask_t ioapic_phys_id_map(physid_mask_t phys_map) | ||
103 | { | ||
104 | /* For clustered we don't have a good way to do this yet - hack */ | ||
105 | return physids_promote(0xFFL); | ||
106 | } | ||
107 | |||
108 | static inline void setup_portio_remap(void) | ||
109 | { | ||
110 | } | ||
111 | |||
112 | static inline void enable_apic_mode(void) | ||
113 | { | ||
114 | } | ||
115 | |||
116 | static inline int check_phys_apicid_present(int boot_cpu_physical_apicid) | ||
117 | { | ||
118 | return (1); | ||
119 | } | ||
120 | |||
121 | /* As we are using single CPU as destination, pick only one CPU here */ | ||
122 | static inline unsigned int cpu_mask_to_apicid(const cpumask_t *cpumask) | ||
123 | { | ||
124 | int cpu; | ||
125 | int apicid; | ||
126 | |||
127 | cpu = first_cpu(*cpumask); | ||
128 | apicid = cpu_to_logical_apicid(cpu); | ||
129 | return apicid; | ||
130 | } | ||
131 | |||
132 | static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *cpumask, | ||
133 | const struct cpumask *andmask) | ||
134 | { | ||
135 | int cpu; | ||
136 | |||
137 | /* | ||
138 | * We're using fixed IRQ delivery, can only return one phys APIC ID. | ||
139 | * May as well be the first. | ||
140 | */ | ||
141 | for_each_cpu_and(cpu, cpumask, andmask) | ||
142 | if (cpumask_test_cpu(cpu, cpu_online_mask)) | ||
143 | break; | ||
144 | if (cpu < nr_cpu_ids) | ||
145 | return cpu_to_logical_apicid(cpu); | ||
146 | |||
147 | return BAD_APICID; | ||
148 | } | ||
149 | |||
150 | static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) | ||
151 | { | ||
152 | return cpuid_apic >> index_msb; | ||
153 | } | ||
154 | |||
155 | #endif /* __ASM_MACH_APIC_H */ | ||
diff --git a/arch/x86/include/asm/bigsmp/apicdef.h b/arch/x86/include/asm/bigsmp/apicdef.h deleted file mode 100644 index 392c3f5ef2fe..000000000000 --- a/arch/x86/include/asm/bigsmp/apicdef.h +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | #ifndef __ASM_MACH_APICDEF_H | ||
2 | #define __ASM_MACH_APICDEF_H | ||
3 | |||
4 | #define APIC_ID_MASK (0xFF<<24) | ||
5 | |||
6 | static inline unsigned get_apic_id(unsigned long x) | ||
7 | { | ||
8 | return (((x)>>24)&0xFF); | ||
9 | } | ||
10 | |||
11 | #define GET_APIC_ID(x) get_apic_id(x) | ||
12 | |||
13 | #endif | ||
diff --git a/arch/x86/include/asm/bigsmp/ipi.h b/arch/x86/include/asm/bigsmp/ipi.h deleted file mode 100644 index 27fcd01b3ae6..000000000000 --- a/arch/x86/include/asm/bigsmp/ipi.h +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | #ifndef __ASM_MACH_IPI_H | ||
2 | #define __ASM_MACH_IPI_H | ||
3 | |||
4 | void send_IPI_mask_sequence(const struct cpumask *mask, int vector); | ||
5 | void send_IPI_mask_allbutself(const struct cpumask *mask, int vector); | ||
6 | |||
7 | static inline void send_IPI_mask(const struct cpumask *mask, int vector) | ||
8 | { | ||
9 | send_IPI_mask_sequence(mask, vector); | ||
10 | } | ||
11 | |||
12 | static inline void send_IPI_allbutself(int vector) | ||
13 | { | ||
14 | send_IPI_mask_allbutself(cpu_online_mask, vector); | ||
15 | } | ||
16 | |||
17 | static inline void send_IPI_all(int vector) | ||
18 | { | ||
19 | send_IPI_mask(cpu_online_mask, vector); | ||
20 | } | ||
21 | |||
22 | #endif /* __ASM_MACH_IPI_H */ | ||
diff --git a/arch/x86/include/asm/calling.h b/arch/x86/include/asm/calling.h index 2bc162e0ec6e..0e63c9a2a8d0 100644 --- a/arch/x86/include/asm/calling.h +++ b/arch/x86/include/asm/calling.h | |||
@@ -1,5 +1,55 @@ | |||
1 | /* | 1 | /* |
2 | * Some macros to handle stack frames in assembly. | 2 | |
3 | x86 function call convention, 64-bit: | ||
4 | ------------------------------------- | ||
5 | arguments | callee-saved | extra caller-saved | return | ||
6 | [callee-clobbered] | | [callee-clobbered] | | ||
7 | --------------------------------------------------------------------------- | ||
8 | rdi rsi rdx rcx r8-9 | rbx rbp [*] r12-15 | r10-11 | rax, rdx [**] | ||
9 | |||
10 | ( rsp is obviously invariant across normal function calls. (gcc can 'merge' | ||
11 | functions when it sees tail-call optimization possibilities) rflags is | ||
12 | clobbered. Leftover arguments are passed over the stack frame.) | ||
13 | |||
14 | [*] In the frame-pointers case rbp is fixed to the stack frame. | ||
15 | |||
16 | [**] for struct return values wider than 64 bits the return convention is a | ||
17 | bit more complex: up to 128 bits width we return small structures | ||
18 | straight in rax, rdx. For structures larger than that (3 words or | ||
19 | larger) the caller puts a pointer to an on-stack return struct | ||
20 | [allocated in the caller's stack frame] into the first argument - i.e. | ||
21 | into rdi. All other arguments shift up by one in this case. | ||
22 | Fortunately this case is rare in the kernel. | ||
23 | |||
24 | For 32-bit we have the following conventions - kernel is built with | ||
25 | -mregparm=3 and -freg-struct-return: | ||
26 | |||
27 | x86 function calling convention, 32-bit: | ||
28 | ---------------------------------------- | ||
29 | arguments | callee-saved | extra caller-saved | return | ||
30 | [callee-clobbered] | | [callee-clobbered] | | ||
31 | ------------------------------------------------------------------------- | ||
32 | eax edx ecx | ebx edi esi ebp [*] | <none> | eax, edx [**] | ||
33 | |||
34 | ( here too esp is obviously invariant across normal function calls. eflags | ||
35 | is clobbered. Leftover arguments are passed over the stack frame. ) | ||
36 | |||
37 | [*] In the frame-pointers case ebp is fixed to the stack frame. | ||
38 | |||
39 | [**] We build with -freg-struct-return, which on 32-bit means similar | ||
40 | semantics as on 64-bit: edx can be used for a second return value | ||
41 | (i.e. covering integer and structure sizes up to 64 bits) - after that | ||
42 | it gets more complex and more expensive: 3-word or larger struct returns | ||
43 | get done in the caller's frame and the pointer to the return struct goes | ||
44 | into regparm0, i.e. eax - the other arguments shift up and the | ||
45 | function's register parameters degenerate to regparm=2 in essence. | ||
46 | |||
47 | */ | ||
48 | |||
49 | |||
50 | /* | ||
51 | * 64-bit system call stack frame layout defines and helpers, | ||
52 | * for assembly code: | ||
3 | */ | 53 | */ |
4 | 54 | ||
5 | #define R15 0 | 55 | #define R15 0 |
@@ -9,7 +59,7 @@ | |||
9 | #define RBP 32 | 59 | #define RBP 32 |
10 | #define RBX 40 | 60 | #define RBX 40 |
11 | 61 | ||
12 | /* arguments: interrupts/non tracing syscalls only save upto here*/ | 62 | /* arguments: interrupts/non tracing syscalls only save up to here: */ |
13 | #define R11 48 | 63 | #define R11 48 |
14 | #define R10 56 | 64 | #define R10 56 |
15 | #define R9 64 | 65 | #define R9 64 |
@@ -22,7 +72,7 @@ | |||
22 | #define ORIG_RAX 120 /* + error_code */ | 72 | #define ORIG_RAX 120 /* + error_code */ |
23 | /* end of arguments */ | 73 | /* end of arguments */ |
24 | 74 | ||
25 | /* cpu exception frame or undefined in case of fast syscall. */ | 75 | /* cpu exception frame or undefined in case of fast syscall: */ |
26 | #define RIP 128 | 76 | #define RIP 128 |
27 | #define CS 136 | 77 | #define CS 136 |
28 | #define EFLAGS 144 | 78 | #define EFLAGS 144 |
diff --git a/arch/x86/include/asm/cpu.h b/arch/x86/include/asm/cpu.h index f03b23e32864..b185091bf19c 100644 --- a/arch/x86/include/asm/cpu.h +++ b/arch/x86/include/asm/cpu.h | |||
@@ -32,10 +32,6 @@ extern void arch_unregister_cpu(int); | |||
32 | 32 | ||
33 | DECLARE_PER_CPU(int, cpu_state); | 33 | DECLARE_PER_CPU(int, cpu_state); |
34 | 34 | ||
35 | #ifdef CONFIG_X86_HAS_BOOT_CPU_ID | 35 | extern unsigned int boot_cpu_id; |
36 | extern unsigned char boot_cpu_id; | ||
37 | #else | ||
38 | #define boot_cpu_id 0 | ||
39 | #endif | ||
40 | 36 | ||
41 | #endif /* _ASM_X86_CPU_H */ | 37 | #endif /* _ASM_X86_CPU_H */ |
diff --git a/arch/x86/include/asm/cpumask.h b/arch/x86/include/asm/cpumask.h index 26c6dad90479..a7f3c75f8ad7 100644 --- a/arch/x86/include/asm/cpumask.h +++ b/arch/x86/include/asm/cpumask.h | |||
@@ -10,6 +10,8 @@ extern cpumask_var_t cpu_callout_mask; | |||
10 | extern cpumask_var_t cpu_initialized_mask; | 10 | extern cpumask_var_t cpu_initialized_mask; |
11 | extern cpumask_var_t cpu_sibling_setup_mask; | 11 | extern cpumask_var_t cpu_sibling_setup_mask; |
12 | 12 | ||
13 | extern void setup_cpu_local_masks(void); | ||
14 | |||
13 | #else /* CONFIG_X86_32 */ | 15 | #else /* CONFIG_X86_32 */ |
14 | 16 | ||
15 | extern cpumask_t cpu_callin_map; | 17 | extern cpumask_t cpu_callin_map; |
@@ -22,6 +24,8 @@ extern cpumask_t cpu_sibling_setup_map; | |||
22 | #define cpu_initialized_mask ((struct cpumask *)&cpu_initialized) | 24 | #define cpu_initialized_mask ((struct cpumask *)&cpu_initialized) |
23 | #define cpu_sibling_setup_mask ((struct cpumask *)&cpu_sibling_setup_map) | 25 | #define cpu_sibling_setup_mask ((struct cpumask *)&cpu_sibling_setup_map) |
24 | 26 | ||
27 | static inline void setup_cpu_local_masks(void) { } | ||
28 | |||
25 | #endif /* CONFIG_X86_32 */ | 29 | #endif /* CONFIG_X86_32 */ |
26 | 30 | ||
27 | #endif /* __ASSEMBLY__ */ | 31 | #endif /* __ASSEMBLY__ */ |
diff --git a/arch/x86/include/asm/mach-default/do_timer.h b/arch/x86/include/asm/do_timer.h index 23ecda0b28a0..23ecda0b28a0 100644 --- a/arch/x86/include/asm/mach-default/do_timer.h +++ b/arch/x86/include/asm/do_timer.h | |||
diff --git a/arch/x86/include/asm/elf.h b/arch/x86/include/asm/elf.h index f51a3ddde01a..83c1bc8d2e8a 100644 --- a/arch/x86/include/asm/elf.h +++ b/arch/x86/include/asm/elf.h | |||
@@ -112,7 +112,7 @@ extern unsigned int vdso_enabled; | |||
112 | * now struct_user_regs, they are different) | 112 | * now struct_user_regs, they are different) |
113 | */ | 113 | */ |
114 | 114 | ||
115 | #define ELF_CORE_COPY_REGS(pr_reg, regs) \ | 115 | #define ELF_CORE_COPY_REGS_COMMON(pr_reg, regs) \ |
116 | do { \ | 116 | do { \ |
117 | pr_reg[0] = regs->bx; \ | 117 | pr_reg[0] = regs->bx; \ |
118 | pr_reg[1] = regs->cx; \ | 118 | pr_reg[1] = regs->cx; \ |
@@ -124,7 +124,6 @@ do { \ | |||
124 | pr_reg[7] = regs->ds & 0xffff; \ | 124 | pr_reg[7] = regs->ds & 0xffff; \ |
125 | pr_reg[8] = regs->es & 0xffff; \ | 125 | pr_reg[8] = regs->es & 0xffff; \ |
126 | pr_reg[9] = regs->fs & 0xffff; \ | 126 | pr_reg[9] = regs->fs & 0xffff; \ |
127 | savesegment(gs, pr_reg[10]); \ | ||
128 | pr_reg[11] = regs->orig_ax; \ | 127 | pr_reg[11] = regs->orig_ax; \ |
129 | pr_reg[12] = regs->ip; \ | 128 | pr_reg[12] = regs->ip; \ |
130 | pr_reg[13] = regs->cs & 0xffff; \ | 129 | pr_reg[13] = regs->cs & 0xffff; \ |
@@ -133,6 +132,18 @@ do { \ | |||
133 | pr_reg[16] = regs->ss & 0xffff; \ | 132 | pr_reg[16] = regs->ss & 0xffff; \ |
134 | } while (0); | 133 | } while (0); |
135 | 134 | ||
135 | #define ELF_CORE_COPY_REGS(pr_reg, regs) \ | ||
136 | do { \ | ||
137 | ELF_CORE_COPY_REGS_COMMON(pr_reg, regs);\ | ||
138 | pr_reg[10] = get_user_gs(regs); \ | ||
139 | } while (0); | ||
140 | |||
141 | #define ELF_CORE_COPY_KERNEL_REGS(pr_reg, regs) \ | ||
142 | do { \ | ||
143 | ELF_CORE_COPY_REGS_COMMON(pr_reg, regs);\ | ||
144 | savesegment(gs, pr_reg[10]); \ | ||
145 | } while (0); | ||
146 | |||
136 | #define ELF_PLATFORM (utsname()->machine) | 147 | #define ELF_PLATFORM (utsname()->machine) |
137 | #define set_personality_64bit() do { } while (0) | 148 | #define set_personality_64bit() do { } while (0) |
138 | 149 | ||
diff --git a/arch/x86/include/asm/mach-default/entry_arch.h b/arch/x86/include/asm/entry_arch.h index b87b077cc231..854d538ae857 100644 --- a/arch/x86/include/asm/mach-default/entry_arch.h +++ b/arch/x86/include/asm/entry_arch.h | |||
@@ -9,7 +9,7 @@ | |||
9 | * is no hardware IRQ pin equivalent for them, they are triggered | 9 | * is no hardware IRQ pin equivalent for them, they are triggered |
10 | * through the ICC by us (IPIs) | 10 | * through the ICC by us (IPIs) |
11 | */ | 11 | */ |
12 | #ifdef CONFIG_X86_SMP | 12 | #ifdef CONFIG_SMP |
13 | BUILD_INTERRUPT(reschedule_interrupt,RESCHEDULE_VECTOR) | 13 | BUILD_INTERRUPT(reschedule_interrupt,RESCHEDULE_VECTOR) |
14 | BUILD_INTERRUPT(call_function_interrupt,CALL_FUNCTION_VECTOR) | 14 | BUILD_INTERRUPT(call_function_interrupt,CALL_FUNCTION_VECTOR) |
15 | BUILD_INTERRUPT(call_function_single_interrupt,CALL_FUNCTION_SINGLE_VECTOR) | 15 | BUILD_INTERRUPT(call_function_single_interrupt,CALL_FUNCTION_SINGLE_VECTOR) |
diff --git a/arch/x86/include/asm/es7000/apic.h b/arch/x86/include/asm/es7000/apic.h deleted file mode 100644 index c58b9cc74465..000000000000 --- a/arch/x86/include/asm/es7000/apic.h +++ /dev/null | |||
@@ -1,242 +0,0 @@ | |||
1 | #ifndef __ASM_ES7000_APIC_H | ||
2 | #define __ASM_ES7000_APIC_H | ||
3 | |||
4 | #include <linux/gfp.h> | ||
5 | |||
6 | #define xapic_phys_to_log_apicid(cpu) per_cpu(x86_bios_cpu_apicid, cpu) | ||
7 | #define esr_disable (1) | ||
8 | |||
9 | static inline int apic_id_registered(void) | ||
10 | { | ||
11 | return (1); | ||
12 | } | ||
13 | |||
14 | static inline const cpumask_t *target_cpus_cluster(void) | ||
15 | { | ||
16 | return &CPU_MASK_ALL; | ||
17 | } | ||
18 | |||
19 | static inline const cpumask_t *target_cpus(void) | ||
20 | { | ||
21 | return &cpumask_of_cpu(smp_processor_id()); | ||
22 | } | ||
23 | |||
24 | #define APIC_DFR_VALUE_CLUSTER (APIC_DFR_CLUSTER) | ||
25 | #define INT_DELIVERY_MODE_CLUSTER (dest_LowestPrio) | ||
26 | #define INT_DEST_MODE_CLUSTER (1) /* logical delivery broadcast to all procs */ | ||
27 | #define NO_BALANCE_IRQ_CLUSTER (1) | ||
28 | |||
29 | #define APIC_DFR_VALUE (APIC_DFR_FLAT) | ||
30 | #define INT_DELIVERY_MODE (dest_Fixed) | ||
31 | #define INT_DEST_MODE (0) /* phys delivery to target procs */ | ||
32 | #define NO_BALANCE_IRQ (0) | ||
33 | #undef APIC_DEST_LOGICAL | ||
34 | #define APIC_DEST_LOGICAL 0x0 | ||
35 | |||
36 | static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid) | ||
37 | { | ||
38 | return 0; | ||
39 | } | ||
40 | static inline unsigned long check_apicid_present(int bit) | ||
41 | { | ||
42 | return physid_isset(bit, phys_cpu_present_map); | ||
43 | } | ||
44 | |||
45 | #define apicid_cluster(apicid) (apicid & 0xF0) | ||
46 | |||
47 | static inline unsigned long calculate_ldr(int cpu) | ||
48 | { | ||
49 | unsigned long id; | ||
50 | id = xapic_phys_to_log_apicid(cpu); | ||
51 | return (SET_APIC_LOGICAL_ID(id)); | ||
52 | } | ||
53 | |||
54 | /* | ||
55 | * Set up the logical destination ID. | ||
56 | * | ||
57 | * Intel recommends to set DFR, LdR and TPR before enabling | ||
58 | * an APIC. See e.g. "AP-388 82489DX User's Manual" (Intel | ||
59 | * document number 292116). So here it goes... | ||
60 | */ | ||
61 | static inline void init_apic_ldr_cluster(void) | ||
62 | { | ||
63 | unsigned long val; | ||
64 | int cpu = smp_processor_id(); | ||
65 | |||
66 | apic_write(APIC_DFR, APIC_DFR_VALUE_CLUSTER); | ||
67 | val = calculate_ldr(cpu); | ||
68 | apic_write(APIC_LDR, val); | ||
69 | } | ||
70 | |||
71 | static inline void init_apic_ldr(void) | ||
72 | { | ||
73 | unsigned long val; | ||
74 | int cpu = smp_processor_id(); | ||
75 | |||
76 | apic_write(APIC_DFR, APIC_DFR_VALUE); | ||
77 | val = calculate_ldr(cpu); | ||
78 | apic_write(APIC_LDR, val); | ||
79 | } | ||
80 | |||
81 | extern int apic_version [MAX_APICS]; | ||
82 | static inline void setup_apic_routing(void) | ||
83 | { | ||
84 | int apic = per_cpu(x86_bios_cpu_apicid, smp_processor_id()); | ||
85 | printk("Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n", | ||
86 | (apic_version[apic] == 0x14) ? | ||
87 | "Physical Cluster" : "Logical Cluster", | ||
88 | nr_ioapics, cpus_addr(*target_cpus())[0]); | ||
89 | } | ||
90 | |||
91 | static inline int multi_timer_check(int apic, int irq) | ||
92 | { | ||
93 | return 0; | ||
94 | } | ||
95 | |||
96 | static inline int apicid_to_node(int logical_apicid) | ||
97 | { | ||
98 | return 0; | ||
99 | } | ||
100 | |||
101 | |||
102 | static inline int cpu_present_to_apicid(int mps_cpu) | ||
103 | { | ||
104 | if (!mps_cpu) | ||
105 | return boot_cpu_physical_apicid; | ||
106 | else if (mps_cpu < nr_cpu_ids) | ||
107 | return (int) per_cpu(x86_bios_cpu_apicid, mps_cpu); | ||
108 | else | ||
109 | return BAD_APICID; | ||
110 | } | ||
111 | |||
112 | static inline physid_mask_t apicid_to_cpu_present(int phys_apicid) | ||
113 | { | ||
114 | static int id = 0; | ||
115 | physid_mask_t mask; | ||
116 | mask = physid_mask_of_physid(id); | ||
117 | ++id; | ||
118 | return mask; | ||
119 | } | ||
120 | |||
121 | extern u8 cpu_2_logical_apicid[]; | ||
122 | /* Mapping from cpu number to logical apicid */ | ||
123 | static inline int cpu_to_logical_apicid(int cpu) | ||
124 | { | ||
125 | #ifdef CONFIG_SMP | ||
126 | if (cpu >= nr_cpu_ids) | ||
127 | return BAD_APICID; | ||
128 | return (int)cpu_2_logical_apicid[cpu]; | ||
129 | #else | ||
130 | return logical_smp_processor_id(); | ||
131 | #endif | ||
132 | } | ||
133 | |||
134 | static inline physid_mask_t ioapic_phys_id_map(physid_mask_t phys_map) | ||
135 | { | ||
136 | /* For clustered we don't have a good way to do this yet - hack */ | ||
137 | return physids_promote(0xff); | ||
138 | } | ||
139 | |||
140 | |||
141 | static inline void setup_portio_remap(void) | ||
142 | { | ||
143 | } | ||
144 | |||
145 | extern unsigned int boot_cpu_physical_apicid; | ||
146 | static inline int check_phys_apicid_present(int cpu_physical_apicid) | ||
147 | { | ||
148 | boot_cpu_physical_apicid = read_apic_id(); | ||
149 | return (1); | ||
150 | } | ||
151 | |||
152 | static inline unsigned int | ||
153 | cpu_mask_to_apicid_cluster(const struct cpumask *cpumask) | ||
154 | { | ||
155 | int num_bits_set; | ||
156 | int cpus_found = 0; | ||
157 | int cpu; | ||
158 | int apicid; | ||
159 | |||
160 | num_bits_set = cpumask_weight(cpumask); | ||
161 | /* Return id to all */ | ||
162 | if (num_bits_set == nr_cpu_ids) | ||
163 | return 0xFF; | ||
164 | /* | ||
165 | * The cpus in the mask must all be on the apic cluster. If are not | ||
166 | * on the same apicid cluster return default value of TARGET_CPUS. | ||
167 | */ | ||
168 | cpu = cpumask_first(cpumask); | ||
169 | apicid = cpu_to_logical_apicid(cpu); | ||
170 | while (cpus_found < num_bits_set) { | ||
171 | if (cpumask_test_cpu(cpu, cpumask)) { | ||
172 | int new_apicid = cpu_to_logical_apicid(cpu); | ||
173 | if (apicid_cluster(apicid) != | ||
174 | apicid_cluster(new_apicid)){ | ||
175 | printk ("%s: Not a valid mask!\n", __func__); | ||
176 | return 0xFF; | ||
177 | } | ||
178 | apicid = new_apicid; | ||
179 | cpus_found++; | ||
180 | } | ||
181 | cpu++; | ||
182 | } | ||
183 | return apicid; | ||
184 | } | ||
185 | |||
186 | static inline unsigned int cpu_mask_to_apicid(const cpumask_t *cpumask) | ||
187 | { | ||
188 | int num_bits_set; | ||
189 | int cpus_found = 0; | ||
190 | int cpu; | ||
191 | int apicid; | ||
192 | |||
193 | num_bits_set = cpus_weight(*cpumask); | ||
194 | /* Return id to all */ | ||
195 | if (num_bits_set == nr_cpu_ids) | ||
196 | return cpu_to_logical_apicid(0); | ||
197 | /* | ||
198 | * The cpus in the mask must all be on the apic cluster. If are not | ||
199 | * on the same apicid cluster return default value of TARGET_CPUS. | ||
200 | */ | ||
201 | cpu = first_cpu(*cpumask); | ||
202 | apicid = cpu_to_logical_apicid(cpu); | ||
203 | while (cpus_found < num_bits_set) { | ||
204 | if (cpu_isset(cpu, *cpumask)) { | ||
205 | int new_apicid = cpu_to_logical_apicid(cpu); | ||
206 | if (apicid_cluster(apicid) != | ||
207 | apicid_cluster(new_apicid)){ | ||
208 | printk ("%s: Not a valid mask!\n", __func__); | ||
209 | return cpu_to_logical_apicid(0); | ||
210 | } | ||
211 | apicid = new_apicid; | ||
212 | cpus_found++; | ||
213 | } | ||
214 | cpu++; | ||
215 | } | ||
216 | return apicid; | ||
217 | } | ||
218 | |||
219 | |||
220 | static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *inmask, | ||
221 | const struct cpumask *andmask) | ||
222 | { | ||
223 | int apicid = cpu_to_logical_apicid(0); | ||
224 | cpumask_var_t cpumask; | ||
225 | |||
226 | if (!alloc_cpumask_var(&cpumask, GFP_ATOMIC)) | ||
227 | return apicid; | ||
228 | |||
229 | cpumask_and(cpumask, inmask, andmask); | ||
230 | cpumask_and(cpumask, cpumask, cpu_online_mask); | ||
231 | apicid = cpu_mask_to_apicid(cpumask); | ||
232 | |||
233 | free_cpumask_var(cpumask); | ||
234 | return apicid; | ||
235 | } | ||
236 | |||
237 | static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) | ||
238 | { | ||
239 | return cpuid_apic >> index_msb; | ||
240 | } | ||
241 | |||
242 | #endif /* __ASM_ES7000_APIC_H */ | ||
diff --git a/arch/x86/include/asm/es7000/apicdef.h b/arch/x86/include/asm/es7000/apicdef.h deleted file mode 100644 index 8b234a3cb851..000000000000 --- a/arch/x86/include/asm/es7000/apicdef.h +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | #ifndef __ASM_ES7000_APICDEF_H | ||
2 | #define __ASM_ES7000_APICDEF_H | ||
3 | |||
4 | #define APIC_ID_MASK (0xFF<<24) | ||
5 | |||
6 | static inline unsigned get_apic_id(unsigned long x) | ||
7 | { | ||
8 | return (((x)>>24)&0xFF); | ||
9 | } | ||
10 | |||
11 | #define GET_APIC_ID(x) get_apic_id(x) | ||
12 | |||
13 | #endif | ||
diff --git a/arch/x86/include/asm/es7000/ipi.h b/arch/x86/include/asm/es7000/ipi.h deleted file mode 100644 index 7e8ed24d4b8a..000000000000 --- a/arch/x86/include/asm/es7000/ipi.h +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | #ifndef __ASM_ES7000_IPI_H | ||
2 | #define __ASM_ES7000_IPI_H | ||
3 | |||
4 | void send_IPI_mask_sequence(const struct cpumask *mask, int vector); | ||
5 | void send_IPI_mask_allbutself(const struct cpumask *mask, int vector); | ||
6 | |||
7 | static inline void send_IPI_mask(const struct cpumask *mask, int vector) | ||
8 | { | ||
9 | send_IPI_mask_sequence(mask, vector); | ||
10 | } | ||
11 | |||
12 | static inline void send_IPI_allbutself(int vector) | ||
13 | { | ||
14 | send_IPI_mask_allbutself(cpu_online_mask, vector); | ||
15 | } | ||
16 | |||
17 | static inline void send_IPI_all(int vector) | ||
18 | { | ||
19 | send_IPI_mask(cpu_online_mask, vector); | ||
20 | } | ||
21 | |||
22 | #endif /* __ASM_ES7000_IPI_H */ | ||
diff --git a/arch/x86/include/asm/es7000/mpparse.h b/arch/x86/include/asm/es7000/mpparse.h deleted file mode 100644 index c1629b090ec2..000000000000 --- a/arch/x86/include/asm/es7000/mpparse.h +++ /dev/null | |||
@@ -1,29 +0,0 @@ | |||
1 | #ifndef __ASM_ES7000_MPPARSE_H | ||
2 | #define __ASM_ES7000_MPPARSE_H | ||
3 | |||
4 | #include <linux/acpi.h> | ||
5 | |||
6 | extern int parse_unisys_oem (char *oemptr); | ||
7 | extern int find_unisys_acpi_oem_table(unsigned long *oem_addr); | ||
8 | extern void unmap_unisys_acpi_oem_table(unsigned long oem_addr); | ||
9 | extern void setup_unisys(void); | ||
10 | |||
11 | #ifndef CONFIG_X86_GENERICARCH | ||
12 | extern int acpi_madt_oem_check(char *oem_id, char *oem_table_id); | ||
13 | extern int mps_oem_check(struct mpc_table *mpc, char *oem, char *productid); | ||
14 | #endif | ||
15 | |||
16 | #ifdef CONFIG_ACPI | ||
17 | |||
18 | static inline int es7000_check_dsdt(void) | ||
19 | { | ||
20 | struct acpi_table_header header; | ||
21 | |||
22 | if (ACPI_SUCCESS(acpi_get_table_header(ACPI_SIG_DSDT, 0, &header)) && | ||
23 | !strncmp(header.oem_id, "UNISYS", 6)) | ||
24 | return 1; | ||
25 | return 0; | ||
26 | } | ||
27 | #endif | ||
28 | |||
29 | #endif /* __ASM_MACH_MPPARSE_H */ | ||
diff --git a/arch/x86/include/asm/es7000/wakecpu.h b/arch/x86/include/asm/es7000/wakecpu.h deleted file mode 100644 index 78f0daaee436..000000000000 --- a/arch/x86/include/asm/es7000/wakecpu.h +++ /dev/null | |||
@@ -1,37 +0,0 @@ | |||
1 | #ifndef __ASM_ES7000_WAKECPU_H | ||
2 | #define __ASM_ES7000_WAKECPU_H | ||
3 | |||
4 | #define TRAMPOLINE_PHYS_LOW 0x467 | ||
5 | #define TRAMPOLINE_PHYS_HIGH 0x469 | ||
6 | |||
7 | static inline void wait_for_init_deassert(atomic_t *deassert) | ||
8 | { | ||
9 | #ifndef CONFIG_ES7000_CLUSTERED_APIC | ||
10 | while (!atomic_read(deassert)) | ||
11 | cpu_relax(); | ||
12 | #endif | ||
13 | return; | ||
14 | } | ||
15 | |||
16 | /* Nothing to do for most platforms, since cleared by the INIT cycle */ | ||
17 | static inline void smp_callin_clear_local_apic(void) | ||
18 | { | ||
19 | } | ||
20 | |||
21 | static inline void store_NMI_vector(unsigned short *high, unsigned short *low) | ||
22 | { | ||
23 | } | ||
24 | |||
25 | static inline void restore_NMI_vector(unsigned short *high, unsigned short *low) | ||
26 | { | ||
27 | } | ||
28 | |||
29 | extern void __inquire_remote_apic(int apicid); | ||
30 | |||
31 | static inline void inquire_remote_apic(int apicid) | ||
32 | { | ||
33 | if (apic_verbosity >= APIC_DEBUG) | ||
34 | __inquire_remote_apic(apicid); | ||
35 | } | ||
36 | |||
37 | #endif /* __ASM_MACH_WAKECPU_H */ | ||
diff --git a/arch/x86/include/asm/fixmap_32.h b/arch/x86/include/asm/fixmap_32.h index c7115c1d7217..047d9bab2b31 100644 --- a/arch/x86/include/asm/fixmap_32.h +++ b/arch/x86/include/asm/fixmap_32.h | |||
@@ -95,10 +95,6 @@ enum fixed_addresses { | |||
95 | (__end_of_permanent_fixed_addresses & 255), | 95 | (__end_of_permanent_fixed_addresses & 255), |
96 | FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS*FIX_BTMAPS_SLOTS - 1, | 96 | FIX_BTMAP_BEGIN = FIX_BTMAP_END + NR_FIX_BTMAPS*FIX_BTMAPS_SLOTS - 1, |
97 | FIX_WP_TEST, | 97 | FIX_WP_TEST, |
98 | #ifdef CONFIG_ACPI | ||
99 | FIX_ACPI_BEGIN, | ||
100 | FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1, | ||
101 | #endif | ||
102 | #ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT | 98 | #ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT |
103 | FIX_OHCI1394_BASE, | 99 | FIX_OHCI1394_BASE, |
104 | #endif | 100 | #endif |
diff --git a/arch/x86/include/asm/fixmap_64.h b/arch/x86/include/asm/fixmap_64.h index 00a30ab9b1a5..298d9ba3faeb 100644 --- a/arch/x86/include/asm/fixmap_64.h +++ b/arch/x86/include/asm/fixmap_64.h | |||
@@ -50,10 +50,6 @@ enum fixed_addresses { | |||
50 | FIX_PARAVIRT_BOOTMAP, | 50 | FIX_PARAVIRT_BOOTMAP, |
51 | #endif | 51 | #endif |
52 | __end_of_permanent_fixed_addresses, | 52 | __end_of_permanent_fixed_addresses, |
53 | #ifdef CONFIG_ACPI | ||
54 | FIX_ACPI_BEGIN, | ||
55 | FIX_ACPI_END = FIX_ACPI_BEGIN + FIX_ACPI_PAGES - 1, | ||
56 | #endif | ||
57 | #ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT | 53 | #ifdef CONFIG_PROVIDE_OHCI1394_DMA_INIT |
58 | FIX_OHCI1394_BASE, | 54 | FIX_OHCI1394_BASE, |
59 | #endif | 55 | #endif |
diff --git a/arch/x86/include/asm/genapic.h b/arch/x86/include/asm/genapic.h index d48bee663a6f..273b99452ae0 100644 --- a/arch/x86/include/asm/genapic.h +++ b/arch/x86/include/asm/genapic.h | |||
@@ -1,5 +1,263 @@ | |||
1 | #ifndef _ASM_X86_GENAPIC_H | ||
2 | #define _ASM_X86_GENAPIC_H | ||
3 | |||
4 | #include <linux/cpumask.h> | ||
5 | |||
6 | #include <asm/mpspec.h> | ||
7 | #include <asm/atomic.h> | ||
8 | |||
9 | /* | ||
10 | * Copyright 2004 James Cleverdon, IBM. | ||
11 | * Subject to the GNU Public License, v.2 | ||
12 | * | ||
13 | * Generic APIC sub-arch data struct. | ||
14 | * | ||
15 | * Hacked for x86-64 by James Cleverdon from i386 architecture code by | ||
16 | * Martin Bligh, Andi Kleen, James Bottomley, John Stultz, and | ||
17 | * James Cleverdon. | ||
18 | */ | ||
19 | struct genapic { | ||
20 | char *name; | ||
21 | |||
22 | int (*probe)(void); | ||
23 | int (*acpi_madt_oem_check)(char *oem_id, char *oem_table_id); | ||
24 | int (*apic_id_registered)(void); | ||
25 | |||
26 | u32 irq_delivery_mode; | ||
27 | u32 irq_dest_mode; | ||
28 | |||
29 | const struct cpumask *(*target_cpus)(void); | ||
30 | |||
31 | int disable_esr; | ||
32 | |||
33 | int dest_logical; | ||
34 | unsigned long (*check_apicid_used)(physid_mask_t bitmap, int apicid); | ||
35 | unsigned long (*check_apicid_present)(int apicid); | ||
36 | |||
37 | void (*vector_allocation_domain)(int cpu, struct cpumask *retmask); | ||
38 | void (*init_apic_ldr)(void); | ||
39 | |||
40 | physid_mask_t (*ioapic_phys_id_map)(physid_mask_t map); | ||
41 | |||
42 | void (*setup_apic_routing)(void); | ||
43 | int (*multi_timer_check)(int apic, int irq); | ||
44 | int (*apicid_to_node)(int logical_apicid); | ||
45 | int (*cpu_to_logical_apicid)(int cpu); | ||
46 | int (*cpu_present_to_apicid)(int mps_cpu); | ||
47 | physid_mask_t (*apicid_to_cpu_present)(int phys_apicid); | ||
48 | void (*setup_portio_remap)(void); | ||
49 | int (*check_phys_apicid_present)(int boot_cpu_physical_apicid); | ||
50 | void (*enable_apic_mode)(void); | ||
51 | int (*phys_pkg_id)(int cpuid_apic, int index_msb); | ||
52 | |||
53 | /* | ||
54 | * When one of the next two hooks returns 1 the genapic | ||
55 | * is switched to this. Essentially they are additional | ||
56 | * probe functions: | ||
57 | */ | ||
58 | int (*mps_oem_check)(struct mpc_table *mpc, char *oem, char *productid); | ||
59 | |||
60 | unsigned int (*get_apic_id)(unsigned long x); | ||
61 | unsigned long (*set_apic_id)(unsigned int id); | ||
62 | unsigned long apic_id_mask; | ||
63 | |||
64 | unsigned int (*cpu_mask_to_apicid)(const struct cpumask *cpumask); | ||
65 | unsigned int (*cpu_mask_to_apicid_and)(const struct cpumask *cpumask, | ||
66 | const struct cpumask *andmask); | ||
67 | |||
68 | /* ipi */ | ||
69 | void (*send_IPI_mask)(const struct cpumask *mask, int vector); | ||
70 | void (*send_IPI_mask_allbutself)(const struct cpumask *mask, | ||
71 | int vector); | ||
72 | void (*send_IPI_allbutself)(int vector); | ||
73 | void (*send_IPI_all)(int vector); | ||
74 | void (*send_IPI_self)(int vector); | ||
75 | |||
76 | /* wakeup_secondary_cpu */ | ||
77 | int (*wakeup_cpu)(int apicid, unsigned long start_eip); | ||
78 | |||
79 | int trampoline_phys_low; | ||
80 | int trampoline_phys_high; | ||
81 | |||
82 | void (*wait_for_init_deassert)(atomic_t *deassert); | ||
83 | void (*smp_callin_clear_local_apic)(void); | ||
84 | void (*store_NMI_vector)(unsigned short *high, unsigned short *low); | ||
85 | void (*inquire_remote_apic)(int apicid); | ||
86 | }; | ||
87 | |||
88 | extern struct genapic *apic; | ||
89 | |||
90 | /* | ||
91 | * Warm reset vector default position: | ||
92 | */ | ||
93 | #define DEFAULT_TRAMPOLINE_PHYS_LOW 0x467 | ||
94 | #define DEFAULT_TRAMPOLINE_PHYS_HIGH 0x469 | ||
95 | |||
1 | #ifdef CONFIG_X86_32 | 96 | #ifdef CONFIG_X86_32 |
2 | # include "genapic_32.h" | 97 | extern void es7000_update_genapic_to_cluster(void); |
3 | #else | 98 | #else |
4 | # include "genapic_64.h" | 99 | extern struct genapic apic_flat; |
100 | extern struct genapic apic_physflat; | ||
101 | extern struct genapic apic_x2apic_cluster; | ||
102 | extern struct genapic apic_x2apic_phys; | ||
103 | extern int default_acpi_madt_oem_check(char *, char *); | ||
104 | |||
105 | extern void apic_send_IPI_self(int vector); | ||
106 | |||
107 | extern struct genapic apic_x2apic_uv_x; | ||
108 | DECLARE_PER_CPU(int, x2apic_extra_bits); | ||
109 | |||
110 | extern void default_setup_apic_routing(void); | ||
111 | |||
112 | extern int default_cpu_present_to_apicid(int mps_cpu); | ||
113 | extern int default_check_phys_apicid_present(int boot_cpu_physical_apicid); | ||
5 | #endif | 114 | #endif |
115 | |||
116 | static inline void default_wait_for_init_deassert(atomic_t *deassert) | ||
117 | { | ||
118 | while (!atomic_read(deassert)) | ||
119 | cpu_relax(); | ||
120 | return; | ||
121 | } | ||
122 | |||
123 | extern void generic_bigsmp_probe(void); | ||
124 | |||
125 | |||
126 | #ifdef CONFIG_X86_LOCAL_APIC | ||
127 | |||
128 | #include <asm/smp.h> | ||
129 | |||
130 | #define APIC_DFR_VALUE (APIC_DFR_FLAT) | ||
131 | |||
132 | static inline const struct cpumask *default_target_cpus(void) | ||
133 | { | ||
134 | #ifdef CONFIG_SMP | ||
135 | return cpu_online_mask; | ||
136 | #else | ||
137 | return cpumask_of(0); | ||
138 | #endif | ||
139 | } | ||
140 | |||
141 | DECLARE_EARLY_PER_CPU(u16, x86_bios_cpu_apicid); | ||
142 | |||
143 | |||
144 | static inline unsigned int read_apic_id(void) | ||
145 | { | ||
146 | unsigned int reg; | ||
147 | |||
148 | reg = apic_read(APIC_ID); | ||
149 | |||
150 | return apic->get_apic_id(reg); | ||
151 | } | ||
152 | |||
153 | #ifdef CONFIG_X86_64 | ||
154 | extern void default_setup_apic_routing(void); | ||
155 | #else | ||
156 | |||
157 | /* | ||
158 | * Set up the logical destination ID. | ||
159 | * | ||
160 | * Intel recommends to set DFR, LDR and TPR before enabling | ||
161 | * an APIC. See e.g. "AP-388 82489DX User's Manual" (Intel | ||
162 | * document number 292116). So here it goes... | ||
163 | */ | ||
164 | extern void default_init_apic_ldr(void); | ||
165 | |||
166 | static inline int default_apic_id_registered(void) | ||
167 | { | ||
168 | return physid_isset(read_apic_id(), phys_cpu_present_map); | ||
169 | } | ||
170 | |||
171 | static inline unsigned int | ||
172 | default_cpu_mask_to_apicid(const struct cpumask *cpumask) | ||
173 | { | ||
174 | return cpumask_bits(cpumask)[0]; | ||
175 | } | ||
176 | |||
177 | static inline unsigned int | ||
178 | default_cpu_mask_to_apicid_and(const struct cpumask *cpumask, | ||
179 | const struct cpumask *andmask) | ||
180 | { | ||
181 | unsigned long mask1 = cpumask_bits(cpumask)[0]; | ||
182 | unsigned long mask2 = cpumask_bits(andmask)[0]; | ||
183 | unsigned long mask3 = cpumask_bits(cpu_online_mask)[0]; | ||
184 | |||
185 | return (unsigned int)(mask1 & mask2 & mask3); | ||
186 | } | ||
187 | |||
188 | static inline int default_phys_pkg_id(int cpuid_apic, int index_msb) | ||
189 | { | ||
190 | return cpuid_apic >> index_msb; | ||
191 | } | ||
192 | |||
193 | static inline void default_setup_apic_routing(void) | ||
194 | { | ||
195 | #ifdef CONFIG_X86_IO_APIC | ||
196 | printk("Enabling APIC mode: %s. Using %d I/O APICs\n", | ||
197 | "Flat", nr_ioapics); | ||
198 | #endif | ||
199 | } | ||
200 | |||
201 | extern int default_apicid_to_node(int logical_apicid); | ||
202 | |||
203 | #endif | ||
204 | |||
205 | static inline unsigned long default_check_apicid_used(physid_mask_t bitmap, int apicid) | ||
206 | { | ||
207 | return physid_isset(apicid, bitmap); | ||
208 | } | ||
209 | |||
210 | static inline unsigned long default_check_apicid_present(int bit) | ||
211 | { | ||
212 | return physid_isset(bit, phys_cpu_present_map); | ||
213 | } | ||
214 | |||
215 | static inline physid_mask_t default_ioapic_phys_id_map(physid_mask_t phys_map) | ||
216 | { | ||
217 | return phys_map; | ||
218 | } | ||
219 | |||
220 | /* Mapping from cpu number to logical apicid */ | ||
221 | static inline int default_cpu_to_logical_apicid(int cpu) | ||
222 | { | ||
223 | return 1 << cpu; | ||
224 | } | ||
225 | |||
226 | static inline int __default_cpu_present_to_apicid(int mps_cpu) | ||
227 | { | ||
228 | if (mps_cpu < nr_cpu_ids && cpu_present(mps_cpu)) | ||
229 | return (int)per_cpu(x86_bios_cpu_apicid, mps_cpu); | ||
230 | else | ||
231 | return BAD_APICID; | ||
232 | } | ||
233 | |||
234 | static inline int | ||
235 | __default_check_phys_apicid_present(int boot_cpu_physical_apicid) | ||
236 | { | ||
237 | return physid_isset(boot_cpu_physical_apicid, phys_cpu_present_map); | ||
238 | } | ||
239 | |||
240 | #ifdef CONFIG_X86_32 | ||
241 | static inline int default_cpu_present_to_apicid(int mps_cpu) | ||
242 | { | ||
243 | return __default_cpu_present_to_apicid(mps_cpu); | ||
244 | } | ||
245 | |||
246 | static inline int | ||
247 | default_check_phys_apicid_present(int boot_cpu_physical_apicid) | ||
248 | { | ||
249 | return __default_check_phys_apicid_present(boot_cpu_physical_apicid); | ||
250 | } | ||
251 | #else | ||
252 | extern int default_cpu_present_to_apicid(int mps_cpu); | ||
253 | extern int default_check_phys_apicid_present(int boot_cpu_physical_apicid); | ||
254 | #endif | ||
255 | |||
256 | static inline physid_mask_t default_apicid_to_cpu_present(int phys_apicid) | ||
257 | { | ||
258 | return physid_mask_of_physid(phys_apicid); | ||
259 | } | ||
260 | |||
261 | #endif /* CONFIG_X86_LOCAL_APIC */ | ||
262 | |||
263 | #endif /* _ASM_X86_GENAPIC_64_H */ | ||
diff --git a/arch/x86/include/asm/genapic_32.h b/arch/x86/include/asm/genapic_32.h deleted file mode 100644 index 4334502d3664..000000000000 --- a/arch/x86/include/asm/genapic_32.h +++ /dev/null | |||
@@ -1,141 +0,0 @@ | |||
1 | #ifndef _ASM_X86_GENAPIC_32_H | ||
2 | #define _ASM_X86_GENAPIC_32_H | ||
3 | |||
4 | #include <asm/mpspec.h> | ||
5 | #include <asm/atomic.h> | ||
6 | |||
7 | /* | ||
8 | * Generic APIC driver interface. | ||
9 | * | ||
10 | * An straight forward mapping of the APIC related parts of the | ||
11 | * x86 subarchitecture interface to a dynamic object. | ||
12 | * | ||
13 | * This is used by the "generic" x86 subarchitecture. | ||
14 | * | ||
15 | * Copyright 2003 Andi Kleen, SuSE Labs. | ||
16 | */ | ||
17 | |||
18 | struct mpc_bus; | ||
19 | struct mpc_table; | ||
20 | struct mpc_cpu; | ||
21 | |||
22 | struct genapic { | ||
23 | char *name; | ||
24 | int (*probe)(void); | ||
25 | |||
26 | int (*apic_id_registered)(void); | ||
27 | const struct cpumask *(*target_cpus)(void); | ||
28 | int int_delivery_mode; | ||
29 | int int_dest_mode; | ||
30 | int ESR_DISABLE; | ||
31 | int apic_destination_logical; | ||
32 | unsigned long (*check_apicid_used)(physid_mask_t bitmap, int apicid); | ||
33 | unsigned long (*check_apicid_present)(int apicid); | ||
34 | int no_balance_irq; | ||
35 | int no_ioapic_check; | ||
36 | void (*init_apic_ldr)(void); | ||
37 | physid_mask_t (*ioapic_phys_id_map)(physid_mask_t map); | ||
38 | |||
39 | void (*setup_apic_routing)(void); | ||
40 | int (*multi_timer_check)(int apic, int irq); | ||
41 | int (*apicid_to_node)(int logical_apicid); | ||
42 | int (*cpu_to_logical_apicid)(int cpu); | ||
43 | int (*cpu_present_to_apicid)(int mps_cpu); | ||
44 | physid_mask_t (*apicid_to_cpu_present)(int phys_apicid); | ||
45 | void (*setup_portio_remap)(void); | ||
46 | int (*check_phys_apicid_present)(int boot_cpu_physical_apicid); | ||
47 | void (*enable_apic_mode)(void); | ||
48 | u32 (*phys_pkg_id)(u32 cpuid_apic, int index_msb); | ||
49 | |||
50 | /* mpparse */ | ||
51 | /* When one of the next two hooks returns 1 the genapic | ||
52 | is switched to this. Essentially they are additional probe | ||
53 | functions. */ | ||
54 | int (*mps_oem_check)(struct mpc_table *mpc, char *oem, | ||
55 | char *productid); | ||
56 | int (*acpi_madt_oem_check)(char *oem_id, char *oem_table_id); | ||
57 | |||
58 | unsigned (*get_apic_id)(unsigned long x); | ||
59 | unsigned long apic_id_mask; | ||
60 | unsigned int (*cpu_mask_to_apicid)(const struct cpumask *cpumask); | ||
61 | unsigned int (*cpu_mask_to_apicid_and)(const struct cpumask *cpumask, | ||
62 | const struct cpumask *andmask); | ||
63 | void (*vector_allocation_domain)(int cpu, struct cpumask *retmask); | ||
64 | |||
65 | #ifdef CONFIG_SMP | ||
66 | /* ipi */ | ||
67 | void (*send_IPI_mask)(const struct cpumask *mask, int vector); | ||
68 | void (*send_IPI_mask_allbutself)(const struct cpumask *mask, | ||
69 | int vector); | ||
70 | void (*send_IPI_allbutself)(int vector); | ||
71 | void (*send_IPI_all)(int vector); | ||
72 | #endif | ||
73 | int (*wakeup_cpu)(int apicid, unsigned long start_eip); | ||
74 | int trampoline_phys_low; | ||
75 | int trampoline_phys_high; | ||
76 | void (*wait_for_init_deassert)(atomic_t *deassert); | ||
77 | void (*smp_callin_clear_local_apic)(void); | ||
78 | void (*store_NMI_vector)(unsigned short *high, unsigned short *low); | ||
79 | void (*restore_NMI_vector)(unsigned short *high, unsigned short *low); | ||
80 | void (*inquire_remote_apic)(int apicid); | ||
81 | }; | ||
82 | |||
83 | #define APICFUNC(x) .x = x, | ||
84 | |||
85 | /* More functions could be probably marked IPIFUNC and save some space | ||
86 | in UP GENERICARCH kernels, but I don't have the nerve right now | ||
87 | to untangle this mess. -AK */ | ||
88 | #ifdef CONFIG_SMP | ||
89 | #define IPIFUNC(x) APICFUNC(x) | ||
90 | #else | ||
91 | #define IPIFUNC(x) | ||
92 | #endif | ||
93 | |||
94 | #define APIC_INIT(aname, aprobe) \ | ||
95 | { \ | ||
96 | .name = aname, \ | ||
97 | .probe = aprobe, \ | ||
98 | .int_delivery_mode = INT_DELIVERY_MODE, \ | ||
99 | .int_dest_mode = INT_DEST_MODE, \ | ||
100 | .no_balance_irq = NO_BALANCE_IRQ, \ | ||
101 | .ESR_DISABLE = esr_disable, \ | ||
102 | .apic_destination_logical = APIC_DEST_LOGICAL, \ | ||
103 | APICFUNC(apic_id_registered) \ | ||
104 | APICFUNC(target_cpus) \ | ||
105 | APICFUNC(check_apicid_used) \ | ||
106 | APICFUNC(check_apicid_present) \ | ||
107 | APICFUNC(init_apic_ldr) \ | ||
108 | APICFUNC(ioapic_phys_id_map) \ | ||
109 | APICFUNC(setup_apic_routing) \ | ||
110 | APICFUNC(multi_timer_check) \ | ||
111 | APICFUNC(apicid_to_node) \ | ||
112 | APICFUNC(cpu_to_logical_apicid) \ | ||
113 | APICFUNC(cpu_present_to_apicid) \ | ||
114 | APICFUNC(apicid_to_cpu_present) \ | ||
115 | APICFUNC(setup_portio_remap) \ | ||
116 | APICFUNC(check_phys_apicid_present) \ | ||
117 | APICFUNC(mps_oem_check) \ | ||
118 | APICFUNC(get_apic_id) \ | ||
119 | .apic_id_mask = APIC_ID_MASK, \ | ||
120 | APICFUNC(cpu_mask_to_apicid) \ | ||
121 | APICFUNC(cpu_mask_to_apicid_and) \ | ||
122 | APICFUNC(vector_allocation_domain) \ | ||
123 | APICFUNC(acpi_madt_oem_check) \ | ||
124 | IPIFUNC(send_IPI_mask) \ | ||
125 | IPIFUNC(send_IPI_allbutself) \ | ||
126 | IPIFUNC(send_IPI_all) \ | ||
127 | APICFUNC(enable_apic_mode) \ | ||
128 | APICFUNC(phys_pkg_id) \ | ||
129 | .trampoline_phys_low = TRAMPOLINE_PHYS_LOW, \ | ||
130 | .trampoline_phys_high = TRAMPOLINE_PHYS_HIGH, \ | ||
131 | APICFUNC(wait_for_init_deassert) \ | ||
132 | APICFUNC(smp_callin_clear_local_apic) \ | ||
133 | APICFUNC(store_NMI_vector) \ | ||
134 | APICFUNC(restore_NMI_vector) \ | ||
135 | APICFUNC(inquire_remote_apic) \ | ||
136 | } | ||
137 | |||
138 | extern struct genapic *genapic; | ||
139 | extern void es7000_update_genapic_to_cluster(void); | ||
140 | |||
141 | #endif /* _ASM_X86_GENAPIC_32_H */ | ||
diff --git a/arch/x86/include/asm/genapic_64.h b/arch/x86/include/asm/genapic_64.h deleted file mode 100644 index 7bb092c59055..000000000000 --- a/arch/x86/include/asm/genapic_64.h +++ /dev/null | |||
@@ -1,60 +0,0 @@ | |||
1 | #ifndef _ASM_X86_GENAPIC_64_H | ||
2 | #define _ASM_X86_GENAPIC_64_H | ||
3 | |||
4 | #include <linux/cpumask.h> | ||
5 | |||
6 | /* | ||
7 | * Copyright 2004 James Cleverdon, IBM. | ||
8 | * Subject to the GNU Public License, v.2 | ||
9 | * | ||
10 | * Generic APIC sub-arch data struct. | ||
11 | * | ||
12 | * Hacked for x86-64 by James Cleverdon from i386 architecture code by | ||
13 | * Martin Bligh, Andi Kleen, James Bottomley, John Stultz, and | ||
14 | * James Cleverdon. | ||
15 | */ | ||
16 | |||
17 | struct genapic { | ||
18 | char *name; | ||
19 | int (*acpi_madt_oem_check)(char *oem_id, char *oem_table_id); | ||
20 | u32 int_delivery_mode; | ||
21 | u32 int_dest_mode; | ||
22 | int (*apic_id_registered)(void); | ||
23 | const struct cpumask *(*target_cpus)(void); | ||
24 | void (*vector_allocation_domain)(int cpu, struct cpumask *retmask); | ||
25 | void (*init_apic_ldr)(void); | ||
26 | /* ipi */ | ||
27 | void (*send_IPI_mask)(const struct cpumask *mask, int vector); | ||
28 | void (*send_IPI_mask_allbutself)(const struct cpumask *mask, | ||
29 | int vector); | ||
30 | void (*send_IPI_allbutself)(int vector); | ||
31 | void (*send_IPI_all)(int vector); | ||
32 | void (*send_IPI_self)(int vector); | ||
33 | /* */ | ||
34 | unsigned int (*cpu_mask_to_apicid)(const struct cpumask *cpumask); | ||
35 | unsigned int (*cpu_mask_to_apicid_and)(const struct cpumask *cpumask, | ||
36 | const struct cpumask *andmask); | ||
37 | unsigned int (*phys_pkg_id)(int index_msb); | ||
38 | unsigned int (*get_apic_id)(unsigned long x); | ||
39 | unsigned long (*set_apic_id)(unsigned int id); | ||
40 | unsigned long apic_id_mask; | ||
41 | /* wakeup_secondary_cpu */ | ||
42 | int (*wakeup_cpu)(int apicid, unsigned long start_eip); | ||
43 | }; | ||
44 | |||
45 | extern struct genapic *genapic; | ||
46 | |||
47 | extern struct genapic apic_flat; | ||
48 | extern struct genapic apic_physflat; | ||
49 | extern struct genapic apic_x2apic_cluster; | ||
50 | extern struct genapic apic_x2apic_phys; | ||
51 | extern int acpi_madt_oem_check(char *, char *); | ||
52 | |||
53 | extern void apic_send_IPI_self(int vector); | ||
54 | |||
55 | extern struct genapic apic_x2apic_uv_x; | ||
56 | DECLARE_PER_CPU(int, x2apic_extra_bits); | ||
57 | |||
58 | extern void setup_apic_routing(void); | ||
59 | |||
60 | #endif /* _ASM_X86_GENAPIC_64_H */ | ||
diff --git a/arch/x86/include/asm/hw_irq.h b/arch/x86/include/asm/hw_irq.h index aa93e53b85ee..f39881b6b68b 100644 --- a/arch/x86/include/asm/hw_irq.h +++ b/arch/x86/include/asm/hw_irq.h | |||
@@ -25,8 +25,6 @@ | |||
25 | #include <asm/irq.h> | 25 | #include <asm/irq.h> |
26 | #include <asm/sections.h> | 26 | #include <asm/sections.h> |
27 | 27 | ||
28 | #define platform_legacy_irq(irq) ((irq) < 16) | ||
29 | |||
30 | /* Interrupt handlers registered during init_IRQ */ | 28 | /* Interrupt handlers registered during init_IRQ */ |
31 | extern void apic_timer_interrupt(void); | 29 | extern void apic_timer_interrupt(void); |
32 | extern void error_interrupt(void); | 30 | extern void error_interrupt(void); |
@@ -60,7 +58,7 @@ extern void make_8259A_irq(unsigned int irq); | |||
60 | extern void init_8259A(int aeoi); | 58 | extern void init_8259A(int aeoi); |
61 | 59 | ||
62 | /* IOAPIC */ | 60 | /* IOAPIC */ |
63 | #define IO_APIC_IRQ(x) (((x) >= 16) || ((1<<(x)) & io_apic_irqs)) | 61 | #define IO_APIC_IRQ(x) (((x) >= NR_IRQS_LEGACY) || ((1<<(x)) & io_apic_irqs)) |
64 | extern unsigned long io_apic_irqs; | 62 | extern unsigned long io_apic_irqs; |
65 | 63 | ||
66 | extern void init_VISWS_APIC_irqs(void); | 64 | extern void init_VISWS_APIC_irqs(void); |
@@ -69,15 +67,7 @@ extern void disable_IO_APIC(void); | |||
69 | extern int IO_APIC_get_PCI_irq_vector(int bus, int slot, int fn); | 67 | extern int IO_APIC_get_PCI_irq_vector(int bus, int slot, int fn); |
70 | extern void setup_ioapic_dest(void); | 68 | extern void setup_ioapic_dest(void); |
71 | 69 | ||
72 | #ifdef CONFIG_X86_64 | ||
73 | extern void enable_IO_APIC(void); | 70 | extern void enable_IO_APIC(void); |
74 | #endif | ||
75 | |||
76 | /* IPI functions */ | ||
77 | #ifdef CONFIG_X86_32 | ||
78 | extern void send_IPI_self(int vector); | ||
79 | #endif | ||
80 | extern void send_IPI(int dest, int vector); | ||
81 | 71 | ||
82 | /* Statistics */ | 72 | /* Statistics */ |
83 | extern atomic_t irq_err_count; | 73 | extern atomic_t irq_err_count; |
@@ -86,21 +76,11 @@ extern atomic_t irq_mis_count; | |||
86 | /* EISA */ | 76 | /* EISA */ |
87 | extern void eisa_set_level_irq(unsigned int irq); | 77 | extern void eisa_set_level_irq(unsigned int irq); |
88 | 78 | ||
89 | /* Voyager functions */ | ||
90 | extern asmlinkage void vic_cpi_interrupt(void); | ||
91 | extern asmlinkage void vic_sys_interrupt(void); | ||
92 | extern asmlinkage void vic_cmn_interrupt(void); | ||
93 | extern asmlinkage void qic_timer_interrupt(void); | ||
94 | extern asmlinkage void qic_invalidate_interrupt(void); | ||
95 | extern asmlinkage void qic_reschedule_interrupt(void); | ||
96 | extern asmlinkage void qic_enable_irq_interrupt(void); | ||
97 | extern asmlinkage void qic_call_function_interrupt(void); | ||
98 | |||
99 | /* SMP */ | 79 | /* SMP */ |
100 | extern void smp_apic_timer_interrupt(struct pt_regs *); | 80 | extern void smp_apic_timer_interrupt(struct pt_regs *); |
101 | extern void smp_spurious_interrupt(struct pt_regs *); | 81 | extern void smp_spurious_interrupt(struct pt_regs *); |
102 | extern void smp_error_interrupt(struct pt_regs *); | 82 | extern void smp_error_interrupt(struct pt_regs *); |
103 | #ifdef CONFIG_X86_SMP | 83 | #ifdef CONFIG_SMP |
104 | extern void smp_reschedule_interrupt(struct pt_regs *); | 84 | extern void smp_reschedule_interrupt(struct pt_regs *); |
105 | extern void smp_call_function_interrupt(struct pt_regs *); | 85 | extern void smp_call_function_interrupt(struct pt_regs *); |
106 | extern void smp_call_function_single_interrupt(struct pt_regs *); | 86 | extern void smp_call_function_single_interrupt(struct pt_regs *); |
diff --git a/arch/x86/include/asm/io.h b/arch/x86/include/asm/io.h index 1dbbdf4be9b4..e5a2ab44cd5c 100644 --- a/arch/x86/include/asm/io.h +++ b/arch/x86/include/asm/io.h | |||
@@ -5,6 +5,7 @@ | |||
5 | 5 | ||
6 | #include <linux/compiler.h> | 6 | #include <linux/compiler.h> |
7 | #include <asm-generic/int-ll64.h> | 7 | #include <asm-generic/int-ll64.h> |
8 | #include <asm/page.h> | ||
8 | 9 | ||
9 | #define build_mmio_read(name, size, type, reg, barrier) \ | 10 | #define build_mmio_read(name, size, type, reg, barrier) \ |
10 | static inline type name(const volatile void __iomem *addr) \ | 11 | static inline type name(const volatile void __iomem *addr) \ |
@@ -80,6 +81,95 @@ static inline void writeq(__u64 val, volatile void __iomem *addr) | |||
80 | #define readq readq | 81 | #define readq readq |
81 | #define writeq writeq | 82 | #define writeq writeq |
82 | 83 | ||
84 | /** | ||
85 | * virt_to_phys - map virtual addresses to physical | ||
86 | * @address: address to remap | ||
87 | * | ||
88 | * The returned physical address is the physical (CPU) mapping for | ||
89 | * the memory address given. It is only valid to use this function on | ||
90 | * addresses directly mapped or allocated via kmalloc. | ||
91 | * | ||
92 | * This function does not give bus mappings for DMA transfers. In | ||
93 | * almost all conceivable cases a device driver should not be using | ||
94 | * this function | ||
95 | */ | ||
96 | |||
97 | static inline phys_addr_t virt_to_phys(volatile void *address) | ||
98 | { | ||
99 | return __pa(address); | ||
100 | } | ||
101 | |||
102 | /** | ||
103 | * phys_to_virt - map physical address to virtual | ||
104 | * @address: address to remap | ||
105 | * | ||
106 | * The returned virtual address is a current CPU mapping for | ||
107 | * the memory address given. It is only valid to use this function on | ||
108 | * addresses that have a kernel mapping | ||
109 | * | ||
110 | * This function does not handle bus mappings for DMA transfers. In | ||
111 | * almost all conceivable cases a device driver should not be using | ||
112 | * this function | ||
113 | */ | ||
114 | |||
115 | static inline void *phys_to_virt(phys_addr_t address) | ||
116 | { | ||
117 | return __va(address); | ||
118 | } | ||
119 | |||
120 | /* | ||
121 | * Change "struct page" to physical address. | ||
122 | */ | ||
123 | #define page_to_phys(page) ((dma_addr_t)page_to_pfn(page) << PAGE_SHIFT) | ||
124 | |||
125 | /* | ||
126 | * ISA I/O bus memory addresses are 1:1 with the physical address. | ||
127 | */ | ||
128 | #define isa_virt_to_bus virt_to_phys | ||
129 | #define isa_page_to_bus page_to_phys | ||
130 | #define isa_bus_to_virt phys_to_virt | ||
131 | |||
132 | /* | ||
133 | * However PCI ones are not necessarily 1:1 and therefore these interfaces | ||
134 | * are forbidden in portable PCI drivers. | ||
135 | * | ||
136 | * Allow them on x86 for legacy drivers, though. | ||
137 | */ | ||
138 | #define virt_to_bus virt_to_phys | ||
139 | #define bus_to_virt phys_to_virt | ||
140 | |||
141 | /** | ||
142 | * ioremap - map bus memory into CPU space | ||
143 | * @offset: bus address of the memory | ||
144 | * @size: size of the resource to map | ||
145 | * | ||
146 | * ioremap performs a platform specific sequence of operations to | ||
147 | * make bus memory CPU accessible via the readb/readw/readl/writeb/ | ||
148 | * writew/writel functions and the other mmio helpers. The returned | ||
149 | * address is not guaranteed to be usable directly as a virtual | ||
150 | * address. | ||
151 | * | ||
152 | * If the area you are trying to map is a PCI BAR you should have a | ||
153 | * look at pci_iomap(). | ||
154 | */ | ||
155 | extern void __iomem *ioremap_nocache(resource_size_t offset, unsigned long size); | ||
156 | extern void __iomem *ioremap_cache(resource_size_t offset, unsigned long size); | ||
157 | extern void __iomem *ioremap_prot(resource_size_t offset, unsigned long size, | ||
158 | unsigned long prot_val); | ||
159 | |||
160 | /* | ||
161 | * The default ioremap() behavior is non-cached: | ||
162 | */ | ||
163 | static inline void __iomem *ioremap(resource_size_t offset, unsigned long size) | ||
164 | { | ||
165 | return ioremap_nocache(offset, size); | ||
166 | } | ||
167 | |||
168 | extern void iounmap(volatile void __iomem *addr); | ||
169 | |||
170 | extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys); | ||
171 | |||
172 | |||
83 | #ifdef CONFIG_X86_32 | 173 | #ifdef CONFIG_X86_32 |
84 | # include "io_32.h" | 174 | # include "io_32.h" |
85 | #else | 175 | #else |
@@ -91,7 +181,7 @@ extern void unxlate_dev_mem_ptr(unsigned long phys, void *addr); | |||
91 | 181 | ||
92 | extern int ioremap_change_attr(unsigned long vaddr, unsigned long size, | 182 | extern int ioremap_change_attr(unsigned long vaddr, unsigned long size, |
93 | unsigned long prot_val); | 183 | unsigned long prot_val); |
94 | extern void __iomem *ioremap_wc(unsigned long offset, unsigned long size); | 184 | extern void __iomem *ioremap_wc(resource_size_t offset, unsigned long size); |
95 | 185 | ||
96 | /* | 186 | /* |
97 | * early_ioremap() and early_iounmap() are for temporary early boot-time | 187 | * early_ioremap() and early_iounmap() are for temporary early boot-time |
@@ -105,5 +195,6 @@ extern void __iomem *early_memremap(unsigned long offset, unsigned long size); | |||
105 | extern void early_iounmap(void __iomem *addr, unsigned long size); | 195 | extern void early_iounmap(void __iomem *addr, unsigned long size); |
106 | extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys); | 196 | extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys); |
107 | 197 | ||
198 | #define IO_SPACE_LIMIT 0xffff | ||
108 | 199 | ||
109 | #endif /* _ASM_X86_IO_H */ | 200 | #endif /* _ASM_X86_IO_H */ |
diff --git a/arch/x86/include/asm/io_32.h b/arch/x86/include/asm/io_32.h index d8e242e1b396..a299900f5920 100644 --- a/arch/x86/include/asm/io_32.h +++ b/arch/x86/include/asm/io_32.h | |||
@@ -37,8 +37,6 @@ | |||
37 | * - Arnaldo Carvalho de Melo <acme@conectiva.com.br> | 37 | * - Arnaldo Carvalho de Melo <acme@conectiva.com.br> |
38 | */ | 38 | */ |
39 | 39 | ||
40 | #define IO_SPACE_LIMIT 0xffff | ||
41 | |||
42 | #define XQUAD_PORTIO_BASE 0xfe400000 | 40 | #define XQUAD_PORTIO_BASE 0xfe400000 |
43 | #define XQUAD_PORTIO_QUAD 0x40000 /* 256k per quad. */ | 41 | #define XQUAD_PORTIO_QUAD 0x40000 /* 256k per quad. */ |
44 | 42 | ||
@@ -53,92 +51,6 @@ | |||
53 | */ | 51 | */ |
54 | #define xlate_dev_kmem_ptr(p) p | 52 | #define xlate_dev_kmem_ptr(p) p |
55 | 53 | ||
56 | /** | ||
57 | * virt_to_phys - map virtual addresses to physical | ||
58 | * @address: address to remap | ||
59 | * | ||
60 | * The returned physical address is the physical (CPU) mapping for | ||
61 | * the memory address given. It is only valid to use this function on | ||
62 | * addresses directly mapped or allocated via kmalloc. | ||
63 | * | ||
64 | * This function does not give bus mappings for DMA transfers. In | ||
65 | * almost all conceivable cases a device driver should not be using | ||
66 | * this function | ||
67 | */ | ||
68 | |||
69 | static inline unsigned long virt_to_phys(volatile void *address) | ||
70 | { | ||
71 | return __pa(address); | ||
72 | } | ||
73 | |||
74 | /** | ||
75 | * phys_to_virt - map physical address to virtual | ||
76 | * @address: address to remap | ||
77 | * | ||
78 | * The returned virtual address is a current CPU mapping for | ||
79 | * the memory address given. It is only valid to use this function on | ||
80 | * addresses that have a kernel mapping | ||
81 | * | ||
82 | * This function does not handle bus mappings for DMA transfers. In | ||
83 | * almost all conceivable cases a device driver should not be using | ||
84 | * this function | ||
85 | */ | ||
86 | |||
87 | static inline void *phys_to_virt(unsigned long address) | ||
88 | { | ||
89 | return __va(address); | ||
90 | } | ||
91 | |||
92 | /* | ||
93 | * Change "struct page" to physical address. | ||
94 | */ | ||
95 | #define page_to_phys(page) ((dma_addr_t)page_to_pfn(page) << PAGE_SHIFT) | ||
96 | |||
97 | /** | ||
98 | * ioremap - map bus memory into CPU space | ||
99 | * @offset: bus address of the memory | ||
100 | * @size: size of the resource to map | ||
101 | * | ||
102 | * ioremap performs a platform specific sequence of operations to | ||
103 | * make bus memory CPU accessible via the readb/readw/readl/writeb/ | ||
104 | * writew/writel functions and the other mmio helpers. The returned | ||
105 | * address is not guaranteed to be usable directly as a virtual | ||
106 | * address. | ||
107 | * | ||
108 | * If the area you are trying to map is a PCI BAR you should have a | ||
109 | * look at pci_iomap(). | ||
110 | */ | ||
111 | extern void __iomem *ioremap_nocache(resource_size_t offset, unsigned long size); | ||
112 | extern void __iomem *ioremap_cache(resource_size_t offset, unsigned long size); | ||
113 | extern void __iomem *ioremap_prot(resource_size_t offset, unsigned long size, | ||
114 | unsigned long prot_val); | ||
115 | |||
116 | /* | ||
117 | * The default ioremap() behavior is non-cached: | ||
118 | */ | ||
119 | static inline void __iomem *ioremap(resource_size_t offset, unsigned long size) | ||
120 | { | ||
121 | return ioremap_nocache(offset, size); | ||
122 | } | ||
123 | |||
124 | extern void iounmap(volatile void __iomem *addr); | ||
125 | |||
126 | /* | ||
127 | * ISA I/O bus memory addresses are 1:1 with the physical address. | ||
128 | */ | ||
129 | #define isa_virt_to_bus virt_to_phys | ||
130 | #define isa_page_to_bus page_to_phys | ||
131 | #define isa_bus_to_virt phys_to_virt | ||
132 | |||
133 | /* | ||
134 | * However PCI ones are not necessarily 1:1 and therefore these interfaces | ||
135 | * are forbidden in portable PCI drivers. | ||
136 | * | ||
137 | * Allow them on x86 for legacy drivers, though. | ||
138 | */ | ||
139 | #define virt_to_bus virt_to_phys | ||
140 | #define bus_to_virt phys_to_virt | ||
141 | |||
142 | static inline void | 54 | static inline void |
143 | memset_io(volatile void __iomem *addr, unsigned char val, int count) | 55 | memset_io(volatile void __iomem *addr, unsigned char val, int count) |
144 | { | 56 | { |
diff --git a/arch/x86/include/asm/io_64.h b/arch/x86/include/asm/io_64.h index 563c16270ba6..244067893af4 100644 --- a/arch/x86/include/asm/io_64.h +++ b/arch/x86/include/asm/io_64.h | |||
@@ -136,73 +136,12 @@ __OUTS(b) | |||
136 | __OUTS(w) | 136 | __OUTS(w) |
137 | __OUTS(l) | 137 | __OUTS(l) |
138 | 138 | ||
139 | #define IO_SPACE_LIMIT 0xffff | ||
140 | |||
141 | #if defined(__KERNEL__) && defined(__x86_64__) | 139 | #if defined(__KERNEL__) && defined(__x86_64__) |
142 | 140 | ||
143 | #include <linux/vmalloc.h> | 141 | #include <linux/vmalloc.h> |
144 | 142 | ||
145 | #ifndef __i386__ | ||
146 | /* | ||
147 | * Change virtual addresses to physical addresses and vv. | ||
148 | * These are pretty trivial | ||
149 | */ | ||
150 | static inline unsigned long virt_to_phys(volatile void *address) | ||
151 | { | ||
152 | return __pa(address); | ||
153 | } | ||
154 | |||
155 | static inline void *phys_to_virt(unsigned long address) | ||
156 | { | ||
157 | return __va(address); | ||
158 | } | ||
159 | #endif | ||
160 | |||
161 | /* | ||
162 | * Change "struct page" to physical address. | ||
163 | */ | ||
164 | #define page_to_phys(page) ((dma_addr_t)page_to_pfn(page) << PAGE_SHIFT) | ||
165 | |||
166 | #include <asm-generic/iomap.h> | 143 | #include <asm-generic/iomap.h> |
167 | 144 | ||
168 | /* | ||
169 | * This one maps high address device memory and turns off caching for that area. | ||
170 | * it's useful if some control registers are in such an area and write combining | ||
171 | * or read caching is not desirable: | ||
172 | */ | ||
173 | extern void __iomem *ioremap_nocache(resource_size_t offset, unsigned long size); | ||
174 | extern void __iomem *ioremap_cache(resource_size_t offset, unsigned long size); | ||
175 | extern void __iomem *ioremap_prot(resource_size_t offset, unsigned long size, | ||
176 | unsigned long prot_val); | ||
177 | |||
178 | /* | ||
179 | * The default ioremap() behavior is non-cached: | ||
180 | */ | ||
181 | static inline void __iomem *ioremap(resource_size_t offset, unsigned long size) | ||
182 | { | ||
183 | return ioremap_nocache(offset, size); | ||
184 | } | ||
185 | |||
186 | extern void iounmap(volatile void __iomem *addr); | ||
187 | |||
188 | extern void __iomem *fix_ioremap(unsigned idx, unsigned long phys); | ||
189 | |||
190 | /* | ||
191 | * ISA I/O bus memory addresses are 1:1 with the physical address. | ||
192 | */ | ||
193 | #define isa_virt_to_bus virt_to_phys | ||
194 | #define isa_page_to_bus page_to_phys | ||
195 | #define isa_bus_to_virt phys_to_virt | ||
196 | |||
197 | /* | ||
198 | * However PCI ones are not necessarily 1:1 and therefore these interfaces | ||
199 | * are forbidden in portable PCI drivers. | ||
200 | * | ||
201 | * Allow them on x86 for legacy drivers, though. | ||
202 | */ | ||
203 | #define virt_to_bus virt_to_phys | ||
204 | #define bus_to_virt phys_to_virt | ||
205 | |||
206 | void __memcpy_fromio(void *, unsigned long, unsigned); | 145 | void __memcpy_fromio(void *, unsigned long, unsigned); |
207 | void __memcpy_toio(unsigned long, const void *, unsigned); | 146 | void __memcpy_toio(unsigned long, const void *, unsigned); |
208 | 147 | ||
diff --git a/arch/x86/include/asm/io_apic.h b/arch/x86/include/asm/io_apic.h index 08ec793aa043..59cb4a1317b7 100644 --- a/arch/x86/include/asm/io_apic.h +++ b/arch/x86/include/asm/io_apic.h | |||
@@ -143,15 +143,6 @@ extern int noioapicreroute; | |||
143 | /* 1 if the timer IRQ uses the '8259A Virtual Wire' mode */ | 143 | /* 1 if the timer IRQ uses the '8259A Virtual Wire' mode */ |
144 | extern int timer_through_8259; | 144 | extern int timer_through_8259; |
145 | 145 | ||
146 | static inline void disable_ioapic_setup(void) | ||
147 | { | ||
148 | #ifdef CONFIG_PCI | ||
149 | noioapicquirk = 1; | ||
150 | noioapicreroute = -1; | ||
151 | #endif | ||
152 | skip_ioapic_setup = 1; | ||
153 | } | ||
154 | |||
155 | /* | 146 | /* |
156 | * If we use the IO-APIC for IRQ routing, disable automatic | 147 | * If we use the IO-APIC for IRQ routing, disable automatic |
157 | * assignment of PCI IRQ's. | 148 | * assignment of PCI IRQ's. |
@@ -178,6 +169,12 @@ extern void reinit_intr_remapped_IO_APIC(int); | |||
178 | 169 | ||
179 | extern void probe_nr_irqs_gsi(void); | 170 | extern void probe_nr_irqs_gsi(void); |
180 | 171 | ||
172 | extern int setup_ioapic_entry(int apic, int irq, | ||
173 | struct IO_APIC_route_entry *entry, | ||
174 | unsigned int destination, int trigger, | ||
175 | int polarity, int vector); | ||
176 | extern void ioapic_write_entry(int apic, int pin, | ||
177 | struct IO_APIC_route_entry e); | ||
181 | #else /* !CONFIG_X86_IO_APIC */ | 178 | #else /* !CONFIG_X86_IO_APIC */ |
182 | #define io_apic_assign_pci_irqs 0 | 179 | #define io_apic_assign_pci_irqs 0 |
183 | static const int timer_through_8259 = 0; | 180 | static const int timer_through_8259 = 0; |
diff --git a/arch/x86/include/asm/ipi.h b/arch/x86/include/asm/ipi.h index c745a306f7d3..5f2efc5d9927 100644 --- a/arch/x86/include/asm/ipi.h +++ b/arch/x86/include/asm/ipi.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifndef _ASM_X86_IPI_H | 1 | #ifndef _ASM_X86_IPI_H |
2 | #define _ASM_X86_IPI_H | 2 | #define _ASM_X86_IPI_H |
3 | 3 | ||
4 | #ifdef CONFIG_X86_LOCAL_APIC | ||
5 | |||
4 | /* | 6 | /* |
5 | * Copyright 2004 James Cleverdon, IBM. | 7 | * Copyright 2004 James Cleverdon, IBM. |
6 | * Subject to the GNU Public License, v.2 | 8 | * Subject to the GNU Public License, v.2 |
@@ -55,8 +57,8 @@ static inline void __xapic_wait_icr_idle(void) | |||
55 | cpu_relax(); | 57 | cpu_relax(); |
56 | } | 58 | } |
57 | 59 | ||
58 | static inline void __send_IPI_shortcut(unsigned int shortcut, int vector, | 60 | static inline void |
59 | unsigned int dest) | 61 | __default_send_IPI_shortcut(unsigned int shortcut, int vector, unsigned int dest) |
60 | { | 62 | { |
61 | /* | 63 | /* |
62 | * Subtle. In the case of the 'never do double writes' workaround | 64 | * Subtle. In the case of the 'never do double writes' workaround |
@@ -87,8 +89,8 @@ static inline void __send_IPI_shortcut(unsigned int shortcut, int vector, | |||
87 | * This is used to send an IPI with no shorthand notation (the destination is | 89 | * This is used to send an IPI with no shorthand notation (the destination is |
88 | * specified in bits 56 to 63 of the ICR). | 90 | * specified in bits 56 to 63 of the ICR). |
89 | */ | 91 | */ |
90 | static inline void __send_IPI_dest_field(unsigned int mask, int vector, | 92 | static inline void |
91 | unsigned int dest) | 93 | __default_send_IPI_dest_field(unsigned int mask, int vector, unsigned int dest) |
92 | { | 94 | { |
93 | unsigned long cfg; | 95 | unsigned long cfg; |
94 | 96 | ||
@@ -117,41 +119,46 @@ static inline void __send_IPI_dest_field(unsigned int mask, int vector, | |||
117 | native_apic_mem_write(APIC_ICR, cfg); | 119 | native_apic_mem_write(APIC_ICR, cfg); |
118 | } | 120 | } |
119 | 121 | ||
120 | static inline void send_IPI_mask_sequence(const struct cpumask *mask, | 122 | extern void default_send_IPI_mask_sequence_phys(const struct cpumask *mask, |
121 | int vector) | 123 | int vector); |
122 | { | 124 | extern void default_send_IPI_mask_allbutself_phys(const struct cpumask *mask, |
123 | unsigned long flags; | 125 | int vector); |
124 | unsigned long query_cpu; | 126 | #include <asm/genapic.h> |
125 | 127 | ||
126 | /* | 128 | extern void default_send_IPI_mask_sequence_logical(const struct cpumask *mask, |
127 | * Hack. The clustered APIC addressing mode doesn't allow us to send | 129 | int vector); |
128 | * to an arbitrary mask, so I do a unicast to each CPU instead. | 130 | extern void default_send_IPI_mask_allbutself_logical(const struct cpumask *mask, |
129 | * - mbligh | 131 | int vector); |
130 | */ | 132 | |
131 | local_irq_save(flags); | 133 | /* Avoid include hell */ |
132 | for_each_cpu(query_cpu, mask) { | 134 | #define NMI_VECTOR 0x02 |
133 | __send_IPI_dest_field(per_cpu(x86_cpu_to_apicid, query_cpu), | 135 | |
134 | vector, APIC_DEST_PHYSICAL); | 136 | extern int no_broadcast; |
135 | } | 137 | |
136 | local_irq_restore(flags); | 138 | static inline void __default_local_send_IPI_allbutself(int vector) |
139 | { | ||
140 | if (no_broadcast || vector == NMI_VECTOR) | ||
141 | apic->send_IPI_mask_allbutself(cpu_online_mask, vector); | ||
142 | else | ||
143 | __default_send_IPI_shortcut(APIC_DEST_ALLBUT, vector, apic->dest_logical); | ||
137 | } | 144 | } |
138 | 145 | ||
139 | static inline void send_IPI_mask_allbutself(const struct cpumask *mask, | 146 | static inline void __default_local_send_IPI_all(int vector) |
140 | int vector) | ||
141 | { | 147 | { |
142 | unsigned long flags; | 148 | if (no_broadcast || vector == NMI_VECTOR) |
143 | unsigned int query_cpu; | 149 | apic->send_IPI_mask(cpu_online_mask, vector); |
144 | unsigned int this_cpu = smp_processor_id(); | 150 | else |
145 | 151 | __default_send_IPI_shortcut(APIC_DEST_ALLINC, vector, apic->dest_logical); | |
146 | /* See Hack comment above */ | ||
147 | |||
148 | local_irq_save(flags); | ||
149 | for_each_cpu(query_cpu, mask) | ||
150 | if (query_cpu != this_cpu) | ||
151 | __send_IPI_dest_field( | ||
152 | per_cpu(x86_cpu_to_apicid, query_cpu), | ||
153 | vector, APIC_DEST_PHYSICAL); | ||
154 | local_irq_restore(flags); | ||
155 | } | 152 | } |
156 | 153 | ||
154 | #ifdef CONFIG_X86_32 | ||
155 | extern void default_send_IPI_mask_logical(const struct cpumask *mask, | ||
156 | int vector); | ||
157 | extern void default_send_IPI_allbutself(int vector); | ||
158 | extern void default_send_IPI_all(int vector); | ||
159 | extern void default_send_IPI_self(int vector); | ||
160 | #endif | ||
161 | |||
162 | #endif | ||
163 | |||
157 | #endif /* _ASM_X86_IPI_H */ | 164 | #endif /* _ASM_X86_IPI_H */ |
diff --git a/arch/x86/include/asm/irq.h b/arch/x86/include/asm/irq.h index 592688ed04d3..107eb2196691 100644 --- a/arch/x86/include/asm/irq.h +++ b/arch/x86/include/asm/irq.h | |||
@@ -36,9 +36,11 @@ static inline int irq_canonicalize(int irq) | |||
36 | extern void fixup_irqs(void); | 36 | extern void fixup_irqs(void); |
37 | #endif | 37 | #endif |
38 | 38 | ||
39 | extern unsigned int do_IRQ(struct pt_regs *regs); | ||
40 | extern void init_IRQ(void); | 39 | extern void init_IRQ(void); |
41 | extern void native_init_IRQ(void); | 40 | extern void native_init_IRQ(void); |
41 | extern bool handle_irq(unsigned irq, struct pt_regs *regs); | ||
42 | |||
43 | extern unsigned int do_IRQ(struct pt_regs *regs); | ||
42 | 44 | ||
43 | /* Interrupt vector management */ | 45 | /* Interrupt vector management */ |
44 | extern DECLARE_BITMAP(used_vectors, NR_VECTORS); | 46 | extern DECLARE_BITMAP(used_vectors, NR_VECTORS); |
diff --git a/arch/x86/include/asm/irq_vectors.h b/arch/x86/include/asm/irq_vectors.h index 0e2220bb3142..b66b518ff000 100644 --- a/arch/x86/include/asm/irq_vectors.h +++ b/arch/x86/include/asm/irq_vectors.h | |||
@@ -1,47 +1,69 @@ | |||
1 | #ifndef _ASM_X86_IRQ_VECTORS_H | 1 | #ifndef _ASM_X86_IRQ_VECTORS_H |
2 | #define _ASM_X86_IRQ_VECTORS_H | 2 | #define _ASM_X86_IRQ_VECTORS_H |
3 | 3 | ||
4 | #include <linux/threads.h> | 4 | /* |
5 | * Linux IRQ vector layout. | ||
6 | * | ||
7 | * There are 256 IDT entries (per CPU - each entry is 8 bytes) which can | ||
8 | * be defined by Linux. They are used as a jump table by the CPU when a | ||
9 | * given vector is triggered - by a CPU-external, CPU-internal or | ||
10 | * software-triggered event. | ||
11 | * | ||
12 | * Linux sets the kernel code address each entry jumps to early during | ||
13 | * bootup, and never changes them. This is the general layout of the | ||
14 | * IDT entries: | ||
15 | * | ||
16 | * Vectors 0 ... 31 : system traps and exceptions - hardcoded events | ||
17 | * Vectors 32 ... 127 : device interrupts | ||
18 | * Vector 128 : legacy int80 syscall interface | ||
19 | * Vectors 129 ... 237 : device interrupts | ||
20 | * Vectors 238 ... 255 : special interrupts | ||
21 | * | ||
22 | * 64-bit x86 has per CPU IDT tables, 32-bit has one shared IDT table. | ||
23 | * | ||
24 | * This file enumerates the exact layout of them: | ||
25 | */ | ||
5 | 26 | ||
6 | #define NMI_VECTOR 0x02 | 27 | #define NMI_VECTOR 0x02 |
7 | 28 | ||
8 | /* | 29 | /* |
9 | * IDT vectors usable for external interrupt sources start | 30 | * IDT vectors usable for external interrupt sources start |
10 | * at 0x20: | 31 | * at 0x20: |
11 | */ | 32 | */ |
12 | #define FIRST_EXTERNAL_VECTOR 0x20 | 33 | #define FIRST_EXTERNAL_VECTOR 0x20 |
13 | 34 | ||
14 | #ifdef CONFIG_X86_32 | 35 | #ifdef CONFIG_X86_32 |
15 | # define SYSCALL_VECTOR 0x80 | 36 | # define SYSCALL_VECTOR 0x80 |
16 | #else | 37 | #else |
17 | # define IA32_SYSCALL_VECTOR 0x80 | 38 | # define IA32_SYSCALL_VECTOR 0x80 |
18 | #endif | 39 | #endif |
19 | 40 | ||
20 | /* | 41 | /* |
21 | * Reserve the lowest usable priority level 0x20 - 0x2f for triggering | 42 | * Reserve the lowest usable priority level 0x20 - 0x2f for triggering |
22 | * cleanup after irq migration. | 43 | * cleanup after irq migration. |
23 | */ | 44 | */ |
24 | #define IRQ_MOVE_CLEANUP_VECTOR FIRST_EXTERNAL_VECTOR | 45 | #define IRQ_MOVE_CLEANUP_VECTOR FIRST_EXTERNAL_VECTOR |
25 | 46 | ||
26 | /* | 47 | /* |
27 | * Vectors 0x30-0x3f are used for ISA interrupts. | 48 | * Vectors 0x30-0x3f are used for ISA interrupts. |
28 | */ | 49 | */ |
29 | #define IRQ0_VECTOR (FIRST_EXTERNAL_VECTOR + 0x10) | 50 | #define IRQ0_VECTOR (FIRST_EXTERNAL_VECTOR + 0x10) |
30 | #define IRQ1_VECTOR (IRQ0_VECTOR + 1) | 51 | |
31 | #define IRQ2_VECTOR (IRQ0_VECTOR + 2) | 52 | #define IRQ1_VECTOR (IRQ0_VECTOR + 1) |
32 | #define IRQ3_VECTOR (IRQ0_VECTOR + 3) | 53 | #define IRQ2_VECTOR (IRQ0_VECTOR + 2) |
33 | #define IRQ4_VECTOR (IRQ0_VECTOR + 4) | 54 | #define IRQ3_VECTOR (IRQ0_VECTOR + 3) |
34 | #define IRQ5_VECTOR (IRQ0_VECTOR + 5) | 55 | #define IRQ4_VECTOR (IRQ0_VECTOR + 4) |
35 | #define IRQ6_VECTOR (IRQ0_VECTOR + 6) | 56 | #define IRQ5_VECTOR (IRQ0_VECTOR + 5) |
36 | #define IRQ7_VECTOR (IRQ0_VECTOR + 7) | 57 | #define IRQ6_VECTOR (IRQ0_VECTOR + 6) |
37 | #define IRQ8_VECTOR (IRQ0_VECTOR + 8) | 58 | #define IRQ7_VECTOR (IRQ0_VECTOR + 7) |
38 | #define IRQ9_VECTOR (IRQ0_VECTOR + 9) | 59 | #define IRQ8_VECTOR (IRQ0_VECTOR + 8) |
39 | #define IRQ10_VECTOR (IRQ0_VECTOR + 10) | 60 | #define IRQ9_VECTOR (IRQ0_VECTOR + 9) |
40 | #define IRQ11_VECTOR (IRQ0_VECTOR + 11) | 61 | #define IRQ10_VECTOR (IRQ0_VECTOR + 10) |
41 | #define IRQ12_VECTOR (IRQ0_VECTOR + 12) | 62 | #define IRQ11_VECTOR (IRQ0_VECTOR + 11) |
42 | #define IRQ13_VECTOR (IRQ0_VECTOR + 13) | 63 | #define IRQ12_VECTOR (IRQ0_VECTOR + 12) |
43 | #define IRQ14_VECTOR (IRQ0_VECTOR + 14) | 64 | #define IRQ13_VECTOR (IRQ0_VECTOR + 13) |
44 | #define IRQ15_VECTOR (IRQ0_VECTOR + 15) | 65 | #define IRQ14_VECTOR (IRQ0_VECTOR + 14) |
66 | #define IRQ15_VECTOR (IRQ0_VECTOR + 15) | ||
45 | 67 | ||
46 | /* | 68 | /* |
47 | * Special IRQ vectors used by the SMP architecture, 0xf0-0xff | 69 | * Special IRQ vectors used by the SMP architecture, 0xf0-0xff |
@@ -50,43 +72,44 @@ | |||
50 | * into a single vector (CALL_FUNCTION_VECTOR) to save vector space. | 72 | * into a single vector (CALL_FUNCTION_VECTOR) to save vector space. |
51 | * TLB, reschedule and local APIC vectors are performance-critical. | 73 | * TLB, reschedule and local APIC vectors are performance-critical. |
52 | */ | 74 | */ |
53 | #ifdef CONFIG_X86_32 | ||
54 | 75 | ||
55 | # define SPURIOUS_APIC_VECTOR 0xff | 76 | #define SPURIOUS_APIC_VECTOR 0xff |
56 | # define ERROR_APIC_VECTOR 0xfe | 77 | /* |
57 | # define RESCHEDULE_VECTOR 0xfd | 78 | * Sanity check |
58 | # define CALL_FUNCTION_VECTOR 0xfc | 79 | */ |
59 | # define CALL_FUNCTION_SINGLE_VECTOR 0xfb | 80 | #if ((SPURIOUS_APIC_VECTOR & 0x0F) != 0x0F) |
60 | # define THERMAL_APIC_VECTOR 0xfa | 81 | # error SPURIOUS_APIC_VECTOR definition error |
61 | /* 0xf8 - 0xf9 : free */ | 82 | #endif |
62 | # define INVALIDATE_TLB_VECTOR_END 0xf7 | ||
63 | # define INVALIDATE_TLB_VECTOR_START 0xf0 /* f0-f7 used for TLB flush */ | ||
64 | 83 | ||
65 | # define NUM_INVALIDATE_TLB_VECTORS 8 | 84 | #define ERROR_APIC_VECTOR 0xfe |
85 | #define RESCHEDULE_VECTOR 0xfd | ||
86 | #define CALL_FUNCTION_VECTOR 0xfc | ||
87 | #define CALL_FUNCTION_SINGLE_VECTOR 0xfb | ||
88 | #define THERMAL_APIC_VECTOR 0xfa | ||
66 | 89 | ||
90 | #ifdef CONFIG_X86_32 | ||
91 | /* 0xf8 - 0xf9 : free */ | ||
67 | #else | 92 | #else |
68 | |||
69 | # define SPURIOUS_APIC_VECTOR 0xff | ||
70 | # define ERROR_APIC_VECTOR 0xfe | ||
71 | # define RESCHEDULE_VECTOR 0xfd | ||
72 | # define CALL_FUNCTION_VECTOR 0xfc | ||
73 | # define CALL_FUNCTION_SINGLE_VECTOR 0xfb | ||
74 | # define THERMAL_APIC_VECTOR 0xfa | ||
75 | # define THRESHOLD_APIC_VECTOR 0xf9 | 93 | # define THRESHOLD_APIC_VECTOR 0xf9 |
76 | # define UV_BAU_MESSAGE 0xf8 | 94 | # define UV_BAU_MESSAGE 0xf8 |
77 | # define INVALIDATE_TLB_VECTOR_END 0xf7 | ||
78 | # define INVALIDATE_TLB_VECTOR_START 0xf0 /* f0-f7 used for TLB flush */ | ||
79 | |||
80 | #define NUM_INVALIDATE_TLB_VECTORS 8 | ||
81 | |||
82 | #endif | 95 | #endif |
83 | 96 | ||
97 | /* f0-f7 used for spreading out TLB flushes: */ | ||
98 | #define INVALIDATE_TLB_VECTOR_END 0xf7 | ||
99 | #define INVALIDATE_TLB_VECTOR_START 0xf0 | ||
100 | #define NUM_INVALIDATE_TLB_VECTORS 8 | ||
101 | |||
84 | /* | 102 | /* |
85 | * Local APIC timer IRQ vector is on a different priority level, | 103 | * Local APIC timer IRQ vector is on a different priority level, |
86 | * to work around the 'lost local interrupt if more than 2 IRQ | 104 | * to work around the 'lost local interrupt if more than 2 IRQ |
87 | * sources per level' errata. | 105 | * sources per level' errata. |
88 | */ | 106 | */ |
89 | #define LOCAL_TIMER_VECTOR 0xef | 107 | #define LOCAL_TIMER_VECTOR 0xef |
108 | |||
109 | /* | ||
110 | * Performance monitoring interrupt vector: | ||
111 | */ | ||
112 | #define LOCAL_PERF_VECTOR 0xee | ||
90 | 113 | ||
91 | /* | 114 | /* |
92 | * Performance monitoring interrupt vector: | 115 | * Performance monitoring interrupt vector: |
@@ -98,80 +121,53 @@ | |||
98 | * start at 0x31(0x41) to spread out vectors evenly between priority | 121 | * start at 0x31(0x41) to spread out vectors evenly between priority |
99 | * levels. (0x80 is the syscall vector) | 122 | * levels. (0x80 is the syscall vector) |
100 | */ | 123 | */ |
101 | #define FIRST_DEVICE_VECTOR (IRQ15_VECTOR + 2) | 124 | #define FIRST_DEVICE_VECTOR (IRQ15_VECTOR + 2) |
102 | |||
103 | #define NR_VECTORS 256 | ||
104 | |||
105 | #define FPU_IRQ 13 | ||
106 | |||
107 | #define FIRST_VM86_IRQ 3 | ||
108 | #define LAST_VM86_IRQ 15 | ||
109 | #define invalid_vm86_irq(irq) ((irq) < 3 || (irq) > 15) | ||
110 | 125 | ||
111 | #define NR_IRQS_LEGACY 16 | 126 | #define NR_VECTORS 256 |
112 | 127 | ||
113 | #if defined(CONFIG_X86_IO_APIC) && !defined(CONFIG_X86_VOYAGER) | 128 | #define FPU_IRQ 13 |
114 | |||
115 | #include <asm/apicnum.h> /* need MAX_IO_APICS */ | ||
116 | |||
117 | #ifndef CONFIG_SPARSE_IRQ | ||
118 | # if NR_CPUS < MAX_IO_APICS | ||
119 | # define NR_IRQS (NR_VECTORS + (32 * NR_CPUS)) | ||
120 | # else | ||
121 | # define NR_IRQS (NR_VECTORS + (32 * MAX_IO_APICS)) | ||
122 | # endif | ||
123 | #else | ||
124 | 129 | ||
125 | # define NR_IRQS \ | 130 | #define FIRST_VM86_IRQ 3 |
126 | ((8 * NR_CPUS) > (32 * MAX_IO_APICS) ? \ | 131 | #define LAST_VM86_IRQ 15 |
127 | (NR_VECTORS + (8 * NR_CPUS)) : \ | ||
128 | (NR_VECTORS + (32 * MAX_IO_APICS))) \ | ||
129 | 132 | ||
133 | #ifndef __ASSEMBLY__ | ||
134 | static inline int invalid_vm86_irq(int irq) | ||
135 | { | ||
136 | return irq < 3 || irq > 15; | ||
137 | } | ||
130 | #endif | 138 | #endif |
131 | 139 | ||
132 | #elif defined(CONFIG_X86_VOYAGER) | 140 | /* |
133 | 141 | * Size the maximum number of interrupts. | |
134 | # define NR_IRQS 224 | 142 | * |
143 | * If the irq_desc[] array has a sparse layout, we can size things | ||
144 | * generously - it scales up linearly with the maximum number of CPUs, | ||
145 | * and the maximum number of IO-APICs, whichever is higher. | ||
146 | * | ||
147 | * In other cases we size more conservatively, to not create too large | ||
148 | * static arrays. | ||
149 | */ | ||
135 | 150 | ||
136 | #else /* IO_APIC || VOYAGER */ | 151 | #define NR_IRQS_LEGACY 16 |
137 | 152 | ||
138 | # define NR_IRQS 16 | 153 | #define CPU_VECTOR_LIMIT ( 8 * NR_CPUS ) |
154 | #define IO_APIC_VECTOR_LIMIT ( 32 * MAX_IO_APICS ) | ||
139 | 155 | ||
156 | #ifdef CONFIG_X86_IO_APIC | ||
157 | # ifdef CONFIG_SPARSE_IRQ | ||
158 | # define NR_IRQS \ | ||
159 | (CPU_VECTOR_LIMIT > IO_APIC_VECTOR_LIMIT ? \ | ||
160 | (NR_VECTORS + CPU_VECTOR_LIMIT) : \ | ||
161 | (NR_VECTORS + IO_APIC_VECTOR_LIMIT)) | ||
162 | # else | ||
163 | # if NR_CPUS < MAX_IO_APICS | ||
164 | # define NR_IRQS (NR_VECTORS + 4*CPU_VECTOR_LIMIT) | ||
165 | # else | ||
166 | # define NR_IRQS (NR_VECTORS + IO_APIC_VECTOR_LIMIT) | ||
167 | # endif | ||
168 | # endif | ||
169 | #else /* !CONFIG_X86_IO_APIC: */ | ||
170 | # define NR_IRQS NR_IRQS_LEGACY | ||
140 | #endif | 171 | #endif |
141 | 172 | ||
142 | /* Voyager specific defines */ | ||
143 | /* These define the CPIs we use in linux */ | ||
144 | #define VIC_CPI_LEVEL0 0 | ||
145 | #define VIC_CPI_LEVEL1 1 | ||
146 | /* now the fake CPIs */ | ||
147 | #define VIC_TIMER_CPI 2 | ||
148 | #define VIC_INVALIDATE_CPI 3 | ||
149 | #define VIC_RESCHEDULE_CPI 4 | ||
150 | #define VIC_ENABLE_IRQ_CPI 5 | ||
151 | #define VIC_CALL_FUNCTION_CPI 6 | ||
152 | #define VIC_CALL_FUNCTION_SINGLE_CPI 7 | ||
153 | |||
154 | /* Now the QIC CPIs: Since we don't need the two initial levels, | ||
155 | * these are 2 less than the VIC CPIs */ | ||
156 | #define QIC_CPI_OFFSET 1 | ||
157 | #define QIC_TIMER_CPI (VIC_TIMER_CPI - QIC_CPI_OFFSET) | ||
158 | #define QIC_INVALIDATE_CPI (VIC_INVALIDATE_CPI - QIC_CPI_OFFSET) | ||
159 | #define QIC_RESCHEDULE_CPI (VIC_RESCHEDULE_CPI - QIC_CPI_OFFSET) | ||
160 | #define QIC_ENABLE_IRQ_CPI (VIC_ENABLE_IRQ_CPI - QIC_CPI_OFFSET) | ||
161 | #define QIC_CALL_FUNCTION_CPI (VIC_CALL_FUNCTION_CPI - QIC_CPI_OFFSET) | ||
162 | #define QIC_CALL_FUNCTION_SINGLE_CPI (VIC_CALL_FUNCTION_SINGLE_CPI - QIC_CPI_OFFSET) | ||
163 | |||
164 | #define VIC_START_FAKE_CPI VIC_TIMER_CPI | ||
165 | #define VIC_END_FAKE_CPI VIC_CALL_FUNCTION_SINGLE_CPI | ||
166 | |||
167 | /* this is the SYS_INT CPI. */ | ||
168 | #define VIC_SYS_INT 8 | ||
169 | #define VIC_CMN_INT 15 | ||
170 | |||
171 | /* This is the boot CPI for alternate processors. It gets overwritten | ||
172 | * by the above once the system has activated all available processors */ | ||
173 | #define VIC_CPU_BOOT_CPI VIC_CPI_LEVEL0 | ||
174 | #define VIC_CPU_BOOT_ERRATA_CPI (VIC_CPI_LEVEL0 + 8) | ||
175 | |||
176 | |||
177 | #endif /* _ASM_X86_IRQ_VECTORS_H */ | 173 | #endif /* _ASM_X86_IRQ_VECTORS_H */ |
diff --git a/arch/x86/include/asm/kexec.h b/arch/x86/include/asm/kexec.h index c61d8b2ab8b9..0ceb6d19ed30 100644 --- a/arch/x86/include/asm/kexec.h +++ b/arch/x86/include/asm/kexec.h | |||
@@ -9,23 +9,8 @@ | |||
9 | # define PAGES_NR 4 | 9 | # define PAGES_NR 4 |
10 | #else | 10 | #else |
11 | # define PA_CONTROL_PAGE 0 | 11 | # define PA_CONTROL_PAGE 0 |
12 | # define VA_CONTROL_PAGE 1 | 12 | # define PA_TABLE_PAGE 1 |
13 | # define PA_PGD 2 | 13 | # define PAGES_NR 2 |
14 | # define VA_PGD 3 | ||
15 | # define PA_PUD_0 4 | ||
16 | # define VA_PUD_0 5 | ||
17 | # define PA_PMD_0 6 | ||
18 | # define VA_PMD_0 7 | ||
19 | # define PA_PTE_0 8 | ||
20 | # define VA_PTE_0 9 | ||
21 | # define PA_PUD_1 10 | ||
22 | # define VA_PUD_1 11 | ||
23 | # define PA_PMD_1 12 | ||
24 | # define VA_PMD_1 13 | ||
25 | # define PA_PTE_1 14 | ||
26 | # define VA_PTE_1 15 | ||
27 | # define PA_TABLE_PAGE 16 | ||
28 | # define PAGES_NR 17 | ||
29 | #endif | 14 | #endif |
30 | 15 | ||
31 | #ifdef CONFIG_X86_32 | 16 | #ifdef CONFIG_X86_32 |
@@ -157,9 +142,9 @@ relocate_kernel(unsigned long indirection_page, | |||
157 | unsigned long start_address) ATTRIB_NORET; | 142 | unsigned long start_address) ATTRIB_NORET; |
158 | #endif | 143 | #endif |
159 | 144 | ||
160 | #ifdef CONFIG_X86_32 | ||
161 | #define ARCH_HAS_KIMAGE_ARCH | 145 | #define ARCH_HAS_KIMAGE_ARCH |
162 | 146 | ||
147 | #ifdef CONFIG_X86_32 | ||
163 | struct kimage_arch { | 148 | struct kimage_arch { |
164 | pgd_t *pgd; | 149 | pgd_t *pgd; |
165 | #ifdef CONFIG_X86_PAE | 150 | #ifdef CONFIG_X86_PAE |
@@ -169,6 +154,12 @@ struct kimage_arch { | |||
169 | pte_t *pte0; | 154 | pte_t *pte0; |
170 | pte_t *pte1; | 155 | pte_t *pte1; |
171 | }; | 156 | }; |
157 | #else | ||
158 | struct kimage_arch { | ||
159 | pud_t *pud; | ||
160 | pmd_t *pmd; | ||
161 | pte_t *pte; | ||
162 | }; | ||
172 | #endif | 163 | #endif |
173 | 164 | ||
174 | #endif /* __ASSEMBLY__ */ | 165 | #endif /* __ASSEMBLY__ */ |
diff --git a/arch/x86/include/asm/mach-default/mach_apic.h b/arch/x86/include/asm/mach-default/mach_apic.h deleted file mode 100644 index cc09cbbee27e..000000000000 --- a/arch/x86/include/asm/mach-default/mach_apic.h +++ /dev/null | |||
@@ -1,168 +0,0 @@ | |||
1 | #ifndef _ASM_X86_MACH_DEFAULT_MACH_APIC_H | ||
2 | #define _ASM_X86_MACH_DEFAULT_MACH_APIC_H | ||
3 | |||
4 | #ifdef CONFIG_X86_LOCAL_APIC | ||
5 | |||
6 | #include <mach_apicdef.h> | ||
7 | #include <asm/smp.h> | ||
8 | |||
9 | #define APIC_DFR_VALUE (APIC_DFR_FLAT) | ||
10 | |||
11 | static inline const struct cpumask *target_cpus(void) | ||
12 | { | ||
13 | #ifdef CONFIG_SMP | ||
14 | return cpu_online_mask; | ||
15 | #else | ||
16 | return cpumask_of(0); | ||
17 | #endif | ||
18 | } | ||
19 | |||
20 | #define NO_BALANCE_IRQ (0) | ||
21 | #define esr_disable (0) | ||
22 | |||
23 | #ifdef CONFIG_X86_64 | ||
24 | #include <asm/genapic.h> | ||
25 | #define INT_DELIVERY_MODE (genapic->int_delivery_mode) | ||
26 | #define INT_DEST_MODE (genapic->int_dest_mode) | ||
27 | #define TARGET_CPUS (genapic->target_cpus()) | ||
28 | #define apic_id_registered (genapic->apic_id_registered) | ||
29 | #define init_apic_ldr (genapic->init_apic_ldr) | ||
30 | #define cpu_mask_to_apicid (genapic->cpu_mask_to_apicid) | ||
31 | #define cpu_mask_to_apicid_and (genapic->cpu_mask_to_apicid_and) | ||
32 | #define phys_pkg_id (genapic->phys_pkg_id) | ||
33 | #define vector_allocation_domain (genapic->vector_allocation_domain) | ||
34 | #define read_apic_id() (GET_APIC_ID(apic_read(APIC_ID))) | ||
35 | #define send_IPI_self (genapic->send_IPI_self) | ||
36 | #define wakeup_secondary_cpu (genapic->wakeup_cpu) | ||
37 | extern void setup_apic_routing(void); | ||
38 | #else | ||
39 | #define INT_DELIVERY_MODE dest_LowestPrio | ||
40 | #define INT_DEST_MODE 1 /* logical delivery broadcast to all procs */ | ||
41 | #define TARGET_CPUS (target_cpus()) | ||
42 | #define wakeup_secondary_cpu wakeup_secondary_cpu_via_init | ||
43 | /* | ||
44 | * Set up the logical destination ID. | ||
45 | * | ||
46 | * Intel recommends to set DFR, LDR and TPR before enabling | ||
47 | * an APIC. See e.g. "AP-388 82489DX User's Manual" (Intel | ||
48 | * document number 292116). So here it goes... | ||
49 | */ | ||
50 | static inline void init_apic_ldr(void) | ||
51 | { | ||
52 | unsigned long val; | ||
53 | |||
54 | apic_write(APIC_DFR, APIC_DFR_VALUE); | ||
55 | val = apic_read(APIC_LDR) & ~APIC_LDR_MASK; | ||
56 | val |= SET_APIC_LOGICAL_ID(1UL << smp_processor_id()); | ||
57 | apic_write(APIC_LDR, val); | ||
58 | } | ||
59 | |||
60 | static inline int apic_id_registered(void) | ||
61 | { | ||
62 | return physid_isset(read_apic_id(), phys_cpu_present_map); | ||
63 | } | ||
64 | |||
65 | static inline unsigned int cpu_mask_to_apicid(const struct cpumask *cpumask) | ||
66 | { | ||
67 | return cpumask_bits(cpumask)[0]; | ||
68 | } | ||
69 | |||
70 | static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *cpumask, | ||
71 | const struct cpumask *andmask) | ||
72 | { | ||
73 | unsigned long mask1 = cpumask_bits(cpumask)[0]; | ||
74 | unsigned long mask2 = cpumask_bits(andmask)[0]; | ||
75 | unsigned long mask3 = cpumask_bits(cpu_online_mask)[0]; | ||
76 | |||
77 | return (unsigned int)(mask1 & mask2 & mask3); | ||
78 | } | ||
79 | |||
80 | static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) | ||
81 | { | ||
82 | return cpuid_apic >> index_msb; | ||
83 | } | ||
84 | |||
85 | static inline void setup_apic_routing(void) | ||
86 | { | ||
87 | #ifdef CONFIG_X86_IO_APIC | ||
88 | printk("Enabling APIC mode: %s. Using %d I/O APICs\n", | ||
89 | "Flat", nr_ioapics); | ||
90 | #endif | ||
91 | } | ||
92 | |||
93 | static inline int apicid_to_node(int logical_apicid) | ||
94 | { | ||
95 | #ifdef CONFIG_SMP | ||
96 | return apicid_2_node[hard_smp_processor_id()]; | ||
97 | #else | ||
98 | return 0; | ||
99 | #endif | ||
100 | } | ||
101 | |||
102 | static inline void vector_allocation_domain(int cpu, struct cpumask *retmask) | ||
103 | { | ||
104 | /* Careful. Some cpus do not strictly honor the set of cpus | ||
105 | * specified in the interrupt destination when using lowest | ||
106 | * priority interrupt delivery mode. | ||
107 | * | ||
108 | * In particular there was a hyperthreading cpu observed to | ||
109 | * deliver interrupts to the wrong hyperthread when only one | ||
110 | * hyperthread was specified in the interrupt desitination. | ||
111 | */ | ||
112 | *retmask = (cpumask_t) { { [0] = APIC_ALL_CPUS } }; | ||
113 | } | ||
114 | #endif | ||
115 | |||
116 | static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid) | ||
117 | { | ||
118 | return physid_isset(apicid, bitmap); | ||
119 | } | ||
120 | |||
121 | static inline unsigned long check_apicid_present(int bit) | ||
122 | { | ||
123 | return physid_isset(bit, phys_cpu_present_map); | ||
124 | } | ||
125 | |||
126 | static inline physid_mask_t ioapic_phys_id_map(physid_mask_t phys_map) | ||
127 | { | ||
128 | return phys_map; | ||
129 | } | ||
130 | |||
131 | static inline int multi_timer_check(int apic, int irq) | ||
132 | { | ||
133 | return 0; | ||
134 | } | ||
135 | |||
136 | /* Mapping from cpu number to logical apicid */ | ||
137 | static inline int cpu_to_logical_apicid(int cpu) | ||
138 | { | ||
139 | return 1 << cpu; | ||
140 | } | ||
141 | |||
142 | static inline int cpu_present_to_apicid(int mps_cpu) | ||
143 | { | ||
144 | if (mps_cpu < nr_cpu_ids && cpu_present(mps_cpu)) | ||
145 | return (int)per_cpu(x86_bios_cpu_apicid, mps_cpu); | ||
146 | else | ||
147 | return BAD_APICID; | ||
148 | } | ||
149 | |||
150 | static inline physid_mask_t apicid_to_cpu_present(int phys_apicid) | ||
151 | { | ||
152 | return physid_mask_of_physid(phys_apicid); | ||
153 | } | ||
154 | |||
155 | static inline void setup_portio_remap(void) | ||
156 | { | ||
157 | } | ||
158 | |||
159 | static inline int check_phys_apicid_present(int boot_cpu_physical_apicid) | ||
160 | { | ||
161 | return physid_isset(boot_cpu_physical_apicid, phys_cpu_present_map); | ||
162 | } | ||
163 | |||
164 | static inline void enable_apic_mode(void) | ||
165 | { | ||
166 | } | ||
167 | #endif /* CONFIG_X86_LOCAL_APIC */ | ||
168 | #endif /* _ASM_X86_MACH_DEFAULT_MACH_APIC_H */ | ||
diff --git a/arch/x86/include/asm/mach-default/mach_apicdef.h b/arch/x86/include/asm/mach-default/mach_apicdef.h deleted file mode 100644 index 53179936d6c6..000000000000 --- a/arch/x86/include/asm/mach-default/mach_apicdef.h +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | #ifndef _ASM_X86_MACH_DEFAULT_MACH_APICDEF_H | ||
2 | #define _ASM_X86_MACH_DEFAULT_MACH_APICDEF_H | ||
3 | |||
4 | #include <asm/apic.h> | ||
5 | |||
6 | #ifdef CONFIG_X86_64 | ||
7 | #define APIC_ID_MASK (genapic->apic_id_mask) | ||
8 | #define GET_APIC_ID(x) (genapic->get_apic_id(x)) | ||
9 | #define SET_APIC_ID(x) (genapic->set_apic_id(x)) | ||
10 | #else | ||
11 | #define APIC_ID_MASK (0xF<<24) | ||
12 | static inline unsigned get_apic_id(unsigned long x) | ||
13 | { | ||
14 | unsigned int ver = GET_APIC_VERSION(apic_read(APIC_LVR)); | ||
15 | if (APIC_XAPIC(ver)) | ||
16 | return (((x)>>24)&0xFF); | ||
17 | else | ||
18 | return (((x)>>24)&0xF); | ||
19 | } | ||
20 | |||
21 | #define GET_APIC_ID(x) get_apic_id(x) | ||
22 | #endif | ||
23 | |||
24 | #endif /* _ASM_X86_MACH_DEFAULT_MACH_APICDEF_H */ | ||
diff --git a/arch/x86/include/asm/mach-default/mach_ipi.h b/arch/x86/include/asm/mach-default/mach_ipi.h deleted file mode 100644 index 191312d155da..000000000000 --- a/arch/x86/include/asm/mach-default/mach_ipi.h +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | #ifndef _ASM_X86_MACH_DEFAULT_MACH_IPI_H | ||
2 | #define _ASM_X86_MACH_DEFAULT_MACH_IPI_H | ||
3 | |||
4 | /* Avoid include hell */ | ||
5 | #define NMI_VECTOR 0x02 | ||
6 | |||
7 | void send_IPI_mask_bitmask(const struct cpumask *mask, int vector); | ||
8 | void send_IPI_mask_allbutself(const struct cpumask *mask, int vector); | ||
9 | void __send_IPI_shortcut(unsigned int shortcut, int vector); | ||
10 | |||
11 | extern int no_broadcast; | ||
12 | |||
13 | #ifdef CONFIG_X86_64 | ||
14 | #include <asm/genapic.h> | ||
15 | #define send_IPI_mask (genapic->send_IPI_mask) | ||
16 | #define send_IPI_mask_allbutself (genapic->send_IPI_mask_allbutself) | ||
17 | #else | ||
18 | static inline void send_IPI_mask(const struct cpumask *mask, int vector) | ||
19 | { | ||
20 | send_IPI_mask_bitmask(mask, vector); | ||
21 | } | ||
22 | void send_IPI_mask_allbutself(const struct cpumask *mask, int vector); | ||
23 | #endif | ||
24 | |||
25 | static inline void __local_send_IPI_allbutself(int vector) | ||
26 | { | ||
27 | if (no_broadcast || vector == NMI_VECTOR) | ||
28 | send_IPI_mask_allbutself(cpu_online_mask, vector); | ||
29 | else | ||
30 | __send_IPI_shortcut(APIC_DEST_ALLBUT, vector); | ||
31 | } | ||
32 | |||
33 | static inline void __local_send_IPI_all(int vector) | ||
34 | { | ||
35 | if (no_broadcast || vector == NMI_VECTOR) | ||
36 | send_IPI_mask(cpu_online_mask, vector); | ||
37 | else | ||
38 | __send_IPI_shortcut(APIC_DEST_ALLINC, vector); | ||
39 | } | ||
40 | |||
41 | #ifdef CONFIG_X86_64 | ||
42 | #define send_IPI_allbutself (genapic->send_IPI_allbutself) | ||
43 | #define send_IPI_all (genapic->send_IPI_all) | ||
44 | #else | ||
45 | static inline void send_IPI_allbutself(int vector) | ||
46 | { | ||
47 | /* | ||
48 | * if there are no other CPUs in the system then we get an APIC send | ||
49 | * error if we try to broadcast, thus avoid sending IPIs in this case. | ||
50 | */ | ||
51 | if (!(num_online_cpus() > 1)) | ||
52 | return; | ||
53 | |||
54 | __local_send_IPI_allbutself(vector); | ||
55 | return; | ||
56 | } | ||
57 | |||
58 | static inline void send_IPI_all(int vector) | ||
59 | { | ||
60 | __local_send_IPI_all(vector); | ||
61 | } | ||
62 | #endif | ||
63 | |||
64 | #endif /* _ASM_X86_MACH_DEFAULT_MACH_IPI_H */ | ||
diff --git a/arch/x86/include/asm/mach-default/mach_mpparse.h b/arch/x86/include/asm/mach-default/mach_mpparse.h deleted file mode 100644 index c70a263d68cd..000000000000 --- a/arch/x86/include/asm/mach-default/mach_mpparse.h +++ /dev/null | |||
@@ -1,17 +0,0 @@ | |||
1 | #ifndef _ASM_X86_MACH_DEFAULT_MACH_MPPARSE_H | ||
2 | #define _ASM_X86_MACH_DEFAULT_MACH_MPPARSE_H | ||
3 | |||
4 | static inline int | ||
5 | mps_oem_check(struct mpc_table *mpc, char *oem, char *productid) | ||
6 | { | ||
7 | return 0; | ||
8 | } | ||
9 | |||
10 | /* Hook from generic ACPI tables.c */ | ||
11 | static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id) | ||
12 | { | ||
13 | return 0; | ||
14 | } | ||
15 | |||
16 | |||
17 | #endif /* _ASM_X86_MACH_DEFAULT_MACH_MPPARSE_H */ | ||
diff --git a/arch/x86/include/asm/mach-default/mach_mpspec.h b/arch/x86/include/asm/mach-default/mach_mpspec.h deleted file mode 100644 index e85ede686be8..000000000000 --- a/arch/x86/include/asm/mach-default/mach_mpspec.h +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | #ifndef _ASM_X86_MACH_DEFAULT_MACH_MPSPEC_H | ||
2 | #define _ASM_X86_MACH_DEFAULT_MACH_MPSPEC_H | ||
3 | |||
4 | #define MAX_IRQ_SOURCES 256 | ||
5 | |||
6 | #if CONFIG_BASE_SMALL == 0 | ||
7 | #define MAX_MP_BUSSES 256 | ||
8 | #else | ||
9 | #define MAX_MP_BUSSES 32 | ||
10 | #endif | ||
11 | |||
12 | #endif /* _ASM_X86_MACH_DEFAULT_MACH_MPSPEC_H */ | ||
diff --git a/arch/x86/include/asm/mach-default/mach_wakecpu.h b/arch/x86/include/asm/mach-default/mach_wakecpu.h deleted file mode 100644 index 89897a6a65b9..000000000000 --- a/arch/x86/include/asm/mach-default/mach_wakecpu.h +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | #ifndef _ASM_X86_MACH_DEFAULT_MACH_WAKECPU_H | ||
2 | #define _ASM_X86_MACH_DEFAULT_MACH_WAKECPU_H | ||
3 | |||
4 | #define TRAMPOLINE_PHYS_LOW (0x467) | ||
5 | #define TRAMPOLINE_PHYS_HIGH (0x469) | ||
6 | |||
7 | static inline void wait_for_init_deassert(atomic_t *deassert) | ||
8 | { | ||
9 | while (!atomic_read(deassert)) | ||
10 | cpu_relax(); | ||
11 | return; | ||
12 | } | ||
13 | |||
14 | /* Nothing to do for most platforms, since cleared by the INIT cycle */ | ||
15 | static inline void smp_callin_clear_local_apic(void) | ||
16 | { | ||
17 | } | ||
18 | |||
19 | static inline void store_NMI_vector(unsigned short *high, unsigned short *low) | ||
20 | { | ||
21 | } | ||
22 | |||
23 | static inline void restore_NMI_vector(unsigned short *high, unsigned short *low) | ||
24 | { | ||
25 | } | ||
26 | |||
27 | #ifdef CONFIG_SMP | ||
28 | extern void __inquire_remote_apic(int apicid); | ||
29 | #else /* CONFIG_SMP */ | ||
30 | static inline void __inquire_remote_apic(int apicid) | ||
31 | { | ||
32 | } | ||
33 | #endif /* CONFIG_SMP */ | ||
34 | |||
35 | static inline void inquire_remote_apic(int apicid) | ||
36 | { | ||
37 | if (apic_verbosity >= APIC_DEBUG) | ||
38 | __inquire_remote_apic(apicid); | ||
39 | } | ||
40 | |||
41 | #endif /* _ASM_X86_MACH_DEFAULT_MACH_WAKECPU_H */ | ||
diff --git a/arch/x86/include/asm/mach-generic/gpio.h b/arch/x86/include/asm/mach-generic/gpio.h deleted file mode 100644 index 995c45efdb33..000000000000 --- a/arch/x86/include/asm/mach-generic/gpio.h +++ /dev/null | |||
@@ -1,15 +0,0 @@ | |||
1 | #ifndef _ASM_X86_MACH_GENERIC_GPIO_H | ||
2 | #define _ASM_X86_MACH_GENERIC_GPIO_H | ||
3 | |||
4 | int gpio_request(unsigned gpio, const char *label); | ||
5 | void gpio_free(unsigned gpio); | ||
6 | int gpio_direction_input(unsigned gpio); | ||
7 | int gpio_direction_output(unsigned gpio, int value); | ||
8 | int gpio_get_value(unsigned gpio); | ||
9 | void gpio_set_value(unsigned gpio, int value); | ||
10 | int gpio_to_irq(unsigned gpio); | ||
11 | int irq_to_gpio(unsigned irq); | ||
12 | |||
13 | #include <asm-generic/gpio.h> /* cansleep wrappers */ | ||
14 | |||
15 | #endif /* _ASM_X86_MACH_GENERIC_GPIO_H */ | ||
diff --git a/arch/x86/include/asm/mach-generic/mach_apic.h b/arch/x86/include/asm/mach-generic/mach_apic.h deleted file mode 100644 index 48553e958ad5..000000000000 --- a/arch/x86/include/asm/mach-generic/mach_apic.h +++ /dev/null | |||
@@ -1,35 +0,0 @@ | |||
1 | #ifndef _ASM_X86_MACH_GENERIC_MACH_APIC_H | ||
2 | #define _ASM_X86_MACH_GENERIC_MACH_APIC_H | ||
3 | |||
4 | #include <asm/genapic.h> | ||
5 | |||
6 | #define esr_disable (genapic->ESR_DISABLE) | ||
7 | #define NO_BALANCE_IRQ (genapic->no_balance_irq) | ||
8 | #define INT_DELIVERY_MODE (genapic->int_delivery_mode) | ||
9 | #define INT_DEST_MODE (genapic->int_dest_mode) | ||
10 | #undef APIC_DEST_LOGICAL | ||
11 | #define APIC_DEST_LOGICAL (genapic->apic_destination_logical) | ||
12 | #define TARGET_CPUS (genapic->target_cpus()) | ||
13 | #define apic_id_registered (genapic->apic_id_registered) | ||
14 | #define init_apic_ldr (genapic->init_apic_ldr) | ||
15 | #define ioapic_phys_id_map (genapic->ioapic_phys_id_map) | ||
16 | #define setup_apic_routing (genapic->setup_apic_routing) | ||
17 | #define multi_timer_check (genapic->multi_timer_check) | ||
18 | #define apicid_to_node (genapic->apicid_to_node) | ||
19 | #define cpu_to_logical_apicid (genapic->cpu_to_logical_apicid) | ||
20 | #define cpu_present_to_apicid (genapic->cpu_present_to_apicid) | ||
21 | #define apicid_to_cpu_present (genapic->apicid_to_cpu_present) | ||
22 | #define setup_portio_remap (genapic->setup_portio_remap) | ||
23 | #define check_apicid_present (genapic->check_apicid_present) | ||
24 | #define check_phys_apicid_present (genapic->check_phys_apicid_present) | ||
25 | #define check_apicid_used (genapic->check_apicid_used) | ||
26 | #define cpu_mask_to_apicid (genapic->cpu_mask_to_apicid) | ||
27 | #define cpu_mask_to_apicid_and (genapic->cpu_mask_to_apicid_and) | ||
28 | #define vector_allocation_domain (genapic->vector_allocation_domain) | ||
29 | #define enable_apic_mode (genapic->enable_apic_mode) | ||
30 | #define phys_pkg_id (genapic->phys_pkg_id) | ||
31 | #define wakeup_secondary_cpu (genapic->wakeup_cpu) | ||
32 | |||
33 | extern void generic_bigsmp_probe(void); | ||
34 | |||
35 | #endif /* _ASM_X86_MACH_GENERIC_MACH_APIC_H */ | ||
diff --git a/arch/x86/include/asm/mach-generic/mach_apicdef.h b/arch/x86/include/asm/mach-generic/mach_apicdef.h deleted file mode 100644 index 68041f3802f4..000000000000 --- a/arch/x86/include/asm/mach-generic/mach_apicdef.h +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | #ifndef _ASM_X86_MACH_GENERIC_MACH_APICDEF_H | ||
2 | #define _ASM_X86_MACH_GENERIC_MACH_APICDEF_H | ||
3 | |||
4 | #ifndef APIC_DEFINITION | ||
5 | #include <asm/genapic.h> | ||
6 | |||
7 | #define GET_APIC_ID (genapic->get_apic_id) | ||
8 | #define APIC_ID_MASK (genapic->apic_id_mask) | ||
9 | #endif | ||
10 | |||
11 | #endif /* _ASM_X86_MACH_GENERIC_MACH_APICDEF_H */ | ||
diff --git a/arch/x86/include/asm/mach-generic/mach_ipi.h b/arch/x86/include/asm/mach-generic/mach_ipi.h deleted file mode 100644 index ffd637e3c3d9..000000000000 --- a/arch/x86/include/asm/mach-generic/mach_ipi.h +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | #ifndef _ASM_X86_MACH_GENERIC_MACH_IPI_H | ||
2 | #define _ASM_X86_MACH_GENERIC_MACH_IPI_H | ||
3 | |||
4 | #include <asm/genapic.h> | ||
5 | |||
6 | #define send_IPI_mask (genapic->send_IPI_mask) | ||
7 | #define send_IPI_allbutself (genapic->send_IPI_allbutself) | ||
8 | #define send_IPI_all (genapic->send_IPI_all) | ||
9 | |||
10 | #endif /* _ASM_X86_MACH_GENERIC_MACH_IPI_H */ | ||
diff --git a/arch/x86/include/asm/mach-generic/mach_mpparse.h b/arch/x86/include/asm/mach-generic/mach_mpparse.h deleted file mode 100644 index 9444ab8dca94..000000000000 --- a/arch/x86/include/asm/mach-generic/mach_mpparse.h +++ /dev/null | |||
@@ -1,9 +0,0 @@ | |||
1 | #ifndef _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H | ||
2 | #define _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H | ||
3 | |||
4 | |||
5 | extern int mps_oem_check(struct mpc_table *, char *, char *); | ||
6 | |||
7 | extern int acpi_madt_oem_check(char *, char *); | ||
8 | |||
9 | #endif /* _ASM_X86_MACH_GENERIC_MACH_MPPARSE_H */ | ||
diff --git a/arch/x86/include/asm/mach-generic/mach_mpspec.h b/arch/x86/include/asm/mach-generic/mach_mpspec.h deleted file mode 100644 index 3bc407226578..000000000000 --- a/arch/x86/include/asm/mach-generic/mach_mpspec.h +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | #ifndef _ASM_X86_MACH_GENERIC_MACH_MPSPEC_H | ||
2 | #define _ASM_X86_MACH_GENERIC_MACH_MPSPEC_H | ||
3 | |||
4 | #define MAX_IRQ_SOURCES 256 | ||
5 | |||
6 | /* Summit or generic (i.e. installer) kernels need lots of bus entries. */ | ||
7 | /* Maximum 256 PCI busses, plus 1 ISA bus in each of 4 cabinets. */ | ||
8 | #define MAX_MP_BUSSES 260 | ||
9 | |||
10 | extern void numaq_mps_oem_check(struct mpc_table *, char *, char *); | ||
11 | |||
12 | #endif /* _ASM_X86_MACH_GENERIC_MACH_MPSPEC_H */ | ||
diff --git a/arch/x86/include/asm/mach-generic/mach_wakecpu.h b/arch/x86/include/asm/mach-generic/mach_wakecpu.h deleted file mode 100644 index 1ab16b168c8a..000000000000 --- a/arch/x86/include/asm/mach-generic/mach_wakecpu.h +++ /dev/null | |||
@@ -1,12 +0,0 @@ | |||
1 | #ifndef _ASM_X86_MACH_GENERIC_MACH_WAKECPU_H | ||
2 | #define _ASM_X86_MACH_GENERIC_MACH_WAKECPU_H | ||
3 | |||
4 | #define TRAMPOLINE_PHYS_LOW (genapic->trampoline_phys_low) | ||
5 | #define TRAMPOLINE_PHYS_HIGH (genapic->trampoline_phys_high) | ||
6 | #define wait_for_init_deassert (genapic->wait_for_init_deassert) | ||
7 | #define smp_callin_clear_local_apic (genapic->smp_callin_clear_local_apic) | ||
8 | #define store_NMI_vector (genapic->store_NMI_vector) | ||
9 | #define restore_NMI_vector (genapic->restore_NMI_vector) | ||
10 | #define inquire_remote_apic (genapic->inquire_remote_apic) | ||
11 | |||
12 | #endif /* _ASM_X86_MACH_GENERIC_MACH_APIC_H */ | ||
diff --git a/arch/x86/include/asm/mach-rdc321x/gpio.h b/arch/x86/include/asm/mach-rdc321x/gpio.h deleted file mode 100644 index c210ab5788b0..000000000000 --- a/arch/x86/include/asm/mach-rdc321x/gpio.h +++ /dev/null | |||
@@ -1,60 +0,0 @@ | |||
1 | #ifndef _ASM_X86_MACH_RDC321X_GPIO_H | ||
2 | #define _ASM_X86_MACH_RDC321X_GPIO_H | ||
3 | |||
4 | #include <linux/kernel.h> | ||
5 | |||
6 | extern int rdc_gpio_get_value(unsigned gpio); | ||
7 | extern void rdc_gpio_set_value(unsigned gpio, int value); | ||
8 | extern int rdc_gpio_direction_input(unsigned gpio); | ||
9 | extern int rdc_gpio_direction_output(unsigned gpio, int value); | ||
10 | extern int rdc_gpio_request(unsigned gpio, const char *label); | ||
11 | extern void rdc_gpio_free(unsigned gpio); | ||
12 | extern void __init rdc321x_gpio_setup(void); | ||
13 | |||
14 | /* Wrappers for the arch-neutral GPIO API */ | ||
15 | |||
16 | static inline int gpio_request(unsigned gpio, const char *label) | ||
17 | { | ||
18 | return rdc_gpio_request(gpio, label); | ||
19 | } | ||
20 | |||
21 | static inline void gpio_free(unsigned gpio) | ||
22 | { | ||
23 | might_sleep(); | ||
24 | rdc_gpio_free(gpio); | ||
25 | } | ||
26 | |||
27 | static inline int gpio_direction_input(unsigned gpio) | ||
28 | { | ||
29 | return rdc_gpio_direction_input(gpio); | ||
30 | } | ||
31 | |||
32 | static inline int gpio_direction_output(unsigned gpio, int value) | ||
33 | { | ||
34 | return rdc_gpio_direction_output(gpio, value); | ||
35 | } | ||
36 | |||
37 | static inline int gpio_get_value(unsigned gpio) | ||
38 | { | ||
39 | return rdc_gpio_get_value(gpio); | ||
40 | } | ||
41 | |||
42 | static inline void gpio_set_value(unsigned gpio, int value) | ||
43 | { | ||
44 | rdc_gpio_set_value(gpio, value); | ||
45 | } | ||
46 | |||
47 | static inline int gpio_to_irq(unsigned gpio) | ||
48 | { | ||
49 | return gpio; | ||
50 | } | ||
51 | |||
52 | static inline int irq_to_gpio(unsigned irq) | ||
53 | { | ||
54 | return irq; | ||
55 | } | ||
56 | |||
57 | /* For cansleep */ | ||
58 | #include <asm-generic/gpio.h> | ||
59 | |||
60 | #endif /* _ASM_X86_MACH_RDC321X_GPIO_H */ | ||
diff --git a/arch/x86/include/asm/mach-default/mach_timer.h b/arch/x86/include/asm/mach_timer.h index 853728519ae9..853728519ae9 100644 --- a/arch/x86/include/asm/mach-default/mach_timer.h +++ b/arch/x86/include/asm/mach_timer.h | |||
diff --git a/arch/x86/include/asm/mach-default/mach_traps.h b/arch/x86/include/asm/mach_traps.h index f7920601e472..f7920601e472 100644 --- a/arch/x86/include/asm/mach-default/mach_traps.h +++ b/arch/x86/include/asm/mach_traps.h | |||
diff --git a/arch/x86/include/asm/mmu_context.h b/arch/x86/include/asm/mmu_context.h index 52948df9cd1d..f923203dc39a 100644 --- a/arch/x86/include/asm/mmu_context.h +++ b/arch/x86/include/asm/mmu_context.h | |||
@@ -79,7 +79,7 @@ do { \ | |||
79 | #ifdef CONFIG_X86_32 | 79 | #ifdef CONFIG_X86_32 |
80 | #define deactivate_mm(tsk, mm) \ | 80 | #define deactivate_mm(tsk, mm) \ |
81 | do { \ | 81 | do { \ |
82 | loadsegment(gs, 0); \ | 82 | lazy_load_gs(0); \ |
83 | } while (0) | 83 | } while (0) |
84 | #else | 84 | #else |
85 | #define deactivate_mm(tsk, mm) \ | 85 | #define deactivate_mm(tsk, mm) \ |
diff --git a/arch/x86/include/asm/mpspec.h b/arch/x86/include/asm/mpspec.h index bd22f2a3713f..5916c8df09d9 100644 --- a/arch/x86/include/asm/mpspec.h +++ b/arch/x86/include/asm/mpspec.h | |||
@@ -9,7 +9,18 @@ extern int apic_version[MAX_APICS]; | |||
9 | extern int pic_mode; | 9 | extern int pic_mode; |
10 | 10 | ||
11 | #ifdef CONFIG_X86_32 | 11 | #ifdef CONFIG_X86_32 |
12 | #include <mach_mpspec.h> | 12 | |
13 | /* | ||
14 | * Summit or generic (i.e. installer) kernels need lots of bus entries. | ||
15 | * Maximum 256 PCI busses, plus 1 ISA bus in each of 4 cabinets. | ||
16 | */ | ||
17 | #if CONFIG_BASE_SMALL == 0 | ||
18 | # define MAX_MP_BUSSES 260 | ||
19 | #else | ||
20 | # define MAX_MP_BUSSES 32 | ||
21 | #endif | ||
22 | |||
23 | #define MAX_IRQ_SOURCES 256 | ||
13 | 24 | ||
14 | extern unsigned int def_to_bigsmp; | 25 | extern unsigned int def_to_bigsmp; |
15 | extern u8 apicid_2_node[]; | 26 | extern u8 apicid_2_node[]; |
@@ -20,15 +31,15 @@ extern int mp_bus_id_to_local[MAX_MP_BUSSES]; | |||
20 | extern int quad_local_to_mp_bus_id [NR_CPUS/4][4]; | 31 | extern int quad_local_to_mp_bus_id [NR_CPUS/4][4]; |
21 | #endif | 32 | #endif |
22 | 33 | ||
23 | #define MAX_APICID 256 | 34 | #define MAX_APICID 256 |
24 | 35 | ||
25 | #else | 36 | #else /* CONFIG_X86_64: */ |
26 | 37 | ||
27 | #define MAX_MP_BUSSES 256 | 38 | #define MAX_MP_BUSSES 256 |
28 | /* Each PCI slot may be a combo card with its own bus. 4 IRQ pins per slot. */ | 39 | /* Each PCI slot may be a combo card with its own bus. 4 IRQ pins per slot. */ |
29 | #define MAX_IRQ_SOURCES (MAX_MP_BUSSES * 4) | 40 | #define MAX_IRQ_SOURCES (MAX_MP_BUSSES * 4) |
30 | 41 | ||
31 | #endif | 42 | #endif /* CONFIG_X86_64 */ |
32 | 43 | ||
33 | extern void early_find_smp_config(void); | 44 | extern void early_find_smp_config(void); |
34 | extern void early_get_smp_config(void); | 45 | extern void early_get_smp_config(void); |
@@ -45,11 +56,13 @@ extern int smp_found_config; | |||
45 | extern int mpc_default_type; | 56 | extern int mpc_default_type; |
46 | extern unsigned long mp_lapic_addr; | 57 | extern unsigned long mp_lapic_addr; |
47 | 58 | ||
48 | extern void find_smp_config(void); | ||
49 | extern void get_smp_config(void); | 59 | extern void get_smp_config(void); |
60 | |||
50 | #ifdef CONFIG_X86_MPPARSE | 61 | #ifdef CONFIG_X86_MPPARSE |
62 | extern void find_smp_config(void); | ||
51 | extern void early_reserve_e820_mpc_new(void); | 63 | extern void early_reserve_e820_mpc_new(void); |
52 | #else | 64 | #else |
65 | static inline void find_smp_config(void) { } | ||
53 | static inline void early_reserve_e820_mpc_new(void) { } | 66 | static inline void early_reserve_e820_mpc_new(void) { } |
54 | #endif | 67 | #endif |
55 | 68 | ||
@@ -64,6 +77,8 @@ extern int acpi_probe_gsi(void); | |||
64 | #ifdef CONFIG_X86_IO_APIC | 77 | #ifdef CONFIG_X86_IO_APIC |
65 | extern int mp_config_acpi_gsi(unsigned char number, unsigned int devfn, u8 pin, | 78 | extern int mp_config_acpi_gsi(unsigned char number, unsigned int devfn, u8 pin, |
66 | u32 gsi, int triggering, int polarity); | 79 | u32 gsi, int triggering, int polarity); |
80 | extern int mp_find_ioapic(int gsi); | ||
81 | extern int mp_find_ioapic_pin(int ioapic, int gsi); | ||
67 | #else | 82 | #else |
68 | static inline int | 83 | static inline int |
69 | mp_config_acpi_gsi(unsigned char number, unsigned int devfn, u8 pin, | 84 | mp_config_acpi_gsi(unsigned char number, unsigned int devfn, u8 pin, |
@@ -148,4 +163,10 @@ static inline void physid_set_mask_of_physid(int physid, physid_mask_t *map) | |||
148 | 163 | ||
149 | extern physid_mask_t phys_cpu_present_map; | 164 | extern physid_mask_t phys_cpu_present_map; |
150 | 165 | ||
166 | extern int generic_mps_oem_check(struct mpc_table *, char *, char *); | ||
167 | |||
168 | extern int default_acpi_madt_oem_check(char *, char *); | ||
169 | |||
170 | extern void numaq_mps_oem_check(struct mpc_table *, char *, char *); | ||
171 | |||
151 | #endif /* _ASM_X86_MPSPEC_H */ | 172 | #endif /* _ASM_X86_MPSPEC_H */ |
diff --git a/arch/x86/include/asm/numaq.h b/arch/x86/include/asm/numaq.h index 1e8bd30b4c16..9f0a5f5d29ec 100644 --- a/arch/x86/include/asm/numaq.h +++ b/arch/x86/include/asm/numaq.h | |||
@@ -31,6 +31,8 @@ | |||
31 | extern int found_numaq; | 31 | extern int found_numaq; |
32 | extern int get_memcfg_numaq(void); | 32 | extern int get_memcfg_numaq(void); |
33 | 33 | ||
34 | extern void *xquad_portio; | ||
35 | |||
34 | /* | 36 | /* |
35 | * SYS_CFG_DATA_PRIV_ADDR, struct eachquadmem, and struct sys_cfg_data are the | 37 | * SYS_CFG_DATA_PRIV_ADDR, struct eachquadmem, and struct sys_cfg_data are the |
36 | */ | 38 | */ |
diff --git a/arch/x86/include/asm/numaq/apic.h b/arch/x86/include/asm/numaq/apic.h deleted file mode 100644 index bf37bc49bd8e..000000000000 --- a/arch/x86/include/asm/numaq/apic.h +++ /dev/null | |||
@@ -1,142 +0,0 @@ | |||
1 | #ifndef __ASM_NUMAQ_APIC_H | ||
2 | #define __ASM_NUMAQ_APIC_H | ||
3 | |||
4 | #include <asm/io.h> | ||
5 | #include <linux/mmzone.h> | ||
6 | #include <linux/nodemask.h> | ||
7 | |||
8 | #define APIC_DFR_VALUE (APIC_DFR_CLUSTER) | ||
9 | |||
10 | static inline const cpumask_t *target_cpus(void) | ||
11 | { | ||
12 | return &CPU_MASK_ALL; | ||
13 | } | ||
14 | |||
15 | #define NO_BALANCE_IRQ (1) | ||
16 | #define esr_disable (1) | ||
17 | |||
18 | #define INT_DELIVERY_MODE dest_LowestPrio | ||
19 | #define INT_DEST_MODE 0 /* physical delivery on LOCAL quad */ | ||
20 | |||
21 | static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid) | ||
22 | { | ||
23 | return physid_isset(apicid, bitmap); | ||
24 | } | ||
25 | static inline unsigned long check_apicid_present(int bit) | ||
26 | { | ||
27 | return physid_isset(bit, phys_cpu_present_map); | ||
28 | } | ||
29 | #define apicid_cluster(apicid) (apicid & 0xF0) | ||
30 | |||
31 | static inline int apic_id_registered(void) | ||
32 | { | ||
33 | return 1; | ||
34 | } | ||
35 | |||
36 | static inline void init_apic_ldr(void) | ||
37 | { | ||
38 | /* Already done in NUMA-Q firmware */ | ||
39 | } | ||
40 | |||
41 | static inline void setup_apic_routing(void) | ||
42 | { | ||
43 | printk("Enabling APIC mode: %s. Using %d I/O APICs\n", | ||
44 | "NUMA-Q", nr_ioapics); | ||
45 | } | ||
46 | |||
47 | /* | ||
48 | * Skip adding the timer int on secondary nodes, which causes | ||
49 | * a small but painful rift in the time-space continuum. | ||
50 | */ | ||
51 | static inline int multi_timer_check(int apic, int irq) | ||
52 | { | ||
53 | return apic != 0 && irq == 0; | ||
54 | } | ||
55 | |||
56 | static inline physid_mask_t ioapic_phys_id_map(physid_mask_t phys_map) | ||
57 | { | ||
58 | /* We don't have a good way to do this yet - hack */ | ||
59 | return physids_promote(0xFUL); | ||
60 | } | ||
61 | |||
62 | /* Mapping from cpu number to logical apicid */ | ||
63 | extern u8 cpu_2_logical_apicid[]; | ||
64 | static inline int cpu_to_logical_apicid(int cpu) | ||
65 | { | ||
66 | if (cpu >= nr_cpu_ids) | ||
67 | return BAD_APICID; | ||
68 | return (int)cpu_2_logical_apicid[cpu]; | ||
69 | } | ||
70 | |||
71 | /* | ||
72 | * Supporting over 60 cpus on NUMA-Q requires a locality-dependent | ||
73 | * cpu to APIC ID relation to properly interact with the intelligent | ||
74 | * mode of the cluster controller. | ||
75 | */ | ||
76 | static inline int cpu_present_to_apicid(int mps_cpu) | ||
77 | { | ||
78 | if (mps_cpu < 60) | ||
79 | return ((mps_cpu >> 2) << 4) | (1 << (mps_cpu & 0x3)); | ||
80 | else | ||
81 | return BAD_APICID; | ||
82 | } | ||
83 | |||
84 | static inline int apicid_to_node(int logical_apicid) | ||
85 | { | ||
86 | return logical_apicid >> 4; | ||
87 | } | ||
88 | |||
89 | static inline physid_mask_t apicid_to_cpu_present(int logical_apicid) | ||
90 | { | ||
91 | int node = apicid_to_node(logical_apicid); | ||
92 | int cpu = __ffs(logical_apicid & 0xf); | ||
93 | |||
94 | return physid_mask_of_physid(cpu + 4*node); | ||
95 | } | ||
96 | |||
97 | extern void *xquad_portio; | ||
98 | |||
99 | static inline void setup_portio_remap(void) | ||
100 | { | ||
101 | int num_quads = num_online_nodes(); | ||
102 | |||
103 | if (num_quads <= 1) | ||
104 | return; | ||
105 | |||
106 | printk("Remapping cross-quad port I/O for %d quads\n", num_quads); | ||
107 | xquad_portio = ioremap(XQUAD_PORTIO_BASE, num_quads*XQUAD_PORTIO_QUAD); | ||
108 | printk("xquad_portio vaddr 0x%08lx, len %08lx\n", | ||
109 | (u_long) xquad_portio, (u_long) num_quads*XQUAD_PORTIO_QUAD); | ||
110 | } | ||
111 | |||
112 | static inline int check_phys_apicid_present(int boot_cpu_physical_apicid) | ||
113 | { | ||
114 | return (1); | ||
115 | } | ||
116 | |||
117 | static inline void enable_apic_mode(void) | ||
118 | { | ||
119 | } | ||
120 | |||
121 | /* | ||
122 | * We use physical apicids here, not logical, so just return the default | ||
123 | * physical broadcast to stop people from breaking us | ||
124 | */ | ||
125 | static inline unsigned int cpu_mask_to_apicid(const cpumask_t *cpumask) | ||
126 | { | ||
127 | return (int) 0xF; | ||
128 | } | ||
129 | |||
130 | static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *cpumask, | ||
131 | const struct cpumask *andmask) | ||
132 | { | ||
133 | return (int) 0xF; | ||
134 | } | ||
135 | |||
136 | /* No NUMA-Q box has a HT CPU, but it can't hurt to use the default code. */ | ||
137 | static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) | ||
138 | { | ||
139 | return cpuid_apic >> index_msb; | ||
140 | } | ||
141 | |||
142 | #endif /* __ASM_NUMAQ_APIC_H */ | ||
diff --git a/arch/x86/include/asm/numaq/apicdef.h b/arch/x86/include/asm/numaq/apicdef.h deleted file mode 100644 index e012a46cc22a..000000000000 --- a/arch/x86/include/asm/numaq/apicdef.h +++ /dev/null | |||
@@ -1,14 +0,0 @@ | |||
1 | #ifndef __ASM_NUMAQ_APICDEF_H | ||
2 | #define __ASM_NUMAQ_APICDEF_H | ||
3 | |||
4 | |||
5 | #define APIC_ID_MASK (0xF<<24) | ||
6 | |||
7 | static inline unsigned get_apic_id(unsigned long x) | ||
8 | { | ||
9 | return (((x)>>24)&0x0F); | ||
10 | } | ||
11 | |||
12 | #define GET_APIC_ID(x) get_apic_id(x) | ||
13 | |||
14 | #endif | ||
diff --git a/arch/x86/include/asm/numaq/ipi.h b/arch/x86/include/asm/numaq/ipi.h deleted file mode 100644 index a8374c652778..000000000000 --- a/arch/x86/include/asm/numaq/ipi.h +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | #ifndef __ASM_NUMAQ_IPI_H | ||
2 | #define __ASM_NUMAQ_IPI_H | ||
3 | |||
4 | void send_IPI_mask_sequence(const struct cpumask *mask, int vector); | ||
5 | void send_IPI_mask_allbutself(const struct cpumask *mask, int vector); | ||
6 | |||
7 | static inline void send_IPI_mask(const struct cpumask *mask, int vector) | ||
8 | { | ||
9 | send_IPI_mask_sequence(mask, vector); | ||
10 | } | ||
11 | |||
12 | static inline void send_IPI_allbutself(int vector) | ||
13 | { | ||
14 | send_IPI_mask_allbutself(cpu_online_mask, vector); | ||
15 | } | ||
16 | |||
17 | static inline void send_IPI_all(int vector) | ||
18 | { | ||
19 | send_IPI_mask(cpu_online_mask, vector); | ||
20 | } | ||
21 | |||
22 | #endif /* __ASM_NUMAQ_IPI_H */ | ||
diff --git a/arch/x86/include/asm/numaq/mpparse.h b/arch/x86/include/asm/numaq/mpparse.h deleted file mode 100644 index a2eeefcd1cc7..000000000000 --- a/arch/x86/include/asm/numaq/mpparse.h +++ /dev/null | |||
@@ -1,6 +0,0 @@ | |||
1 | #ifndef __ASM_NUMAQ_MPPARSE_H | ||
2 | #define __ASM_NUMAQ_MPPARSE_H | ||
3 | |||
4 | extern void numaq_mps_oem_check(struct mpc_table *, char *, char *); | ||
5 | |||
6 | #endif /* __ASM_NUMAQ_MPPARSE_H */ | ||
diff --git a/arch/x86/include/asm/numaq/wakecpu.h b/arch/x86/include/asm/numaq/wakecpu.h deleted file mode 100644 index 6f499df8eddb..000000000000 --- a/arch/x86/include/asm/numaq/wakecpu.h +++ /dev/null | |||
@@ -1,45 +0,0 @@ | |||
1 | #ifndef __ASM_NUMAQ_WAKECPU_H | ||
2 | #define __ASM_NUMAQ_WAKECPU_H | ||
3 | |||
4 | /* This file copes with machines that wakeup secondary CPUs by NMIs */ | ||
5 | |||
6 | #define TRAMPOLINE_PHYS_LOW (0x8) | ||
7 | #define TRAMPOLINE_PHYS_HIGH (0xa) | ||
8 | |||
9 | /* We don't do anything here because we use NMI's to boot instead */ | ||
10 | static inline void wait_for_init_deassert(atomic_t *deassert) | ||
11 | { | ||
12 | } | ||
13 | |||
14 | /* | ||
15 | * Because we use NMIs rather than the INIT-STARTUP sequence to | ||
16 | * bootstrap the CPUs, the APIC may be in a weird state. Kick it. | ||
17 | */ | ||
18 | static inline void smp_callin_clear_local_apic(void) | ||
19 | { | ||
20 | clear_local_APIC(); | ||
21 | } | ||
22 | |||
23 | static inline void store_NMI_vector(unsigned short *high, unsigned short *low) | ||
24 | { | ||
25 | printk("Storing NMI vector\n"); | ||
26 | *high = | ||
27 | *((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_HIGH)); | ||
28 | *low = | ||
29 | *((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_LOW)); | ||
30 | } | ||
31 | |||
32 | static inline void restore_NMI_vector(unsigned short *high, unsigned short *low) | ||
33 | { | ||
34 | printk("Restoring NMI vector\n"); | ||
35 | *((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_HIGH)) = | ||
36 | *high; | ||
37 | *((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_LOW)) = | ||
38 | *low; | ||
39 | } | ||
40 | |||
41 | static inline void inquire_remote_apic(int apicid) | ||
42 | { | ||
43 | } | ||
44 | |||
45 | #endif /* __ASM_NUMAQ_WAKECPU_H */ | ||
diff --git a/arch/x86/include/asm/page.h b/arch/x86/include/asm/page.h index e9873a2e8695..05f2da7f387a 100644 --- a/arch/x86/include/asm/page.h +++ b/arch/x86/include/asm/page.h | |||
@@ -57,7 +57,6 @@ typedef struct { pgdval_t pgd; } pgd_t; | |||
57 | typedef struct { pgprotval_t pgprot; } pgprot_t; | 57 | typedef struct { pgprotval_t pgprot; } pgprot_t; |
58 | 58 | ||
59 | extern int page_is_ram(unsigned long pagenr); | 59 | extern int page_is_ram(unsigned long pagenr); |
60 | extern int pagerange_is_ram(unsigned long start, unsigned long end); | ||
61 | extern int devmem_is_allowed(unsigned long pagenr); | 60 | extern int devmem_is_allowed(unsigned long pagenr); |
62 | extern void map_devmem(unsigned long pfn, unsigned long size, | 61 | extern void map_devmem(unsigned long pfn, unsigned long size, |
63 | pgprot_t vma_prot); | 62 | pgprot_t vma_prot); |
@@ -95,6 +94,11 @@ static inline pgdval_t native_pgd_val(pgd_t pgd) | |||
95 | return pgd.pgd; | 94 | return pgd.pgd; |
96 | } | 95 | } |
97 | 96 | ||
97 | static inline pgdval_t pgd_flags(pgd_t pgd) | ||
98 | { | ||
99 | return native_pgd_val(pgd) & PTE_FLAGS_MASK; | ||
100 | } | ||
101 | |||
98 | #if PAGETABLE_LEVELS >= 3 | 102 | #if PAGETABLE_LEVELS >= 3 |
99 | #if PAGETABLE_LEVELS == 4 | 103 | #if PAGETABLE_LEVELS == 4 |
100 | typedef struct { pudval_t pud; } pud_t; | 104 | typedef struct { pudval_t pud; } pud_t; |
@@ -117,6 +121,11 @@ static inline pudval_t native_pud_val(pud_t pud) | |||
117 | } | 121 | } |
118 | #endif /* PAGETABLE_LEVELS == 4 */ | 122 | #endif /* PAGETABLE_LEVELS == 4 */ |
119 | 123 | ||
124 | static inline pudval_t pud_flags(pud_t pud) | ||
125 | { | ||
126 | return native_pud_val(pud) & PTE_FLAGS_MASK; | ||
127 | } | ||
128 | |||
120 | typedef struct { pmdval_t pmd; } pmd_t; | 129 | typedef struct { pmdval_t pmd; } pmd_t; |
121 | 130 | ||
122 | static inline pmd_t native_make_pmd(pmdval_t val) | 131 | static inline pmd_t native_make_pmd(pmdval_t val) |
@@ -128,6 +137,7 @@ static inline pmdval_t native_pmd_val(pmd_t pmd) | |||
128 | { | 137 | { |
129 | return pmd.pmd; | 138 | return pmd.pmd; |
130 | } | 139 | } |
140 | |||
131 | #else /* PAGETABLE_LEVELS == 2 */ | 141 | #else /* PAGETABLE_LEVELS == 2 */ |
132 | #include <asm-generic/pgtable-nopmd.h> | 142 | #include <asm-generic/pgtable-nopmd.h> |
133 | 143 | ||
@@ -137,6 +147,11 @@ static inline pmdval_t native_pmd_val(pmd_t pmd) | |||
137 | } | 147 | } |
138 | #endif /* PAGETABLE_LEVELS >= 3 */ | 148 | #endif /* PAGETABLE_LEVELS >= 3 */ |
139 | 149 | ||
150 | static inline pmdval_t pmd_flags(pmd_t pmd) | ||
151 | { | ||
152 | return native_pmd_val(pmd) & PTE_FLAGS_MASK; | ||
153 | } | ||
154 | |||
140 | static inline pte_t native_make_pte(pteval_t val) | 155 | static inline pte_t native_make_pte(pteval_t val) |
141 | { | 156 | { |
142 | return (pte_t) { .pte = val }; | 157 | return (pte_t) { .pte = val }; |
@@ -147,7 +162,7 @@ static inline pteval_t native_pte_val(pte_t pte) | |||
147 | return pte.pte; | 162 | return pte.pte; |
148 | } | 163 | } |
149 | 164 | ||
150 | static inline pteval_t native_pte_flags(pte_t pte) | 165 | static inline pteval_t pte_flags(pte_t pte) |
151 | { | 166 | { |
152 | return native_pte_val(pte) & PTE_FLAGS_MASK; | 167 | return native_pte_val(pte) & PTE_FLAGS_MASK; |
153 | } | 168 | } |
@@ -173,7 +188,6 @@ static inline pteval_t native_pte_flags(pte_t pte) | |||
173 | #endif | 188 | #endif |
174 | 189 | ||
175 | #define pte_val(x) native_pte_val(x) | 190 | #define pte_val(x) native_pte_val(x) |
176 | #define pte_flags(x) native_pte_flags(x) | ||
177 | #define __pte(x) native_make_pte(x) | 191 | #define __pte(x) native_make_pte(x) |
178 | 192 | ||
179 | #endif /* CONFIG_PARAVIRT */ | 193 | #endif /* CONFIG_PARAVIRT */ |
diff --git a/arch/x86/include/asm/paravirt.h b/arch/x86/include/asm/paravirt.h index ccd59f00fd5c..b788dfd20483 100644 --- a/arch/x86/include/asm/paravirt.h +++ b/arch/x86/include/asm/paravirt.h | |||
@@ -12,21 +12,38 @@ | |||
12 | #define CLBR_EAX (1 << 0) | 12 | #define CLBR_EAX (1 << 0) |
13 | #define CLBR_ECX (1 << 1) | 13 | #define CLBR_ECX (1 << 1) |
14 | #define CLBR_EDX (1 << 2) | 14 | #define CLBR_EDX (1 << 2) |
15 | #define CLBR_EDI (1 << 3) | ||
15 | 16 | ||
16 | #ifdef CONFIG_X86_64 | 17 | #ifdef CONFIG_X86_32 |
17 | #define CLBR_RSI (1 << 3) | 18 | /* CLBR_ANY should match all regs platform has. For i386, that's just it */ |
18 | #define CLBR_RDI (1 << 4) | 19 | #define CLBR_ANY ((1 << 4) - 1) |
20 | |||
21 | #define CLBR_ARG_REGS (CLBR_EAX | CLBR_EDX | CLBR_ECX) | ||
22 | #define CLBR_RET_REG (CLBR_EAX | CLBR_EDX) | ||
23 | #define CLBR_SCRATCH (0) | ||
24 | #else | ||
25 | #define CLBR_RAX CLBR_EAX | ||
26 | #define CLBR_RCX CLBR_ECX | ||
27 | #define CLBR_RDX CLBR_EDX | ||
28 | #define CLBR_RDI CLBR_EDI | ||
29 | #define CLBR_RSI (1 << 4) | ||
19 | #define CLBR_R8 (1 << 5) | 30 | #define CLBR_R8 (1 << 5) |
20 | #define CLBR_R9 (1 << 6) | 31 | #define CLBR_R9 (1 << 6) |
21 | #define CLBR_R10 (1 << 7) | 32 | #define CLBR_R10 (1 << 7) |
22 | #define CLBR_R11 (1 << 8) | 33 | #define CLBR_R11 (1 << 8) |
34 | |||
23 | #define CLBR_ANY ((1 << 9) - 1) | 35 | #define CLBR_ANY ((1 << 9) - 1) |
36 | |||
37 | #define CLBR_ARG_REGS (CLBR_RDI | CLBR_RSI | CLBR_RDX | \ | ||
38 | CLBR_RCX | CLBR_R8 | CLBR_R9) | ||
39 | #define CLBR_RET_REG (CLBR_RAX) | ||
40 | #define CLBR_SCRATCH (CLBR_R10 | CLBR_R11) | ||
41 | |||
24 | #include <asm/desc_defs.h> | 42 | #include <asm/desc_defs.h> |
25 | #else | ||
26 | /* CLBR_ANY should match all regs platform has. For i386, that's just it */ | ||
27 | #define CLBR_ANY ((1 << 3) - 1) | ||
28 | #endif /* X86_64 */ | 43 | #endif /* X86_64 */ |
29 | 44 | ||
45 | #define CLBR_CALLEE_SAVE ((CLBR_ARG_REGS | CLBR_SCRATCH) & ~CLBR_RET_REG) | ||
46 | |||
30 | #ifndef __ASSEMBLY__ | 47 | #ifndef __ASSEMBLY__ |
31 | #include <linux/types.h> | 48 | #include <linux/types.h> |
32 | #include <linux/cpumask.h> | 49 | #include <linux/cpumask.h> |
@@ -40,6 +57,14 @@ struct tss_struct; | |||
40 | struct mm_struct; | 57 | struct mm_struct; |
41 | struct desc_struct; | 58 | struct desc_struct; |
42 | 59 | ||
60 | /* | ||
61 | * Wrapper type for pointers to code which uses the non-standard | ||
62 | * calling convention. See PV_CALL_SAVE_REGS_THUNK below. | ||
63 | */ | ||
64 | struct paravirt_callee_save { | ||
65 | void *func; | ||
66 | }; | ||
67 | |||
43 | /* general info */ | 68 | /* general info */ |
44 | struct pv_info { | 69 | struct pv_info { |
45 | unsigned int kernel_rpl; | 70 | unsigned int kernel_rpl; |
@@ -189,11 +214,15 @@ struct pv_irq_ops { | |||
189 | * expected to use X86_EFLAGS_IF; all other bits | 214 | * expected to use X86_EFLAGS_IF; all other bits |
190 | * returned from save_fl are undefined, and may be ignored by | 215 | * returned from save_fl are undefined, and may be ignored by |
191 | * restore_fl. | 216 | * restore_fl. |
217 | * | ||
218 | * NOTE: These functions callers expect the callee to preserve | ||
219 | * more registers than the standard C calling convention. | ||
192 | */ | 220 | */ |
193 | unsigned long (*save_fl)(void); | 221 | struct paravirt_callee_save save_fl; |
194 | void (*restore_fl)(unsigned long); | 222 | struct paravirt_callee_save restore_fl; |
195 | void (*irq_disable)(void); | 223 | struct paravirt_callee_save irq_disable; |
196 | void (*irq_enable)(void); | 224 | struct paravirt_callee_save irq_enable; |
225 | |||
197 | void (*safe_halt)(void); | 226 | void (*safe_halt)(void); |
198 | void (*halt)(void); | 227 | void (*halt)(void); |
199 | 228 | ||
@@ -279,12 +308,11 @@ struct pv_mmu_ops { | |||
279 | void (*ptep_modify_prot_commit)(struct mm_struct *mm, unsigned long addr, | 308 | void (*ptep_modify_prot_commit)(struct mm_struct *mm, unsigned long addr, |
280 | pte_t *ptep, pte_t pte); | 309 | pte_t *ptep, pte_t pte); |
281 | 310 | ||
282 | pteval_t (*pte_val)(pte_t); | 311 | struct paravirt_callee_save pte_val; |
283 | pteval_t (*pte_flags)(pte_t); | 312 | struct paravirt_callee_save make_pte; |
284 | pte_t (*make_pte)(pteval_t pte); | ||
285 | 313 | ||
286 | pgdval_t (*pgd_val)(pgd_t); | 314 | struct paravirt_callee_save pgd_val; |
287 | pgd_t (*make_pgd)(pgdval_t pgd); | 315 | struct paravirt_callee_save make_pgd; |
288 | 316 | ||
289 | #if PAGETABLE_LEVELS >= 3 | 317 | #if PAGETABLE_LEVELS >= 3 |
290 | #ifdef CONFIG_X86_PAE | 318 | #ifdef CONFIG_X86_PAE |
@@ -299,12 +327,12 @@ struct pv_mmu_ops { | |||
299 | 327 | ||
300 | void (*set_pud)(pud_t *pudp, pud_t pudval); | 328 | void (*set_pud)(pud_t *pudp, pud_t pudval); |
301 | 329 | ||
302 | pmdval_t (*pmd_val)(pmd_t); | 330 | struct paravirt_callee_save pmd_val; |
303 | pmd_t (*make_pmd)(pmdval_t pmd); | 331 | struct paravirt_callee_save make_pmd; |
304 | 332 | ||
305 | #if PAGETABLE_LEVELS == 4 | 333 | #if PAGETABLE_LEVELS == 4 |
306 | pudval_t (*pud_val)(pud_t); | 334 | struct paravirt_callee_save pud_val; |
307 | pud_t (*make_pud)(pudval_t pud); | 335 | struct paravirt_callee_save make_pud; |
308 | 336 | ||
309 | void (*set_pgd)(pgd_t *pudp, pgd_t pgdval); | 337 | void (*set_pgd)(pgd_t *pudp, pgd_t pgdval); |
310 | #endif /* PAGETABLE_LEVELS == 4 */ | 338 | #endif /* PAGETABLE_LEVELS == 4 */ |
@@ -389,6 +417,8 @@ extern struct pv_lock_ops pv_lock_ops; | |||
389 | asm("start_" #ops "_" #name ": " code "; end_" #ops "_" #name ":") | 417 | asm("start_" #ops "_" #name ": " code "; end_" #ops "_" #name ":") |
390 | 418 | ||
391 | unsigned paravirt_patch_nop(void); | 419 | unsigned paravirt_patch_nop(void); |
420 | unsigned paravirt_patch_ident_32(void *insnbuf, unsigned len); | ||
421 | unsigned paravirt_patch_ident_64(void *insnbuf, unsigned len); | ||
392 | unsigned paravirt_patch_ignore(unsigned len); | 422 | unsigned paravirt_patch_ignore(unsigned len); |
393 | unsigned paravirt_patch_call(void *insnbuf, | 423 | unsigned paravirt_patch_call(void *insnbuf, |
394 | const void *target, u16 tgt_clobbers, | 424 | const void *target, u16 tgt_clobbers, |
@@ -480,25 +510,45 @@ int paravirt_disable_iospace(void); | |||
480 | * makes sure the incoming and outgoing types are always correct. | 510 | * makes sure the incoming and outgoing types are always correct. |
481 | */ | 511 | */ |
482 | #ifdef CONFIG_X86_32 | 512 | #ifdef CONFIG_X86_32 |
483 | #define PVOP_VCALL_ARGS unsigned long __eax, __edx, __ecx | 513 | #define PVOP_VCALL_ARGS \ |
514 | unsigned long __eax = __eax, __edx = __edx, __ecx = __ecx | ||
484 | #define PVOP_CALL_ARGS PVOP_VCALL_ARGS | 515 | #define PVOP_CALL_ARGS PVOP_VCALL_ARGS |
516 | |||
517 | #define PVOP_CALL_ARG1(x) "a" ((unsigned long)(x)) | ||
518 | #define PVOP_CALL_ARG2(x) "d" ((unsigned long)(x)) | ||
519 | #define PVOP_CALL_ARG3(x) "c" ((unsigned long)(x)) | ||
520 | |||
485 | #define PVOP_VCALL_CLOBBERS "=a" (__eax), "=d" (__edx), \ | 521 | #define PVOP_VCALL_CLOBBERS "=a" (__eax), "=d" (__edx), \ |
486 | "=c" (__ecx) | 522 | "=c" (__ecx) |
487 | #define PVOP_CALL_CLOBBERS PVOP_VCALL_CLOBBERS | 523 | #define PVOP_CALL_CLOBBERS PVOP_VCALL_CLOBBERS |
524 | |||
525 | #define PVOP_VCALLEE_CLOBBERS "=a" (__eax), "=d" (__edx) | ||
526 | #define PVOP_CALLEE_CLOBBERS PVOP_VCALLEE_CLOBBERS | ||
527 | |||
488 | #define EXTRA_CLOBBERS | 528 | #define EXTRA_CLOBBERS |
489 | #define VEXTRA_CLOBBERS | 529 | #define VEXTRA_CLOBBERS |
490 | #else | 530 | #else /* CONFIG_X86_64 */ |
491 | #define PVOP_VCALL_ARGS unsigned long __edi, __esi, __edx, __ecx | 531 | #define PVOP_VCALL_ARGS \ |
532 | unsigned long __edi = __edi, __esi = __esi, \ | ||
533 | __edx = __edx, __ecx = __ecx | ||
492 | #define PVOP_CALL_ARGS PVOP_VCALL_ARGS, __eax | 534 | #define PVOP_CALL_ARGS PVOP_VCALL_ARGS, __eax |
535 | |||
536 | #define PVOP_CALL_ARG1(x) "D" ((unsigned long)(x)) | ||
537 | #define PVOP_CALL_ARG2(x) "S" ((unsigned long)(x)) | ||
538 | #define PVOP_CALL_ARG3(x) "d" ((unsigned long)(x)) | ||
539 | #define PVOP_CALL_ARG4(x) "c" ((unsigned long)(x)) | ||
540 | |||
493 | #define PVOP_VCALL_CLOBBERS "=D" (__edi), \ | 541 | #define PVOP_VCALL_CLOBBERS "=D" (__edi), \ |
494 | "=S" (__esi), "=d" (__edx), \ | 542 | "=S" (__esi), "=d" (__edx), \ |
495 | "=c" (__ecx) | 543 | "=c" (__ecx) |
496 | |||
497 | #define PVOP_CALL_CLOBBERS PVOP_VCALL_CLOBBERS, "=a" (__eax) | 544 | #define PVOP_CALL_CLOBBERS PVOP_VCALL_CLOBBERS, "=a" (__eax) |
498 | 545 | ||
546 | #define PVOP_VCALLEE_CLOBBERS "=a" (__eax) | ||
547 | #define PVOP_CALLEE_CLOBBERS PVOP_VCALLEE_CLOBBERS | ||
548 | |||
499 | #define EXTRA_CLOBBERS , "r8", "r9", "r10", "r11" | 549 | #define EXTRA_CLOBBERS , "r8", "r9", "r10", "r11" |
500 | #define VEXTRA_CLOBBERS , "rax", "r8", "r9", "r10", "r11" | 550 | #define VEXTRA_CLOBBERS , "rax", "r8", "r9", "r10", "r11" |
501 | #endif | 551 | #endif /* CONFIG_X86_32 */ |
502 | 552 | ||
503 | #ifdef CONFIG_PARAVIRT_DEBUG | 553 | #ifdef CONFIG_PARAVIRT_DEBUG |
504 | #define PVOP_TEST_NULL(op) BUG_ON(op == NULL) | 554 | #define PVOP_TEST_NULL(op) BUG_ON(op == NULL) |
@@ -506,10 +556,11 @@ int paravirt_disable_iospace(void); | |||
506 | #define PVOP_TEST_NULL(op) ((void)op) | 556 | #define PVOP_TEST_NULL(op) ((void)op) |
507 | #endif | 557 | #endif |
508 | 558 | ||
509 | #define __PVOP_CALL(rettype, op, pre, post, ...) \ | 559 | #define ____PVOP_CALL(rettype, op, clbr, call_clbr, extra_clbr, \ |
560 | pre, post, ...) \ | ||
510 | ({ \ | 561 | ({ \ |
511 | rettype __ret; \ | 562 | rettype __ret; \ |
512 | PVOP_CALL_ARGS; \ | 563 | PVOP_CALL_ARGS; \ |
513 | PVOP_TEST_NULL(op); \ | 564 | PVOP_TEST_NULL(op); \ |
514 | /* This is 32-bit specific, but is okay in 64-bit */ \ | 565 | /* This is 32-bit specific, but is okay in 64-bit */ \ |
515 | /* since this condition will never hold */ \ | 566 | /* since this condition will never hold */ \ |
@@ -517,70 +568,113 @@ int paravirt_disable_iospace(void); | |||
517 | asm volatile(pre \ | 568 | asm volatile(pre \ |
518 | paravirt_alt(PARAVIRT_CALL) \ | 569 | paravirt_alt(PARAVIRT_CALL) \ |
519 | post \ | 570 | post \ |
520 | : PVOP_CALL_CLOBBERS \ | 571 | : call_clbr \ |
521 | : paravirt_type(op), \ | 572 | : paravirt_type(op), \ |
522 | paravirt_clobber(CLBR_ANY), \ | 573 | paravirt_clobber(clbr), \ |
523 | ##__VA_ARGS__ \ | 574 | ##__VA_ARGS__ \ |
524 | : "memory", "cc" EXTRA_CLOBBERS); \ | 575 | : "memory", "cc" extra_clbr); \ |
525 | __ret = (rettype)((((u64)__edx) << 32) | __eax); \ | 576 | __ret = (rettype)((((u64)__edx) << 32) | __eax); \ |
526 | } else { \ | 577 | } else { \ |
527 | asm volatile(pre \ | 578 | asm volatile(pre \ |
528 | paravirt_alt(PARAVIRT_CALL) \ | 579 | paravirt_alt(PARAVIRT_CALL) \ |
529 | post \ | 580 | post \ |
530 | : PVOP_CALL_CLOBBERS \ | 581 | : call_clbr \ |
531 | : paravirt_type(op), \ | 582 | : paravirt_type(op), \ |
532 | paravirt_clobber(CLBR_ANY), \ | 583 | paravirt_clobber(clbr), \ |
533 | ##__VA_ARGS__ \ | 584 | ##__VA_ARGS__ \ |
534 | : "memory", "cc" EXTRA_CLOBBERS); \ | 585 | : "memory", "cc" extra_clbr); \ |
535 | __ret = (rettype)__eax; \ | 586 | __ret = (rettype)__eax; \ |
536 | } \ | 587 | } \ |
537 | __ret; \ | 588 | __ret; \ |
538 | }) | 589 | }) |
539 | #define __PVOP_VCALL(op, pre, post, ...) \ | 590 | |
591 | #define __PVOP_CALL(rettype, op, pre, post, ...) \ | ||
592 | ____PVOP_CALL(rettype, op, CLBR_ANY, PVOP_CALL_CLOBBERS, \ | ||
593 | EXTRA_CLOBBERS, pre, post, ##__VA_ARGS__) | ||
594 | |||
595 | #define __PVOP_CALLEESAVE(rettype, op, pre, post, ...) \ | ||
596 | ____PVOP_CALL(rettype, op.func, CLBR_RET_REG, \ | ||
597 | PVOP_CALLEE_CLOBBERS, , \ | ||
598 | pre, post, ##__VA_ARGS__) | ||
599 | |||
600 | |||
601 | #define ____PVOP_VCALL(op, clbr, call_clbr, extra_clbr, pre, post, ...) \ | ||
540 | ({ \ | 602 | ({ \ |
541 | PVOP_VCALL_ARGS; \ | 603 | PVOP_VCALL_ARGS; \ |
542 | PVOP_TEST_NULL(op); \ | 604 | PVOP_TEST_NULL(op); \ |
543 | asm volatile(pre \ | 605 | asm volatile(pre \ |
544 | paravirt_alt(PARAVIRT_CALL) \ | 606 | paravirt_alt(PARAVIRT_CALL) \ |
545 | post \ | 607 | post \ |
546 | : PVOP_VCALL_CLOBBERS \ | 608 | : call_clbr \ |
547 | : paravirt_type(op), \ | 609 | : paravirt_type(op), \ |
548 | paravirt_clobber(CLBR_ANY), \ | 610 | paravirt_clobber(clbr), \ |
549 | ##__VA_ARGS__ \ | 611 | ##__VA_ARGS__ \ |
550 | : "memory", "cc" VEXTRA_CLOBBERS); \ | 612 | : "memory", "cc" extra_clbr); \ |
551 | }) | 613 | }) |
552 | 614 | ||
615 | #define __PVOP_VCALL(op, pre, post, ...) \ | ||
616 | ____PVOP_VCALL(op, CLBR_ANY, PVOP_VCALL_CLOBBERS, \ | ||
617 | VEXTRA_CLOBBERS, \ | ||
618 | pre, post, ##__VA_ARGS__) | ||
619 | |||
620 | #define __PVOP_VCALLEESAVE(rettype, op, pre, post, ...) \ | ||
621 | ____PVOP_CALL(rettype, op.func, CLBR_RET_REG, \ | ||
622 | PVOP_VCALLEE_CLOBBERS, , \ | ||
623 | pre, post, ##__VA_ARGS__) | ||
624 | |||
625 | |||
626 | |||
553 | #define PVOP_CALL0(rettype, op) \ | 627 | #define PVOP_CALL0(rettype, op) \ |
554 | __PVOP_CALL(rettype, op, "", "") | 628 | __PVOP_CALL(rettype, op, "", "") |
555 | #define PVOP_VCALL0(op) \ | 629 | #define PVOP_VCALL0(op) \ |
556 | __PVOP_VCALL(op, "", "") | 630 | __PVOP_VCALL(op, "", "") |
557 | 631 | ||
632 | #define PVOP_CALLEE0(rettype, op) \ | ||
633 | __PVOP_CALLEESAVE(rettype, op, "", "") | ||
634 | #define PVOP_VCALLEE0(op) \ | ||
635 | __PVOP_VCALLEESAVE(op, "", "") | ||
636 | |||
637 | |||
558 | #define PVOP_CALL1(rettype, op, arg1) \ | 638 | #define PVOP_CALL1(rettype, op, arg1) \ |
559 | __PVOP_CALL(rettype, op, "", "", "0" ((unsigned long)(arg1))) | 639 | __PVOP_CALL(rettype, op, "", "", PVOP_CALL_ARG1(arg1)) |
560 | #define PVOP_VCALL1(op, arg1) \ | 640 | #define PVOP_VCALL1(op, arg1) \ |
561 | __PVOP_VCALL(op, "", "", "0" ((unsigned long)(arg1))) | 641 | __PVOP_VCALL(op, "", "", PVOP_CALL_ARG1(arg1)) |
642 | |||
643 | #define PVOP_CALLEE1(rettype, op, arg1) \ | ||
644 | __PVOP_CALLEESAVE(rettype, op, "", "", PVOP_CALL_ARG1(arg1)) | ||
645 | #define PVOP_VCALLEE1(op, arg1) \ | ||
646 | __PVOP_VCALLEESAVE(op, "", "", PVOP_CALL_ARG1(arg1)) | ||
647 | |||
562 | 648 | ||
563 | #define PVOP_CALL2(rettype, op, arg1, arg2) \ | 649 | #define PVOP_CALL2(rettype, op, arg1, arg2) \ |
564 | __PVOP_CALL(rettype, op, "", "", "0" ((unsigned long)(arg1)), \ | 650 | __PVOP_CALL(rettype, op, "", "", PVOP_CALL_ARG1(arg1), \ |
565 | "1" ((unsigned long)(arg2))) | 651 | PVOP_CALL_ARG2(arg2)) |
566 | #define PVOP_VCALL2(op, arg1, arg2) \ | 652 | #define PVOP_VCALL2(op, arg1, arg2) \ |
567 | __PVOP_VCALL(op, "", "", "0" ((unsigned long)(arg1)), \ | 653 | __PVOP_VCALL(op, "", "", PVOP_CALL_ARG1(arg1), \ |
568 | "1" ((unsigned long)(arg2))) | 654 | PVOP_CALL_ARG2(arg2)) |
655 | |||
656 | #define PVOP_CALLEE2(rettype, op, arg1, arg2) \ | ||
657 | __PVOP_CALLEESAVE(rettype, op, "", "", PVOP_CALL_ARG1(arg1), \ | ||
658 | PVOP_CALL_ARG2(arg2)) | ||
659 | #define PVOP_VCALLEE2(op, arg1, arg2) \ | ||
660 | __PVOP_VCALLEESAVE(op, "", "", PVOP_CALL_ARG1(arg1), \ | ||
661 | PVOP_CALL_ARG2(arg2)) | ||
662 | |||
569 | 663 | ||
570 | #define PVOP_CALL3(rettype, op, arg1, arg2, arg3) \ | 664 | #define PVOP_CALL3(rettype, op, arg1, arg2, arg3) \ |
571 | __PVOP_CALL(rettype, op, "", "", "0" ((unsigned long)(arg1)), \ | 665 | __PVOP_CALL(rettype, op, "", "", PVOP_CALL_ARG1(arg1), \ |
572 | "1"((unsigned long)(arg2)), "2"((unsigned long)(arg3))) | 666 | PVOP_CALL_ARG2(arg2), PVOP_CALL_ARG3(arg3)) |
573 | #define PVOP_VCALL3(op, arg1, arg2, arg3) \ | 667 | #define PVOP_VCALL3(op, arg1, arg2, arg3) \ |
574 | __PVOP_VCALL(op, "", "", "0" ((unsigned long)(arg1)), \ | 668 | __PVOP_VCALL(op, "", "", PVOP_CALL_ARG1(arg1), \ |
575 | "1"((unsigned long)(arg2)), "2"((unsigned long)(arg3))) | 669 | PVOP_CALL_ARG2(arg2), PVOP_CALL_ARG3(arg3)) |
576 | 670 | ||
577 | /* This is the only difference in x86_64. We can make it much simpler */ | 671 | /* This is the only difference in x86_64. We can make it much simpler */ |
578 | #ifdef CONFIG_X86_32 | 672 | #ifdef CONFIG_X86_32 |
579 | #define PVOP_CALL4(rettype, op, arg1, arg2, arg3, arg4) \ | 673 | #define PVOP_CALL4(rettype, op, arg1, arg2, arg3, arg4) \ |
580 | __PVOP_CALL(rettype, op, \ | 674 | __PVOP_CALL(rettype, op, \ |
581 | "push %[_arg4];", "lea 4(%%esp),%%esp;", \ | 675 | "push %[_arg4];", "lea 4(%%esp),%%esp;", \ |
582 | "0" ((u32)(arg1)), "1" ((u32)(arg2)), \ | 676 | PVOP_CALL_ARG1(arg1), PVOP_CALL_ARG2(arg2), \ |
583 | "2" ((u32)(arg3)), [_arg4] "mr" ((u32)(arg4))) | 677 | PVOP_CALL_ARG3(arg3), [_arg4] "mr" ((u32)(arg4))) |
584 | #define PVOP_VCALL4(op, arg1, arg2, arg3, arg4) \ | 678 | #define PVOP_VCALL4(op, arg1, arg2, arg3, arg4) \ |
585 | __PVOP_VCALL(op, \ | 679 | __PVOP_VCALL(op, \ |
586 | "push %[_arg4];", "lea 4(%%esp),%%esp;", \ | 680 | "push %[_arg4];", "lea 4(%%esp),%%esp;", \ |
@@ -588,13 +682,13 @@ int paravirt_disable_iospace(void); | |||
588 | "2" ((u32)(arg3)), [_arg4] "mr" ((u32)(arg4))) | 682 | "2" ((u32)(arg3)), [_arg4] "mr" ((u32)(arg4))) |
589 | #else | 683 | #else |
590 | #define PVOP_CALL4(rettype, op, arg1, arg2, arg3, arg4) \ | 684 | #define PVOP_CALL4(rettype, op, arg1, arg2, arg3, arg4) \ |
591 | __PVOP_CALL(rettype, op, "", "", "0" ((unsigned long)(arg1)), \ | 685 | __PVOP_CALL(rettype, op, "", "", \ |
592 | "1"((unsigned long)(arg2)), "2"((unsigned long)(arg3)), \ | 686 | PVOP_CALL_ARG1(arg1), PVOP_CALL_ARG2(arg2), \ |
593 | "3"((unsigned long)(arg4))) | 687 | PVOP_CALL_ARG3(arg3), PVOP_CALL_ARG4(arg4)) |
594 | #define PVOP_VCALL4(op, arg1, arg2, arg3, arg4) \ | 688 | #define PVOP_VCALL4(op, arg1, arg2, arg3, arg4) \ |
595 | __PVOP_VCALL(op, "", "", "0" ((unsigned long)(arg1)), \ | 689 | __PVOP_VCALL(op, "", "", \ |
596 | "1"((unsigned long)(arg2)), "2"((unsigned long)(arg3)), \ | 690 | PVOP_CALL_ARG1(arg1), PVOP_CALL_ARG2(arg2), \ |
597 | "3"((unsigned long)(arg4))) | 691 | PVOP_CALL_ARG3(arg3), PVOP_CALL_ARG4(arg4)) |
598 | #endif | 692 | #endif |
599 | 693 | ||
600 | static inline int paravirt_enabled(void) | 694 | static inline int paravirt_enabled(void) |
@@ -1061,13 +1155,13 @@ static inline pte_t __pte(pteval_t val) | |||
1061 | pteval_t ret; | 1155 | pteval_t ret; |
1062 | 1156 | ||
1063 | if (sizeof(pteval_t) > sizeof(long)) | 1157 | if (sizeof(pteval_t) > sizeof(long)) |
1064 | ret = PVOP_CALL2(pteval_t, | 1158 | ret = PVOP_CALLEE2(pteval_t, |
1065 | pv_mmu_ops.make_pte, | 1159 | pv_mmu_ops.make_pte, |
1066 | val, (u64)val >> 32); | 1160 | val, (u64)val >> 32); |
1067 | else | 1161 | else |
1068 | ret = PVOP_CALL1(pteval_t, | 1162 | ret = PVOP_CALLEE1(pteval_t, |
1069 | pv_mmu_ops.make_pte, | 1163 | pv_mmu_ops.make_pte, |
1070 | val); | 1164 | val); |
1071 | 1165 | ||
1072 | return (pte_t) { .pte = ret }; | 1166 | return (pte_t) { .pte = ret }; |
1073 | } | 1167 | } |
@@ -1077,29 +1171,12 @@ static inline pteval_t pte_val(pte_t pte) | |||
1077 | pteval_t ret; | 1171 | pteval_t ret; |
1078 | 1172 | ||
1079 | if (sizeof(pteval_t) > sizeof(long)) | 1173 | if (sizeof(pteval_t) > sizeof(long)) |
1080 | ret = PVOP_CALL2(pteval_t, pv_mmu_ops.pte_val, | 1174 | ret = PVOP_CALLEE2(pteval_t, pv_mmu_ops.pte_val, |
1081 | pte.pte, (u64)pte.pte >> 32); | 1175 | pte.pte, (u64)pte.pte >> 32); |
1082 | else | ||
1083 | ret = PVOP_CALL1(pteval_t, pv_mmu_ops.pte_val, | ||
1084 | pte.pte); | ||
1085 | |||
1086 | return ret; | ||
1087 | } | ||
1088 | |||
1089 | static inline pteval_t pte_flags(pte_t pte) | ||
1090 | { | ||
1091 | pteval_t ret; | ||
1092 | |||
1093 | if (sizeof(pteval_t) > sizeof(long)) | ||
1094 | ret = PVOP_CALL2(pteval_t, pv_mmu_ops.pte_flags, | ||
1095 | pte.pte, (u64)pte.pte >> 32); | ||
1096 | else | 1176 | else |
1097 | ret = PVOP_CALL1(pteval_t, pv_mmu_ops.pte_flags, | 1177 | ret = PVOP_CALLEE1(pteval_t, pv_mmu_ops.pte_val, |
1098 | pte.pte); | 1178 | pte.pte); |
1099 | 1179 | ||
1100 | #ifdef CONFIG_PARAVIRT_DEBUG | ||
1101 | BUG_ON(ret & PTE_PFN_MASK); | ||
1102 | #endif | ||
1103 | return ret; | 1180 | return ret; |
1104 | } | 1181 | } |
1105 | 1182 | ||
@@ -1108,11 +1185,11 @@ static inline pgd_t __pgd(pgdval_t val) | |||
1108 | pgdval_t ret; | 1185 | pgdval_t ret; |
1109 | 1186 | ||
1110 | if (sizeof(pgdval_t) > sizeof(long)) | 1187 | if (sizeof(pgdval_t) > sizeof(long)) |
1111 | ret = PVOP_CALL2(pgdval_t, pv_mmu_ops.make_pgd, | 1188 | ret = PVOP_CALLEE2(pgdval_t, pv_mmu_ops.make_pgd, |
1112 | val, (u64)val >> 32); | 1189 | val, (u64)val >> 32); |
1113 | else | 1190 | else |
1114 | ret = PVOP_CALL1(pgdval_t, pv_mmu_ops.make_pgd, | 1191 | ret = PVOP_CALLEE1(pgdval_t, pv_mmu_ops.make_pgd, |
1115 | val); | 1192 | val); |
1116 | 1193 | ||
1117 | return (pgd_t) { ret }; | 1194 | return (pgd_t) { ret }; |
1118 | } | 1195 | } |
@@ -1122,11 +1199,11 @@ static inline pgdval_t pgd_val(pgd_t pgd) | |||
1122 | pgdval_t ret; | 1199 | pgdval_t ret; |
1123 | 1200 | ||
1124 | if (sizeof(pgdval_t) > sizeof(long)) | 1201 | if (sizeof(pgdval_t) > sizeof(long)) |
1125 | ret = PVOP_CALL2(pgdval_t, pv_mmu_ops.pgd_val, | 1202 | ret = PVOP_CALLEE2(pgdval_t, pv_mmu_ops.pgd_val, |
1126 | pgd.pgd, (u64)pgd.pgd >> 32); | 1203 | pgd.pgd, (u64)pgd.pgd >> 32); |
1127 | else | 1204 | else |
1128 | ret = PVOP_CALL1(pgdval_t, pv_mmu_ops.pgd_val, | 1205 | ret = PVOP_CALLEE1(pgdval_t, pv_mmu_ops.pgd_val, |
1129 | pgd.pgd); | 1206 | pgd.pgd); |
1130 | 1207 | ||
1131 | return ret; | 1208 | return ret; |
1132 | } | 1209 | } |
@@ -1190,11 +1267,11 @@ static inline pmd_t __pmd(pmdval_t val) | |||
1190 | pmdval_t ret; | 1267 | pmdval_t ret; |
1191 | 1268 | ||
1192 | if (sizeof(pmdval_t) > sizeof(long)) | 1269 | if (sizeof(pmdval_t) > sizeof(long)) |
1193 | ret = PVOP_CALL2(pmdval_t, pv_mmu_ops.make_pmd, | 1270 | ret = PVOP_CALLEE2(pmdval_t, pv_mmu_ops.make_pmd, |
1194 | val, (u64)val >> 32); | 1271 | val, (u64)val >> 32); |
1195 | else | 1272 | else |
1196 | ret = PVOP_CALL1(pmdval_t, pv_mmu_ops.make_pmd, | 1273 | ret = PVOP_CALLEE1(pmdval_t, pv_mmu_ops.make_pmd, |
1197 | val); | 1274 | val); |
1198 | 1275 | ||
1199 | return (pmd_t) { ret }; | 1276 | return (pmd_t) { ret }; |
1200 | } | 1277 | } |
@@ -1204,11 +1281,11 @@ static inline pmdval_t pmd_val(pmd_t pmd) | |||
1204 | pmdval_t ret; | 1281 | pmdval_t ret; |
1205 | 1282 | ||
1206 | if (sizeof(pmdval_t) > sizeof(long)) | 1283 | if (sizeof(pmdval_t) > sizeof(long)) |
1207 | ret = PVOP_CALL2(pmdval_t, pv_mmu_ops.pmd_val, | 1284 | ret = PVOP_CALLEE2(pmdval_t, pv_mmu_ops.pmd_val, |
1208 | pmd.pmd, (u64)pmd.pmd >> 32); | 1285 | pmd.pmd, (u64)pmd.pmd >> 32); |
1209 | else | 1286 | else |
1210 | ret = PVOP_CALL1(pmdval_t, pv_mmu_ops.pmd_val, | 1287 | ret = PVOP_CALLEE1(pmdval_t, pv_mmu_ops.pmd_val, |
1211 | pmd.pmd); | 1288 | pmd.pmd); |
1212 | 1289 | ||
1213 | return ret; | 1290 | return ret; |
1214 | } | 1291 | } |
@@ -1230,11 +1307,11 @@ static inline pud_t __pud(pudval_t val) | |||
1230 | pudval_t ret; | 1307 | pudval_t ret; |
1231 | 1308 | ||
1232 | if (sizeof(pudval_t) > sizeof(long)) | 1309 | if (sizeof(pudval_t) > sizeof(long)) |
1233 | ret = PVOP_CALL2(pudval_t, pv_mmu_ops.make_pud, | 1310 | ret = PVOP_CALLEE2(pudval_t, pv_mmu_ops.make_pud, |
1234 | val, (u64)val >> 32); | 1311 | val, (u64)val >> 32); |
1235 | else | 1312 | else |
1236 | ret = PVOP_CALL1(pudval_t, pv_mmu_ops.make_pud, | 1313 | ret = PVOP_CALLEE1(pudval_t, pv_mmu_ops.make_pud, |
1237 | val); | 1314 | val); |
1238 | 1315 | ||
1239 | return (pud_t) { ret }; | 1316 | return (pud_t) { ret }; |
1240 | } | 1317 | } |
@@ -1244,11 +1321,11 @@ static inline pudval_t pud_val(pud_t pud) | |||
1244 | pudval_t ret; | 1321 | pudval_t ret; |
1245 | 1322 | ||
1246 | if (sizeof(pudval_t) > sizeof(long)) | 1323 | if (sizeof(pudval_t) > sizeof(long)) |
1247 | ret = PVOP_CALL2(pudval_t, pv_mmu_ops.pud_val, | 1324 | ret = PVOP_CALLEE2(pudval_t, pv_mmu_ops.pud_val, |
1248 | pud.pud, (u64)pud.pud >> 32); | 1325 | pud.pud, (u64)pud.pud >> 32); |
1249 | else | 1326 | else |
1250 | ret = PVOP_CALL1(pudval_t, pv_mmu_ops.pud_val, | 1327 | ret = PVOP_CALLEE1(pudval_t, pv_mmu_ops.pud_val, |
1251 | pud.pud); | 1328 | pud.pud); |
1252 | 1329 | ||
1253 | return ret; | 1330 | return ret; |
1254 | } | 1331 | } |
@@ -1354,14 +1431,7 @@ static inline void arch_leave_lazy_cpu_mode(void) | |||
1354 | PVOP_VCALL0(pv_cpu_ops.lazy_mode.leave); | 1431 | PVOP_VCALL0(pv_cpu_ops.lazy_mode.leave); |
1355 | } | 1432 | } |
1356 | 1433 | ||
1357 | static inline void arch_flush_lazy_cpu_mode(void) | 1434 | void arch_flush_lazy_cpu_mode(void); |
1358 | { | ||
1359 | if (unlikely(paravirt_get_lazy_mode() == PARAVIRT_LAZY_CPU)) { | ||
1360 | arch_leave_lazy_cpu_mode(); | ||
1361 | arch_enter_lazy_cpu_mode(); | ||
1362 | } | ||
1363 | } | ||
1364 | |||
1365 | 1435 | ||
1366 | #define __HAVE_ARCH_ENTER_LAZY_MMU_MODE | 1436 | #define __HAVE_ARCH_ENTER_LAZY_MMU_MODE |
1367 | static inline void arch_enter_lazy_mmu_mode(void) | 1437 | static inline void arch_enter_lazy_mmu_mode(void) |
@@ -1374,13 +1444,7 @@ static inline void arch_leave_lazy_mmu_mode(void) | |||
1374 | PVOP_VCALL0(pv_mmu_ops.lazy_mode.leave); | 1444 | PVOP_VCALL0(pv_mmu_ops.lazy_mode.leave); |
1375 | } | 1445 | } |
1376 | 1446 | ||
1377 | static inline void arch_flush_lazy_mmu_mode(void) | 1447 | void arch_flush_lazy_mmu_mode(void); |
1378 | { | ||
1379 | if (unlikely(paravirt_get_lazy_mode() == PARAVIRT_LAZY_MMU)) { | ||
1380 | arch_leave_lazy_mmu_mode(); | ||
1381 | arch_enter_lazy_mmu_mode(); | ||
1382 | } | ||
1383 | } | ||
1384 | 1448 | ||
1385 | static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx, | 1449 | static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx, |
1386 | unsigned long phys, pgprot_t flags) | 1450 | unsigned long phys, pgprot_t flags) |
@@ -1389,9 +1453,10 @@ static inline void __set_fixmap(unsigned /* enum fixed_addresses */ idx, | |||
1389 | } | 1453 | } |
1390 | 1454 | ||
1391 | void _paravirt_nop(void); | 1455 | void _paravirt_nop(void); |
1392 | #define paravirt_nop ((void *)_paravirt_nop) | 1456 | u32 _paravirt_ident_32(u32); |
1457 | u64 _paravirt_ident_64(u64); | ||
1393 | 1458 | ||
1394 | void paravirt_use_bytelocks(void); | 1459 | #define paravirt_nop ((void *)_paravirt_nop) |
1395 | 1460 | ||
1396 | #ifdef CONFIG_SMP | 1461 | #ifdef CONFIG_SMP |
1397 | 1462 | ||
@@ -1441,12 +1506,37 @@ extern struct paravirt_patch_site __parainstructions[], | |||
1441 | __parainstructions_end[]; | 1506 | __parainstructions_end[]; |
1442 | 1507 | ||
1443 | #ifdef CONFIG_X86_32 | 1508 | #ifdef CONFIG_X86_32 |
1444 | #define PV_SAVE_REGS "pushl %%ecx; pushl %%edx;" | 1509 | #define PV_SAVE_REGS "pushl %ecx; pushl %edx;" |
1445 | #define PV_RESTORE_REGS "popl %%edx; popl %%ecx" | 1510 | #define PV_RESTORE_REGS "popl %edx; popl %ecx;" |
1511 | |||
1512 | /* save and restore all caller-save registers, except return value */ | ||
1513 | #define PV_SAVE_ALL_CALLER_REGS "pushl %ecx;" | ||
1514 | #define PV_RESTORE_ALL_CALLER_REGS "popl %ecx;" | ||
1515 | |||
1446 | #define PV_FLAGS_ARG "0" | 1516 | #define PV_FLAGS_ARG "0" |
1447 | #define PV_EXTRA_CLOBBERS | 1517 | #define PV_EXTRA_CLOBBERS |
1448 | #define PV_VEXTRA_CLOBBERS | 1518 | #define PV_VEXTRA_CLOBBERS |
1449 | #else | 1519 | #else |
1520 | /* save and restore all caller-save registers, except return value */ | ||
1521 | #define PV_SAVE_ALL_CALLER_REGS \ | ||
1522 | "push %rcx;" \ | ||
1523 | "push %rdx;" \ | ||
1524 | "push %rsi;" \ | ||
1525 | "push %rdi;" \ | ||
1526 | "push %r8;" \ | ||
1527 | "push %r9;" \ | ||
1528 | "push %r10;" \ | ||
1529 | "push %r11;" | ||
1530 | #define PV_RESTORE_ALL_CALLER_REGS \ | ||
1531 | "pop %r11;" \ | ||
1532 | "pop %r10;" \ | ||
1533 | "pop %r9;" \ | ||
1534 | "pop %r8;" \ | ||
1535 | "pop %rdi;" \ | ||
1536 | "pop %rsi;" \ | ||
1537 | "pop %rdx;" \ | ||
1538 | "pop %rcx;" | ||
1539 | |||
1450 | /* We save some registers, but all of them, that's too much. We clobber all | 1540 | /* We save some registers, but all of them, that's too much. We clobber all |
1451 | * caller saved registers but the argument parameter */ | 1541 | * caller saved registers but the argument parameter */ |
1452 | #define PV_SAVE_REGS "pushq %%rdi;" | 1542 | #define PV_SAVE_REGS "pushq %%rdi;" |
@@ -1456,52 +1546,76 @@ extern struct paravirt_patch_site __parainstructions[], | |||
1456 | #define PV_FLAGS_ARG "D" | 1546 | #define PV_FLAGS_ARG "D" |
1457 | #endif | 1547 | #endif |
1458 | 1548 | ||
1549 | /* | ||
1550 | * Generate a thunk around a function which saves all caller-save | ||
1551 | * registers except for the return value. This allows C functions to | ||
1552 | * be called from assembler code where fewer than normal registers are | ||
1553 | * available. It may also help code generation around calls from C | ||
1554 | * code if the common case doesn't use many registers. | ||
1555 | * | ||
1556 | * When a callee is wrapped in a thunk, the caller can assume that all | ||
1557 | * arg regs and all scratch registers are preserved across the | ||
1558 | * call. The return value in rax/eax will not be saved, even for void | ||
1559 | * functions. | ||
1560 | */ | ||
1561 | #define PV_CALLEE_SAVE_REGS_THUNK(func) \ | ||
1562 | extern typeof(func) __raw_callee_save_##func; \ | ||
1563 | static void *__##func##__ __used = func; \ | ||
1564 | \ | ||
1565 | asm(".pushsection .text;" \ | ||
1566 | "__raw_callee_save_" #func ": " \ | ||
1567 | PV_SAVE_ALL_CALLER_REGS \ | ||
1568 | "call " #func ";" \ | ||
1569 | PV_RESTORE_ALL_CALLER_REGS \ | ||
1570 | "ret;" \ | ||
1571 | ".popsection") | ||
1572 | |||
1573 | /* Get a reference to a callee-save function */ | ||
1574 | #define PV_CALLEE_SAVE(func) \ | ||
1575 | ((struct paravirt_callee_save) { __raw_callee_save_##func }) | ||
1576 | |||
1577 | /* Promise that "func" already uses the right calling convention */ | ||
1578 | #define __PV_IS_CALLEE_SAVE(func) \ | ||
1579 | ((struct paravirt_callee_save) { func }) | ||
1580 | |||
1459 | static inline unsigned long __raw_local_save_flags(void) | 1581 | static inline unsigned long __raw_local_save_flags(void) |
1460 | { | 1582 | { |
1461 | unsigned long f; | 1583 | unsigned long f; |
1462 | 1584 | ||
1463 | asm volatile(paravirt_alt(PV_SAVE_REGS | 1585 | asm volatile(paravirt_alt(PARAVIRT_CALL) |
1464 | PARAVIRT_CALL | ||
1465 | PV_RESTORE_REGS) | ||
1466 | : "=a"(f) | 1586 | : "=a"(f) |
1467 | : paravirt_type(pv_irq_ops.save_fl), | 1587 | : paravirt_type(pv_irq_ops.save_fl), |
1468 | paravirt_clobber(CLBR_EAX) | 1588 | paravirt_clobber(CLBR_EAX) |
1469 | : "memory", "cc" PV_VEXTRA_CLOBBERS); | 1589 | : "memory", "cc"); |
1470 | return f; | 1590 | return f; |
1471 | } | 1591 | } |
1472 | 1592 | ||
1473 | static inline void raw_local_irq_restore(unsigned long f) | 1593 | static inline void raw_local_irq_restore(unsigned long f) |
1474 | { | 1594 | { |
1475 | asm volatile(paravirt_alt(PV_SAVE_REGS | 1595 | asm volatile(paravirt_alt(PARAVIRT_CALL) |
1476 | PARAVIRT_CALL | ||
1477 | PV_RESTORE_REGS) | ||
1478 | : "=a"(f) | 1596 | : "=a"(f) |
1479 | : PV_FLAGS_ARG(f), | 1597 | : PV_FLAGS_ARG(f), |
1480 | paravirt_type(pv_irq_ops.restore_fl), | 1598 | paravirt_type(pv_irq_ops.restore_fl), |
1481 | paravirt_clobber(CLBR_EAX) | 1599 | paravirt_clobber(CLBR_EAX) |
1482 | : "memory", "cc" PV_EXTRA_CLOBBERS); | 1600 | : "memory", "cc"); |
1483 | } | 1601 | } |
1484 | 1602 | ||
1485 | static inline void raw_local_irq_disable(void) | 1603 | static inline void raw_local_irq_disable(void) |
1486 | { | 1604 | { |
1487 | asm volatile(paravirt_alt(PV_SAVE_REGS | 1605 | asm volatile(paravirt_alt(PARAVIRT_CALL) |
1488 | PARAVIRT_CALL | ||
1489 | PV_RESTORE_REGS) | ||
1490 | : | 1606 | : |
1491 | : paravirt_type(pv_irq_ops.irq_disable), | 1607 | : paravirt_type(pv_irq_ops.irq_disable), |
1492 | paravirt_clobber(CLBR_EAX) | 1608 | paravirt_clobber(CLBR_EAX) |
1493 | : "memory", "eax", "cc" PV_EXTRA_CLOBBERS); | 1609 | : "memory", "eax", "cc"); |
1494 | } | 1610 | } |
1495 | 1611 | ||
1496 | static inline void raw_local_irq_enable(void) | 1612 | static inline void raw_local_irq_enable(void) |
1497 | { | 1613 | { |
1498 | asm volatile(paravirt_alt(PV_SAVE_REGS | 1614 | asm volatile(paravirt_alt(PARAVIRT_CALL) |
1499 | PARAVIRT_CALL | ||
1500 | PV_RESTORE_REGS) | ||
1501 | : | 1615 | : |
1502 | : paravirt_type(pv_irq_ops.irq_enable), | 1616 | : paravirt_type(pv_irq_ops.irq_enable), |
1503 | paravirt_clobber(CLBR_EAX) | 1617 | paravirt_clobber(CLBR_EAX) |
1504 | : "memory", "eax", "cc" PV_EXTRA_CLOBBERS); | 1618 | : "memory", "eax", "cc"); |
1505 | } | 1619 | } |
1506 | 1620 | ||
1507 | static inline unsigned long __raw_local_irq_save(void) | 1621 | static inline unsigned long __raw_local_irq_save(void) |
@@ -1544,33 +1658,49 @@ static inline unsigned long __raw_local_irq_save(void) | |||
1544 | .popsection | 1658 | .popsection |
1545 | 1659 | ||
1546 | 1660 | ||
1661 | #define COND_PUSH(set, mask, reg) \ | ||
1662 | .if ((~(set)) & mask); push %reg; .endif | ||
1663 | #define COND_POP(set, mask, reg) \ | ||
1664 | .if ((~(set)) & mask); pop %reg; .endif | ||
1665 | |||
1547 | #ifdef CONFIG_X86_64 | 1666 | #ifdef CONFIG_X86_64 |
1548 | #define PV_SAVE_REGS \ | 1667 | |
1549 | push %rax; \ | 1668 | #define PV_SAVE_REGS(set) \ |
1550 | push %rcx; \ | 1669 | COND_PUSH(set, CLBR_RAX, rax); \ |
1551 | push %rdx; \ | 1670 | COND_PUSH(set, CLBR_RCX, rcx); \ |
1552 | push %rsi; \ | 1671 | COND_PUSH(set, CLBR_RDX, rdx); \ |
1553 | push %rdi; \ | 1672 | COND_PUSH(set, CLBR_RSI, rsi); \ |
1554 | push %r8; \ | 1673 | COND_PUSH(set, CLBR_RDI, rdi); \ |
1555 | push %r9; \ | 1674 | COND_PUSH(set, CLBR_R8, r8); \ |
1556 | push %r10; \ | 1675 | COND_PUSH(set, CLBR_R9, r9); \ |
1557 | push %r11 | 1676 | COND_PUSH(set, CLBR_R10, r10); \ |
1558 | #define PV_RESTORE_REGS \ | 1677 | COND_PUSH(set, CLBR_R11, r11) |
1559 | pop %r11; \ | 1678 | #define PV_RESTORE_REGS(set) \ |
1560 | pop %r10; \ | 1679 | COND_POP(set, CLBR_R11, r11); \ |
1561 | pop %r9; \ | 1680 | COND_POP(set, CLBR_R10, r10); \ |
1562 | pop %r8; \ | 1681 | COND_POP(set, CLBR_R9, r9); \ |
1563 | pop %rdi; \ | 1682 | COND_POP(set, CLBR_R8, r8); \ |
1564 | pop %rsi; \ | 1683 | COND_POP(set, CLBR_RDI, rdi); \ |
1565 | pop %rdx; \ | 1684 | COND_POP(set, CLBR_RSI, rsi); \ |
1566 | pop %rcx; \ | 1685 | COND_POP(set, CLBR_RDX, rdx); \ |
1567 | pop %rax | 1686 | COND_POP(set, CLBR_RCX, rcx); \ |
1687 | COND_POP(set, CLBR_RAX, rax) | ||
1688 | |||
1568 | #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 8) | 1689 | #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 8) |
1569 | #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .quad, 8) | 1690 | #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .quad, 8) |
1570 | #define PARA_INDIRECT(addr) *addr(%rip) | 1691 | #define PARA_INDIRECT(addr) *addr(%rip) |
1571 | #else | 1692 | #else |
1572 | #define PV_SAVE_REGS pushl %eax; pushl %edi; pushl %ecx; pushl %edx | 1693 | #define PV_SAVE_REGS(set) \ |
1573 | #define PV_RESTORE_REGS popl %edx; popl %ecx; popl %edi; popl %eax | 1694 | COND_PUSH(set, CLBR_EAX, eax); \ |
1695 | COND_PUSH(set, CLBR_EDI, edi); \ | ||
1696 | COND_PUSH(set, CLBR_ECX, ecx); \ | ||
1697 | COND_PUSH(set, CLBR_EDX, edx) | ||
1698 | #define PV_RESTORE_REGS(set) \ | ||
1699 | COND_POP(set, CLBR_EDX, edx); \ | ||
1700 | COND_POP(set, CLBR_ECX, ecx); \ | ||
1701 | COND_POP(set, CLBR_EDI, edi); \ | ||
1702 | COND_POP(set, CLBR_EAX, eax) | ||
1703 | |||
1574 | #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4) | 1704 | #define PARA_PATCH(struct, off) ((PARAVIRT_PATCH_##struct + (off)) / 4) |
1575 | #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4) | 1705 | #define PARA_SITE(ptype, clobbers, ops) _PVSITE(ptype, clobbers, ops, .long, 4) |
1576 | #define PARA_INDIRECT(addr) *%cs:addr | 1706 | #define PARA_INDIRECT(addr) *%cs:addr |
@@ -1582,15 +1712,15 @@ static inline unsigned long __raw_local_irq_save(void) | |||
1582 | 1712 | ||
1583 | #define DISABLE_INTERRUPTS(clobbers) \ | 1713 | #define DISABLE_INTERRUPTS(clobbers) \ |
1584 | PARA_SITE(PARA_PATCH(pv_irq_ops, PV_IRQ_irq_disable), clobbers, \ | 1714 | PARA_SITE(PARA_PATCH(pv_irq_ops, PV_IRQ_irq_disable), clobbers, \ |
1585 | PV_SAVE_REGS; \ | 1715 | PV_SAVE_REGS(clobbers | CLBR_CALLEE_SAVE); \ |
1586 | call PARA_INDIRECT(pv_irq_ops+PV_IRQ_irq_disable); \ | 1716 | call PARA_INDIRECT(pv_irq_ops+PV_IRQ_irq_disable); \ |
1587 | PV_RESTORE_REGS;) \ | 1717 | PV_RESTORE_REGS(clobbers | CLBR_CALLEE_SAVE);) |
1588 | 1718 | ||
1589 | #define ENABLE_INTERRUPTS(clobbers) \ | 1719 | #define ENABLE_INTERRUPTS(clobbers) \ |
1590 | PARA_SITE(PARA_PATCH(pv_irq_ops, PV_IRQ_irq_enable), clobbers, \ | 1720 | PARA_SITE(PARA_PATCH(pv_irq_ops, PV_IRQ_irq_enable), clobbers, \ |
1591 | PV_SAVE_REGS; \ | 1721 | PV_SAVE_REGS(clobbers | CLBR_CALLEE_SAVE); \ |
1592 | call PARA_INDIRECT(pv_irq_ops+PV_IRQ_irq_enable); \ | 1722 | call PARA_INDIRECT(pv_irq_ops+PV_IRQ_irq_enable); \ |
1593 | PV_RESTORE_REGS;) | 1723 | PV_RESTORE_REGS(clobbers | CLBR_CALLEE_SAVE);) |
1594 | 1724 | ||
1595 | #define USERGS_SYSRET32 \ | 1725 | #define USERGS_SYSRET32 \ |
1596 | PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_usergs_sysret32), \ | 1726 | PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_usergs_sysret32), \ |
@@ -1620,11 +1750,15 @@ static inline unsigned long __raw_local_irq_save(void) | |||
1620 | PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_swapgs), CLBR_NONE, \ | 1750 | PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_swapgs), CLBR_NONE, \ |
1621 | swapgs) | 1751 | swapgs) |
1622 | 1752 | ||
1753 | /* | ||
1754 | * Note: swapgs is very special, and in practise is either going to be | ||
1755 | * implemented with a single "swapgs" instruction or something very | ||
1756 | * special. Either way, we don't need to save any registers for | ||
1757 | * it. | ||
1758 | */ | ||
1623 | #define SWAPGS \ | 1759 | #define SWAPGS \ |
1624 | PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_swapgs), CLBR_NONE, \ | 1760 | PARA_SITE(PARA_PATCH(pv_cpu_ops, PV_CPU_swapgs), CLBR_NONE, \ |
1625 | PV_SAVE_REGS; \ | 1761 | call PARA_INDIRECT(pv_cpu_ops+PV_CPU_swapgs) \ |
1626 | call PARA_INDIRECT(pv_cpu_ops+PV_CPU_swapgs); \ | ||
1627 | PV_RESTORE_REGS \ | ||
1628 | ) | 1762 | ) |
1629 | 1763 | ||
1630 | #define GET_CR2_INTO_RCX \ | 1764 | #define GET_CR2_INTO_RCX \ |
diff --git a/arch/x86/include/asm/pat.h b/arch/x86/include/asm/pat.h index b8493b3b9890..9709fdff6615 100644 --- a/arch/x86/include/asm/pat.h +++ b/arch/x86/include/asm/pat.h | |||
@@ -5,10 +5,8 @@ | |||
5 | 5 | ||
6 | #ifdef CONFIG_X86_PAT | 6 | #ifdef CONFIG_X86_PAT |
7 | extern int pat_enabled; | 7 | extern int pat_enabled; |
8 | extern void validate_pat_support(struct cpuinfo_x86 *c); | ||
9 | #else | 8 | #else |
10 | static const int pat_enabled; | 9 | static const int pat_enabled; |
11 | static inline void validate_pat_support(struct cpuinfo_x86 *c) { } | ||
12 | #endif | 10 | #endif |
13 | 11 | ||
14 | extern void pat_init(void); | 12 | extern void pat_init(void); |
@@ -17,6 +15,4 @@ extern int reserve_memtype(u64 start, u64 end, | |||
17 | unsigned long req_type, unsigned long *ret_type); | 15 | unsigned long req_type, unsigned long *ret_type); |
18 | extern int free_memtype(u64 start, u64 end); | 16 | extern int free_memtype(u64 start, u64 end); |
19 | 17 | ||
20 | extern void pat_disable(char *reason); | ||
21 | |||
22 | #endif /* _ASM_X86_PAT_H */ | 18 | #endif /* _ASM_X86_PAT_H */ |
diff --git a/arch/x86/include/asm/mach-default/pci-functions.h b/arch/x86/include/asm/pci-functions.h index ed0bab427354..ed0bab427354 100644 --- a/arch/x86/include/asm/mach-default/pci-functions.h +++ b/arch/x86/include/asm/pci-functions.h | |||
diff --git a/arch/x86/include/asm/percpu.h b/arch/x86/include/asm/percpu.h index 0b64af4f13ac..aee103b26d01 100644 --- a/arch/x86/include/asm/percpu.h +++ b/arch/x86/include/asm/percpu.h | |||
@@ -34,6 +34,12 @@ | |||
34 | #define PER_CPU_VAR(var) per_cpu__##var | 34 | #define PER_CPU_VAR(var) per_cpu__##var |
35 | #endif /* SMP */ | 35 | #endif /* SMP */ |
36 | 36 | ||
37 | #ifdef CONFIG_X86_64_SMP | ||
38 | #define INIT_PER_CPU_VAR(var) init_per_cpu__##var | ||
39 | #else | ||
40 | #define INIT_PER_CPU_VAR(var) per_cpu__##var | ||
41 | #endif | ||
42 | |||
37 | #else /* ...!ASSEMBLY */ | 43 | #else /* ...!ASSEMBLY */ |
38 | 44 | ||
39 | #include <linux/stringify.h> | 45 | #include <linux/stringify.h> |
@@ -45,6 +51,22 @@ | |||
45 | #define __percpu_arg(x) "%" #x | 51 | #define __percpu_arg(x) "%" #x |
46 | #endif | 52 | #endif |
47 | 53 | ||
54 | /* | ||
55 | * Initialized pointers to per-cpu variables needed for the boot | ||
56 | * processor need to use these macros to get the proper address | ||
57 | * offset from __per_cpu_load on SMP. | ||
58 | * | ||
59 | * There also must be an entry in vmlinux_64.lds.S | ||
60 | */ | ||
61 | #define DECLARE_INIT_PER_CPU(var) \ | ||
62 | extern typeof(per_cpu_var(var)) init_per_cpu_var(var) | ||
63 | |||
64 | #ifdef CONFIG_X86_64_SMP | ||
65 | #define init_per_cpu_var(var) init_per_cpu__##var | ||
66 | #else | ||
67 | #define init_per_cpu_var(var) per_cpu_var(var) | ||
68 | #endif | ||
69 | |||
48 | /* For arch-specific code, we can use direct single-insn ops (they | 70 | /* For arch-specific code, we can use direct single-insn ops (they |
49 | * don't give an lvalue though). */ | 71 | * don't give an lvalue though). */ |
50 | extern void __bad_percpu_size(void); | 72 | extern void __bad_percpu_size(void); |
diff --git a/arch/x86/include/asm/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h index e0d199fe1d83..c1774ac9da7a 100644 --- a/arch/x86/include/asm/pgtable-2level.h +++ b/arch/x86/include/asm/pgtable-2level.h | |||
@@ -53,8 +53,6 @@ static inline pte_t native_ptep_get_and_clear(pte_t *xp) | |||
53 | #define native_ptep_get_and_clear(xp) native_local_ptep_get_and_clear(xp) | 53 | #define native_ptep_get_and_clear(xp) native_local_ptep_get_and_clear(xp) |
54 | #endif | 54 | #endif |
55 | 55 | ||
56 | #define pte_none(x) (!(x).pte_low) | ||
57 | |||
58 | /* | 56 | /* |
59 | * Bits _PAGE_BIT_PRESENT, _PAGE_BIT_FILE and _PAGE_BIT_PROTNONE are taken, | 57 | * Bits _PAGE_BIT_PRESENT, _PAGE_BIT_FILE and _PAGE_BIT_PROTNONE are taken, |
60 | * split up the 29 bits of offset into this range: | 58 | * split up the 29 bits of offset into this range: |
diff --git a/arch/x86/include/asm/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h index 447da43cddb3..3f13cdf61156 100644 --- a/arch/x86/include/asm/pgtable-3level.h +++ b/arch/x86/include/asm/pgtable-3level.h | |||
@@ -18,21 +18,6 @@ | |||
18 | printk("%s:%d: bad pgd %p(%016Lx).\n", \ | 18 | printk("%s:%d: bad pgd %p(%016Lx).\n", \ |
19 | __FILE__, __LINE__, &(e), pgd_val(e)) | 19 | __FILE__, __LINE__, &(e), pgd_val(e)) |
20 | 20 | ||
21 | static inline int pud_none(pud_t pud) | ||
22 | { | ||
23 | return pud_val(pud) == 0; | ||
24 | } | ||
25 | |||
26 | static inline int pud_bad(pud_t pud) | ||
27 | { | ||
28 | return (pud_val(pud) & ~(PTE_PFN_MASK | _KERNPG_TABLE | _PAGE_USER)) != 0; | ||
29 | } | ||
30 | |||
31 | static inline int pud_present(pud_t pud) | ||
32 | { | ||
33 | return pud_val(pud) & _PAGE_PRESENT; | ||
34 | } | ||
35 | |||
36 | /* Rules for using set_pte: the pte being assigned *must* be | 21 | /* Rules for using set_pte: the pte being assigned *must* be |
37 | * either not present or in a state where the hardware will | 22 | * either not present or in a state where the hardware will |
38 | * not attempt to update the pte. In places where this is | 23 | * not attempt to update the pte. In places where this is |
@@ -120,15 +105,6 @@ static inline void pud_clear(pud_t *pudp) | |||
120 | write_cr3(pgd); | 105 | write_cr3(pgd); |
121 | } | 106 | } |
122 | 107 | ||
123 | #define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT) | ||
124 | |||
125 | #define pud_page_vaddr(pud) ((unsigned long) __va(pud_val(pud) & PTE_PFN_MASK)) | ||
126 | |||
127 | |||
128 | /* Find an entry in the second-level page table.. */ | ||
129 | #define pmd_offset(pud, address) ((pmd_t *)pud_page_vaddr(*(pud)) + \ | ||
130 | pmd_index(address)) | ||
131 | |||
132 | #ifdef CONFIG_SMP | 108 | #ifdef CONFIG_SMP |
133 | static inline pte_t native_ptep_get_and_clear(pte_t *ptep) | 109 | static inline pte_t native_ptep_get_and_clear(pte_t *ptep) |
134 | { | 110 | { |
@@ -145,17 +121,6 @@ static inline pte_t native_ptep_get_and_clear(pte_t *ptep) | |||
145 | #define native_ptep_get_and_clear(xp) native_local_ptep_get_and_clear(xp) | 121 | #define native_ptep_get_and_clear(xp) native_local_ptep_get_and_clear(xp) |
146 | #endif | 122 | #endif |
147 | 123 | ||
148 | #define __HAVE_ARCH_PTE_SAME | ||
149 | static inline int pte_same(pte_t a, pte_t b) | ||
150 | { | ||
151 | return a.pte_low == b.pte_low && a.pte_high == b.pte_high; | ||
152 | } | ||
153 | |||
154 | static inline int pte_none(pte_t pte) | ||
155 | { | ||
156 | return !pte.pte_low && !pte.pte_high; | ||
157 | } | ||
158 | |||
159 | /* | 124 | /* |
160 | * Bits 0, 6 and 7 are taken in the low part of the pte, | 125 | * Bits 0, 6 and 7 are taken in the low part of the pte, |
161 | * put the 32 bits of offset into the high part. | 126 | * put the 32 bits of offset into the high part. |
diff --git a/arch/x86/include/asm/pgtable.h b/arch/x86/include/asm/pgtable.h index 4f5af8447d54..8fef0f6bfbb6 100644 --- a/arch/x86/include/asm/pgtable.h +++ b/arch/x86/include/asm/pgtable.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifndef _ASM_X86_PGTABLE_H | 1 | #ifndef _ASM_X86_PGTABLE_H |
2 | #define _ASM_X86_PGTABLE_H | 2 | #define _ASM_X86_PGTABLE_H |
3 | 3 | ||
4 | #include <asm/page.h> | ||
5 | |||
4 | #define FIRST_USER_ADDRESS 0 | 6 | #define FIRST_USER_ADDRESS 0 |
5 | 7 | ||
6 | #define _PAGE_BIT_PRESENT 0 /* is present */ | 8 | #define _PAGE_BIT_PRESENT 0 /* is present */ |
@@ -236,68 +238,82 @@ static inline unsigned long pte_pfn(pte_t pte) | |||
236 | 238 | ||
237 | static inline int pmd_large(pmd_t pte) | 239 | static inline int pmd_large(pmd_t pte) |
238 | { | 240 | { |
239 | return (pmd_val(pte) & (_PAGE_PSE | _PAGE_PRESENT)) == | 241 | return (pmd_flags(pte) & (_PAGE_PSE | _PAGE_PRESENT)) == |
240 | (_PAGE_PSE | _PAGE_PRESENT); | 242 | (_PAGE_PSE | _PAGE_PRESENT); |
241 | } | 243 | } |
242 | 244 | ||
245 | static inline pte_t pte_set_flags(pte_t pte, pteval_t set) | ||
246 | { | ||
247 | pteval_t v = native_pte_val(pte); | ||
248 | |||
249 | return native_make_pte(v | set); | ||
250 | } | ||
251 | |||
252 | static inline pte_t pte_clear_flags(pte_t pte, pteval_t clear) | ||
253 | { | ||
254 | pteval_t v = native_pte_val(pte); | ||
255 | |||
256 | return native_make_pte(v & ~clear); | ||
257 | } | ||
258 | |||
243 | static inline pte_t pte_mkclean(pte_t pte) | 259 | static inline pte_t pte_mkclean(pte_t pte) |
244 | { | 260 | { |
245 | return __pte(pte_val(pte) & ~_PAGE_DIRTY); | 261 | return pte_clear_flags(pte, _PAGE_DIRTY); |
246 | } | 262 | } |
247 | 263 | ||
248 | static inline pte_t pte_mkold(pte_t pte) | 264 | static inline pte_t pte_mkold(pte_t pte) |
249 | { | 265 | { |
250 | return __pte(pte_val(pte) & ~_PAGE_ACCESSED); | 266 | return pte_clear_flags(pte, _PAGE_ACCESSED); |
251 | } | 267 | } |
252 | 268 | ||
253 | static inline pte_t pte_wrprotect(pte_t pte) | 269 | static inline pte_t pte_wrprotect(pte_t pte) |
254 | { | 270 | { |
255 | return __pte(pte_val(pte) & ~_PAGE_RW); | 271 | return pte_clear_flags(pte, _PAGE_RW); |
256 | } | 272 | } |
257 | 273 | ||
258 | static inline pte_t pte_mkexec(pte_t pte) | 274 | static inline pte_t pte_mkexec(pte_t pte) |
259 | { | 275 | { |
260 | return __pte(pte_val(pte) & ~_PAGE_NX); | 276 | return pte_clear_flags(pte, _PAGE_NX); |
261 | } | 277 | } |
262 | 278 | ||
263 | static inline pte_t pte_mkdirty(pte_t pte) | 279 | static inline pte_t pte_mkdirty(pte_t pte) |
264 | { | 280 | { |
265 | return __pte(pte_val(pte) | _PAGE_DIRTY); | 281 | return pte_set_flags(pte, _PAGE_DIRTY); |
266 | } | 282 | } |
267 | 283 | ||
268 | static inline pte_t pte_mkyoung(pte_t pte) | 284 | static inline pte_t pte_mkyoung(pte_t pte) |
269 | { | 285 | { |
270 | return __pte(pte_val(pte) | _PAGE_ACCESSED); | 286 | return pte_set_flags(pte, _PAGE_ACCESSED); |
271 | } | 287 | } |
272 | 288 | ||
273 | static inline pte_t pte_mkwrite(pte_t pte) | 289 | static inline pte_t pte_mkwrite(pte_t pte) |
274 | { | 290 | { |
275 | return __pte(pte_val(pte) | _PAGE_RW); | 291 | return pte_set_flags(pte, _PAGE_RW); |
276 | } | 292 | } |
277 | 293 | ||
278 | static inline pte_t pte_mkhuge(pte_t pte) | 294 | static inline pte_t pte_mkhuge(pte_t pte) |
279 | { | 295 | { |
280 | return __pte(pte_val(pte) | _PAGE_PSE); | 296 | return pte_set_flags(pte, _PAGE_PSE); |
281 | } | 297 | } |
282 | 298 | ||
283 | static inline pte_t pte_clrhuge(pte_t pte) | 299 | static inline pte_t pte_clrhuge(pte_t pte) |
284 | { | 300 | { |
285 | return __pte(pte_val(pte) & ~_PAGE_PSE); | 301 | return pte_clear_flags(pte, _PAGE_PSE); |
286 | } | 302 | } |
287 | 303 | ||
288 | static inline pte_t pte_mkglobal(pte_t pte) | 304 | static inline pte_t pte_mkglobal(pte_t pte) |
289 | { | 305 | { |
290 | return __pte(pte_val(pte) | _PAGE_GLOBAL); | 306 | return pte_set_flags(pte, _PAGE_GLOBAL); |
291 | } | 307 | } |
292 | 308 | ||
293 | static inline pte_t pte_clrglobal(pte_t pte) | 309 | static inline pte_t pte_clrglobal(pte_t pte) |
294 | { | 310 | { |
295 | return __pte(pte_val(pte) & ~_PAGE_GLOBAL); | 311 | return pte_clear_flags(pte, _PAGE_GLOBAL); |
296 | } | 312 | } |
297 | 313 | ||
298 | static inline pte_t pte_mkspecial(pte_t pte) | 314 | static inline pte_t pte_mkspecial(pte_t pte) |
299 | { | 315 | { |
300 | return __pte(pte_val(pte) | _PAGE_SPECIAL); | 316 | return pte_set_flags(pte, _PAGE_SPECIAL); |
301 | } | 317 | } |
302 | 318 | ||
303 | extern pteval_t __supported_pte_mask; | 319 | extern pteval_t __supported_pte_mask; |
@@ -451,6 +467,190 @@ static inline void __init paravirt_pagetable_setup_done(pgd_t *base) | |||
451 | # include "pgtable_64.h" | 467 | # include "pgtable_64.h" |
452 | #endif | 468 | #endif |
453 | 469 | ||
470 | #ifndef __ASSEMBLY__ | ||
471 | #include <linux/mm_types.h> | ||
472 | |||
473 | static inline int pte_none(pte_t pte) | ||
474 | { | ||
475 | return !pte.pte; | ||
476 | } | ||
477 | |||
478 | #define __HAVE_ARCH_PTE_SAME | ||
479 | static inline int pte_same(pte_t a, pte_t b) | ||
480 | { | ||
481 | return a.pte == b.pte; | ||
482 | } | ||
483 | |||
484 | static inline int pte_present(pte_t a) | ||
485 | { | ||
486 | return pte_flags(a) & (_PAGE_PRESENT | _PAGE_PROTNONE); | ||
487 | } | ||
488 | |||
489 | static inline int pmd_present(pmd_t pmd) | ||
490 | { | ||
491 | return pmd_flags(pmd) & _PAGE_PRESENT; | ||
492 | } | ||
493 | |||
494 | static inline int pmd_none(pmd_t pmd) | ||
495 | { | ||
496 | /* Only check low word on 32-bit platforms, since it might be | ||
497 | out of sync with upper half. */ | ||
498 | return (unsigned long)native_pmd_val(pmd) == 0; | ||
499 | } | ||
500 | |||
501 | static inline unsigned long pmd_page_vaddr(pmd_t pmd) | ||
502 | { | ||
503 | return (unsigned long)__va(pmd_val(pmd) & PTE_PFN_MASK); | ||
504 | } | ||
505 | |||
506 | /* | ||
507 | * Currently stuck as a macro due to indirect forward reference to | ||
508 | * linux/mmzone.h's __section_mem_map_addr() definition: | ||
509 | */ | ||
510 | #define pmd_page(pmd) pfn_to_page(pmd_val(pmd) >> PAGE_SHIFT) | ||
511 | |||
512 | /* | ||
513 | * the pmd page can be thought of an array like this: pmd_t[PTRS_PER_PMD] | ||
514 | * | ||
515 | * this macro returns the index of the entry in the pmd page which would | ||
516 | * control the given virtual address | ||
517 | */ | ||
518 | static inline unsigned pmd_index(unsigned long address) | ||
519 | { | ||
520 | return (address >> PMD_SHIFT) & (PTRS_PER_PMD - 1); | ||
521 | } | ||
522 | |||
523 | /* | ||
524 | * Conversion functions: convert a page and protection to a page entry, | ||
525 | * and a page entry and page directory to the page they refer to. | ||
526 | * | ||
527 | * (Currently stuck as a macro because of indirect forward reference | ||
528 | * to linux/mm.h:page_to_nid()) | ||
529 | */ | ||
530 | #define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot)) | ||
531 | |||
532 | /* | ||
533 | * the pte page can be thought of an array like this: pte_t[PTRS_PER_PTE] | ||
534 | * | ||
535 | * this function returns the index of the entry in the pte page which would | ||
536 | * control the given virtual address | ||
537 | */ | ||
538 | static inline unsigned pte_index(unsigned long address) | ||
539 | { | ||
540 | return (address >> PAGE_SHIFT) & (PTRS_PER_PTE - 1); | ||
541 | } | ||
542 | |||
543 | static inline pte_t *pte_offset_kernel(pmd_t *pmd, unsigned long address) | ||
544 | { | ||
545 | return (pte_t *)pmd_page_vaddr(*pmd) + pte_index(address); | ||
546 | } | ||
547 | |||
548 | static inline int pmd_bad(pmd_t pmd) | ||
549 | { | ||
550 | return (pmd_flags(pmd) & ~_PAGE_USER) != _KERNPG_TABLE; | ||
551 | } | ||
552 | |||
553 | static inline unsigned long pages_to_mb(unsigned long npg) | ||
554 | { | ||
555 | return npg >> (20 - PAGE_SHIFT); | ||
556 | } | ||
557 | |||
558 | #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ | ||
559 | remap_pfn_range(vma, vaddr, pfn, size, prot) | ||
560 | |||
561 | #if PAGETABLE_LEVELS == 2 | ||
562 | static inline int pud_large(pud_t pud) | ||
563 | { | ||
564 | return 0; | ||
565 | } | ||
566 | #endif | ||
567 | |||
568 | #if PAGETABLE_LEVELS > 2 | ||
569 | static inline int pud_none(pud_t pud) | ||
570 | { | ||
571 | return native_pud_val(pud) == 0; | ||
572 | } | ||
573 | |||
574 | static inline int pud_present(pud_t pud) | ||
575 | { | ||
576 | return pud_flags(pud) & _PAGE_PRESENT; | ||
577 | } | ||
578 | |||
579 | static inline unsigned long pud_page_vaddr(pud_t pud) | ||
580 | { | ||
581 | return (unsigned long)__va((unsigned long)pud_val(pud) & PTE_PFN_MASK); | ||
582 | } | ||
583 | |||
584 | /* | ||
585 | * Currently stuck as a macro due to indirect forward reference to | ||
586 | * linux/mmzone.h's __section_mem_map_addr() definition: | ||
587 | */ | ||
588 | #define pud_page(pud) pfn_to_page(pud_val(pud) >> PAGE_SHIFT) | ||
589 | |||
590 | /* Find an entry in the second-level page table.. */ | ||
591 | static inline pmd_t *pmd_offset(pud_t *pud, unsigned long address) | ||
592 | { | ||
593 | return (pmd_t *)pud_page_vaddr(*pud) + pmd_index(address); | ||
594 | } | ||
595 | |||
596 | static inline unsigned long pmd_pfn(pmd_t pmd) | ||
597 | { | ||
598 | return (pmd_val(pmd) & PTE_PFN_MASK) >> PAGE_SHIFT; | ||
599 | } | ||
600 | |||
601 | static inline int pud_large(pud_t pud) | ||
602 | { | ||
603 | return (pud_flags(pud) & (_PAGE_PSE | _PAGE_PRESENT)) == | ||
604 | (_PAGE_PSE | _PAGE_PRESENT); | ||
605 | } | ||
606 | |||
607 | static inline int pud_bad(pud_t pud) | ||
608 | { | ||
609 | return (pud_flags(pud) & ~(_KERNPG_TABLE | _PAGE_USER)) != 0; | ||
610 | } | ||
611 | #endif /* PAGETABLE_LEVELS > 2 */ | ||
612 | |||
613 | #if PAGETABLE_LEVELS > 3 | ||
614 | static inline int pgd_present(pgd_t pgd) | ||
615 | { | ||
616 | return pgd_flags(pgd) & _PAGE_PRESENT; | ||
617 | } | ||
618 | |||
619 | static inline unsigned long pgd_page_vaddr(pgd_t pgd) | ||
620 | { | ||
621 | return (unsigned long)__va((unsigned long)pgd_val(pgd) & PTE_PFN_MASK); | ||
622 | } | ||
623 | |||
624 | /* | ||
625 | * Currently stuck as a macro due to indirect forward reference to | ||
626 | * linux/mmzone.h's __section_mem_map_addr() definition: | ||
627 | */ | ||
628 | #define pgd_page(pgd) pfn_to_page(pgd_val(pgd) >> PAGE_SHIFT) | ||
629 | |||
630 | /* to find an entry in a page-table-directory. */ | ||
631 | static inline unsigned pud_index(unsigned long address) | ||
632 | { | ||
633 | return (address >> PUD_SHIFT) & (PTRS_PER_PUD - 1); | ||
634 | } | ||
635 | |||
636 | static inline pud_t *pud_offset(pgd_t *pgd, unsigned long address) | ||
637 | { | ||
638 | return (pud_t *)pgd_page_vaddr(*pgd) + pud_index(address); | ||
639 | } | ||
640 | |||
641 | static inline int pgd_bad(pgd_t pgd) | ||
642 | { | ||
643 | return (pgd_flags(pgd) & ~_PAGE_USER) != _KERNPG_TABLE; | ||
644 | } | ||
645 | |||
646 | static inline int pgd_none(pgd_t pgd) | ||
647 | { | ||
648 | return !native_pgd_val(pgd); | ||
649 | } | ||
650 | #endif /* PAGETABLE_LEVELS > 3 */ | ||
651 | |||
652 | #endif /* __ASSEMBLY__ */ | ||
653 | |||
454 | /* | 654 | /* |
455 | * the pgd page can be thought of an array like this: pgd_t[PTRS_PER_PGD] | 655 | * the pgd page can be thought of an array like this: pgd_t[PTRS_PER_PGD] |
456 | * | 656 | * |
diff --git a/arch/x86/include/asm/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h index 72b020deb46b..1952bb762aac 100644 --- a/arch/x86/include/asm/pgtable_32.h +++ b/arch/x86/include/asm/pgtable_32.h | |||
@@ -85,55 +85,12 @@ extern void set_pmd_pfn(unsigned long, unsigned long, pgprot_t); | |||
85 | /* The boot page tables (all created as a single array) */ | 85 | /* The boot page tables (all created as a single array) */ |
86 | extern unsigned long pg0[]; | 86 | extern unsigned long pg0[]; |
87 | 87 | ||
88 | #define pte_present(x) ((x).pte_low & (_PAGE_PRESENT | _PAGE_PROTNONE)) | ||
89 | |||
90 | /* To avoid harmful races, pmd_none(x) should check only the lower when PAE */ | ||
91 | #define pmd_none(x) (!(unsigned long)pmd_val((x))) | ||
92 | #define pmd_present(x) (pmd_val((x)) & _PAGE_PRESENT) | ||
93 | #define pmd_bad(x) ((pmd_val(x) & (PTE_FLAGS_MASK & ~_PAGE_USER)) != _KERNPG_TABLE) | ||
94 | |||
95 | #define pages_to_mb(x) ((x) >> (20-PAGE_SHIFT)) | ||
96 | |||
97 | #ifdef CONFIG_X86_PAE | 88 | #ifdef CONFIG_X86_PAE |
98 | # include <asm/pgtable-3level.h> | 89 | # include <asm/pgtable-3level.h> |
99 | #else | 90 | #else |
100 | # include <asm/pgtable-2level.h> | 91 | # include <asm/pgtable-2level.h> |
101 | #endif | 92 | #endif |
102 | 93 | ||
103 | /* | ||
104 | * Conversion functions: convert a page and protection to a page entry, | ||
105 | * and a page entry and page directory to the page they refer to. | ||
106 | */ | ||
107 | #define mk_pte(page, pgprot) pfn_pte(page_to_pfn(page), (pgprot)) | ||
108 | |||
109 | |||
110 | static inline int pud_large(pud_t pud) { return 0; } | ||
111 | |||
112 | /* | ||
113 | * the pmd page can be thought of an array like this: pmd_t[PTRS_PER_PMD] | ||
114 | * | ||
115 | * this macro returns the index of the entry in the pmd page which would | ||
116 | * control the given virtual address | ||
117 | */ | ||
118 | #define pmd_index(address) \ | ||
119 | (((address) >> PMD_SHIFT) & (PTRS_PER_PMD - 1)) | ||
120 | |||
121 | /* | ||
122 | * the pte page can be thought of an array like this: pte_t[PTRS_PER_PTE] | ||
123 | * | ||
124 | * this macro returns the index of the entry in the pte page which would | ||
125 | * control the given virtual address | ||
126 | */ | ||
127 | #define pte_index(address) \ | ||
128 | (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) | ||
129 | #define pte_offset_kernel(dir, address) \ | ||
130 | ((pte_t *)pmd_page_vaddr(*(dir)) + pte_index((address))) | ||
131 | |||
132 | #define pmd_page(pmd) (pfn_to_page(pmd_val((pmd)) >> PAGE_SHIFT)) | ||
133 | |||
134 | #define pmd_page_vaddr(pmd) \ | ||
135 | ((unsigned long)__va(pmd_val((pmd)) & PTE_PFN_MASK)) | ||
136 | |||
137 | #if defined(CONFIG_HIGHPTE) | 94 | #if defined(CONFIG_HIGHPTE) |
138 | #define pte_offset_map(dir, address) \ | 95 | #define pte_offset_map(dir, address) \ |
139 | ((pte_t *)kmap_atomic_pte(pmd_page(*(dir)), KM_PTE0) + \ | 96 | ((pte_t *)kmap_atomic_pte(pmd_page(*(dir)), KM_PTE0) + \ |
@@ -176,7 +133,4 @@ do { \ | |||
176 | #define kern_addr_valid(kaddr) (0) | 133 | #define kern_addr_valid(kaddr) (0) |
177 | #endif | 134 | #endif |
178 | 135 | ||
179 | #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ | ||
180 | remap_pfn_range(vma, vaddr, pfn, size, prot) | ||
181 | |||
182 | #endif /* _ASM_X86_PGTABLE_32_H */ | 136 | #endif /* _ASM_X86_PGTABLE_32_H */ |
diff --git a/arch/x86/include/asm/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h index 1df9637dfda3..1c4e247c51fd 100644 --- a/arch/x86/include/asm/pgtable_64.h +++ b/arch/x86/include/asm/pgtable_64.h | |||
@@ -66,9 +66,6 @@ extern void paging_init(void); | |||
66 | printk("%s:%d: bad pgd %p(%016lx).\n", \ | 66 | printk("%s:%d: bad pgd %p(%016lx).\n", \ |
67 | __FILE__, __LINE__, &(e), pgd_val(e)) | 67 | __FILE__, __LINE__, &(e), pgd_val(e)) |
68 | 68 | ||
69 | #define pgd_none(x) (!pgd_val(x)) | ||
70 | #define pud_none(x) (!pud_val(x)) | ||
71 | |||
72 | struct mm_struct; | 69 | struct mm_struct; |
73 | 70 | ||
74 | void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte); | 71 | void set_pte_vaddr_pud(pud_t *pud_page, unsigned long vaddr, pte_t new_pte); |
@@ -133,8 +130,6 @@ static inline void native_pgd_clear(pgd_t *pgd) | |||
133 | native_set_pgd(pgd, native_make_pgd(0)); | 130 | native_set_pgd(pgd, native_make_pgd(0)); |
134 | } | 131 | } |
135 | 132 | ||
136 | #define pte_same(a, b) ((a).pte == (b).pte) | ||
137 | |||
138 | #endif /* !__ASSEMBLY__ */ | 133 | #endif /* !__ASSEMBLY__ */ |
139 | 134 | ||
140 | #define PMD_SIZE (_AC(1, UL) << PMD_SHIFT) | 135 | #define PMD_SIZE (_AC(1, UL) << PMD_SHIFT) |
@@ -155,26 +150,6 @@ static inline void native_pgd_clear(pgd_t *pgd) | |||
155 | 150 | ||
156 | #ifndef __ASSEMBLY__ | 151 | #ifndef __ASSEMBLY__ |
157 | 152 | ||
158 | static inline int pgd_bad(pgd_t pgd) | ||
159 | { | ||
160 | return (pgd_val(pgd) & ~(PTE_PFN_MASK | _PAGE_USER)) != _KERNPG_TABLE; | ||
161 | } | ||
162 | |||
163 | static inline int pud_bad(pud_t pud) | ||
164 | { | ||
165 | return (pud_val(pud) & ~(PTE_PFN_MASK | _PAGE_USER)) != _KERNPG_TABLE; | ||
166 | } | ||
167 | |||
168 | static inline int pmd_bad(pmd_t pmd) | ||
169 | { | ||
170 | return (pmd_val(pmd) & ~(PTE_PFN_MASK | _PAGE_USER)) != _KERNPG_TABLE; | ||
171 | } | ||
172 | |||
173 | #define pte_none(x) (!pte_val((x))) | ||
174 | #define pte_present(x) (pte_val((x)) & (_PAGE_PRESENT | _PAGE_PROTNONE)) | ||
175 | |||
176 | #define pages_to_mb(x) ((x) >> (20 - PAGE_SHIFT)) /* FIXME: is this right? */ | ||
177 | |||
178 | /* | 153 | /* |
179 | * Conversion functions: convert a page and protection to a page entry, | 154 | * Conversion functions: convert a page and protection to a page entry, |
180 | * and a page entry and page directory to the page they refer to. | 155 | * and a page entry and page directory to the page they refer to. |
@@ -183,41 +158,12 @@ static inline int pmd_bad(pmd_t pmd) | |||
183 | /* | 158 | /* |
184 | * Level 4 access. | 159 | * Level 4 access. |
185 | */ | 160 | */ |
186 | #define pgd_page_vaddr(pgd) \ | ||
187 | ((unsigned long)__va((unsigned long)pgd_val((pgd)) & PTE_PFN_MASK)) | ||
188 | #define pgd_page(pgd) (pfn_to_page(pgd_val((pgd)) >> PAGE_SHIFT)) | ||
189 | #define pgd_present(pgd) (pgd_val(pgd) & _PAGE_PRESENT) | ||
190 | static inline int pgd_large(pgd_t pgd) { return 0; } | 161 | static inline int pgd_large(pgd_t pgd) { return 0; } |
191 | #define mk_kernel_pgd(address) __pgd((address) | _KERNPG_TABLE) | 162 | #define mk_kernel_pgd(address) __pgd((address) | _KERNPG_TABLE) |
192 | 163 | ||
193 | /* PUD - Level3 access */ | 164 | /* PUD - Level3 access */ |
194 | /* to find an entry in a page-table-directory. */ | ||
195 | #define pud_page_vaddr(pud) \ | ||
196 | ((unsigned long)__va(pud_val((pud)) & PHYSICAL_PAGE_MASK)) | ||
197 | #define pud_page(pud) (pfn_to_page(pud_val((pud)) >> PAGE_SHIFT)) | ||
198 | #define pud_index(address) (((address) >> PUD_SHIFT) & (PTRS_PER_PUD - 1)) | ||
199 | #define pud_offset(pgd, address) \ | ||
200 | ((pud_t *)pgd_page_vaddr(*(pgd)) + pud_index((address))) | ||
201 | #define pud_present(pud) (pud_val((pud)) & _PAGE_PRESENT) | ||
202 | |||
203 | static inline int pud_large(pud_t pte) | ||
204 | { | ||
205 | return (pud_val(pte) & (_PAGE_PSE | _PAGE_PRESENT)) == | ||
206 | (_PAGE_PSE | _PAGE_PRESENT); | ||
207 | } | ||
208 | 165 | ||
209 | /* PMD - Level 2 access */ | 166 | /* PMD - Level 2 access */ |
210 | #define pmd_page_vaddr(pmd) ((unsigned long) __va(pmd_val((pmd)) & PTE_PFN_MASK)) | ||
211 | #define pmd_page(pmd) (pfn_to_page(pmd_val((pmd)) >> PAGE_SHIFT)) | ||
212 | |||
213 | #define pmd_index(address) (((address) >> PMD_SHIFT) & (PTRS_PER_PMD - 1)) | ||
214 | #define pmd_offset(dir, address) ((pmd_t *)pud_page_vaddr(*(dir)) + \ | ||
215 | pmd_index(address)) | ||
216 | #define pmd_none(x) (!pmd_val((x))) | ||
217 | #define pmd_present(x) (pmd_val((x)) & _PAGE_PRESENT) | ||
218 | #define pfn_pmd(nr, prot) (__pmd(((nr) << PAGE_SHIFT) | pgprot_val((prot)))) | ||
219 | #define pmd_pfn(x) ((pmd_val((x)) & __PHYSICAL_MASK) >> PAGE_SHIFT) | ||
220 | |||
221 | #define pte_to_pgoff(pte) ((pte_val((pte)) & PHYSICAL_PAGE_MASK) >> PAGE_SHIFT) | 167 | #define pte_to_pgoff(pte) ((pte_val((pte)) & PHYSICAL_PAGE_MASK) >> PAGE_SHIFT) |
222 | #define pgoff_to_pte(off) ((pte_t) { .pte = ((off) << PAGE_SHIFT) | \ | 168 | #define pgoff_to_pte(off) ((pte_t) { .pte = ((off) << PAGE_SHIFT) | \ |
223 | _PAGE_FILE }) | 169 | _PAGE_FILE }) |
@@ -225,13 +171,6 @@ static inline int pud_large(pud_t pte) | |||
225 | 171 | ||
226 | /* PTE - Level 1 access. */ | 172 | /* PTE - Level 1 access. */ |
227 | 173 | ||
228 | /* page, protection -> pte */ | ||
229 | #define mk_pte(page, pgprot) pfn_pte(page_to_pfn((page)), (pgprot)) | ||
230 | |||
231 | #define pte_index(address) (((address) >> PAGE_SHIFT) & (PTRS_PER_PTE - 1)) | ||
232 | #define pte_offset_kernel(dir, address) ((pte_t *) pmd_page_vaddr(*(dir)) + \ | ||
233 | pte_index((address))) | ||
234 | |||
235 | /* x86-64 always has all page tables mapped. */ | 174 | /* x86-64 always has all page tables mapped. */ |
236 | #define pte_offset_map(dir, address) pte_offset_kernel((dir), (address)) | 175 | #define pte_offset_map(dir, address) pte_offset_kernel((dir), (address)) |
237 | #define pte_offset_map_nested(dir, address) pte_offset_kernel((dir), (address)) | 176 | #define pte_offset_map_nested(dir, address) pte_offset_kernel((dir), (address)) |
@@ -265,9 +204,6 @@ extern int direct_gbpages; | |||
265 | extern int kern_addr_valid(unsigned long addr); | 204 | extern int kern_addr_valid(unsigned long addr); |
266 | extern void cleanup_highmap(void); | 205 | extern void cleanup_highmap(void); |
267 | 206 | ||
268 | #define io_remap_pfn_range(vma, vaddr, pfn, size, prot) \ | ||
269 | remap_pfn_range(vma, vaddr, pfn, size, prot) | ||
270 | |||
271 | #define HAVE_ARCH_UNMAPPED_AREA | 207 | #define HAVE_ARCH_UNMAPPED_AREA |
272 | #define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN | 208 | #define HAVE_ARCH_UNMAPPED_AREA_TOPDOWN |
273 | 209 | ||
diff --git a/arch/x86/include/asm/prctl.h b/arch/x86/include/asm/prctl.h index a8894647dd9a..3ac5032fae09 100644 --- a/arch/x86/include/asm/prctl.h +++ b/arch/x86/include/asm/prctl.h | |||
@@ -6,8 +6,4 @@ | |||
6 | #define ARCH_GET_FS 0x1003 | 6 | #define ARCH_GET_FS 0x1003 |
7 | #define ARCH_GET_GS 0x1004 | 7 | #define ARCH_GET_GS 0x1004 |
8 | 8 | ||
9 | #ifdef CONFIG_X86_64 | ||
10 | extern long sys_arch_prctl(int, unsigned long); | ||
11 | #endif /* CONFIG_X86_64 */ | ||
12 | |||
13 | #endif /* _ASM_X86_PRCTL_H */ | 9 | #endif /* _ASM_X86_PRCTL_H */ |
diff --git a/arch/x86/include/asm/processor.h b/arch/x86/include/asm/processor.h index c15766a2969f..a0133838b67c 100644 --- a/arch/x86/include/asm/processor.h +++ b/arch/x86/include/asm/processor.h | |||
@@ -73,7 +73,7 @@ struct cpuinfo_x86 { | |||
73 | char pad0; | 73 | char pad0; |
74 | #else | 74 | #else |
75 | /* Number of 4K pages in DTLB/ITLB combined(in pages): */ | 75 | /* Number of 4K pages in DTLB/ITLB combined(in pages): */ |
76 | int x86_tlbsize; | 76 | int x86_tlbsize; |
77 | __u8 x86_virt_bits; | 77 | __u8 x86_virt_bits; |
78 | __u8 x86_phys_bits; | 78 | __u8 x86_phys_bits; |
79 | #endif | 79 | #endif |
@@ -393,16 +393,14 @@ union irq_stack_union { | |||
393 | }; | 393 | }; |
394 | 394 | ||
395 | DECLARE_PER_CPU(union irq_stack_union, irq_stack_union); | 395 | DECLARE_PER_CPU(union irq_stack_union, irq_stack_union); |
396 | DECLARE_PER_CPU(char *, irq_stack_ptr); | 396 | DECLARE_INIT_PER_CPU(irq_stack_union); |
397 | 397 | ||
398 | static inline void load_gs_base(int cpu) | 398 | DECLARE_PER_CPU(char *, irq_stack_ptr); |
399 | { | 399 | #else /* X86_64 */ |
400 | /* Memory clobbers used to order pda/percpu accesses */ | 400 | #ifdef CONFIG_CC_STACKPROTECTOR |
401 | mb(); | 401 | DECLARE_PER_CPU(unsigned long, stack_canary); |
402 | wrmsrl(MSR_GS_BASE, (unsigned long)per_cpu(irq_stack_union.gs_base, cpu)); | ||
403 | mb(); | ||
404 | } | ||
405 | #endif | 402 | #endif |
403 | #endif /* X86_64 */ | ||
406 | 404 | ||
407 | extern void print_cpu_info(struct cpuinfo_x86 *); | 405 | extern void print_cpu_info(struct cpuinfo_x86 *); |
408 | extern unsigned int xstate_size; | 406 | extern unsigned int xstate_size; |
@@ -776,9 +774,9 @@ extern int sysenter_setup(void); | |||
776 | extern struct desc_ptr early_gdt_descr; | 774 | extern struct desc_ptr early_gdt_descr; |
777 | 775 | ||
778 | extern void cpu_set_gdt(int); | 776 | extern void cpu_set_gdt(int); |
779 | extern void switch_to_new_gdt(void); | 777 | extern void switch_to_new_gdt(int); |
778 | extern void load_percpu_segment(int); | ||
780 | extern void cpu_init(void); | 779 | extern void cpu_init(void); |
781 | extern void init_gdt(int cpu); | ||
782 | 780 | ||
783 | static inline unsigned long get_debugctlmsr(void) | 781 | static inline unsigned long get_debugctlmsr(void) |
784 | { | 782 | { |
diff --git a/arch/x86/include/asm/proto.h b/arch/x86/include/asm/proto.h index d6a22f92ba77..49fb3ecf3bb3 100644 --- a/arch/x86/include/asm/proto.h +++ b/arch/x86/include/asm/proto.h | |||
@@ -18,11 +18,7 @@ extern void syscall32_cpu_init(void); | |||
18 | 18 | ||
19 | extern void check_efer(void); | 19 | extern void check_efer(void); |
20 | 20 | ||
21 | #ifdef CONFIG_X86_BIOS_REBOOT | ||
22 | extern int reboot_force; | 21 | extern int reboot_force; |
23 | #else | ||
24 | static const int reboot_force = 0; | ||
25 | #endif | ||
26 | 22 | ||
27 | long do_arch_prctl(struct task_struct *task, int code, unsigned long addr); | 23 | long do_arch_prctl(struct task_struct *task, int code, unsigned long addr); |
28 | 24 | ||
diff --git a/arch/x86/include/asm/ptrace.h b/arch/x86/include/asm/ptrace.h index 6d34d954c228..e304b66abeea 100644 --- a/arch/x86/include/asm/ptrace.h +++ b/arch/x86/include/asm/ptrace.h | |||
@@ -28,7 +28,7 @@ struct pt_regs { | |||
28 | int xds; | 28 | int xds; |
29 | int xes; | 29 | int xes; |
30 | int xfs; | 30 | int xfs; |
31 | /* int gs; */ | 31 | int xgs; |
32 | long orig_eax; | 32 | long orig_eax; |
33 | long eip; | 33 | long eip; |
34 | int xcs; | 34 | int xcs; |
@@ -50,7 +50,7 @@ struct pt_regs { | |||
50 | unsigned long ds; | 50 | unsigned long ds; |
51 | unsigned long es; | 51 | unsigned long es; |
52 | unsigned long fs; | 52 | unsigned long fs; |
53 | /* int gs; */ | 53 | unsigned long gs; |
54 | unsigned long orig_ax; | 54 | unsigned long orig_ax; |
55 | unsigned long ip; | 55 | unsigned long ip; |
56 | unsigned long cs; | 56 | unsigned long cs; |
diff --git a/arch/x86/include/asm/mach-rdc321x/rdc321x_defs.h b/arch/x86/include/asm/rdc321x_defs.h index c8e9c8bed3d0..c8e9c8bed3d0 100644 --- a/arch/x86/include/asm/mach-rdc321x/rdc321x_defs.h +++ b/arch/x86/include/asm/rdc321x_defs.h | |||
diff --git a/arch/x86/include/asm/segment.h b/arch/x86/include/asm/segment.h index 1dc1b51ac623..14e0ed86a6f9 100644 --- a/arch/x86/include/asm/segment.h +++ b/arch/x86/include/asm/segment.h | |||
@@ -61,7 +61,7 @@ | |||
61 | * | 61 | * |
62 | * 26 - ESPFIX small SS | 62 | * 26 - ESPFIX small SS |
63 | * 27 - per-cpu [ offset to per-cpu data area ] | 63 | * 27 - per-cpu [ offset to per-cpu data area ] |
64 | * 28 - unused | 64 | * 28 - stack_canary-20 [ for stack protector ] |
65 | * 29 - unused | 65 | * 29 - unused |
66 | * 30 - unused | 66 | * 30 - unused |
67 | * 31 - TSS for double fault handler | 67 | * 31 - TSS for double fault handler |
@@ -95,6 +95,13 @@ | |||
95 | #define __KERNEL_PERCPU 0 | 95 | #define __KERNEL_PERCPU 0 |
96 | #endif | 96 | #endif |
97 | 97 | ||
98 | #define GDT_ENTRY_STACK_CANARY (GDT_ENTRY_KERNEL_BASE + 16) | ||
99 | #ifdef CONFIG_CC_STACKPROTECTOR | ||
100 | #define __KERNEL_STACK_CANARY (GDT_ENTRY_STACK_CANARY * 8) | ||
101 | #else | ||
102 | #define __KERNEL_STACK_CANARY 0 | ||
103 | #endif | ||
104 | |||
98 | #define GDT_ENTRY_DOUBLEFAULT_TSS 31 | 105 | #define GDT_ENTRY_DOUBLEFAULT_TSS 31 |
99 | 106 | ||
100 | /* | 107 | /* |
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h index 536949749bc2..45b40278b582 100644 --- a/arch/x86/include/asm/setup.h +++ b/arch/x86/include/asm/setup.h | |||
@@ -1,6 +1,8 @@ | |||
1 | #ifndef _ASM_X86_SETUP_H | 1 | #ifndef _ASM_X86_SETUP_H |
2 | #define _ASM_X86_SETUP_H | 2 | #define _ASM_X86_SETUP_H |
3 | 3 | ||
4 | #ifdef __KERNEL__ | ||
5 | |||
4 | #define COMMAND_LINE_SIZE 2048 | 6 | #define COMMAND_LINE_SIZE 2048 |
5 | 7 | ||
6 | #ifndef __ASSEMBLY__ | 8 | #ifndef __ASSEMBLY__ |
@@ -8,10 +10,8 @@ | |||
8 | /* Interrupt control for vSMPowered x86_64 systems */ | 10 | /* Interrupt control for vSMPowered x86_64 systems */ |
9 | void vsmp_init(void); | 11 | void vsmp_init(void); |
10 | 12 | ||
11 | |||
12 | void setup_bios_corruption_check(void); | 13 | void setup_bios_corruption_check(void); |
13 | 14 | ||
14 | |||
15 | #ifdef CONFIG_X86_VISWS | 15 | #ifdef CONFIG_X86_VISWS |
16 | extern void visws_early_detect(void); | 16 | extern void visws_early_detect(void); |
17 | extern int is_visws_box(void); | 17 | extern int is_visws_box(void); |
@@ -43,7 +43,7 @@ struct x86_quirks { | |||
43 | void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name); | 43 | void (*mpc_oem_bus_info)(struct mpc_bus *m, char *name); |
44 | void (*mpc_oem_pci_bus)(struct mpc_bus *m); | 44 | void (*mpc_oem_pci_bus)(struct mpc_bus *m); |
45 | void (*smp_read_mpc_oem)(struct mpc_oemtable *oemtable, | 45 | void (*smp_read_mpc_oem)(struct mpc_oemtable *oemtable, |
46 | unsigned short oemsize); | 46 | unsigned short oemsize); |
47 | int (*setup_ioapic_ids)(void); | 47 | int (*setup_ioapic_ids)(void); |
48 | int (*update_genapic)(void); | 48 | int (*update_genapic)(void); |
49 | }; | 49 | }; |
@@ -56,8 +56,6 @@ extern unsigned long saved_video_mode; | |||
56 | #endif | 56 | #endif |
57 | #endif /* __ASSEMBLY__ */ | 57 | #endif /* __ASSEMBLY__ */ |
58 | 58 | ||
59 | #ifdef __KERNEL__ | ||
60 | |||
61 | #ifdef __i386__ | 59 | #ifdef __i386__ |
62 | 60 | ||
63 | #include <linux/pfn.h> | 61 | #include <linux/pfn.h> |
diff --git a/arch/x86/include/asm/mach-default/setup_arch.h b/arch/x86/include/asm/setup_arch.h index 38846208b548..38846208b548 100644 --- a/arch/x86/include/asm/mach-default/setup_arch.h +++ b/arch/x86/include/asm/setup_arch.h | |||
diff --git a/arch/x86/include/asm/smp.h b/arch/x86/include/asm/smp.h index 45ef8a1b9d7c..47d0e21f2b9e 100644 --- a/arch/x86/include/asm/smp.h +++ b/arch/x86/include/asm/smp.h | |||
@@ -182,28 +182,9 @@ static inline int logical_smp_processor_id(void) | |||
182 | return GET_APIC_LOGICAL_ID(*(u32 *)(APIC_BASE + APIC_LDR)); | 182 | return GET_APIC_LOGICAL_ID(*(u32 *)(APIC_BASE + APIC_LDR)); |
183 | } | 183 | } |
184 | 184 | ||
185 | #include <mach_apicdef.h> | ||
186 | static inline unsigned int read_apic_id(void) | ||
187 | { | ||
188 | unsigned int reg; | ||
189 | |||
190 | reg = *(u32 *)(APIC_BASE + APIC_ID); | ||
191 | |||
192 | return GET_APIC_ID(reg); | ||
193 | } | ||
194 | #endif | 185 | #endif |
195 | 186 | ||
196 | |||
197 | # if defined(APIC_DEFINITION) || defined(CONFIG_X86_64) | ||
198 | extern int hard_smp_processor_id(void); | 187 | extern int hard_smp_processor_id(void); |
199 | # else | ||
200 | #include <mach_apicdef.h> | ||
201 | static inline int hard_smp_processor_id(void) | ||
202 | { | ||
203 | /* we don't want to mark this access volatile - bad code generation */ | ||
204 | return read_apic_id(); | ||
205 | } | ||
206 | # endif /* APIC_DEFINITION */ | ||
207 | 188 | ||
208 | #else /* CONFIG_X86_LOCAL_APIC */ | 189 | #else /* CONFIG_X86_LOCAL_APIC */ |
209 | 190 | ||
diff --git a/arch/x86/include/asm/mach-default/smpboot_hooks.h b/arch/x86/include/asm/smpboot_hooks.h index 23bf52103b89..1def60114906 100644 --- a/arch/x86/include/asm/mach-default/smpboot_hooks.h +++ b/arch/x86/include/asm/smpboot_hooks.h | |||
@@ -13,10 +13,10 @@ static inline void smpboot_setup_warm_reset_vector(unsigned long start_eip) | |||
13 | CMOS_WRITE(0xa, 0xf); | 13 | CMOS_WRITE(0xa, 0xf); |
14 | local_flush_tlb(); | 14 | local_flush_tlb(); |
15 | pr_debug("1.\n"); | 15 | pr_debug("1.\n"); |
16 | *((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_HIGH)) = | 16 | *((volatile unsigned short *)phys_to_virt(apic->trampoline_phys_high)) = |
17 | start_eip >> 4; | 17 | start_eip >> 4; |
18 | pr_debug("2.\n"); | 18 | pr_debug("2.\n"); |
19 | *((volatile unsigned short *)phys_to_virt(TRAMPOLINE_PHYS_LOW)) = | 19 | *((volatile unsigned short *)phys_to_virt(apic->trampoline_phys_low)) = |
20 | start_eip & 0xf; | 20 | start_eip & 0xf; |
21 | pr_debug("3.\n"); | 21 | pr_debug("3.\n"); |
22 | } | 22 | } |
@@ -34,7 +34,7 @@ static inline void smpboot_restore_warm_reset_vector(void) | |||
34 | */ | 34 | */ |
35 | CMOS_WRITE(0, 0xf); | 35 | CMOS_WRITE(0, 0xf); |
36 | 36 | ||
37 | *((volatile long *)phys_to_virt(TRAMPOLINE_PHYS_LOW)) = 0; | 37 | *((volatile long *)phys_to_virt(apic->trampoline_phys_low)) = 0; |
38 | } | 38 | } |
39 | 39 | ||
40 | static inline void __init smpboot_setup_io_apic(void) | 40 | static inline void __init smpboot_setup_io_apic(void) |
diff --git a/arch/x86/include/asm/spinlock.h b/arch/x86/include/asm/spinlock.h index 8247e94ac6b1..3a5696656680 100644 --- a/arch/x86/include/asm/spinlock.h +++ b/arch/x86/include/asm/spinlock.h | |||
@@ -172,70 +172,8 @@ static inline int __ticket_spin_is_contended(raw_spinlock_t *lock) | |||
172 | return (((tmp >> TICKET_SHIFT) - tmp) & ((1 << TICKET_SHIFT) - 1)) > 1; | 172 | return (((tmp >> TICKET_SHIFT) - tmp) & ((1 << TICKET_SHIFT) - 1)) > 1; |
173 | } | 173 | } |
174 | 174 | ||
175 | #ifdef CONFIG_PARAVIRT | 175 | #ifndef CONFIG_PARAVIRT |
176 | /* | ||
177 | * Define virtualization-friendly old-style lock byte lock, for use in | ||
178 | * pv_lock_ops if desired. | ||
179 | * | ||
180 | * This differs from the pre-2.6.24 spinlock by always using xchgb | ||
181 | * rather than decb to take the lock; this allows it to use a | ||
182 | * zero-initialized lock structure. It also maintains a 1-byte | ||
183 | * contention counter, so that we can implement | ||
184 | * __byte_spin_is_contended. | ||
185 | */ | ||
186 | struct __byte_spinlock { | ||
187 | s8 lock; | ||
188 | s8 spinners; | ||
189 | }; | ||
190 | |||
191 | static inline int __byte_spin_is_locked(raw_spinlock_t *lock) | ||
192 | { | ||
193 | struct __byte_spinlock *bl = (struct __byte_spinlock *)lock; | ||
194 | return bl->lock != 0; | ||
195 | } | ||
196 | |||
197 | static inline int __byte_spin_is_contended(raw_spinlock_t *lock) | ||
198 | { | ||
199 | struct __byte_spinlock *bl = (struct __byte_spinlock *)lock; | ||
200 | return bl->spinners != 0; | ||
201 | } | ||
202 | |||
203 | static inline void __byte_spin_lock(raw_spinlock_t *lock) | ||
204 | { | ||
205 | struct __byte_spinlock *bl = (struct __byte_spinlock *)lock; | ||
206 | s8 val = 1; | ||
207 | |||
208 | asm("1: xchgb %1, %0\n" | ||
209 | " test %1,%1\n" | ||
210 | " jz 3f\n" | ||
211 | " " LOCK_PREFIX "incb %2\n" | ||
212 | "2: rep;nop\n" | ||
213 | " cmpb $1, %0\n" | ||
214 | " je 2b\n" | ||
215 | " " LOCK_PREFIX "decb %2\n" | ||
216 | " jmp 1b\n" | ||
217 | "3:" | ||
218 | : "+m" (bl->lock), "+q" (val), "+m" (bl->spinners): : "memory"); | ||
219 | } | ||
220 | |||
221 | static inline int __byte_spin_trylock(raw_spinlock_t *lock) | ||
222 | { | ||
223 | struct __byte_spinlock *bl = (struct __byte_spinlock *)lock; | ||
224 | u8 old = 1; | ||
225 | |||
226 | asm("xchgb %1,%0" | ||
227 | : "+m" (bl->lock), "+q" (old) : : "memory"); | ||
228 | 176 | ||
229 | return old == 0; | ||
230 | } | ||
231 | |||
232 | static inline void __byte_spin_unlock(raw_spinlock_t *lock) | ||
233 | { | ||
234 | struct __byte_spinlock *bl = (struct __byte_spinlock *)lock; | ||
235 | smp_wmb(); | ||
236 | bl->lock = 0; | ||
237 | } | ||
238 | #else /* !CONFIG_PARAVIRT */ | ||
239 | static inline int __raw_spin_is_locked(raw_spinlock_t *lock) | 177 | static inline int __raw_spin_is_locked(raw_spinlock_t *lock) |
240 | { | 178 | { |
241 | return __ticket_spin_is_locked(lock); | 179 | return __ticket_spin_is_locked(lock); |
@@ -268,7 +206,7 @@ static __always_inline void __raw_spin_lock_flags(raw_spinlock_t *lock, | |||
268 | __raw_spin_lock(lock); | 206 | __raw_spin_lock(lock); |
269 | } | 207 | } |
270 | 208 | ||
271 | #endif /* CONFIG_PARAVIRT */ | 209 | #endif |
272 | 210 | ||
273 | static inline void __raw_spin_unlock_wait(raw_spinlock_t *lock) | 211 | static inline void __raw_spin_unlock_wait(raw_spinlock_t *lock) |
274 | { | 212 | { |
@@ -330,8 +268,7 @@ static inline int __raw_read_trylock(raw_rwlock_t *lock) | |||
330 | { | 268 | { |
331 | atomic_t *count = (atomic_t *)lock; | 269 | atomic_t *count = (atomic_t *)lock; |
332 | 270 | ||
333 | atomic_dec(count); | 271 | if (atomic_dec_return(count) >= 0) |
334 | if (atomic_read(count) >= 0) | ||
335 | return 1; | 272 | return 1; |
336 | atomic_inc(count); | 273 | atomic_inc(count); |
337 | return 0; | 274 | return 0; |
diff --git a/arch/x86/include/asm/stackprotector.h b/arch/x86/include/asm/stackprotector.h index 36a700acaf2b..c2d742c6e15f 100644 --- a/arch/x86/include/asm/stackprotector.h +++ b/arch/x86/include/asm/stackprotector.h | |||
@@ -1,8 +1,54 @@ | |||
1 | /* | ||
2 | * GCC stack protector support. | ||
3 | * | ||
4 | * Stack protector works by putting predefined pattern at the start of | ||
5 | * the stack frame and verifying that it hasn't been overwritten when | ||
6 | * returning from the function. The pattern is called stack canary | ||
7 | * and unfortunately gcc requires it to be at a fixed offset from %gs. | ||
8 | * On x86_64, the offset is 40 bytes and on x86_32 20 bytes. x86_64 | ||
9 | * and x86_32 use segment registers differently and thus handles this | ||
10 | * requirement differently. | ||
11 | * | ||
12 | * On x86_64, %gs is shared by percpu area and stack canary. All | ||
13 | * percpu symbols are zero based and %gs points to the base of percpu | ||
14 | * area. The first occupant of the percpu area is always | ||
15 | * irq_stack_union which contains stack_canary at offset 40. Userland | ||
16 | * %gs is always saved and restored on kernel entry and exit using | ||
17 | * swapgs, so stack protector doesn't add any complexity there. | ||
18 | * | ||
19 | * On x86_32, it's slightly more complicated. As in x86_64, %gs is | ||
20 | * used for userland TLS. Unfortunately, some processors are much | ||
21 | * slower at loading segment registers with different value when | ||
22 | * entering and leaving the kernel, so the kernel uses %fs for percpu | ||
23 | * area and manages %gs lazily so that %gs is switched only when | ||
24 | * necessary, usually during task switch. | ||
25 | * | ||
26 | * As gcc requires the stack canary at %gs:20, %gs can't be managed | ||
27 | * lazily if stack protector is enabled, so the kernel saves and | ||
28 | * restores userland %gs on kernel entry and exit. This behavior is | ||
29 | * controlled by CONFIG_X86_32_LAZY_GS and accessors are defined in | ||
30 | * system.h to hide the details. | ||
31 | */ | ||
32 | |||
1 | #ifndef _ASM_STACKPROTECTOR_H | 33 | #ifndef _ASM_STACKPROTECTOR_H |
2 | #define _ASM_STACKPROTECTOR_H 1 | 34 | #define _ASM_STACKPROTECTOR_H 1 |
3 | 35 | ||
36 | #ifdef CONFIG_CC_STACKPROTECTOR | ||
37 | |||
4 | #include <asm/tsc.h> | 38 | #include <asm/tsc.h> |
5 | #include <asm/processor.h> | 39 | #include <asm/processor.h> |
40 | #include <asm/percpu.h> | ||
41 | #include <asm/system.h> | ||
42 | #include <asm/desc.h> | ||
43 | #include <linux/random.h> | ||
44 | |||
45 | /* | ||
46 | * 24 byte read-only segment initializer for stack canary. Linker | ||
47 | * can't handle the address bit shifting. Address will be set in | ||
48 | * head_32 for boot CPU and setup_per_cpu_areas() for others. | ||
49 | */ | ||
50 | #define GDT_STACK_CANARY_INIT \ | ||
51 | [GDT_ENTRY_STACK_CANARY] = { { { 0x00000018, 0x00409000 } } }, | ||
6 | 52 | ||
7 | /* | 53 | /* |
8 | * Initialize the stackprotector canary value. | 54 | * Initialize the stackprotector canary value. |
@@ -15,12 +61,9 @@ static __always_inline void boot_init_stack_canary(void) | |||
15 | u64 canary; | 61 | u64 canary; |
16 | u64 tsc; | 62 | u64 tsc; |
17 | 63 | ||
18 | /* | 64 | #ifdef CONFIG_X86_64 |
19 | * Build time only check to make sure the stack_canary is at | ||
20 | * offset 40 in the pda; this is a gcc ABI requirement | ||
21 | */ | ||
22 | BUILD_BUG_ON(offsetof(union irq_stack_union, stack_canary) != 40); | 65 | BUILD_BUG_ON(offsetof(union irq_stack_union, stack_canary) != 40); |
23 | 66 | #endif | |
24 | /* | 67 | /* |
25 | * We both use the random pool and the current TSC as a source | 68 | * We both use the random pool and the current TSC as a source |
26 | * of randomness. The TSC only matters for very early init, | 69 | * of randomness. The TSC only matters for very early init, |
@@ -32,7 +75,50 @@ static __always_inline void boot_init_stack_canary(void) | |||
32 | canary += tsc + (tsc << 32UL); | 75 | canary += tsc + (tsc << 32UL); |
33 | 76 | ||
34 | current->stack_canary = canary; | 77 | current->stack_canary = canary; |
78 | #ifdef CONFIG_X86_64 | ||
35 | percpu_write(irq_stack_union.stack_canary, canary); | 79 | percpu_write(irq_stack_union.stack_canary, canary); |
80 | #else | ||
81 | percpu_write(stack_canary, canary); | ||
82 | #endif | ||
36 | } | 83 | } |
37 | 84 | ||
85 | static inline void setup_stack_canary_segment(int cpu) | ||
86 | { | ||
87 | #ifdef CONFIG_X86_32 | ||
88 | unsigned long canary = (unsigned long)&per_cpu(stack_canary, cpu) - 20; | ||
89 | struct desc_struct *gdt_table = get_cpu_gdt_table(cpu); | ||
90 | struct desc_struct desc; | ||
91 | |||
92 | desc = gdt_table[GDT_ENTRY_STACK_CANARY]; | ||
93 | desc.base0 = canary & 0xffff; | ||
94 | desc.base1 = (canary >> 16) & 0xff; | ||
95 | desc.base2 = (canary >> 24) & 0xff; | ||
96 | write_gdt_entry(gdt_table, GDT_ENTRY_STACK_CANARY, &desc, DESCTYPE_S); | ||
97 | #endif | ||
98 | } | ||
99 | |||
100 | static inline void load_stack_canary_segment(void) | ||
101 | { | ||
102 | #ifdef CONFIG_X86_32 | ||
103 | asm("mov %0, %%gs" : : "r" (__KERNEL_STACK_CANARY) : "memory"); | ||
104 | #endif | ||
105 | } | ||
106 | |||
107 | #else /* CC_STACKPROTECTOR */ | ||
108 | |||
109 | #define GDT_STACK_CANARY_INIT | ||
110 | |||
111 | /* dummy boot_init_stack_canary() is defined in linux/stackprotector.h */ | ||
112 | |||
113 | static inline void setup_stack_canary_segment(int cpu) | ||
114 | { } | ||
115 | |||
116 | static inline void load_stack_canary_segment(void) | ||
117 | { | ||
118 | #ifdef CONFIG_X86_32 | ||
119 | asm volatile ("mov %0, %%gs" : : "r" (0)); | ||
38 | #endif | 120 | #endif |
121 | } | ||
122 | |||
123 | #endif /* CC_STACKPROTECTOR */ | ||
124 | #endif /* _ASM_STACKPROTECTOR_H */ | ||
diff --git a/arch/x86/include/asm/summit/apic.h b/arch/x86/include/asm/summit/apic.h deleted file mode 100644 index 93d2c8667cfe..000000000000 --- a/arch/x86/include/asm/summit/apic.h +++ /dev/null | |||
@@ -1,202 +0,0 @@ | |||
1 | #ifndef __ASM_SUMMIT_APIC_H | ||
2 | #define __ASM_SUMMIT_APIC_H | ||
3 | |||
4 | #include <asm/smp.h> | ||
5 | #include <linux/gfp.h> | ||
6 | |||
7 | #define esr_disable (1) | ||
8 | #define NO_BALANCE_IRQ (0) | ||
9 | |||
10 | /* In clustered mode, the high nibble of APIC ID is a cluster number. | ||
11 | * The low nibble is a 4-bit bitmap. */ | ||
12 | #define XAPIC_DEST_CPUS_SHIFT 4 | ||
13 | #define XAPIC_DEST_CPUS_MASK ((1u << XAPIC_DEST_CPUS_SHIFT) - 1) | ||
14 | #define XAPIC_DEST_CLUSTER_MASK (XAPIC_DEST_CPUS_MASK << XAPIC_DEST_CPUS_SHIFT) | ||
15 | |||
16 | #define APIC_DFR_VALUE (APIC_DFR_CLUSTER) | ||
17 | |||
18 | static inline const cpumask_t *target_cpus(void) | ||
19 | { | ||
20 | /* CPU_MASK_ALL (0xff) has undefined behaviour with | ||
21 | * dest_LowestPrio mode logical clustered apic interrupt routing | ||
22 | * Just start on cpu 0. IRQ balancing will spread load | ||
23 | */ | ||
24 | return &cpumask_of_cpu(0); | ||
25 | } | ||
26 | |||
27 | #define INT_DELIVERY_MODE (dest_LowestPrio) | ||
28 | #define INT_DEST_MODE 1 /* logical delivery broadcast to all procs */ | ||
29 | |||
30 | static inline unsigned long check_apicid_used(physid_mask_t bitmap, int apicid) | ||
31 | { | ||
32 | return 0; | ||
33 | } | ||
34 | |||
35 | /* we don't use the phys_cpu_present_map to indicate apicid presence */ | ||
36 | static inline unsigned long check_apicid_present(int bit) | ||
37 | { | ||
38 | return 1; | ||
39 | } | ||
40 | |||
41 | #define apicid_cluster(apicid) ((apicid) & XAPIC_DEST_CLUSTER_MASK) | ||
42 | |||
43 | extern u8 cpu_2_logical_apicid[]; | ||
44 | |||
45 | static inline void init_apic_ldr(void) | ||
46 | { | ||
47 | unsigned long val, id; | ||
48 | int count = 0; | ||
49 | u8 my_id = (u8)hard_smp_processor_id(); | ||
50 | u8 my_cluster = (u8)apicid_cluster(my_id); | ||
51 | #ifdef CONFIG_SMP | ||
52 | u8 lid; | ||
53 | int i; | ||
54 | |||
55 | /* Create logical APIC IDs by counting CPUs already in cluster. */ | ||
56 | for (count = 0, i = nr_cpu_ids; --i >= 0; ) { | ||
57 | lid = cpu_2_logical_apicid[i]; | ||
58 | if (lid != BAD_APICID && apicid_cluster(lid) == my_cluster) | ||
59 | ++count; | ||
60 | } | ||
61 | #endif | ||
62 | /* We only have a 4 wide bitmap in cluster mode. If a deranged | ||
63 | * BIOS puts 5 CPUs in one APIC cluster, we're hosed. */ | ||
64 | BUG_ON(count >= XAPIC_DEST_CPUS_SHIFT); | ||
65 | id = my_cluster | (1UL << count); | ||
66 | apic_write(APIC_DFR, APIC_DFR_VALUE); | ||
67 | val = apic_read(APIC_LDR) & ~APIC_LDR_MASK; | ||
68 | val |= SET_APIC_LOGICAL_ID(id); | ||
69 | apic_write(APIC_LDR, val); | ||
70 | } | ||
71 | |||
72 | static inline int multi_timer_check(int apic, int irq) | ||
73 | { | ||
74 | return 0; | ||
75 | } | ||
76 | |||
77 | static inline int apic_id_registered(void) | ||
78 | { | ||
79 | return 1; | ||
80 | } | ||
81 | |||
82 | static inline void setup_apic_routing(void) | ||
83 | { | ||
84 | printk("Enabling APIC mode: Summit. Using %d I/O APICs\n", | ||
85 | nr_ioapics); | ||
86 | } | ||
87 | |||
88 | static inline int apicid_to_node(int logical_apicid) | ||
89 | { | ||
90 | #ifdef CONFIG_SMP | ||
91 | return apicid_2_node[hard_smp_processor_id()]; | ||
92 | #else | ||
93 | return 0; | ||
94 | #endif | ||
95 | } | ||
96 | |||
97 | /* Mapping from cpu number to logical apicid */ | ||
98 | static inline int cpu_to_logical_apicid(int cpu) | ||
99 | { | ||
100 | #ifdef CONFIG_SMP | ||
101 | if (cpu >= nr_cpu_ids) | ||
102 | return BAD_APICID; | ||
103 | return (int)cpu_2_logical_apicid[cpu]; | ||
104 | #else | ||
105 | return logical_smp_processor_id(); | ||
106 | #endif | ||
107 | } | ||
108 | |||
109 | static inline int cpu_present_to_apicid(int mps_cpu) | ||
110 | { | ||
111 | if (mps_cpu < nr_cpu_ids) | ||
112 | return (int)per_cpu(x86_bios_cpu_apicid, mps_cpu); | ||
113 | else | ||
114 | return BAD_APICID; | ||
115 | } | ||
116 | |||
117 | static inline physid_mask_t ioapic_phys_id_map(physid_mask_t phys_id_map) | ||
118 | { | ||
119 | /* For clustered we don't have a good way to do this yet - hack */ | ||
120 | return physids_promote(0x0F); | ||
121 | } | ||
122 | |||
123 | static inline physid_mask_t apicid_to_cpu_present(int apicid) | ||
124 | { | ||
125 | return physid_mask_of_physid(0); | ||
126 | } | ||
127 | |||
128 | static inline void setup_portio_remap(void) | ||
129 | { | ||
130 | } | ||
131 | |||
132 | static inline int check_phys_apicid_present(int boot_cpu_physical_apicid) | ||
133 | { | ||
134 | return 1; | ||
135 | } | ||
136 | |||
137 | static inline void enable_apic_mode(void) | ||
138 | { | ||
139 | } | ||
140 | |||
141 | static inline unsigned int cpu_mask_to_apicid(const cpumask_t *cpumask) | ||
142 | { | ||
143 | int num_bits_set; | ||
144 | int cpus_found = 0; | ||
145 | int cpu; | ||
146 | int apicid; | ||
147 | |||
148 | num_bits_set = cpus_weight(*cpumask); | ||
149 | /* Return id to all */ | ||
150 | if (num_bits_set >= nr_cpu_ids) | ||
151 | return (int) 0xFF; | ||
152 | /* | ||
153 | * The cpus in the mask must all be on the apic cluster. If are not | ||
154 | * on the same apicid cluster return default value of TARGET_CPUS. | ||
155 | */ | ||
156 | cpu = first_cpu(*cpumask); | ||
157 | apicid = cpu_to_logical_apicid(cpu); | ||
158 | while (cpus_found < num_bits_set) { | ||
159 | if (cpu_isset(cpu, *cpumask)) { | ||
160 | int new_apicid = cpu_to_logical_apicid(cpu); | ||
161 | if (apicid_cluster(apicid) != | ||
162 | apicid_cluster(new_apicid)){ | ||
163 | printk ("%s: Not a valid mask!\n", __func__); | ||
164 | return 0xFF; | ||
165 | } | ||
166 | apicid = apicid | new_apicid; | ||
167 | cpus_found++; | ||
168 | } | ||
169 | cpu++; | ||
170 | } | ||
171 | return apicid; | ||
172 | } | ||
173 | |||
174 | static inline unsigned int cpu_mask_to_apicid_and(const struct cpumask *inmask, | ||
175 | const struct cpumask *andmask) | ||
176 | { | ||
177 | int apicid = cpu_to_logical_apicid(0); | ||
178 | cpumask_var_t cpumask; | ||
179 | |||
180 | if (!alloc_cpumask_var(&cpumask, GFP_ATOMIC)) | ||
181 | return apicid; | ||
182 | |||
183 | cpumask_and(cpumask, inmask, andmask); | ||
184 | cpumask_and(cpumask, cpumask, cpu_online_mask); | ||
185 | apicid = cpu_mask_to_apicid(cpumask); | ||
186 | |||
187 | free_cpumask_var(cpumask); | ||
188 | return apicid; | ||
189 | } | ||
190 | |||
191 | /* cpuid returns the value latched in the HW at reset, not the APIC ID | ||
192 | * register's value. For any box whose BIOS changes APIC IDs, like | ||
193 | * clustered APIC systems, we must use hard_smp_processor_id. | ||
194 | * | ||
195 | * See Intel's IA-32 SW Dev's Manual Vol2 under CPUID. | ||
196 | */ | ||
197 | static inline u32 phys_pkg_id(u32 cpuid_apic, int index_msb) | ||
198 | { | ||
199 | return hard_smp_processor_id() >> index_msb; | ||
200 | } | ||
201 | |||
202 | #endif /* __ASM_SUMMIT_APIC_H */ | ||
diff --git a/arch/x86/include/asm/summit/apicdef.h b/arch/x86/include/asm/summit/apicdef.h deleted file mode 100644 index f3fbca1f61c1..000000000000 --- a/arch/x86/include/asm/summit/apicdef.h +++ /dev/null | |||
@@ -1,13 +0,0 @@ | |||
1 | #ifndef __ASM_SUMMIT_APICDEF_H | ||
2 | #define __ASM_SUMMIT_APICDEF_H | ||
3 | |||
4 | #define APIC_ID_MASK (0xFF<<24) | ||
5 | |||
6 | static inline unsigned get_apic_id(unsigned long x) | ||
7 | { | ||
8 | return (x>>24)&0xFF; | ||
9 | } | ||
10 | |||
11 | #define GET_APIC_ID(x) get_apic_id(x) | ||
12 | |||
13 | #endif | ||
diff --git a/arch/x86/include/asm/summit/ipi.h b/arch/x86/include/asm/summit/ipi.h deleted file mode 100644 index a8a2c24f50cc..000000000000 --- a/arch/x86/include/asm/summit/ipi.h +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | #ifndef __ASM_SUMMIT_IPI_H | ||
2 | #define __ASM_SUMMIT_IPI_H | ||
3 | |||
4 | void send_IPI_mask_sequence(const cpumask_t *mask, int vector); | ||
5 | void send_IPI_mask_allbutself(const cpumask_t *mask, int vector); | ||
6 | |||
7 | static inline void send_IPI_mask(const cpumask_t *mask, int vector) | ||
8 | { | ||
9 | send_IPI_mask_sequence(mask, vector); | ||
10 | } | ||
11 | |||
12 | static inline void send_IPI_allbutself(int vector) | ||
13 | { | ||
14 | cpumask_t mask = cpu_online_map; | ||
15 | cpu_clear(smp_processor_id(), mask); | ||
16 | |||
17 | if (!cpus_empty(mask)) | ||
18 | send_IPI_mask(&mask, vector); | ||
19 | } | ||
20 | |||
21 | static inline void send_IPI_all(int vector) | ||
22 | { | ||
23 | send_IPI_mask(&cpu_online_map, vector); | ||
24 | } | ||
25 | |||
26 | #endif /* __ASM_SUMMIT_IPI_H */ | ||
diff --git a/arch/x86/include/asm/summit/mpparse.h b/arch/x86/include/asm/summit/mpparse.h deleted file mode 100644 index 380e86c02363..000000000000 --- a/arch/x86/include/asm/summit/mpparse.h +++ /dev/null | |||
@@ -1,109 +0,0 @@ | |||
1 | #ifndef __ASM_SUMMIT_MPPARSE_H | ||
2 | #define __ASM_SUMMIT_MPPARSE_H | ||
3 | |||
4 | #include <asm/tsc.h> | ||
5 | |||
6 | extern int use_cyclone; | ||
7 | |||
8 | #ifdef CONFIG_X86_SUMMIT_NUMA | ||
9 | extern void setup_summit(void); | ||
10 | #else | ||
11 | #define setup_summit() {} | ||
12 | #endif | ||
13 | |||
14 | static inline int mps_oem_check(struct mpc_table *mpc, char *oem, | ||
15 | char *productid) | ||
16 | { | ||
17 | if (!strncmp(oem, "IBM ENSW", 8) && | ||
18 | (!strncmp(productid, "VIGIL SMP", 9) | ||
19 | || !strncmp(productid, "EXA", 3) | ||
20 | || !strncmp(productid, "RUTHLESS SMP", 12))){ | ||
21 | mark_tsc_unstable("Summit based system"); | ||
22 | use_cyclone = 1; /*enable cyclone-timer*/ | ||
23 | setup_summit(); | ||
24 | return 1; | ||
25 | } | ||
26 | return 0; | ||
27 | } | ||
28 | |||
29 | /* Hook from generic ACPI tables.c */ | ||
30 | static inline int acpi_madt_oem_check(char *oem_id, char *oem_table_id) | ||
31 | { | ||
32 | if (!strncmp(oem_id, "IBM", 3) && | ||
33 | (!strncmp(oem_table_id, "SERVIGIL", 8) | ||
34 | || !strncmp(oem_table_id, "EXA", 3))){ | ||
35 | mark_tsc_unstable("Summit based system"); | ||
36 | use_cyclone = 1; /*enable cyclone-timer*/ | ||
37 | setup_summit(); | ||
38 | return 1; | ||
39 | } | ||
40 | return 0; | ||
41 | } | ||
42 | |||
43 | struct rio_table_hdr { | ||
44 | unsigned char version; /* Version number of this data structure */ | ||
45 | /* Version 3 adds chassis_num & WP_index */ | ||
46 | unsigned char num_scal_dev; /* # of Scalability devices (Twisters for Vigil) */ | ||
47 | unsigned char num_rio_dev; /* # of RIO I/O devices (Cyclones and Winnipegs) */ | ||
48 | } __attribute__((packed)); | ||
49 | |||
50 | struct scal_detail { | ||
51 | unsigned char node_id; /* Scalability Node ID */ | ||
52 | unsigned long CBAR; /* Address of 1MB register space */ | ||
53 | unsigned char port0node; /* Node ID port connected to: 0xFF=None */ | ||
54 | unsigned char port0port; /* Port num port connected to: 0,1,2, or 0xFF=None */ | ||
55 | unsigned char port1node; /* Node ID port connected to: 0xFF = None */ | ||
56 | unsigned char port1port; /* Port num port connected to: 0,1,2, or 0xFF=None */ | ||
57 | unsigned char port2node; /* Node ID port connected to: 0xFF = None */ | ||
58 | unsigned char port2port; /* Port num port connected to: 0,1,2, or 0xFF=None */ | ||
59 | unsigned char chassis_num; /* 1 based Chassis number (1 = boot node) */ | ||
60 | } __attribute__((packed)); | ||
61 | |||
62 | struct rio_detail { | ||
63 | unsigned char node_id; /* RIO Node ID */ | ||
64 | unsigned long BBAR; /* Address of 1MB register space */ | ||
65 | unsigned char type; /* Type of device */ | ||
66 | unsigned char owner_id; /* For WPEG: Node ID of Cyclone that owns this WPEG*/ | ||
67 | /* For CYC: Node ID of Twister that owns this CYC */ | ||
68 | unsigned char port0node; /* Node ID port connected to: 0xFF=None */ | ||
69 | unsigned char port0port; /* Port num port connected to: 0,1,2, or 0xFF=None */ | ||
70 | unsigned char port1node; /* Node ID port connected to: 0xFF=None */ | ||
71 | unsigned char port1port; /* Port num port connected to: 0,1,2, or 0xFF=None */ | ||
72 | unsigned char first_slot; /* For WPEG: Lowest slot number below this WPEG */ | ||
73 | /* For CYC: 0 */ | ||
74 | unsigned char status; /* For WPEG: Bit 0 = 1 : the XAPIC is used */ | ||
75 | /* = 0 : the XAPIC is not used, ie:*/ | ||
76 | /* ints fwded to another XAPIC */ | ||
77 | /* Bits1:7 Reserved */ | ||
78 | /* For CYC: Bits0:7 Reserved */ | ||
79 | unsigned char WP_index; /* For WPEG: WPEG instance index - lower ones have */ | ||
80 | /* lower slot numbers/PCI bus numbers */ | ||
81 | /* For CYC: No meaning */ | ||
82 | unsigned char chassis_num; /* 1 based Chassis number */ | ||
83 | /* For LookOut WPEGs this field indicates the */ | ||
84 | /* Expansion Chassis #, enumerated from Boot */ | ||
85 | /* Node WPEG external port, then Boot Node CYC */ | ||
86 | /* external port, then Next Vigil chassis WPEG */ | ||
87 | /* external port, etc. */ | ||
88 | /* Shared Lookouts have only 1 chassis number (the */ | ||
89 | /* first one assigned) */ | ||
90 | } __attribute__((packed)); | ||
91 | |||
92 | |||
93 | typedef enum { | ||
94 | CompatTwister = 0, /* Compatibility Twister */ | ||
95 | AltTwister = 1, /* Alternate Twister of internal 8-way */ | ||
96 | CompatCyclone = 2, /* Compatibility Cyclone */ | ||
97 | AltCyclone = 3, /* Alternate Cyclone of internal 8-way */ | ||
98 | CompatWPEG = 4, /* Compatibility WPEG */ | ||
99 | AltWPEG = 5, /* Second Planar WPEG */ | ||
100 | LookOutAWPEG = 6, /* LookOut WPEG */ | ||
101 | LookOutBWPEG = 7, /* LookOut WPEG */ | ||
102 | } node_type; | ||
103 | |||
104 | static inline int is_WPEG(struct rio_detail *rio){ | ||
105 | return (rio->type == CompatWPEG || rio->type == AltWPEG || | ||
106 | rio->type == LookOutAWPEG || rio->type == LookOutBWPEG); | ||
107 | } | ||
108 | |||
109 | #endif /* __ASM_SUMMIT_MPPARSE_H */ | ||
diff --git a/arch/x86/include/asm/syscalls.h b/arch/x86/include/asm/syscalls.h index c0b0bda754ee..68b1be10cfad 100644 --- a/arch/x86/include/asm/syscalls.h +++ b/arch/x86/include/asm/syscalls.h | |||
@@ -29,21 +29,21 @@ asmlinkage int sys_get_thread_area(struct user_desc __user *); | |||
29 | /* X86_32 only */ | 29 | /* X86_32 only */ |
30 | #ifdef CONFIG_X86_32 | 30 | #ifdef CONFIG_X86_32 |
31 | /* kernel/process_32.c */ | 31 | /* kernel/process_32.c */ |
32 | asmlinkage int sys_fork(struct pt_regs); | 32 | int sys_fork(struct pt_regs *); |
33 | asmlinkage int sys_clone(struct pt_regs); | 33 | int sys_clone(struct pt_regs *); |
34 | asmlinkage int sys_vfork(struct pt_regs); | 34 | int sys_vfork(struct pt_regs *); |
35 | asmlinkage int sys_execve(struct pt_regs); | 35 | int sys_execve(struct pt_regs *); |
36 | 36 | ||
37 | /* kernel/signal_32.c */ | 37 | /* kernel/signal_32.c */ |
38 | asmlinkage int sys_sigsuspend(int, int, old_sigset_t); | 38 | asmlinkage int sys_sigsuspend(int, int, old_sigset_t); |
39 | asmlinkage int sys_sigaction(int, const struct old_sigaction __user *, | 39 | asmlinkage int sys_sigaction(int, const struct old_sigaction __user *, |
40 | struct old_sigaction __user *); | 40 | struct old_sigaction __user *); |
41 | asmlinkage int sys_sigaltstack(unsigned long); | 41 | int sys_sigaltstack(struct pt_regs *); |
42 | asmlinkage unsigned long sys_sigreturn(unsigned long); | 42 | unsigned long sys_sigreturn(struct pt_regs *); |
43 | asmlinkage int sys_rt_sigreturn(unsigned long); | 43 | long sys_rt_sigreturn(struct pt_regs *); |
44 | 44 | ||
45 | /* kernel/ioport.c */ | 45 | /* kernel/ioport.c */ |
46 | asmlinkage long sys_iopl(unsigned long); | 46 | long sys_iopl(struct pt_regs *); |
47 | 47 | ||
48 | /* kernel/sys_i386_32.c */ | 48 | /* kernel/sys_i386_32.c */ |
49 | asmlinkage long sys_mmap2(unsigned long, unsigned long, unsigned long, | 49 | asmlinkage long sys_mmap2(unsigned long, unsigned long, unsigned long, |
@@ -59,8 +59,8 @@ struct oldold_utsname; | |||
59 | asmlinkage int sys_olduname(struct oldold_utsname __user *); | 59 | asmlinkage int sys_olduname(struct oldold_utsname __user *); |
60 | 60 | ||
61 | /* kernel/vm86_32.c */ | 61 | /* kernel/vm86_32.c */ |
62 | asmlinkage int sys_vm86old(struct pt_regs); | 62 | int sys_vm86old(struct pt_regs *); |
63 | asmlinkage int sys_vm86(struct pt_regs); | 63 | int sys_vm86(struct pt_regs *); |
64 | 64 | ||
65 | #else /* CONFIG_X86_32 */ | 65 | #else /* CONFIG_X86_32 */ |
66 | 66 | ||
diff --git a/arch/x86/include/asm/system.h b/arch/x86/include/asm/system.h index 2fcc70bc85f3..c00bfdbdd456 100644 --- a/arch/x86/include/asm/system.h +++ b/arch/x86/include/asm/system.h | |||
@@ -23,6 +23,20 @@ struct task_struct *__switch_to(struct task_struct *prev, | |||
23 | 23 | ||
24 | #ifdef CONFIG_X86_32 | 24 | #ifdef CONFIG_X86_32 |
25 | 25 | ||
26 | #ifdef CONFIG_CC_STACKPROTECTOR | ||
27 | #define __switch_canary \ | ||
28 | "movl %P[task_canary](%[next]), %%ebx\n\t" \ | ||
29 | "movl %%ebx, "__percpu_arg([stack_canary])"\n\t" | ||
30 | #define __switch_canary_oparam \ | ||
31 | , [stack_canary] "=m" (per_cpu_var(stack_canary)) | ||
32 | #define __switch_canary_iparam \ | ||
33 | , [task_canary] "i" (offsetof(struct task_struct, stack_canary)) | ||
34 | #else /* CC_STACKPROTECTOR */ | ||
35 | #define __switch_canary | ||
36 | #define __switch_canary_oparam | ||
37 | #define __switch_canary_iparam | ||
38 | #endif /* CC_STACKPROTECTOR */ | ||
39 | |||
26 | /* | 40 | /* |
27 | * Saving eflags is important. It switches not only IOPL between tasks, | 41 | * Saving eflags is important. It switches not only IOPL between tasks, |
28 | * it also protects other tasks from NT leaking through sysenter etc. | 42 | * it also protects other tasks from NT leaking through sysenter etc. |
@@ -44,6 +58,7 @@ do { \ | |||
44 | "movl %[next_sp],%%esp\n\t" /* restore ESP */ \ | 58 | "movl %[next_sp],%%esp\n\t" /* restore ESP */ \ |
45 | "movl $1f,%[prev_ip]\n\t" /* save EIP */ \ | 59 | "movl $1f,%[prev_ip]\n\t" /* save EIP */ \ |
46 | "pushl %[next_ip]\n\t" /* restore EIP */ \ | 60 | "pushl %[next_ip]\n\t" /* restore EIP */ \ |
61 | __switch_canary \ | ||
47 | "jmp __switch_to\n" /* regparm call */ \ | 62 | "jmp __switch_to\n" /* regparm call */ \ |
48 | "1:\t" \ | 63 | "1:\t" \ |
49 | "popl %%ebp\n\t" /* restore EBP */ \ | 64 | "popl %%ebp\n\t" /* restore EBP */ \ |
@@ -58,6 +73,8 @@ do { \ | |||
58 | "=b" (ebx), "=c" (ecx), "=d" (edx), \ | 73 | "=b" (ebx), "=c" (ecx), "=d" (edx), \ |
59 | "=S" (esi), "=D" (edi) \ | 74 | "=S" (esi), "=D" (edi) \ |
60 | \ | 75 | \ |
76 | __switch_canary_oparam \ | ||
77 | \ | ||
61 | /* input parameters: */ \ | 78 | /* input parameters: */ \ |
62 | : [next_sp] "m" (next->thread.sp), \ | 79 | : [next_sp] "m" (next->thread.sp), \ |
63 | [next_ip] "m" (next->thread.ip), \ | 80 | [next_ip] "m" (next->thread.ip), \ |
@@ -66,6 +83,8 @@ do { \ | |||
66 | [prev] "a" (prev), \ | 83 | [prev] "a" (prev), \ |
67 | [next] "d" (next) \ | 84 | [next] "d" (next) \ |
68 | \ | 85 | \ |
86 | __switch_canary_iparam \ | ||
87 | \ | ||
69 | : /* reloaded segment registers */ \ | 88 | : /* reloaded segment registers */ \ |
70 | "memory"); \ | 89 | "memory"); \ |
71 | } while (0) | 90 | } while (0) |
@@ -111,16 +130,16 @@ do { \ | |||
111 | "movq "__percpu_arg([current_task])",%%rsi\n\t" \ | 130 | "movq "__percpu_arg([current_task])",%%rsi\n\t" \ |
112 | __switch_canary \ | 131 | __switch_canary \ |
113 | "movq %P[thread_info](%%rsi),%%r8\n\t" \ | 132 | "movq %P[thread_info](%%rsi),%%r8\n\t" \ |
114 | LOCK_PREFIX "btr %[tif_fork],%P[ti_flags](%%r8)\n\t" \ | ||
115 | "movq %%rax,%%rdi\n\t" \ | 133 | "movq %%rax,%%rdi\n\t" \ |
116 | "jc ret_from_fork\n\t" \ | 134 | "testl %[_tif_fork],%P[ti_flags](%%r8)\n\t" \ |
135 | "jnz ret_from_fork\n\t" \ | ||
117 | RESTORE_CONTEXT \ | 136 | RESTORE_CONTEXT \ |
118 | : "=a" (last) \ | 137 | : "=a" (last) \ |
119 | __switch_canary_oparam \ | 138 | __switch_canary_oparam \ |
120 | : [next] "S" (next), [prev] "D" (prev), \ | 139 | : [next] "S" (next), [prev] "D" (prev), \ |
121 | [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \ | 140 | [threadrsp] "i" (offsetof(struct task_struct, thread.sp)), \ |
122 | [ti_flags] "i" (offsetof(struct thread_info, flags)), \ | 141 | [ti_flags] "i" (offsetof(struct thread_info, flags)), \ |
123 | [tif_fork] "i" (TIF_FORK), \ | 142 | [_tif_fork] "i" (_TIF_FORK), \ |
124 | [thread_info] "i" (offsetof(struct task_struct, stack)), \ | 143 | [thread_info] "i" (offsetof(struct task_struct, stack)), \ |
125 | [current_task] "m" (per_cpu_var(current_task)) \ | 144 | [current_task] "m" (per_cpu_var(current_task)) \ |
126 | __switch_canary_iparam \ | 145 | __switch_canary_iparam \ |
@@ -182,6 +201,25 @@ extern void native_load_gs_index(unsigned); | |||
182 | #define savesegment(seg, value) \ | 201 | #define savesegment(seg, value) \ |
183 | asm("mov %%" #seg ",%0":"=r" (value) : : "memory") | 202 | asm("mov %%" #seg ",%0":"=r" (value) : : "memory") |
184 | 203 | ||
204 | /* | ||
205 | * x86_32 user gs accessors. | ||
206 | */ | ||
207 | #ifdef CONFIG_X86_32 | ||
208 | #ifdef CONFIG_X86_32_LAZY_GS | ||
209 | #define get_user_gs(regs) (u16)({unsigned long v; savesegment(gs, v); v;}) | ||
210 | #define set_user_gs(regs, v) loadsegment(gs, (unsigned long)(v)) | ||
211 | #define task_user_gs(tsk) ((tsk)->thread.gs) | ||
212 | #define lazy_save_gs(v) savesegment(gs, (v)) | ||
213 | #define lazy_load_gs(v) loadsegment(gs, (v)) | ||
214 | #else /* X86_32_LAZY_GS */ | ||
215 | #define get_user_gs(regs) (u16)((regs)->gs) | ||
216 | #define set_user_gs(regs, v) do { (regs)->gs = (v); } while (0) | ||
217 | #define task_user_gs(tsk) (task_pt_regs(tsk)->gs) | ||
218 | #define lazy_save_gs(v) do { } while (0) | ||
219 | #define lazy_load_gs(v) do { } while (0) | ||
220 | #endif /* X86_32_LAZY_GS */ | ||
221 | #endif /* X86_32 */ | ||
222 | |||
185 | static inline unsigned long get_limit(unsigned long segment) | 223 | static inline unsigned long get_limit(unsigned long segment) |
186 | { | 224 | { |
187 | unsigned long __limit; | 225 | unsigned long __limit; |
diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h index f38488989db7..ca7310e02446 100644 --- a/arch/x86/include/asm/thread_info.h +++ b/arch/x86/include/asm/thread_info.h | |||
@@ -40,6 +40,7 @@ struct thread_info { | |||
40 | */ | 40 | */ |
41 | __u8 supervisor_stack[0]; | 41 | __u8 supervisor_stack[0]; |
42 | #endif | 42 | #endif |
43 | int uaccess_err; | ||
43 | }; | 44 | }; |
44 | 45 | ||
45 | #define INIT_THREAD_INFO(tsk) \ | 46 | #define INIT_THREAD_INFO(tsk) \ |
diff --git a/arch/x86/include/asm/topology.h b/arch/x86/include/asm/topology.h index 10022ed3a4b6..77cfb2cfb386 100644 --- a/arch/x86/include/asm/topology.h +++ b/arch/x86/include/asm/topology.h | |||
@@ -74,6 +74,8 @@ static inline const struct cpumask *cpumask_of_node(int node) | |||
74 | return &node_to_cpumask_map[node]; | 74 | return &node_to_cpumask_map[node]; |
75 | } | 75 | } |
76 | 76 | ||
77 | static inline void setup_node_to_cpumask_map(void) { } | ||
78 | |||
77 | #else /* CONFIG_X86_64 */ | 79 | #else /* CONFIG_X86_64 */ |
78 | 80 | ||
79 | /* Mappings between node number and cpus on that node. */ | 81 | /* Mappings between node number and cpus on that node. */ |
@@ -120,6 +122,8 @@ static inline cpumask_t node_to_cpumask(int node) | |||
120 | 122 | ||
121 | #endif /* !CONFIG_DEBUG_PER_CPU_MAPS */ | 123 | #endif /* !CONFIG_DEBUG_PER_CPU_MAPS */ |
122 | 124 | ||
125 | extern void setup_node_to_cpumask_map(void); | ||
126 | |||
123 | /* | 127 | /* |
124 | * Replace default node_to_cpumask_ptr with optimized version | 128 | * Replace default node_to_cpumask_ptr with optimized version |
125 | * Deprecated: use "const struct cpumask *mask = cpumask_of_node(node)" | 129 | * Deprecated: use "const struct cpumask *mask = cpumask_of_node(node)" |
@@ -218,6 +222,8 @@ static inline int node_to_first_cpu(int node) | |||
218 | return first_cpu(cpu_online_map); | 222 | return first_cpu(cpu_online_map); |
219 | } | 223 | } |
220 | 224 | ||
225 | static inline void setup_node_to_cpumask_map(void) { } | ||
226 | |||
221 | /* | 227 | /* |
222 | * Replace default node_to_cpumask_ptr with optimized version | 228 | * Replace default node_to_cpumask_ptr with optimized version |
223 | * Deprecated: use "const struct cpumask *mask = cpumask_of_node(node)" | 229 | * Deprecated: use "const struct cpumask *mask = cpumask_of_node(node)" |
diff --git a/arch/x86/include/asm/traps.h b/arch/x86/include/asm/traps.h index cf3bb053da0b..0d5342515b86 100644 --- a/arch/x86/include/asm/traps.h +++ b/arch/x86/include/asm/traps.h | |||
@@ -41,7 +41,7 @@ dotraplinkage void do_int3(struct pt_regs *, long); | |||
41 | dotraplinkage void do_overflow(struct pt_regs *, long); | 41 | dotraplinkage void do_overflow(struct pt_regs *, long); |
42 | dotraplinkage void do_bounds(struct pt_regs *, long); | 42 | dotraplinkage void do_bounds(struct pt_regs *, long); |
43 | dotraplinkage void do_invalid_op(struct pt_regs *, long); | 43 | dotraplinkage void do_invalid_op(struct pt_regs *, long); |
44 | dotraplinkage void do_device_not_available(struct pt_regs); | 44 | dotraplinkage void do_device_not_available(struct pt_regs *, long); |
45 | dotraplinkage void do_coprocessor_segment_overrun(struct pt_regs *, long); | 45 | dotraplinkage void do_coprocessor_segment_overrun(struct pt_regs *, long); |
46 | dotraplinkage void do_invalid_TSS(struct pt_regs *, long); | 46 | dotraplinkage void do_invalid_TSS(struct pt_regs *, long); |
47 | dotraplinkage void do_segment_not_present(struct pt_regs *, long); | 47 | dotraplinkage void do_segment_not_present(struct pt_regs *, long); |
diff --git a/arch/x86/include/asm/uaccess.h b/arch/x86/include/asm/uaccess.h index 4340055b7559..b685ece89d5c 100644 --- a/arch/x86/include/asm/uaccess.h +++ b/arch/x86/include/asm/uaccess.h | |||
@@ -121,7 +121,7 @@ extern int __get_user_bad(void); | |||
121 | 121 | ||
122 | #define __get_user_x(size, ret, x, ptr) \ | 122 | #define __get_user_x(size, ret, x, ptr) \ |
123 | asm volatile("call __get_user_" #size \ | 123 | asm volatile("call __get_user_" #size \ |
124 | : "=a" (ret),"=d" (x) \ | 124 | : "=a" (ret), "=d" (x) \ |
125 | : "0" (ptr)) \ | 125 | : "0" (ptr)) \ |
126 | 126 | ||
127 | /* Careful: we have to cast the result to the type of the pointer | 127 | /* Careful: we have to cast the result to the type of the pointer |
@@ -181,12 +181,12 @@ extern int __get_user_bad(void); | |||
181 | 181 | ||
182 | #define __put_user_x(size, x, ptr, __ret_pu) \ | 182 | #define __put_user_x(size, x, ptr, __ret_pu) \ |
183 | asm volatile("call __put_user_" #size : "=a" (__ret_pu) \ | 183 | asm volatile("call __put_user_" #size : "=a" (__ret_pu) \ |
184 | :"0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx") | 184 | : "0" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx") |
185 | 185 | ||
186 | 186 | ||
187 | 187 | ||
188 | #ifdef CONFIG_X86_32 | 188 | #ifdef CONFIG_X86_32 |
189 | #define __put_user_u64(x, addr, err) \ | 189 | #define __put_user_asm_u64(x, addr, err, errret) \ |
190 | asm volatile("1: movl %%eax,0(%2)\n" \ | 190 | asm volatile("1: movl %%eax,0(%2)\n" \ |
191 | "2: movl %%edx,4(%2)\n" \ | 191 | "2: movl %%edx,4(%2)\n" \ |
192 | "3:\n" \ | 192 | "3:\n" \ |
@@ -197,14 +197,24 @@ extern int __get_user_bad(void); | |||
197 | _ASM_EXTABLE(1b, 4b) \ | 197 | _ASM_EXTABLE(1b, 4b) \ |
198 | _ASM_EXTABLE(2b, 4b) \ | 198 | _ASM_EXTABLE(2b, 4b) \ |
199 | : "=r" (err) \ | 199 | : "=r" (err) \ |
200 | : "A" (x), "r" (addr), "i" (-EFAULT), "0" (err)) | 200 | : "A" (x), "r" (addr), "i" (errret), "0" (err)) |
201 | |||
202 | #define __put_user_asm_ex_u64(x, addr) \ | ||
203 | asm volatile("1: movl %%eax,0(%1)\n" \ | ||
204 | "2: movl %%edx,4(%1)\n" \ | ||
205 | "3:\n" \ | ||
206 | _ASM_EXTABLE(1b, 2b - 1b) \ | ||
207 | _ASM_EXTABLE(2b, 3b - 2b) \ | ||
208 | : : "A" (x), "r" (addr)) | ||
201 | 209 | ||
202 | #define __put_user_x8(x, ptr, __ret_pu) \ | 210 | #define __put_user_x8(x, ptr, __ret_pu) \ |
203 | asm volatile("call __put_user_8" : "=a" (__ret_pu) \ | 211 | asm volatile("call __put_user_8" : "=a" (__ret_pu) \ |
204 | : "A" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx") | 212 | : "A" ((typeof(*(ptr)))(x)), "c" (ptr) : "ebx") |
205 | #else | 213 | #else |
206 | #define __put_user_u64(x, ptr, retval) \ | 214 | #define __put_user_asm_u64(x, ptr, retval, errret) \ |
207 | __put_user_asm(x, ptr, retval, "q", "", "Zr", -EFAULT) | 215 | __put_user_asm(x, ptr, retval, "q", "", "Zr", errret) |
216 | #define __put_user_asm_ex_u64(x, addr) \ | ||
217 | __put_user_asm_ex(x, addr, "q", "", "Zr") | ||
208 | #define __put_user_x8(x, ptr, __ret_pu) __put_user_x(8, x, ptr, __ret_pu) | 218 | #define __put_user_x8(x, ptr, __ret_pu) __put_user_x(8, x, ptr, __ret_pu) |
209 | #endif | 219 | #endif |
210 | 220 | ||
@@ -276,10 +286,32 @@ do { \ | |||
276 | __put_user_asm(x, ptr, retval, "w", "w", "ir", errret); \ | 286 | __put_user_asm(x, ptr, retval, "w", "w", "ir", errret); \ |
277 | break; \ | 287 | break; \ |
278 | case 4: \ | 288 | case 4: \ |
279 | __put_user_asm(x, ptr, retval, "l", "k", "ir", errret);\ | 289 | __put_user_asm(x, ptr, retval, "l", "k", "ir", errret); \ |
280 | break; \ | 290 | break; \ |
281 | case 8: \ | 291 | case 8: \ |
282 | __put_user_u64((__typeof__(*ptr))(x), ptr, retval); \ | 292 | __put_user_asm_u64((__typeof__(*ptr))(x), ptr, retval, \ |
293 | errret); \ | ||
294 | break; \ | ||
295 | default: \ | ||
296 | __put_user_bad(); \ | ||
297 | } \ | ||
298 | } while (0) | ||
299 | |||
300 | #define __put_user_size_ex(x, ptr, size) \ | ||
301 | do { \ | ||
302 | __chk_user_ptr(ptr); \ | ||
303 | switch (size) { \ | ||
304 | case 1: \ | ||
305 | __put_user_asm_ex(x, ptr, "b", "b", "iq"); \ | ||
306 | break; \ | ||
307 | case 2: \ | ||
308 | __put_user_asm_ex(x, ptr, "w", "w", "ir"); \ | ||
309 | break; \ | ||
310 | case 4: \ | ||
311 | __put_user_asm_ex(x, ptr, "l", "k", "ir"); \ | ||
312 | break; \ | ||
313 | case 8: \ | ||
314 | __put_user_asm_ex_u64((__typeof__(*ptr))(x), ptr); \ | ||
283 | break; \ | 315 | break; \ |
284 | default: \ | 316 | default: \ |
285 | __put_user_bad(); \ | 317 | __put_user_bad(); \ |
@@ -311,9 +343,12 @@ do { \ | |||
311 | 343 | ||
312 | #ifdef CONFIG_X86_32 | 344 | #ifdef CONFIG_X86_32 |
313 | #define __get_user_asm_u64(x, ptr, retval, errret) (x) = __get_user_bad() | 345 | #define __get_user_asm_u64(x, ptr, retval, errret) (x) = __get_user_bad() |
346 | #define __get_user_asm_ex_u64(x, ptr) (x) = __get_user_bad() | ||
314 | #else | 347 | #else |
315 | #define __get_user_asm_u64(x, ptr, retval, errret) \ | 348 | #define __get_user_asm_u64(x, ptr, retval, errret) \ |
316 | __get_user_asm(x, ptr, retval, "q", "", "=r", errret) | 349 | __get_user_asm(x, ptr, retval, "q", "", "=r", errret) |
350 | #define __get_user_asm_ex_u64(x, ptr) \ | ||
351 | __get_user_asm_ex(x, ptr, "q", "", "=r") | ||
317 | #endif | 352 | #endif |
318 | 353 | ||
319 | #define __get_user_size(x, ptr, size, retval, errret) \ | 354 | #define __get_user_size(x, ptr, size, retval, errret) \ |
@@ -350,6 +385,33 @@ do { \ | |||
350 | : "=r" (err), ltype(x) \ | 385 | : "=r" (err), ltype(x) \ |
351 | : "m" (__m(addr)), "i" (errret), "0" (err)) | 386 | : "m" (__m(addr)), "i" (errret), "0" (err)) |
352 | 387 | ||
388 | #define __get_user_size_ex(x, ptr, size) \ | ||
389 | do { \ | ||
390 | __chk_user_ptr(ptr); \ | ||
391 | switch (size) { \ | ||
392 | case 1: \ | ||
393 | __get_user_asm_ex(x, ptr, "b", "b", "=q"); \ | ||
394 | break; \ | ||
395 | case 2: \ | ||
396 | __get_user_asm_ex(x, ptr, "w", "w", "=r"); \ | ||
397 | break; \ | ||
398 | case 4: \ | ||
399 | __get_user_asm_ex(x, ptr, "l", "k", "=r"); \ | ||
400 | break; \ | ||
401 | case 8: \ | ||
402 | __get_user_asm_ex_u64(x, ptr); \ | ||
403 | break; \ | ||
404 | default: \ | ||
405 | (x) = __get_user_bad(); \ | ||
406 | } \ | ||
407 | } while (0) | ||
408 | |||
409 | #define __get_user_asm_ex(x, addr, itype, rtype, ltype) \ | ||
410 | asm volatile("1: mov"itype" %1,%"rtype"0\n" \ | ||
411 | "2:\n" \ | ||
412 | _ASM_EXTABLE(1b, 2b - 1b) \ | ||
413 | : ltype(x) : "m" (__m(addr))) | ||
414 | |||
353 | #define __put_user_nocheck(x, ptr, size) \ | 415 | #define __put_user_nocheck(x, ptr, size) \ |
354 | ({ \ | 416 | ({ \ |
355 | int __pu_err; \ | 417 | int __pu_err; \ |
@@ -385,6 +447,26 @@ struct __large_struct { unsigned long buf[100]; }; | |||
385 | _ASM_EXTABLE(1b, 3b) \ | 447 | _ASM_EXTABLE(1b, 3b) \ |
386 | : "=r"(err) \ | 448 | : "=r"(err) \ |
387 | : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err)) | 449 | : ltype(x), "m" (__m(addr)), "i" (errret), "0" (err)) |
450 | |||
451 | #define __put_user_asm_ex(x, addr, itype, rtype, ltype) \ | ||
452 | asm volatile("1: mov"itype" %"rtype"0,%1\n" \ | ||
453 | "2:\n" \ | ||
454 | _ASM_EXTABLE(1b, 2b - 1b) \ | ||
455 | : : ltype(x), "m" (__m(addr))) | ||
456 | |||
457 | /* | ||
458 | * uaccess_try and catch | ||
459 | */ | ||
460 | #define uaccess_try do { \ | ||
461 | int prev_err = current_thread_info()->uaccess_err; \ | ||
462 | current_thread_info()->uaccess_err = 0; \ | ||
463 | barrier(); | ||
464 | |||
465 | #define uaccess_catch(err) \ | ||
466 | (err) |= current_thread_info()->uaccess_err; \ | ||
467 | current_thread_info()->uaccess_err = prev_err; \ | ||
468 | } while (0) | ||
469 | |||
388 | /** | 470 | /** |
389 | * __get_user: - Get a simple variable from user space, with less checking. | 471 | * __get_user: - Get a simple variable from user space, with less checking. |
390 | * @x: Variable to store result. | 472 | * @x: Variable to store result. |
@@ -408,6 +490,7 @@ struct __large_struct { unsigned long buf[100]; }; | |||
408 | 490 | ||
409 | #define __get_user(x, ptr) \ | 491 | #define __get_user(x, ptr) \ |
410 | __get_user_nocheck((x), (ptr), sizeof(*(ptr))) | 492 | __get_user_nocheck((x), (ptr), sizeof(*(ptr))) |
493 | |||
411 | /** | 494 | /** |
412 | * __put_user: - Write a simple value into user space, with less checking. | 495 | * __put_user: - Write a simple value into user space, with less checking. |
413 | * @x: Value to copy to user space. | 496 | * @x: Value to copy to user space. |
@@ -435,6 +518,45 @@ struct __large_struct { unsigned long buf[100]; }; | |||
435 | #define __put_user_unaligned __put_user | 518 | #define __put_user_unaligned __put_user |
436 | 519 | ||
437 | /* | 520 | /* |
521 | * {get|put}_user_try and catch | ||
522 | * | ||
523 | * get_user_try { | ||
524 | * get_user_ex(...); | ||
525 | * } get_user_catch(err) | ||
526 | */ | ||
527 | #define get_user_try uaccess_try | ||
528 | #define get_user_catch(err) uaccess_catch(err) | ||
529 | |||
530 | #define get_user_ex(x, ptr) do { \ | ||
531 | unsigned long __gue_val; \ | ||
532 | __get_user_size_ex((__gue_val), (ptr), (sizeof(*(ptr)))); \ | ||
533 | (x) = (__force __typeof__(*(ptr)))__gue_val; \ | ||
534 | } while (0) | ||
535 | |||
536 | #ifdef CONFIG_X86_WP_WORKS_OK | ||
537 | |||
538 | #define put_user_try uaccess_try | ||
539 | #define put_user_catch(err) uaccess_catch(err) | ||
540 | |||
541 | #define put_user_ex(x, ptr) \ | ||
542 | __put_user_size_ex((__typeof__(*(ptr)))(x), (ptr), sizeof(*(ptr))) | ||
543 | |||
544 | #else /* !CONFIG_X86_WP_WORKS_OK */ | ||
545 | |||
546 | #define put_user_try do { \ | ||
547 | int __uaccess_err = 0; | ||
548 | |||
549 | #define put_user_catch(err) \ | ||
550 | (err) |= __uaccess_err; \ | ||
551 | } while (0) | ||
552 | |||
553 | #define put_user_ex(x, ptr) do { \ | ||
554 | __uaccess_err |= __put_user(x, ptr); \ | ||
555 | } while (0) | ||
556 | |||
557 | #endif /* CONFIG_X86_WP_WORKS_OK */ | ||
558 | |||
559 | /* | ||
438 | * movsl can be slow when source and dest are not both 8-byte aligned | 560 | * movsl can be slow when source and dest are not both 8-byte aligned |
439 | */ | 561 | */ |
440 | #ifdef CONFIG_X86_INTEL_USERCOPY | 562 | #ifdef CONFIG_X86_INTEL_USERCOPY |
diff --git a/arch/x86/include/asm/uv/uv.h b/arch/x86/include/asm/uv/uv.h index 8ac1d7e312f3..8242bf965812 100644 --- a/arch/x86/include/asm/uv/uv.h +++ b/arch/x86/include/asm/uv/uv.h | |||
@@ -3,6 +3,9 @@ | |||
3 | 3 | ||
4 | enum uv_system_type {UV_NONE, UV_LEGACY_APIC, UV_X2APIC, UV_NON_UNIQUE_APIC}; | 4 | enum uv_system_type {UV_NONE, UV_LEGACY_APIC, UV_X2APIC, UV_NON_UNIQUE_APIC}; |
5 | 5 | ||
6 | struct cpumask; | ||
7 | struct mm_struct; | ||
8 | |||
6 | #ifdef CONFIG_X86_UV | 9 | #ifdef CONFIG_X86_UV |
7 | 10 | ||
8 | extern enum uv_system_type get_uv_system_type(void); | 11 | extern enum uv_system_type get_uv_system_type(void); |
diff --git a/arch/x86/include/asm/voyager.h b/arch/x86/include/asm/voyager.h index b3e647307625..c1635d43616f 100644 --- a/arch/x86/include/asm/voyager.h +++ b/arch/x86/include/asm/voyager.h | |||
@@ -527,3 +527,45 @@ extern void voyager_smp_intr_init(void); | |||
527 | #define VOYAGER_PSI_SUBREAD 2 | 527 | #define VOYAGER_PSI_SUBREAD 2 |
528 | #define VOYAGER_PSI_SUBWRITE 3 | 528 | #define VOYAGER_PSI_SUBWRITE 3 |
529 | extern void voyager_cat_psi(__u8, __u16, __u8 *); | 529 | extern void voyager_cat_psi(__u8, __u16, __u8 *); |
530 | |||
531 | /* These define the CPIs we use in linux */ | ||
532 | #define VIC_CPI_LEVEL0 0 | ||
533 | #define VIC_CPI_LEVEL1 1 | ||
534 | /* now the fake CPIs */ | ||
535 | #define VIC_TIMER_CPI 2 | ||
536 | #define VIC_INVALIDATE_CPI 3 | ||
537 | #define VIC_RESCHEDULE_CPI 4 | ||
538 | #define VIC_ENABLE_IRQ_CPI 5 | ||
539 | #define VIC_CALL_FUNCTION_CPI 6 | ||
540 | #define VIC_CALL_FUNCTION_SINGLE_CPI 7 | ||
541 | |||
542 | /* Now the QIC CPIs: Since we don't need the two initial levels, | ||
543 | * these are 2 less than the VIC CPIs */ | ||
544 | #define QIC_CPI_OFFSET 1 | ||
545 | #define QIC_TIMER_CPI (VIC_TIMER_CPI - QIC_CPI_OFFSET) | ||
546 | #define QIC_INVALIDATE_CPI (VIC_INVALIDATE_CPI - QIC_CPI_OFFSET) | ||
547 | #define QIC_RESCHEDULE_CPI (VIC_RESCHEDULE_CPI - QIC_CPI_OFFSET) | ||
548 | #define QIC_ENABLE_IRQ_CPI (VIC_ENABLE_IRQ_CPI - QIC_CPI_OFFSET) | ||
549 | #define QIC_CALL_FUNCTION_CPI (VIC_CALL_FUNCTION_CPI - QIC_CPI_OFFSET) | ||
550 | #define QIC_CALL_FUNCTION_SINGLE_CPI (VIC_CALL_FUNCTION_SINGLE_CPI - QIC_CPI_OFFSET) | ||
551 | |||
552 | #define VIC_START_FAKE_CPI VIC_TIMER_CPI | ||
553 | #define VIC_END_FAKE_CPI VIC_CALL_FUNCTION_SINGLE_CPI | ||
554 | |||
555 | /* this is the SYS_INT CPI. */ | ||
556 | #define VIC_SYS_INT 8 | ||
557 | #define VIC_CMN_INT 15 | ||
558 | |||
559 | /* This is the boot CPI for alternate processors. It gets overwritten | ||
560 | * by the above once the system has activated all available processors */ | ||
561 | #define VIC_CPU_BOOT_CPI VIC_CPI_LEVEL0 | ||
562 | #define VIC_CPU_BOOT_ERRATA_CPI (VIC_CPI_LEVEL0 + 8) | ||
563 | |||
564 | extern asmlinkage void vic_cpi_interrupt(void); | ||
565 | extern asmlinkage void vic_sys_interrupt(void); | ||
566 | extern asmlinkage void vic_cmn_interrupt(void); | ||
567 | extern asmlinkage void qic_timer_interrupt(void); | ||
568 | extern asmlinkage void qic_invalidate_interrupt(void); | ||
569 | extern asmlinkage void qic_reschedule_interrupt(void); | ||
570 | extern asmlinkage void qic_enable_irq_interrupt(void); | ||
571 | extern asmlinkage void qic_call_function_interrupt(void); | ||
diff --git a/arch/x86/include/asm/xen/events.h b/arch/x86/include/asm/xen/events.h index 19144184983a..1df35417c412 100644 --- a/arch/x86/include/asm/xen/events.h +++ b/arch/x86/include/asm/xen/events.h | |||
@@ -15,10 +15,4 @@ static inline int xen_irqs_disabled(struct pt_regs *regs) | |||
15 | return raw_irqs_disabled_flags(regs->flags); | 15 | return raw_irqs_disabled_flags(regs->flags); |
16 | } | 16 | } |
17 | 17 | ||
18 | static inline void xen_do_IRQ(int irq, struct pt_regs *regs) | ||
19 | { | ||
20 | regs->orig_ax = ~irq; | ||
21 | do_IRQ(regs); | ||
22 | } | ||
23 | |||
24 | #endif /* _ASM_X86_XEN_EVENTS_H */ | 18 | #endif /* _ASM_X86_XEN_EVENTS_H */ |
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile index a99437c965cc..24f357e7557a 100644 --- a/arch/x86/kernel/Makefile +++ b/arch/x86/kernel/Makefile | |||
@@ -28,9 +28,9 @@ CFLAGS_paravirt.o := $(nostackp) | |||
28 | obj-y := process_$(BITS).o signal.o entry_$(BITS).o | 28 | obj-y := process_$(BITS).o signal.o entry_$(BITS).o |
29 | obj-y += traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o | 29 | obj-y += traps.o irq.o irq_$(BITS).o dumpstack_$(BITS).o |
30 | obj-y += time_$(BITS).o ioport.o ldt.o dumpstack.o | 30 | obj-y += time_$(BITS).o ioport.o ldt.o dumpstack.o |
31 | obj-y += setup.o i8259.o irqinit_$(BITS).o setup_percpu.o | 31 | obj-y += setup.o i8259.o irqinit_$(BITS).o |
32 | obj-$(CONFIG_X86_VISWS) += visws_quirks.o | 32 | obj-$(CONFIG_X86_VISWS) += visws_quirks.o |
33 | obj-$(CONFIG_X86_32) += probe_roms_32.o | 33 | obj-$(CONFIG_X86_32) += probe_32.o probe_roms_32.o |
34 | obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o | 34 | obj-$(CONFIG_X86_32) += sys_i386_32.o i386_ksyms_32.o |
35 | obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o | 35 | obj-$(CONFIG_X86_64) += sys_x86_64.o x8664_ksyms_64.o |
36 | obj-$(CONFIG_X86_64) += syscall_64.o vsyscall_64.o | 36 | obj-$(CONFIG_X86_64) += syscall_64.o vsyscall_64.o |
@@ -50,20 +50,20 @@ obj-y += step.o | |||
50 | obj-$(CONFIG_STACKTRACE) += stacktrace.o | 50 | obj-$(CONFIG_STACKTRACE) += stacktrace.o |
51 | obj-y += cpu/ | 51 | obj-y += cpu/ |
52 | obj-y += acpi/ | 52 | obj-y += acpi/ |
53 | obj-$(CONFIG_X86_BIOS_REBOOT) += reboot.o | 53 | obj-y += reboot.o |
54 | obj-$(CONFIG_MCA) += mca_32.o | 54 | obj-$(CONFIG_MCA) += mca_32.o |
55 | obj-$(CONFIG_X86_MSR) += msr.o | 55 | obj-$(CONFIG_X86_MSR) += msr.o |
56 | obj-$(CONFIG_X86_CPUID) += cpuid.o | 56 | obj-$(CONFIG_X86_CPUID) += cpuid.o |
57 | obj-$(CONFIG_PCI) += early-quirks.o | 57 | obj-$(CONFIG_PCI) += early-quirks.o |
58 | apm-y := apm_32.o | 58 | apm-y := apm_32.o |
59 | obj-$(CONFIG_APM) += apm.o | 59 | obj-$(CONFIG_APM) += apm.o |
60 | obj-$(CONFIG_X86_SMP) += smp.o | 60 | obj-$(CONFIG_SMP) += smp.o |
61 | obj-$(CONFIG_X86_SMP) += smpboot.o tsc_sync.o ipi.o | 61 | obj-$(CONFIG_SMP) += smpboot.o tsc_sync.o ipi.o |
62 | obj-$(CONFIG_X86_32_SMP) += smpcommon.o | 62 | obj-$(CONFIG_SMP) += setup_percpu.o |
63 | obj-$(CONFIG_X86_64_SMP) += tsc_sync.o smpcommon.o | 63 | obj-$(CONFIG_X86_64_SMP) += tsc_sync.o |
64 | obj-$(CONFIG_X86_TRAMPOLINE) += trampoline_$(BITS).o | 64 | obj-$(CONFIG_X86_TRAMPOLINE) += trampoline_$(BITS).o |
65 | obj-$(CONFIG_X86_MPPARSE) += mpparse.o | 65 | obj-$(CONFIG_X86_MPPARSE) += mpparse.o |
66 | obj-$(CONFIG_X86_LOCAL_APIC) += apic.o nmi.o | 66 | obj-$(CONFIG_X86_LOCAL_APIC) += apic.o nmi.o ipi.o |
67 | obj-$(CONFIG_X86_IO_APIC) += io_apic.o | 67 | obj-$(CONFIG_X86_IO_APIC) += io_apic.o |
68 | obj-$(CONFIG_X86_REBOOTFIXUPS) += reboot_fixups_32.o | 68 | obj-$(CONFIG_X86_REBOOTFIXUPS) += reboot_fixups_32.o |
69 | obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o | 69 | obj-$(CONFIG_DYNAMIC_FTRACE) += ftrace.o |
@@ -71,9 +71,10 @@ obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o | |||
71 | obj-$(CONFIG_KEXEC) += machine_kexec_$(BITS).o | 71 | obj-$(CONFIG_KEXEC) += machine_kexec_$(BITS).o |
72 | obj-$(CONFIG_KEXEC) += relocate_kernel_$(BITS).o crash.o | 72 | obj-$(CONFIG_KEXEC) += relocate_kernel_$(BITS).o crash.o |
73 | obj-$(CONFIG_CRASH_DUMP) += crash_dump_$(BITS).o | 73 | obj-$(CONFIG_CRASH_DUMP) += crash_dump_$(BITS).o |
74 | obj-$(CONFIG_X86_BIGSMP) += bigsmp_32.o | ||
74 | obj-$(CONFIG_X86_NUMAQ) += numaq_32.o | 75 | obj-$(CONFIG_X86_NUMAQ) += numaq_32.o |
75 | obj-$(CONFIG_X86_ES7000) += es7000_32.o | 76 | obj-$(CONFIG_X86_ES7000) += es7000_32.o |
76 | obj-$(CONFIG_X86_SUMMIT_NUMA) += summit_32.o | 77 | obj-$(CONFIG_X86_SUMMIT) += summit_32.o |
77 | obj-y += vsmp_64.o | 78 | obj-y += vsmp_64.o |
78 | obj-$(CONFIG_KPROBES) += kprobes.o | 79 | obj-$(CONFIG_KPROBES) += kprobes.o |
79 | obj-$(CONFIG_MODULES) += module_$(BITS).o | 80 | obj-$(CONFIG_MODULES) += module_$(BITS).o |
diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index c193ec3c695e..956c1dee6fbe 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c | |||
@@ -42,10 +42,6 @@ | |||
42 | #include <asm/mpspec.h> | 42 | #include <asm/mpspec.h> |
43 | #include <asm/smp.h> | 43 | #include <asm/smp.h> |
44 | 44 | ||
45 | #ifdef CONFIG_X86_LOCAL_APIC | ||
46 | # include <mach_apic.h> | ||
47 | #endif | ||
48 | |||
49 | static int __initdata acpi_force = 0; | 45 | static int __initdata acpi_force = 0; |
50 | u32 acpi_rsdt_forced; | 46 | u32 acpi_rsdt_forced; |
51 | #ifdef CONFIG_ACPI | 47 | #ifdef CONFIG_ACPI |
@@ -56,16 +52,7 @@ int acpi_disabled = 1; | |||
56 | EXPORT_SYMBOL(acpi_disabled); | 52 | EXPORT_SYMBOL(acpi_disabled); |
57 | 53 | ||
58 | #ifdef CONFIG_X86_64 | 54 | #ifdef CONFIG_X86_64 |
59 | 55 | # include <asm/proto.h> | |
60 | #include <asm/proto.h> | ||
61 | |||
62 | #else /* X86 */ | ||
63 | |||
64 | #ifdef CONFIG_X86_LOCAL_APIC | ||
65 | #include <mach_apic.h> | ||
66 | #include <mach_mpparse.h> | ||
67 | #endif /* CONFIG_X86_LOCAL_APIC */ | ||
68 | |||
69 | #endif /* X86 */ | 56 | #endif /* X86 */ |
70 | 57 | ||
71 | #define BAD_MADT_ENTRY(entry, end) ( \ | 58 | #define BAD_MADT_ENTRY(entry, end) ( \ |
@@ -121,35 +108,18 @@ enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_PIC; | |||
121 | */ | 108 | */ |
122 | char *__init __acpi_map_table(unsigned long phys, unsigned long size) | 109 | char *__init __acpi_map_table(unsigned long phys, unsigned long size) |
123 | { | 110 | { |
124 | unsigned long base, offset, mapped_size; | ||
125 | int idx; | ||
126 | 111 | ||
127 | if (!phys || !size) | 112 | if (!phys || !size) |
128 | return NULL; | 113 | return NULL; |
129 | 114 | ||
130 | if (phys+size <= (max_low_pfn_mapped << PAGE_SHIFT)) | 115 | return early_ioremap(phys, size); |
131 | return __va(phys); | 116 | } |
132 | 117 | void __init __acpi_unmap_table(char *map, unsigned long size) | |
133 | offset = phys & (PAGE_SIZE - 1); | 118 | { |
134 | mapped_size = PAGE_SIZE - offset; | 119 | if (!map || !size) |
135 | clear_fixmap(FIX_ACPI_END); | 120 | return; |
136 | set_fixmap(FIX_ACPI_END, phys); | ||
137 | base = fix_to_virt(FIX_ACPI_END); | ||
138 | |||
139 | /* | ||
140 | * Most cases can be covered by the below. | ||
141 | */ | ||
142 | idx = FIX_ACPI_END; | ||
143 | while (mapped_size < size) { | ||
144 | if (--idx < FIX_ACPI_BEGIN) | ||
145 | return NULL; /* cannot handle this */ | ||
146 | phys += PAGE_SIZE; | ||
147 | clear_fixmap(idx); | ||
148 | set_fixmap(idx, phys); | ||
149 | mapped_size += PAGE_SIZE; | ||
150 | } | ||
151 | 121 | ||
152 | return ((unsigned char *)base + offset); | 122 | early_iounmap(map, size); |
153 | } | 123 | } |
154 | 124 | ||
155 | #ifdef CONFIG_PCI_MMCONFIG | 125 | #ifdef CONFIG_PCI_MMCONFIG |
@@ -239,7 +209,8 @@ static int __init acpi_parse_madt(struct acpi_table_header *table) | |||
239 | madt->address); | 209 | madt->address); |
240 | } | 210 | } |
241 | 211 | ||
242 | acpi_madt_oem_check(madt->header.oem_id, madt->header.oem_table_id); | 212 | default_acpi_madt_oem_check(madt->header.oem_id, |
213 | madt->header.oem_table_id); | ||
243 | 214 | ||
244 | return 0; | 215 | return 0; |
245 | } | 216 | } |
@@ -884,7 +855,7 @@ static struct { | |||
884 | DECLARE_BITMAP(pin_programmed, MP_MAX_IOAPIC_PIN + 1); | 855 | DECLARE_BITMAP(pin_programmed, MP_MAX_IOAPIC_PIN + 1); |
885 | } mp_ioapic_routing[MAX_IO_APICS]; | 856 | } mp_ioapic_routing[MAX_IO_APICS]; |
886 | 857 | ||
887 | static int mp_find_ioapic(int gsi) | 858 | int mp_find_ioapic(int gsi) |
888 | { | 859 | { |
889 | int i = 0; | 860 | int i = 0; |
890 | 861 | ||
@@ -899,6 +870,16 @@ static int mp_find_ioapic(int gsi) | |||
899 | return -1; | 870 | return -1; |
900 | } | 871 | } |
901 | 872 | ||
873 | int mp_find_ioapic_pin(int ioapic, int gsi) | ||
874 | { | ||
875 | if (WARN_ON(ioapic == -1)) | ||
876 | return -1; | ||
877 | if (WARN_ON(gsi > mp_ioapic_routing[ioapic].gsi_end)) | ||
878 | return -1; | ||
879 | |||
880 | return gsi - mp_ioapic_routing[ioapic].gsi_base; | ||
881 | } | ||
882 | |||
902 | static u8 __init uniq_ioapic_id(u8 id) | 883 | static u8 __init uniq_ioapic_id(u8 id) |
903 | { | 884 | { |
904 | #ifdef CONFIG_X86_32 | 885 | #ifdef CONFIG_X86_32 |
@@ -1034,7 +1015,7 @@ void __init mp_override_legacy_irq(u8 bus_irq, u8 polarity, u8 trigger, u32 gsi) | |||
1034 | ioapic = mp_find_ioapic(gsi); | 1015 | ioapic = mp_find_ioapic(gsi); |
1035 | if (ioapic < 0) | 1016 | if (ioapic < 0) |
1036 | return; | 1017 | return; |
1037 | pin = gsi - mp_ioapic_routing[ioapic].gsi_base; | 1018 | pin = mp_find_ioapic_pin(ioapic, gsi); |
1038 | 1019 | ||
1039 | /* | 1020 | /* |
1040 | * TBD: This check is for faulty timer entries, where the override | 1021 | * TBD: This check is for faulty timer entries, where the override |
@@ -1154,7 +1135,7 @@ int mp_register_gsi(u32 gsi, int triggering, int polarity) | |||
1154 | return gsi; | 1135 | return gsi; |
1155 | } | 1136 | } |
1156 | 1137 | ||
1157 | ioapic_pin = gsi - mp_ioapic_routing[ioapic].gsi_base; | 1138 | ioapic_pin = mp_find_ioapic_pin(ioapic, gsi); |
1158 | 1139 | ||
1159 | #ifdef CONFIG_X86_32 | 1140 | #ifdef CONFIG_X86_32 |
1160 | if (ioapic_renumber_irq) | 1141 | if (ioapic_renumber_irq) |
@@ -1243,7 +1224,7 @@ int mp_config_acpi_gsi(unsigned char number, unsigned int devfn, u8 pin, | |||
1243 | mp_irq.srcbusirq = (((devfn >> 3) & 0x1f) << 2) | ((pin - 1) & 3); | 1224 | mp_irq.srcbusirq = (((devfn >> 3) & 0x1f) << 2) | ((pin - 1) & 3); |
1244 | ioapic = mp_find_ioapic(gsi); | 1225 | ioapic = mp_find_ioapic(gsi); |
1245 | mp_irq.dstapic = mp_ioapic_routing[ioapic].apic_id; | 1226 | mp_irq.dstapic = mp_ioapic_routing[ioapic].apic_id; |
1246 | mp_irq.dstirq = gsi - mp_ioapic_routing[ioapic].gsi_base; | 1227 | mp_irq.dstirq = mp_find_ioapic_pin(ioapic, gsi); |
1247 | 1228 | ||
1248 | save_mp_irq(&mp_irq); | 1229 | save_mp_irq(&mp_irq); |
1249 | #endif | 1230 | #endif |
@@ -1370,7 +1351,7 @@ static void __init acpi_process_madt(void) | |||
1370 | if (!error) { | 1351 | if (!error) { |
1371 | acpi_lapic = 1; | 1352 | acpi_lapic = 1; |
1372 | 1353 | ||
1373 | #ifdef CONFIG_X86_GENERICARCH | 1354 | #ifdef CONFIG_X86_BIGSMP |
1374 | generic_bigsmp_probe(); | 1355 | generic_bigsmp_probe(); |
1375 | #endif | 1356 | #endif |
1376 | /* | 1357 | /* |
@@ -1382,9 +1363,8 @@ static void __init acpi_process_madt(void) | |||
1382 | acpi_ioapic = 1; | 1363 | acpi_ioapic = 1; |
1383 | 1364 | ||
1384 | smp_found_config = 1; | 1365 | smp_found_config = 1; |
1385 | #ifdef CONFIG_X86_32 | 1366 | if (apic->setup_apic_routing) |
1386 | setup_apic_routing(); | 1367 | apic->setup_apic_routing(); |
1387 | #endif | ||
1388 | } | 1368 | } |
1389 | } | 1369 | } |
1390 | if (error == -EINVAL) { | 1370 | if (error == -EINVAL) { |
diff --git a/arch/x86/kernel/apic.c b/arch/x86/kernel/apic.c index abfa0b641aea..c9aed4510585 100644 --- a/arch/x86/kernel/apic.c +++ b/arch/x86/kernel/apic.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Local APIC handling, local APIC timers | 2 | * Local APIC handling, local APIC timers |
3 | * | 3 | * |
4 | * (c) 1999, 2000 Ingo Molnar <mingo@redhat.com> | 4 | * (c) 1999, 2000, 2009 Ingo Molnar <mingo@redhat.com> |
5 | * | 5 | * |
6 | * Fixes | 6 | * Fixes |
7 | * Maciej W. Rozycki : Bits for genuine 82489DX APICs; | 7 | * Maciej W. Rozycki : Bits for genuine 82489DX APICs; |
@@ -14,52 +14,72 @@ | |||
14 | * Mikael Pettersson : PM converted to driver model. | 14 | * Mikael Pettersson : PM converted to driver model. |
15 | */ | 15 | */ |
16 | 16 | ||
17 | #include <linux/init.h> | ||
18 | |||
19 | #include <linux/mm.h> | ||
20 | #include <linux/delay.h> | ||
21 | #include <linux/bootmem.h> | ||
22 | #include <linux/interrupt.h> | ||
23 | #include <linux/mc146818rtc.h> | ||
24 | #include <linux/kernel_stat.h> | 17 | #include <linux/kernel_stat.h> |
25 | #include <linux/sysdev.h> | 18 | #include <linux/mc146818rtc.h> |
26 | #include <linux/ioport.h> | ||
27 | #include <linux/cpu.h> | ||
28 | #include <linux/clockchips.h> | ||
29 | #include <linux/acpi_pmtmr.h> | 19 | #include <linux/acpi_pmtmr.h> |
20 | #include <linux/clockchips.h> | ||
21 | #include <linux/interrupt.h> | ||
22 | #include <linux/bootmem.h> | ||
23 | #include <linux/ftrace.h> | ||
24 | #include <linux/ioport.h> | ||
30 | #include <linux/module.h> | 25 | #include <linux/module.h> |
31 | #include <linux/dmi.h> | 26 | #include <linux/sysdev.h> |
27 | #include <linux/delay.h> | ||
28 | #include <linux/timex.h> | ||
32 | #include <linux/dmar.h> | 29 | #include <linux/dmar.h> |
33 | #include <linux/ftrace.h> | 30 | #include <linux/init.h> |
34 | #include <linux/smp.h> | 31 | #include <linux/cpu.h> |
32 | #include <linux/dmi.h> | ||
35 | #include <linux/nmi.h> | 33 | #include <linux/nmi.h> |
36 | #include <linux/timex.h> | 34 | #include <linux/smp.h> |
35 | #include <linux/mm.h> | ||
37 | 36 | ||
38 | #include <asm/perf_counter.h> | 37 | #include <asm/perf_counter.h> |
39 | #include <asm/atomic.h> | ||
40 | #include <asm/mtrr.h> | ||
41 | #include <asm/mpspec.h> | ||
42 | #include <asm/desc.h> | ||
43 | #include <asm/arch_hooks.h> | 38 | #include <asm/arch_hooks.h> |
44 | #include <asm/hpet.h> | ||
45 | #include <asm/pgalloc.h> | 39 | #include <asm/pgalloc.h> |
40 | #include <asm/genapic.h> | ||
41 | #include <asm/atomic.h> | ||
42 | #include <asm/mpspec.h> | ||
46 | #include <asm/i8253.h> | 43 | #include <asm/i8253.h> |
47 | #include <asm/idle.h> | 44 | #include <asm/i8259.h> |
48 | #include <asm/proto.h> | 45 | #include <asm/proto.h> |
49 | #include <asm/apic.h> | 46 | #include <asm/apic.h> |
50 | #include <asm/i8259.h> | 47 | #include <asm/desc.h> |
48 | #include <asm/hpet.h> | ||
49 | #include <asm/idle.h> | ||
50 | #include <asm/mtrr.h> | ||
51 | #include <asm/smp.h> | 51 | #include <asm/smp.h> |
52 | 52 | ||
53 | #include <mach_apic.h> | 53 | unsigned int num_processors; |
54 | #include <mach_apicdef.h> | 54 | |
55 | #include <mach_ipi.h> | 55 | unsigned disabled_cpus __cpuinitdata; |
56 | |||
57 | /* Processor that is doing the boot up */ | ||
58 | unsigned int boot_cpu_physical_apicid = -1U; | ||
56 | 59 | ||
57 | /* | 60 | /* |
58 | * Sanity check | 61 | * The highest APIC ID seen during enumeration. |
62 | * | ||
63 | * This determines the messaging protocol we can use: if all APIC IDs | ||
64 | * are in the 0 ... 7 range, then we can use logical addressing which | ||
65 | * has some performance advantages (better broadcasting). | ||
66 | * | ||
67 | * If there's an APIC ID above 8, we use physical addressing. | ||
59 | */ | 68 | */ |
60 | #if ((SPURIOUS_APIC_VECTOR & 0x0F) != 0x0F) | 69 | unsigned int max_physical_apicid; |
61 | # error SPURIOUS_APIC_VECTOR definition error | 70 | |
62 | #endif | 71 | /* |
72 | * Bitmask of physically existing CPUs: | ||
73 | */ | ||
74 | physid_mask_t phys_cpu_present_map; | ||
75 | |||
76 | /* | ||
77 | * Map cpu index to physical APIC ID | ||
78 | */ | ||
79 | DEFINE_EARLY_PER_CPU(u16, x86_cpu_to_apicid, BAD_APICID); | ||
80 | DEFINE_EARLY_PER_CPU(u16, x86_bios_cpu_apicid, BAD_APICID); | ||
81 | EXPORT_EARLY_PER_CPU_SYMBOL(x86_cpu_to_apicid); | ||
82 | EXPORT_EARLY_PER_CPU_SYMBOL(x86_bios_cpu_apicid); | ||
63 | 83 | ||
64 | #ifdef CONFIG_X86_32 | 84 | #ifdef CONFIG_X86_32 |
65 | /* | 85 | /* |
@@ -458,7 +478,7 @@ static void lapic_timer_setup(enum clock_event_mode mode, | |||
458 | static void lapic_timer_broadcast(const struct cpumask *mask) | 478 | static void lapic_timer_broadcast(const struct cpumask *mask) |
459 | { | 479 | { |
460 | #ifdef CONFIG_SMP | 480 | #ifdef CONFIG_SMP |
461 | send_IPI_mask(mask, LOCAL_TIMER_VECTOR); | 481 | apic->send_IPI_mask(mask, LOCAL_TIMER_VECTOR); |
462 | #endif | 482 | #endif |
463 | } | 483 | } |
464 | 484 | ||
@@ -536,7 +556,8 @@ static void __init lapic_cal_handler(struct clock_event_device *dev) | |||
536 | } | 556 | } |
537 | } | 557 | } |
538 | 558 | ||
539 | static int __init calibrate_by_pmtimer(long deltapm, long *delta) | 559 | static int __init |
560 | calibrate_by_pmtimer(long deltapm, long *delta, long *deltatsc) | ||
540 | { | 561 | { |
541 | const long pm_100ms = PMTMR_TICKS_PER_SEC / 10; | 562 | const long pm_100ms = PMTMR_TICKS_PER_SEC / 10; |
542 | const long pm_thresh = pm_100ms / 100; | 563 | const long pm_thresh = pm_100ms / 100; |
@@ -547,7 +568,7 @@ static int __init calibrate_by_pmtimer(long deltapm, long *delta) | |||
547 | return -1; | 568 | return -1; |
548 | #endif | 569 | #endif |
549 | 570 | ||
550 | apic_printk(APIC_VERBOSE, "... PM timer delta = %ld\n", deltapm); | 571 | apic_printk(APIC_VERBOSE, "... PM-Timer delta = %ld\n", deltapm); |
551 | 572 | ||
552 | /* Check, if the PM timer is available */ | 573 | /* Check, if the PM timer is available */ |
553 | if (!deltapm) | 574 | if (!deltapm) |
@@ -557,19 +578,30 @@ static int __init calibrate_by_pmtimer(long deltapm, long *delta) | |||
557 | 578 | ||
558 | if (deltapm > (pm_100ms - pm_thresh) && | 579 | if (deltapm > (pm_100ms - pm_thresh) && |
559 | deltapm < (pm_100ms + pm_thresh)) { | 580 | deltapm < (pm_100ms + pm_thresh)) { |
560 | apic_printk(APIC_VERBOSE, "... PM timer result ok\n"); | 581 | apic_printk(APIC_VERBOSE, "... PM-Timer result ok\n"); |
561 | } else { | 582 | return 0; |
562 | res = (((u64)deltapm) * mult) >> 22; | 583 | } |
563 | do_div(res, 1000000); | 584 | |
564 | pr_warning("APIC calibration not consistent " | 585 | res = (((u64)deltapm) * mult) >> 22; |
565 | "with PM Timer: %ldms instead of 100ms\n", | 586 | do_div(res, 1000000); |
566 | (long)res); | 587 | pr_warning("APIC calibration not consistent " |
567 | /* Correct the lapic counter value */ | 588 | "with PM-Timer: %ldms instead of 100ms\n",(long)res); |
568 | res = (((u64)(*delta)) * pm_100ms); | 589 | |
590 | /* Correct the lapic counter value */ | ||
591 | res = (((u64)(*delta)) * pm_100ms); | ||
592 | do_div(res, deltapm); | ||
593 | pr_info("APIC delta adjusted to PM-Timer: " | ||
594 | "%lu (%ld)\n", (unsigned long)res, *delta); | ||
595 | *delta = (long)res; | ||
596 | |||
597 | /* Correct the tsc counter value */ | ||
598 | if (cpu_has_tsc) { | ||
599 | res = (((u64)(*deltatsc)) * pm_100ms); | ||
569 | do_div(res, deltapm); | 600 | do_div(res, deltapm); |
570 | pr_info("APIC delta adjusted to PM-Timer: " | 601 | apic_printk(APIC_VERBOSE, "TSC delta adjusted to " |
571 | "%lu (%ld)\n", (unsigned long)res, *delta); | 602 | "PM-Timer: %lu (%ld) \n", |
572 | *delta = (long)res; | 603 | (unsigned long)res, *deltatsc); |
604 | *deltatsc = (long)res; | ||
573 | } | 605 | } |
574 | 606 | ||
575 | return 0; | 607 | return 0; |
@@ -580,7 +612,7 @@ static int __init calibrate_APIC_clock(void) | |||
580 | struct clock_event_device *levt = &__get_cpu_var(lapic_events); | 612 | struct clock_event_device *levt = &__get_cpu_var(lapic_events); |
581 | void (*real_handler)(struct clock_event_device *dev); | 613 | void (*real_handler)(struct clock_event_device *dev); |
582 | unsigned long deltaj; | 614 | unsigned long deltaj; |
583 | long delta; | 615 | long delta, deltatsc; |
584 | int pm_referenced = 0; | 616 | int pm_referenced = 0; |
585 | 617 | ||
586 | local_irq_disable(); | 618 | local_irq_disable(); |
@@ -610,9 +642,11 @@ static int __init calibrate_APIC_clock(void) | |||
610 | delta = lapic_cal_t1 - lapic_cal_t2; | 642 | delta = lapic_cal_t1 - lapic_cal_t2; |
611 | apic_printk(APIC_VERBOSE, "... lapic delta = %ld\n", delta); | 643 | apic_printk(APIC_VERBOSE, "... lapic delta = %ld\n", delta); |
612 | 644 | ||
645 | deltatsc = (long)(lapic_cal_tsc2 - lapic_cal_tsc1); | ||
646 | |||
613 | /* we trust the PM based calibration if possible */ | 647 | /* we trust the PM based calibration if possible */ |
614 | pm_referenced = !calibrate_by_pmtimer(lapic_cal_pm2 - lapic_cal_pm1, | 648 | pm_referenced = !calibrate_by_pmtimer(lapic_cal_pm2 - lapic_cal_pm1, |
615 | &delta); | 649 | &delta, &deltatsc); |
616 | 650 | ||
617 | /* Calculate the scaled math multiplication factor */ | 651 | /* Calculate the scaled math multiplication factor */ |
618 | lapic_clockevent.mult = div_sc(delta, TICK_NSEC * LAPIC_CAL_LOOPS, | 652 | lapic_clockevent.mult = div_sc(delta, TICK_NSEC * LAPIC_CAL_LOOPS, |
@@ -630,11 +664,10 @@ static int __init calibrate_APIC_clock(void) | |||
630 | calibration_result); | 664 | calibration_result); |
631 | 665 | ||
632 | if (cpu_has_tsc) { | 666 | if (cpu_has_tsc) { |
633 | delta = (long)(lapic_cal_tsc2 - lapic_cal_tsc1); | ||
634 | apic_printk(APIC_VERBOSE, "..... CPU clock speed is " | 667 | apic_printk(APIC_VERBOSE, "..... CPU clock speed is " |
635 | "%ld.%04ld MHz.\n", | 668 | "%ld.%04ld MHz.\n", |
636 | (delta / LAPIC_CAL_LOOPS) / (1000000 / HZ), | 669 | (deltatsc / LAPIC_CAL_LOOPS) / (1000000 / HZ), |
637 | (delta / LAPIC_CAL_LOOPS) % (1000000 / HZ)); | 670 | (deltatsc / LAPIC_CAL_LOOPS) % (1000000 / HZ)); |
638 | } | 671 | } |
639 | 672 | ||
640 | apic_printk(APIC_VERBOSE, "..... host bus clock speed is " | 673 | apic_printk(APIC_VERBOSE, "..... host bus clock speed is " |
@@ -994,11 +1027,11 @@ int __init verify_local_APIC(void) | |||
994 | */ | 1027 | */ |
995 | reg0 = apic_read(APIC_ID); | 1028 | reg0 = apic_read(APIC_ID); |
996 | apic_printk(APIC_DEBUG, "Getting ID: %x\n", reg0); | 1029 | apic_printk(APIC_DEBUG, "Getting ID: %x\n", reg0); |
997 | apic_write(APIC_ID, reg0 ^ APIC_ID_MASK); | 1030 | apic_write(APIC_ID, reg0 ^ apic->apic_id_mask); |
998 | reg1 = apic_read(APIC_ID); | 1031 | reg1 = apic_read(APIC_ID); |
999 | apic_printk(APIC_DEBUG, "Getting ID: %x\n", reg1); | 1032 | apic_printk(APIC_DEBUG, "Getting ID: %x\n", reg1); |
1000 | apic_write(APIC_ID, reg0); | 1033 | apic_write(APIC_ID, reg0); |
1001 | if (reg1 != (reg0 ^ APIC_ID_MASK)) | 1034 | if (reg1 != (reg0 ^ apic->apic_id_mask)) |
1002 | return 0; | 1035 | return 0; |
1003 | 1036 | ||
1004 | /* | 1037 | /* |
@@ -1092,7 +1125,7 @@ static void __cpuinit lapic_setup_esr(void) | |||
1092 | return; | 1125 | return; |
1093 | } | 1126 | } |
1094 | 1127 | ||
1095 | if (esr_disable) { | 1128 | if (apic->disable_esr) { |
1096 | /* | 1129 | /* |
1097 | * Something untraceable is creating bad interrupts on | 1130 | * Something untraceable is creating bad interrupts on |
1098 | * secondary quads ... for the moment, just leave the | 1131 | * secondary quads ... for the moment, just leave the |
@@ -1134,15 +1167,13 @@ void __cpuinit setup_local_APIC(void) | |||
1134 | int i, j; | 1167 | int i, j; |
1135 | 1168 | ||
1136 | if (disable_apic) { | 1169 | if (disable_apic) { |
1137 | #ifdef CONFIG_X86_IO_APIC | 1170 | arch_disable_smp_support(); |
1138 | disable_ioapic_setup(); | ||
1139 | #endif | ||
1140 | return; | 1171 | return; |
1141 | } | 1172 | } |
1142 | 1173 | ||
1143 | #ifdef CONFIG_X86_32 | 1174 | #ifdef CONFIG_X86_32 |
1144 | /* Pound the ESR really hard over the head with a big hammer - mbligh */ | 1175 | /* Pound the ESR really hard over the head with a big hammer - mbligh */ |
1145 | if (lapic_is_integrated() && esr_disable) { | 1176 | if (lapic_is_integrated() && apic->disable_esr) { |
1146 | apic_write(APIC_ESR, 0); | 1177 | apic_write(APIC_ESR, 0); |
1147 | apic_write(APIC_ESR, 0); | 1178 | apic_write(APIC_ESR, 0); |
1148 | apic_write(APIC_ESR, 0); | 1179 | apic_write(APIC_ESR, 0); |
@@ -1157,7 +1188,7 @@ void __cpuinit setup_local_APIC(void) | |||
1157 | * Double-check whether this APIC is really registered. | 1188 | * Double-check whether this APIC is really registered. |
1158 | * This is meaningless in clustered apic mode, so we skip it. | 1189 | * This is meaningless in clustered apic mode, so we skip it. |
1159 | */ | 1190 | */ |
1160 | if (!apic_id_registered()) | 1191 | if (!apic->apic_id_registered()) |
1161 | BUG(); | 1192 | BUG(); |
1162 | 1193 | ||
1163 | /* | 1194 | /* |
@@ -1165,7 +1196,7 @@ void __cpuinit setup_local_APIC(void) | |||
1165 | * an APIC. See e.g. "AP-388 82489DX User's Manual" (Intel | 1196 | * an APIC. See e.g. "AP-388 82489DX User's Manual" (Intel |
1166 | * document number 292116). So here it goes... | 1197 | * document number 292116). So here it goes... |
1167 | */ | 1198 | */ |
1168 | init_apic_ldr(); | 1199 | apic->init_apic_ldr(); |
1169 | 1200 | ||
1170 | /* | 1201 | /* |
1171 | * Set Task Priority to 'accept all'. We never change this | 1202 | * Set Task Priority to 'accept all'. We never change this |
@@ -1611,7 +1642,7 @@ int __init APIC_init_uniprocessor(void) | |||
1611 | enable_IR_x2apic(); | 1642 | enable_IR_x2apic(); |
1612 | #endif | 1643 | #endif |
1613 | #ifdef CONFIG_X86_64 | 1644 | #ifdef CONFIG_X86_64 |
1614 | setup_apic_routing(); | 1645 | default_setup_apic_routing(); |
1615 | #endif | 1646 | #endif |
1616 | 1647 | ||
1617 | verify_local_APIC(); | 1648 | verify_local_APIC(); |
@@ -1749,7 +1780,8 @@ void __init connect_bsp_APIC(void) | |||
1749 | outb(0x01, 0x23); | 1780 | outb(0x01, 0x23); |
1750 | } | 1781 | } |
1751 | #endif | 1782 | #endif |
1752 | enable_apic_mode(); | 1783 | if (apic->enable_apic_mode) |
1784 | apic->enable_apic_mode(); | ||
1753 | } | 1785 | } |
1754 | 1786 | ||
1755 | /** | 1787 | /** |
@@ -1887,7 +1919,7 @@ void __cpuinit generic_processor_info(int apicid, int version) | |||
1887 | } | 1919 | } |
1888 | #endif | 1920 | #endif |
1889 | 1921 | ||
1890 | #if defined(CONFIG_X86_SMP) || defined(CONFIG_X86_64) | 1922 | #if defined(CONFIG_SMP) || defined(CONFIG_X86_64) |
1891 | early_per_cpu(x86_cpu_to_apicid, cpu) = apicid; | 1923 | early_per_cpu(x86_cpu_to_apicid, cpu) = apicid; |
1892 | early_per_cpu(x86_bios_cpu_apicid, cpu) = apicid; | 1924 | early_per_cpu(x86_bios_cpu_apicid, cpu) = apicid; |
1893 | #endif | 1925 | #endif |
@@ -1896,11 +1928,30 @@ void __cpuinit generic_processor_info(int apicid, int version) | |||
1896 | set_cpu_present(cpu, true); | 1928 | set_cpu_present(cpu, true); |
1897 | } | 1929 | } |
1898 | 1930 | ||
1899 | #ifdef CONFIG_X86_64 | ||
1900 | int hard_smp_processor_id(void) | 1931 | int hard_smp_processor_id(void) |
1901 | { | 1932 | { |
1902 | return read_apic_id(); | 1933 | return read_apic_id(); |
1903 | } | 1934 | } |
1935 | |||
1936 | void default_init_apic_ldr(void) | ||
1937 | { | ||
1938 | unsigned long val; | ||
1939 | |||
1940 | apic_write(APIC_DFR, APIC_DFR_VALUE); | ||
1941 | val = apic_read(APIC_LDR) & ~APIC_LDR_MASK; | ||
1942 | val |= SET_APIC_LOGICAL_ID(1UL << smp_processor_id()); | ||
1943 | apic_write(APIC_LDR, val); | ||
1944 | } | ||
1945 | |||
1946 | #ifdef CONFIG_X86_32 | ||
1947 | int default_apicid_to_node(int logical_apicid) | ||
1948 | { | ||
1949 | #ifdef CONFIG_SMP | ||
1950 | return apicid_2_node[hard_smp_processor_id()]; | ||
1951 | #else | ||
1952 | return 0; | ||
1953 | #endif | ||
1954 | } | ||
1904 | #endif | 1955 | #endif |
1905 | 1956 | ||
1906 | /* | 1957 | /* |
diff --git a/arch/x86/kernel/apm_32.c b/arch/x86/kernel/apm_32.c index 98807bb095ad..37ba5f85b718 100644 --- a/arch/x86/kernel/apm_32.c +++ b/arch/x86/kernel/apm_32.c | |||
@@ -301,7 +301,7 @@ extern int (*console_blank_hook)(int); | |||
301 | */ | 301 | */ |
302 | #define APM_ZERO_SEGS | 302 | #define APM_ZERO_SEGS |
303 | 303 | ||
304 | #include "apm.h" | 304 | #include <asm/apm.h> |
305 | 305 | ||
306 | /* | 306 | /* |
307 | * Define to re-initialize the interrupt 0 timer to 100 Hz after a suspend. | 307 | * Define to re-initialize the interrupt 0 timer to 100 Hz after a suspend. |
diff --git a/arch/x86/kernel/asm-offsets_32.c b/arch/x86/kernel/asm-offsets_32.c index ee4df08feee6..fbf2f33e3080 100644 --- a/arch/x86/kernel/asm-offsets_32.c +++ b/arch/x86/kernel/asm-offsets_32.c | |||
@@ -75,6 +75,7 @@ void foo(void) | |||
75 | OFFSET(PT_DS, pt_regs, ds); | 75 | OFFSET(PT_DS, pt_regs, ds); |
76 | OFFSET(PT_ES, pt_regs, es); | 76 | OFFSET(PT_ES, pt_regs, es); |
77 | OFFSET(PT_FS, pt_regs, fs); | 77 | OFFSET(PT_FS, pt_regs, fs); |
78 | OFFSET(PT_GS, pt_regs, gs); | ||
78 | OFFSET(PT_ORIG_EAX, pt_regs, orig_ax); | 79 | OFFSET(PT_ORIG_EAX, pt_regs, orig_ax); |
79 | OFFSET(PT_EIP, pt_regs, ip); | 80 | OFFSET(PT_EIP, pt_regs, ip); |
80 | OFFSET(PT_CS, pt_regs, cs); | 81 | OFFSET(PT_CS, pt_regs, cs); |
diff --git a/arch/x86/kernel/bigsmp_32.c b/arch/x86/kernel/bigsmp_32.c new file mode 100644 index 000000000000..47a62f46afdb --- /dev/null +++ b/arch/x86/kernel/bigsmp_32.c | |||
@@ -0,0 +1,266 @@ | |||
1 | /* | ||
2 | * APIC driver for "bigsmp" XAPIC machines with more than 8 virtual CPUs. | ||
3 | * Drives the local APIC in "clustered mode". | ||
4 | */ | ||
5 | #define APIC_DEFINITION 1 | ||
6 | #include <linux/threads.h> | ||
7 | #include <linux/cpumask.h> | ||
8 | #include <asm/mpspec.h> | ||
9 | #include <asm/genapic.h> | ||
10 | #include <asm/fixmap.h> | ||
11 | #include <asm/apicdef.h> | ||
12 | #include <asm/ipi.h> | ||
13 | #include <linux/kernel.h> | ||
14 | #include <linux/init.h> | ||
15 | #include <linux/dmi.h> | ||
16 | #include <linux/smp.h> | ||
17 | |||
18 | |||
19 | static inline unsigned bigsmp_get_apic_id(unsigned long x) | ||
20 | { | ||
21 | return (x >> 24) & 0xFF; | ||
22 | } | ||
23 | |||
24 | #define xapic_phys_to_log_apicid(cpu) (per_cpu(x86_bios_cpu_apicid, cpu)) | ||
25 | |||
26 | static inline int bigsmp_apic_id_registered(void) | ||
27 | { | ||
28 | return 1; | ||
29 | } | ||
30 | |||
31 | static inline const cpumask_t *bigsmp_target_cpus(void) | ||
32 | { | ||
33 | #ifdef CONFIG_SMP | ||
34 | return &cpu_online_map; | ||
35 | #else | ||
36 | return &cpumask_of_cpu(0); | ||
37 | #endif | ||
38 | } | ||
39 | |||
40 | #define APIC_DFR_VALUE (APIC_DFR_FLAT) | ||
41 | |||
42 | static inline unsigned long | ||
43 | bigsmp_check_apicid_used(physid_mask_t bitmap, int apicid) | ||
44 | { | ||
45 | return 0; | ||
46 | } | ||
47 | |||
48 | static inline unsigned long bigsmp_check_apicid_present(int bit) | ||
49 | { | ||
50 | return 1; | ||
51 | } | ||
52 | |||
53 | static inline unsigned long calculate_ldr(int cpu) | ||
54 | { | ||
55 | unsigned long val, id; | ||
56 | val = apic_read(APIC_LDR) & ~APIC_LDR_MASK; | ||
57 | id = xapic_phys_to_log_apicid(cpu); | ||
58 | val |= SET_APIC_LOGICAL_ID(id); | ||
59 | return val; | ||
60 | } | ||
61 | |||
62 | /* | ||
63 | * Set up the logical destination ID. | ||
64 | * | ||
65 | * Intel recommends to set DFR, LDR and TPR before enabling | ||
66 | * an APIC. See e.g. "AP-388 82489DX User's Manual" (Intel | ||
67 | * document number 292116). So here it goes... | ||
68 | */ | ||
69 | static inline void bigsmp_init_apic_ldr(void) | ||
70 | { | ||
71 | unsigned long val; | ||
72 | int cpu = smp_processor_id(); | ||
73 | |||
74 | apic_write(APIC_DFR, APIC_DFR_VALUE); | ||
75 | val = calculate_ldr(cpu); | ||
76 | apic_write(APIC_LDR, val); | ||
77 | } | ||
78 | |||
79 | static inline void bigsmp_setup_apic_routing(void) | ||
80 | { | ||
81 | printk("Enabling APIC mode: %s. Using %d I/O APICs\n", | ||
82 | "Physflat", nr_ioapics); | ||
83 | } | ||
84 | |||
85 | static inline int bigsmp_apicid_to_node(int logical_apicid) | ||
86 | { | ||
87 | return apicid_2_node[hard_smp_processor_id()]; | ||
88 | } | ||
89 | |||
90 | static inline int bigsmp_cpu_present_to_apicid(int mps_cpu) | ||
91 | { | ||
92 | if (mps_cpu < nr_cpu_ids) | ||
93 | return (int) per_cpu(x86_bios_cpu_apicid, mps_cpu); | ||
94 | |||
95 | return BAD_APICID; | ||
96 | } | ||
97 | |||
98 | static inline physid_mask_t bigsmp_apicid_to_cpu_present(int phys_apicid) | ||
99 | { | ||
100 | return physid_mask_of_physid(phys_apicid); | ||
101 | } | ||
102 | |||
103 | extern u8 cpu_2_logical_apicid[]; | ||
104 | /* Mapping from cpu number to logical apicid */ | ||
105 | static inline int bigsmp_cpu_to_logical_apicid(int cpu) | ||
106 | { | ||
107 | if (cpu >= nr_cpu_ids) | ||
108 | return BAD_APICID; | ||
109 | return cpu_physical_id(cpu); | ||
110 | } | ||
111 | |||
112 | static inline physid_mask_t bigsmp_ioapic_phys_id_map(physid_mask_t phys_map) | ||
113 | { | ||
114 | /* For clustered we don't have a good way to do this yet - hack */ | ||
115 | return physids_promote(0xFFL); | ||
116 | } | ||
117 | |||
118 | static inline void bigsmp_setup_portio_remap(void) | ||
119 | { | ||
120 | } | ||
121 | |||
122 | static inline int bigsmp_check_phys_apicid_present(int boot_cpu_physical_apicid) | ||
123 | { | ||
124 | return 1; | ||
125 | } | ||
126 | |||
127 | /* As we are using single CPU as destination, pick only one CPU here */ | ||
128 | static inline unsigned int bigsmp_cpu_mask_to_apicid(const cpumask_t *cpumask) | ||
129 | { | ||
130 | return bigsmp_cpu_to_logical_apicid(first_cpu(*cpumask)); | ||
131 | } | ||
132 | |||
133 | static inline unsigned int | ||
134 | bigsmp_cpu_mask_to_apicid_and(const struct cpumask *cpumask, | ||
135 | const struct cpumask *andmask) | ||
136 | { | ||
137 | int cpu; | ||
138 | |||
139 | /* | ||
140 | * We're using fixed IRQ delivery, can only return one phys APIC ID. | ||
141 | * May as well be the first. | ||
142 | */ | ||
143 | for_each_cpu_and(cpu, cpumask, andmask) { | ||
144 | if (cpumask_test_cpu(cpu, cpu_online_mask)) | ||
145 | break; | ||
146 | } | ||
147 | if (cpu < nr_cpu_ids) | ||
148 | return bigsmp_cpu_to_logical_apicid(cpu); | ||
149 | |||
150 | return BAD_APICID; | ||
151 | } | ||
152 | |||
153 | static inline int bigsmp_phys_pkg_id(int cpuid_apic, int index_msb) | ||
154 | { | ||
155 | return cpuid_apic >> index_msb; | ||
156 | } | ||
157 | |||
158 | static inline void bigsmp_send_IPI_mask(const struct cpumask *mask, int vector) | ||
159 | { | ||
160 | default_send_IPI_mask_sequence_phys(mask, vector); | ||
161 | } | ||
162 | |||
163 | static inline void bigsmp_send_IPI_allbutself(int vector) | ||
164 | { | ||
165 | default_send_IPI_mask_allbutself_phys(cpu_online_mask, vector); | ||
166 | } | ||
167 | |||
168 | static inline void bigsmp_send_IPI_all(int vector) | ||
169 | { | ||
170 | bigsmp_send_IPI_mask(cpu_online_mask, vector); | ||
171 | } | ||
172 | |||
173 | static int dmi_bigsmp; /* can be set by dmi scanners */ | ||
174 | |||
175 | static int hp_ht_bigsmp(const struct dmi_system_id *d) | ||
176 | { | ||
177 | printk(KERN_NOTICE "%s detected: force use of apic=bigsmp\n", d->ident); | ||
178 | dmi_bigsmp = 1; | ||
179 | return 0; | ||
180 | } | ||
181 | |||
182 | |||
183 | static const struct dmi_system_id bigsmp_dmi_table[] = { | ||
184 | { hp_ht_bigsmp, "HP ProLiant DL760 G2", | ||
185 | { DMI_MATCH(DMI_BIOS_VENDOR, "HP"), | ||
186 | DMI_MATCH(DMI_BIOS_VERSION, "P44-"),} | ||
187 | }, | ||
188 | |||
189 | { hp_ht_bigsmp, "HP ProLiant DL740", | ||
190 | { DMI_MATCH(DMI_BIOS_VENDOR, "HP"), | ||
191 | DMI_MATCH(DMI_BIOS_VERSION, "P47-"),} | ||
192 | }, | ||
193 | { } | ||
194 | }; | ||
195 | |||
196 | static void bigsmp_vector_allocation_domain(int cpu, cpumask_t *retmask) | ||
197 | { | ||
198 | cpus_clear(*retmask); | ||
199 | cpu_set(cpu, *retmask); | ||
200 | } | ||
201 | |||
202 | static int probe_bigsmp(void) | ||
203 | { | ||
204 | if (def_to_bigsmp) | ||
205 | dmi_bigsmp = 1; | ||
206 | else | ||
207 | dmi_check_system(bigsmp_dmi_table); | ||
208 | return dmi_bigsmp; | ||
209 | } | ||
210 | |||
211 | struct genapic apic_bigsmp = { | ||
212 | |||
213 | .name = "bigsmp", | ||
214 | .probe = probe_bigsmp, | ||
215 | .acpi_madt_oem_check = NULL, | ||
216 | .apic_id_registered = bigsmp_apic_id_registered, | ||
217 | |||
218 | .irq_delivery_mode = dest_Fixed, | ||
219 | /* phys delivery to target CPU: */ | ||
220 | .irq_dest_mode = 0, | ||
221 | |||
222 | .target_cpus = bigsmp_target_cpus, | ||
223 | .disable_esr = 1, | ||
224 | .dest_logical = 0, | ||
225 | .check_apicid_used = bigsmp_check_apicid_used, | ||
226 | .check_apicid_present = bigsmp_check_apicid_present, | ||
227 | |||
228 | .vector_allocation_domain = bigsmp_vector_allocation_domain, | ||
229 | .init_apic_ldr = bigsmp_init_apic_ldr, | ||
230 | |||
231 | .ioapic_phys_id_map = bigsmp_ioapic_phys_id_map, | ||
232 | .setup_apic_routing = bigsmp_setup_apic_routing, | ||
233 | .multi_timer_check = NULL, | ||
234 | .apicid_to_node = bigsmp_apicid_to_node, | ||
235 | .cpu_to_logical_apicid = bigsmp_cpu_to_logical_apicid, | ||
236 | .cpu_present_to_apicid = bigsmp_cpu_present_to_apicid, | ||
237 | .apicid_to_cpu_present = bigsmp_apicid_to_cpu_present, | ||
238 | .setup_portio_remap = NULL, | ||
239 | .check_phys_apicid_present = bigsmp_check_phys_apicid_present, | ||
240 | .enable_apic_mode = NULL, | ||
241 | .phys_pkg_id = bigsmp_phys_pkg_id, | ||
242 | .mps_oem_check = NULL, | ||
243 | |||
244 | .get_apic_id = bigsmp_get_apic_id, | ||
245 | .set_apic_id = NULL, | ||
246 | .apic_id_mask = 0xFF << 24, | ||
247 | |||
248 | .cpu_mask_to_apicid = bigsmp_cpu_mask_to_apicid, | ||
249 | .cpu_mask_to_apicid_and = bigsmp_cpu_mask_to_apicid_and, | ||
250 | |||
251 | .send_IPI_mask = bigsmp_send_IPI_mask, | ||
252 | .send_IPI_mask_allbutself = NULL, | ||
253 | .send_IPI_allbutself = bigsmp_send_IPI_allbutself, | ||
254 | .send_IPI_all = bigsmp_send_IPI_all, | ||
255 | .send_IPI_self = default_send_IPI_self, | ||
256 | |||
257 | .wakeup_cpu = NULL, | ||
258 | .trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW, | ||
259 | .trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH, | ||
260 | |||
261 | .wait_for_init_deassert = default_wait_for_init_deassert, | ||
262 | |||
263 | .smp_callin_clear_local_apic = NULL, | ||
264 | .store_NMI_vector = NULL, | ||
265 | .inquire_remote_apic = default_inquire_remote_apic, | ||
266 | }; | ||
diff --git a/arch/x86/kernel/cpu/addon_cpuid_features.c b/arch/x86/kernel/cpu/addon_cpuid_features.c index 2cf23634b6d9..e48640cfac0c 100644 --- a/arch/x86/kernel/cpu/addon_cpuid_features.c +++ b/arch/x86/kernel/cpu/addon_cpuid_features.c | |||
@@ -7,7 +7,7 @@ | |||
7 | #include <asm/pat.h> | 7 | #include <asm/pat.h> |
8 | #include <asm/processor.h> | 8 | #include <asm/processor.h> |
9 | 9 | ||
10 | #include <mach_apic.h> | 10 | #include <asm/genapic.h> |
11 | 11 | ||
12 | struct cpuid_bit { | 12 | struct cpuid_bit { |
13 | u16 feature; | 13 | u16 feature; |
@@ -69,7 +69,7 @@ void __cpuinit init_scattered_cpuid_features(struct cpuinfo_x86 *c) | |||
69 | */ | 69 | */ |
70 | void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c) | 70 | void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c) |
71 | { | 71 | { |
72 | #ifdef CONFIG_X86_SMP | 72 | #ifdef CONFIG_SMP |
73 | unsigned int eax, ebx, ecx, edx, sub_index; | 73 | unsigned int eax, ebx, ecx, edx, sub_index; |
74 | unsigned int ht_mask_width, core_plus_mask_width; | 74 | unsigned int ht_mask_width, core_plus_mask_width; |
75 | unsigned int core_select_mask, core_level_siblings; | 75 | unsigned int core_select_mask, core_level_siblings; |
@@ -116,22 +116,14 @@ void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c) | |||
116 | 116 | ||
117 | core_select_mask = (~(-1 << core_plus_mask_width)) >> ht_mask_width; | 117 | core_select_mask = (~(-1 << core_plus_mask_width)) >> ht_mask_width; |
118 | 118 | ||
119 | #ifdef CONFIG_X86_32 | 119 | c->cpu_core_id = apic->phys_pkg_id(c->initial_apicid, ht_mask_width) |
120 | c->cpu_core_id = phys_pkg_id(c->initial_apicid, ht_mask_width) | ||
121 | & core_select_mask; | 120 | & core_select_mask; |
122 | c->phys_proc_id = phys_pkg_id(c->initial_apicid, core_plus_mask_width); | 121 | c->phys_proc_id = apic->phys_pkg_id(c->initial_apicid, core_plus_mask_width); |
123 | /* | 122 | /* |
124 | * Reinit the apicid, now that we have extended initial_apicid. | 123 | * Reinit the apicid, now that we have extended initial_apicid. |
125 | */ | 124 | */ |
126 | c->apicid = phys_pkg_id(c->initial_apicid, 0); | 125 | c->apicid = apic->phys_pkg_id(c->initial_apicid, 0); |
127 | #else | 126 | |
128 | c->cpu_core_id = phys_pkg_id(ht_mask_width) & core_select_mask; | ||
129 | c->phys_proc_id = phys_pkg_id(core_plus_mask_width); | ||
130 | /* | ||
131 | * Reinit the apicid, now that we have extended initial_apicid. | ||
132 | */ | ||
133 | c->apicid = phys_pkg_id(0); | ||
134 | #endif | ||
135 | c->x86_max_cores = (core_level_siblings / smp_num_siblings); | 127 | c->x86_max_cores = (core_level_siblings / smp_num_siblings); |
136 | 128 | ||
137 | 129 | ||
@@ -143,37 +135,3 @@ void __cpuinit detect_extended_topology(struct cpuinfo_x86 *c) | |||
143 | return; | 135 | return; |
144 | #endif | 136 | #endif |
145 | } | 137 | } |
146 | |||
147 | #ifdef CONFIG_X86_PAT | ||
148 | void __cpuinit validate_pat_support(struct cpuinfo_x86 *c) | ||
149 | { | ||
150 | if (!cpu_has_pat) | ||
151 | pat_disable("PAT not supported by CPU."); | ||
152 | |||
153 | switch (c->x86_vendor) { | ||
154 | case X86_VENDOR_INTEL: | ||
155 | /* | ||
156 | * There is a known erratum on Pentium III and Core Solo | ||
157 | * and Core Duo CPUs. | ||
158 | * " Page with PAT set to WC while associated MTRR is UC | ||
159 | * may consolidate to UC " | ||
160 | * Because of this erratum, it is better to stick with | ||
161 | * setting WC in MTRR rather than using PAT on these CPUs. | ||
162 | * | ||
163 | * Enable PAT WC only on P4, Core 2 or later CPUs. | ||
164 | */ | ||
165 | if (c->x86 > 0x6 || (c->x86 == 6 && c->x86_model >= 15)) | ||
166 | return; | ||
167 | |||
168 | pat_disable("PAT WC disabled due to known CPU erratum."); | ||
169 | return; | ||
170 | |||
171 | case X86_VENDOR_AMD: | ||
172 | case X86_VENDOR_CENTAUR: | ||
173 | case X86_VENDOR_TRANSMETA: | ||
174 | return; | ||
175 | } | ||
176 | |||
177 | pat_disable("PAT disabled. Not yet verified on this CPU type."); | ||
178 | } | ||
179 | #endif | ||
diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c index 7c878f6aa919..ff4d7b9e32e4 100644 --- a/arch/x86/kernel/cpu/amd.c +++ b/arch/x86/kernel/cpu/amd.c | |||
@@ -12,7 +12,7 @@ | |||
12 | # include <asm/cacheflush.h> | 12 | # include <asm/cacheflush.h> |
13 | #endif | 13 | #endif |
14 | 14 | ||
15 | #include <mach_apic.h> | 15 | #include <asm/genapic.h> |
16 | 16 | ||
17 | #include "cpu.h" | 17 | #include "cpu.h" |
18 | 18 | ||
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 6fd316689c47..3a9d45a14ad9 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c | |||
@@ -27,7 +27,7 @@ | |||
27 | #ifdef CONFIG_X86_LOCAL_APIC | 27 | #ifdef CONFIG_X86_LOCAL_APIC |
28 | #include <asm/mpspec.h> | 28 | #include <asm/mpspec.h> |
29 | #include <asm/apic.h> | 29 | #include <asm/apic.h> |
30 | #include <mach_apic.h> | 30 | #include <asm/genapic.h> |
31 | #include <asm/genapic.h> | 31 | #include <asm/genapic.h> |
32 | #include <asm/uv/uv.h> | 32 | #include <asm/uv/uv.h> |
33 | #endif | 33 | #endif |
@@ -40,6 +40,7 @@ | |||
40 | #include <asm/sections.h> | 40 | #include <asm/sections.h> |
41 | #include <asm/setup.h> | 41 | #include <asm/setup.h> |
42 | #include <asm/hypervisor.h> | 42 | #include <asm/hypervisor.h> |
43 | #include <asm/stackprotector.h> | ||
43 | 44 | ||
44 | #include "cpu.h" | 45 | #include "cpu.h" |
45 | 46 | ||
@@ -53,6 +54,15 @@ cpumask_var_t cpu_initialized_mask; | |||
53 | /* representing cpus for which sibling maps can be computed */ | 54 | /* representing cpus for which sibling maps can be computed */ |
54 | cpumask_var_t cpu_sibling_setup_mask; | 55 | cpumask_var_t cpu_sibling_setup_mask; |
55 | 56 | ||
57 | /* correctly size the local cpu masks */ | ||
58 | void __init setup_cpu_local_masks(void) | ||
59 | { | ||
60 | alloc_bootmem_cpumask_var(&cpu_initialized_mask); | ||
61 | alloc_bootmem_cpumask_var(&cpu_callin_mask); | ||
62 | alloc_bootmem_cpumask_var(&cpu_callout_mask); | ||
63 | alloc_bootmem_cpumask_var(&cpu_sibling_setup_mask); | ||
64 | } | ||
65 | |||
56 | #else /* CONFIG_X86_32 */ | 66 | #else /* CONFIG_X86_32 */ |
57 | 67 | ||
58 | cpumask_t cpu_callin_map; | 68 | cpumask_t cpu_callin_map; |
@@ -114,6 +124,7 @@ DEFINE_PER_CPU_PAGE_ALIGNED(struct gdt_page, gdt_page) = { .gdt = { | |||
114 | 124 | ||
115 | [GDT_ENTRY_ESPFIX_SS] = { { { 0x00000000, 0x00c09200 } } }, | 125 | [GDT_ENTRY_ESPFIX_SS] = { { { 0x00000000, 0x00c09200 } } }, |
116 | [GDT_ENTRY_PERCPU] = { { { 0x0000ffff, 0x00cf9200 } } }, | 126 | [GDT_ENTRY_PERCPU] = { { { 0x0000ffff, 0x00cf9200 } } }, |
127 | GDT_STACK_CANARY_INIT | ||
117 | #endif | 128 | #endif |
118 | } }; | 129 | } }; |
119 | EXPORT_PER_CPU_SYMBOL_GPL(gdt_page); | 130 | EXPORT_PER_CPU_SYMBOL_GPL(gdt_page); |
@@ -216,6 +227,49 @@ static inline void squash_the_stupid_serial_number(struct cpuinfo_x86 *c) | |||
216 | #endif | 227 | #endif |
217 | 228 | ||
218 | /* | 229 | /* |
230 | * Some CPU features depend on higher CPUID levels, which may not always | ||
231 | * be available due to CPUID level capping or broken virtualization | ||
232 | * software. Add those features to this table to auto-disable them. | ||
233 | */ | ||
234 | struct cpuid_dependent_feature { | ||
235 | u32 feature; | ||
236 | u32 level; | ||
237 | }; | ||
238 | static const struct cpuid_dependent_feature __cpuinitconst | ||
239 | cpuid_dependent_features[] = { | ||
240 | { X86_FEATURE_MWAIT, 0x00000005 }, | ||
241 | { X86_FEATURE_DCA, 0x00000009 }, | ||
242 | { X86_FEATURE_XSAVE, 0x0000000d }, | ||
243 | { 0, 0 } | ||
244 | }; | ||
245 | |||
246 | static void __cpuinit filter_cpuid_features(struct cpuinfo_x86 *c, bool warn) | ||
247 | { | ||
248 | const struct cpuid_dependent_feature *df; | ||
249 | for (df = cpuid_dependent_features; df->feature; df++) { | ||
250 | /* | ||
251 | * Note: cpuid_level is set to -1 if unavailable, but | ||
252 | * extended_extended_level is set to 0 if unavailable | ||
253 | * and the legitimate extended levels are all negative | ||
254 | * when signed; hence the weird messing around with | ||
255 | * signs here... | ||
256 | */ | ||
257 | if (cpu_has(c, df->feature) && | ||
258 | ((s32)df->feature < 0 ? | ||
259 | (u32)df->feature > (u32)c->extended_cpuid_level : | ||
260 | (s32)df->feature > (s32)c->cpuid_level)) { | ||
261 | clear_cpu_cap(c, df->feature); | ||
262 | if (warn) | ||
263 | printk(KERN_WARNING | ||
264 | "CPU: CPU feature %s disabled " | ||
265 | "due to lack of CPUID level 0x%x\n", | ||
266 | x86_cap_flags[df->feature], | ||
267 | df->level); | ||
268 | } | ||
269 | } | ||
270 | } | ||
271 | |||
272 | /* | ||
219 | * Naming convention should be: <Name> [(<Codename>)] | 273 | * Naming convention should be: <Name> [(<Codename>)] |
220 | * This table only is used unless init_<vendor>() below doesn't set it; | 274 | * This table only is used unless init_<vendor>() below doesn't set it; |
221 | * in particular, if CPUID levels 0x80000002..4 are supported, this isn't used | 275 | * in particular, if CPUID levels 0x80000002..4 are supported, this isn't used |
@@ -245,18 +299,29 @@ static char __cpuinit *table_lookup_model(struct cpuinfo_x86 *c) | |||
245 | 299 | ||
246 | __u32 cleared_cpu_caps[NCAPINTS] __cpuinitdata; | 300 | __u32 cleared_cpu_caps[NCAPINTS] __cpuinitdata; |
247 | 301 | ||
302 | void load_percpu_segment(int cpu) | ||
303 | { | ||
304 | #ifdef CONFIG_X86_32 | ||
305 | loadsegment(fs, __KERNEL_PERCPU); | ||
306 | #else | ||
307 | loadsegment(gs, 0); | ||
308 | wrmsrl(MSR_GS_BASE, (unsigned long)per_cpu(irq_stack_union.gs_base, cpu)); | ||
309 | #endif | ||
310 | load_stack_canary_segment(); | ||
311 | } | ||
312 | |||
248 | /* Current gdt points %fs at the "master" per-cpu area: after this, | 313 | /* Current gdt points %fs at the "master" per-cpu area: after this, |
249 | * it's on the real one. */ | 314 | * it's on the real one. */ |
250 | void switch_to_new_gdt(void) | 315 | void switch_to_new_gdt(int cpu) |
251 | { | 316 | { |
252 | struct desc_ptr gdt_descr; | 317 | struct desc_ptr gdt_descr; |
253 | 318 | ||
254 | gdt_descr.address = (long)get_cpu_gdt_table(smp_processor_id()); | 319 | gdt_descr.address = (long)get_cpu_gdt_table(cpu); |
255 | gdt_descr.size = GDT_SIZE - 1; | 320 | gdt_descr.size = GDT_SIZE - 1; |
256 | load_gdt(&gdt_descr); | 321 | load_gdt(&gdt_descr); |
257 | #ifdef CONFIG_X86_32 | 322 | /* Reload the per-cpu base */ |
258 | asm("mov %0, %%fs" : : "r" (__KERNEL_PERCPU) : "memory"); | 323 | |
259 | #endif | 324 | load_percpu_segment(cpu); |
260 | } | 325 | } |
261 | 326 | ||
262 | static struct cpu_dev *cpu_devs[X86_VENDOR_NUM] = {}; | 327 | static struct cpu_dev *cpu_devs[X86_VENDOR_NUM] = {}; |
@@ -386,11 +451,7 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c) | |||
386 | } | 451 | } |
387 | 452 | ||
388 | index_msb = get_count_order(smp_num_siblings); | 453 | index_msb = get_count_order(smp_num_siblings); |
389 | #ifdef CONFIG_X86_64 | 454 | c->phys_proc_id = apic->phys_pkg_id(c->initial_apicid, index_msb); |
390 | c->phys_proc_id = phys_pkg_id(index_msb); | ||
391 | #else | ||
392 | c->phys_proc_id = phys_pkg_id(c->initial_apicid, index_msb); | ||
393 | #endif | ||
394 | 455 | ||
395 | smp_num_siblings = smp_num_siblings / c->x86_max_cores; | 456 | smp_num_siblings = smp_num_siblings / c->x86_max_cores; |
396 | 457 | ||
@@ -398,13 +459,8 @@ void __cpuinit detect_ht(struct cpuinfo_x86 *c) | |||
398 | 459 | ||
399 | core_bits = get_count_order(c->x86_max_cores); | 460 | core_bits = get_count_order(c->x86_max_cores); |
400 | 461 | ||
401 | #ifdef CONFIG_X86_64 | 462 | c->cpu_core_id = apic->phys_pkg_id(c->initial_apicid, index_msb) & |
402 | c->cpu_core_id = phys_pkg_id(index_msb) & | ||
403 | ((1 << core_bits) - 1); | ||
404 | #else | ||
405 | c->cpu_core_id = phys_pkg_id(c->initial_apicid, index_msb) & | ||
406 | ((1 << core_bits) - 1); | 463 | ((1 << core_bits) - 1); |
407 | #endif | ||
408 | } | 464 | } |
409 | 465 | ||
410 | out: | 466 | out: |
@@ -573,11 +629,10 @@ static void __init early_identify_cpu(struct cpuinfo_x86 *c) | |||
573 | if (this_cpu->c_early_init) | 629 | if (this_cpu->c_early_init) |
574 | this_cpu->c_early_init(c); | 630 | this_cpu->c_early_init(c); |
575 | 631 | ||
576 | validate_pat_support(c); | ||
577 | |||
578 | #ifdef CONFIG_SMP | 632 | #ifdef CONFIG_SMP |
579 | c->cpu_index = boot_cpu_id; | 633 | c->cpu_index = boot_cpu_id; |
580 | #endif | 634 | #endif |
635 | filter_cpuid_features(c, false); | ||
581 | } | 636 | } |
582 | 637 | ||
583 | void __init early_cpu_init(void) | 638 | void __init early_cpu_init(void) |
@@ -640,7 +695,7 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) | |||
640 | c->initial_apicid = (cpuid_ebx(1) >> 24) & 0xFF; | 695 | c->initial_apicid = (cpuid_ebx(1) >> 24) & 0xFF; |
641 | #ifdef CONFIG_X86_32 | 696 | #ifdef CONFIG_X86_32 |
642 | # ifdef CONFIG_X86_HT | 697 | # ifdef CONFIG_X86_HT |
643 | c->apicid = phys_pkg_id(c->initial_apicid, 0); | 698 | c->apicid = apic->phys_pkg_id(c->initial_apicid, 0); |
644 | # else | 699 | # else |
645 | c->apicid = c->initial_apicid; | 700 | c->apicid = c->initial_apicid; |
646 | # endif | 701 | # endif |
@@ -687,7 +742,7 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c) | |||
687 | this_cpu->c_identify(c); | 742 | this_cpu->c_identify(c); |
688 | 743 | ||
689 | #ifdef CONFIG_X86_64 | 744 | #ifdef CONFIG_X86_64 |
690 | c->apicid = phys_pkg_id(0); | 745 | c->apicid = apic->phys_pkg_id(c->initial_apicid, 0); |
691 | #endif | 746 | #endif |
692 | 747 | ||
693 | /* | 748 | /* |
@@ -711,6 +766,9 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c) | |||
711 | * we do "generic changes." | 766 | * we do "generic changes." |
712 | */ | 767 | */ |
713 | 768 | ||
769 | /* Filter out anything that depends on CPUID levels we don't have */ | ||
770 | filter_cpuid_features(c, true); | ||
771 | |||
714 | /* If the model name is still unset, do table lookup. */ | 772 | /* If the model name is still unset, do table lookup. */ |
715 | if (!c->x86_model_id[0]) { | 773 | if (!c->x86_model_id[0]) { |
716 | char *p; | 774 | char *p; |
@@ -885,12 +943,8 @@ struct desc_ptr idt_descr = { 256 * 16 - 1, (unsigned long) idt_table }; | |||
885 | 943 | ||
886 | DEFINE_PER_CPU_FIRST(union irq_stack_union, | 944 | DEFINE_PER_CPU_FIRST(union irq_stack_union, |
887 | irq_stack_union) __aligned(PAGE_SIZE); | 945 | irq_stack_union) __aligned(PAGE_SIZE); |
888 | #ifdef CONFIG_SMP | ||
889 | DEFINE_PER_CPU(char *, irq_stack_ptr); /* will be set during per cpu init */ | ||
890 | #else | ||
891 | DEFINE_PER_CPU(char *, irq_stack_ptr) = | 946 | DEFINE_PER_CPU(char *, irq_stack_ptr) = |
892 | per_cpu_var(irq_stack_union.irq_stack) + IRQ_STACK_SIZE - 64; | 947 | init_per_cpu_var(irq_stack_union.irq_stack) + IRQ_STACK_SIZE - 64; |
893 | #endif | ||
894 | 948 | ||
895 | DEFINE_PER_CPU(unsigned long, kernel_stack) = | 949 | DEFINE_PER_CPU(unsigned long, kernel_stack) = |
896 | (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE; | 950 | (unsigned long)&init_thread_union - KERNEL_STACK_OFFSET + THREAD_SIZE; |
@@ -933,16 +987,21 @@ unsigned long kernel_eflags; | |||
933 | */ | 987 | */ |
934 | DEFINE_PER_CPU(struct orig_ist, orig_ist); | 988 | DEFINE_PER_CPU(struct orig_ist, orig_ist); |
935 | 989 | ||
936 | #else | 990 | #else /* x86_64 */ |
937 | 991 | ||
938 | /* Make sure %fs is initialized properly in idle threads */ | 992 | #ifdef CONFIG_CC_STACKPROTECTOR |
993 | DEFINE_PER_CPU(unsigned long, stack_canary); | ||
994 | #endif | ||
995 | |||
996 | /* Make sure %fs and %gs are initialized properly in idle threads */ | ||
939 | struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs) | 997 | struct pt_regs * __cpuinit idle_regs(struct pt_regs *regs) |
940 | { | 998 | { |
941 | memset(regs, 0, sizeof(struct pt_regs)); | 999 | memset(regs, 0, sizeof(struct pt_regs)); |
942 | regs->fs = __KERNEL_PERCPU; | 1000 | regs->fs = __KERNEL_PERCPU; |
1001 | regs->gs = __KERNEL_STACK_CANARY; | ||
943 | return regs; | 1002 | return regs; |
944 | } | 1003 | } |
945 | #endif | 1004 | #endif /* x86_64 */ |
946 | 1005 | ||
947 | /* | 1006 | /* |
948 | * cpu_init() initializes state that is per-CPU. Some data is already | 1007 | * cpu_init() initializes state that is per-CPU. Some data is already |
@@ -961,10 +1020,6 @@ void __cpuinit cpu_init(void) | |||
961 | struct task_struct *me; | 1020 | struct task_struct *me; |
962 | int i; | 1021 | int i; |
963 | 1022 | ||
964 | loadsegment(fs, 0); | ||
965 | loadsegment(gs, 0); | ||
966 | load_gs_base(cpu); | ||
967 | |||
968 | #ifdef CONFIG_NUMA | 1023 | #ifdef CONFIG_NUMA |
969 | if (cpu != 0 && percpu_read(node_number) == 0 && | 1024 | if (cpu != 0 && percpu_read(node_number) == 0 && |
970 | cpu_to_node(cpu) != NUMA_NO_NODE) | 1025 | cpu_to_node(cpu) != NUMA_NO_NODE) |
@@ -985,7 +1040,9 @@ void __cpuinit cpu_init(void) | |||
985 | * and set up the GDT descriptor: | 1040 | * and set up the GDT descriptor: |
986 | */ | 1041 | */ |
987 | 1042 | ||
988 | switch_to_new_gdt(); | 1043 | switch_to_new_gdt(cpu); |
1044 | loadsegment(fs, 0); | ||
1045 | |||
989 | load_idt((const struct desc_ptr *)&idt_descr); | 1046 | load_idt((const struct desc_ptr *)&idt_descr); |
990 | 1047 | ||
991 | memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8); | 1048 | memset(me->thread.tls_array, 0, GDT_ENTRY_TLS_ENTRIES * 8); |
@@ -1043,22 +1100,19 @@ void __cpuinit cpu_init(void) | |||
1043 | */ | 1100 | */ |
1044 | if (kgdb_connected && arch_kgdb_ops.correct_hw_break) | 1101 | if (kgdb_connected && arch_kgdb_ops.correct_hw_break) |
1045 | arch_kgdb_ops.correct_hw_break(); | 1102 | arch_kgdb_ops.correct_hw_break(); |
1046 | else { | 1103 | else |
1047 | #endif | 1104 | #endif |
1048 | /* | 1105 | { |
1049 | * Clear all 6 debug registers: | 1106 | /* |
1050 | */ | 1107 | * Clear all 6 debug registers: |
1051 | 1108 | */ | |
1052 | set_debugreg(0UL, 0); | 1109 | set_debugreg(0UL, 0); |
1053 | set_debugreg(0UL, 1); | 1110 | set_debugreg(0UL, 1); |
1054 | set_debugreg(0UL, 2); | 1111 | set_debugreg(0UL, 2); |
1055 | set_debugreg(0UL, 3); | 1112 | set_debugreg(0UL, 3); |
1056 | set_debugreg(0UL, 6); | 1113 | set_debugreg(0UL, 6); |
1057 | set_debugreg(0UL, 7); | 1114 | set_debugreg(0UL, 7); |
1058 | #ifdef CONFIG_KGDB | ||
1059 | /* If the kgdb is connected no debug regs should be altered. */ | ||
1060 | } | 1115 | } |
1061 | #endif | ||
1062 | 1116 | ||
1063 | fpu_init(); | 1117 | fpu_init(); |
1064 | 1118 | ||
@@ -1088,7 +1142,7 @@ void __cpuinit cpu_init(void) | |||
1088 | clear_in_cr4(X86_CR4_VME|X86_CR4_PVI|X86_CR4_TSD|X86_CR4_DE); | 1142 | clear_in_cr4(X86_CR4_VME|X86_CR4_PVI|X86_CR4_TSD|X86_CR4_DE); |
1089 | 1143 | ||
1090 | load_idt(&idt_descr); | 1144 | load_idt(&idt_descr); |
1091 | switch_to_new_gdt(); | 1145 | switch_to_new_gdt(cpu); |
1092 | 1146 | ||
1093 | /* | 1147 | /* |
1094 | * Set up and load the per-CPU TSS and LDT | 1148 | * Set up and load the per-CPU TSS and LDT |
@@ -1109,9 +1163,6 @@ void __cpuinit cpu_init(void) | |||
1109 | __set_tss_desc(cpu, GDT_ENTRY_DOUBLEFAULT_TSS, &doublefault_tss); | 1163 | __set_tss_desc(cpu, GDT_ENTRY_DOUBLEFAULT_TSS, &doublefault_tss); |
1110 | #endif | 1164 | #endif |
1111 | 1165 | ||
1112 | /* Clear %gs. */ | ||
1113 | asm volatile ("mov %0, %%gs" : : "r" (0)); | ||
1114 | |||
1115 | /* Clear all 6 debug registers: */ | 1166 | /* Clear all 6 debug registers: */ |
1116 | set_debugreg(0, 0); | 1167 | set_debugreg(0, 0); |
1117 | set_debugreg(0, 1); | 1168 | set_debugreg(0, 1); |
diff --git a/arch/x86/kernel/cpu/intel.c b/arch/x86/kernel/cpu/intel.c index 24ff26a38ade..1f137a87d4bd 100644 --- a/arch/x86/kernel/cpu/intel.c +++ b/arch/x86/kernel/cpu/intel.c | |||
@@ -24,7 +24,7 @@ | |||
24 | #ifdef CONFIG_X86_LOCAL_APIC | 24 | #ifdef CONFIG_X86_LOCAL_APIC |
25 | #include <asm/mpspec.h> | 25 | #include <asm/mpspec.h> |
26 | #include <asm/apic.h> | 26 | #include <asm/apic.h> |
27 | #include <mach_apic.h> | 27 | #include <asm/genapic.h> |
28 | #endif | 28 | #endif |
29 | 29 | ||
30 | static void __cpuinit early_init_intel(struct cpuinfo_x86 *c) | 30 | static void __cpuinit early_init_intel(struct cpuinfo_x86 *c) |
@@ -63,6 +63,18 @@ static void __cpuinit early_init_intel(struct cpuinfo_x86 *c) | |||
63 | set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC); | 63 | set_cpu_cap(c, X86_FEATURE_NONSTOP_TSC); |
64 | } | 64 | } |
65 | 65 | ||
66 | /* | ||
67 | * There is a known erratum on Pentium III and Core Solo | ||
68 | * and Core Duo CPUs. | ||
69 | * " Page with PAT set to WC while associated MTRR is UC | ||
70 | * may consolidate to UC " | ||
71 | * Because of this erratum, it is better to stick with | ||
72 | * setting WC in MTRR rather than using PAT on these CPUs. | ||
73 | * | ||
74 | * Enable PAT WC only on P4, Core 2 or later CPUs. | ||
75 | */ | ||
76 | if (c->x86 == 6 && c->x86_model < 15) | ||
77 | clear_cpu_cap(c, X86_FEATURE_PAT); | ||
66 | } | 78 | } |
67 | 79 | ||
68 | #ifdef CONFIG_X86_32 | 80 | #ifdef CONFIG_X86_32 |
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index 11b93cabdf78..ad7f2a696f4a 100644 --- a/arch/x86/kernel/crash.c +++ b/arch/x86/kernel/crash.c | |||
@@ -28,7 +28,7 @@ | |||
28 | #include <asm/reboot.h> | 28 | #include <asm/reboot.h> |
29 | #include <asm/virtext.h> | 29 | #include <asm/virtext.h> |
30 | 30 | ||
31 | #include <mach_ipi.h> | 31 | #include <asm/genapic.h> |
32 | 32 | ||
33 | 33 | ||
34 | #if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC) | 34 | #if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC) |
diff --git a/arch/x86/kernel/dumpstack.c b/arch/x86/kernel/dumpstack.c index 6b1f6f6f8661..87d103ded1c3 100644 --- a/arch/x86/kernel/dumpstack.c +++ b/arch/x86/kernel/dumpstack.c | |||
@@ -99,7 +99,7 @@ print_context_stack(struct thread_info *tinfo, | |||
99 | frame = frame->next_frame; | 99 | frame = frame->next_frame; |
100 | bp = (unsigned long) frame; | 100 | bp = (unsigned long) frame; |
101 | } else { | 101 | } else { |
102 | ops->address(data, addr, bp == 0); | 102 | ops->address(data, addr, 0); |
103 | } | 103 | } |
104 | print_ftrace_graph_addr(addr, data, ops, tinfo, graph); | 104 | print_ftrace_graph_addr(addr, data, ops, tinfo, graph); |
105 | } | 105 | } |
diff --git a/arch/x86/kernel/early_printk.c b/arch/x86/kernel/early_printk.c index 504ad198e4ad..639ad98238a2 100644 --- a/arch/x86/kernel/early_printk.c +++ b/arch/x86/kernel/early_printk.c | |||
@@ -13,8 +13,8 @@ | |||
13 | #include <asm/setup.h> | 13 | #include <asm/setup.h> |
14 | #include <xen/hvc-console.h> | 14 | #include <xen/hvc-console.h> |
15 | #include <asm/pci-direct.h> | 15 | #include <asm/pci-direct.h> |
16 | #include <asm/pgtable.h> | ||
17 | #include <asm/fixmap.h> | 16 | #include <asm/fixmap.h> |
17 | #include <asm/pgtable.h> | ||
18 | #include <linux/usb/ehci_def.h> | 18 | #include <linux/usb/ehci_def.h> |
19 | 19 | ||
20 | /* Simple VGA output */ | 20 | /* Simple VGA output */ |
diff --git a/arch/x86/kernel/entry_32.S b/arch/x86/kernel/entry_32.S index a0b91aac72a1..e99206831459 100644 --- a/arch/x86/kernel/entry_32.S +++ b/arch/x86/kernel/entry_32.S | |||
@@ -30,12 +30,13 @@ | |||
30 | * 1C(%esp) - %ds | 30 | * 1C(%esp) - %ds |
31 | * 20(%esp) - %es | 31 | * 20(%esp) - %es |
32 | * 24(%esp) - %fs | 32 | * 24(%esp) - %fs |
33 | * 28(%esp) - orig_eax | 33 | * 28(%esp) - %gs saved iff !CONFIG_X86_32_LAZY_GS |
34 | * 2C(%esp) - %eip | 34 | * 2C(%esp) - orig_eax |
35 | * 30(%esp) - %cs | 35 | * 30(%esp) - %eip |
36 | * 34(%esp) - %eflags | 36 | * 34(%esp) - %cs |
37 | * 38(%esp) - %oldesp | 37 | * 38(%esp) - %eflags |
38 | * 3C(%esp) - %oldss | 38 | * 3C(%esp) - %oldesp |
39 | * 40(%esp) - %oldss | ||
39 | * | 40 | * |
40 | * "current" is in register %ebx during any slow entries. | 41 | * "current" is in register %ebx during any slow entries. |
41 | */ | 42 | */ |
@@ -101,121 +102,221 @@ | |||
101 | #define resume_userspace_sig resume_userspace | 102 | #define resume_userspace_sig resume_userspace |
102 | #endif | 103 | #endif |
103 | 104 | ||
104 | #define SAVE_ALL \ | 105 | /* |
105 | cld; \ | 106 | * User gs save/restore |
106 | pushl %fs; \ | 107 | * |
107 | CFI_ADJUST_CFA_OFFSET 4;\ | 108 | * %gs is used for userland TLS and kernel only uses it for stack |
108 | /*CFI_REL_OFFSET fs, 0;*/\ | 109 | * canary which is required to be at %gs:20 by gcc. Read the comment |
109 | pushl %es; \ | 110 | * at the top of stackprotector.h for more info. |
110 | CFI_ADJUST_CFA_OFFSET 4;\ | 111 | * |
111 | /*CFI_REL_OFFSET es, 0;*/\ | 112 | * Local labels 98 and 99 are used. |
112 | pushl %ds; \ | 113 | */ |
113 | CFI_ADJUST_CFA_OFFSET 4;\ | 114 | #ifdef CONFIG_X86_32_LAZY_GS |
114 | /*CFI_REL_OFFSET ds, 0;*/\ | 115 | |
115 | pushl %eax; \ | 116 | /* unfortunately push/pop can't be no-op */ |
116 | CFI_ADJUST_CFA_OFFSET 4;\ | 117 | .macro PUSH_GS |
117 | CFI_REL_OFFSET eax, 0;\ | 118 | pushl $0 |
118 | pushl %ebp; \ | 119 | CFI_ADJUST_CFA_OFFSET 4 |
119 | CFI_ADJUST_CFA_OFFSET 4;\ | 120 | .endm |
120 | CFI_REL_OFFSET ebp, 0;\ | 121 | .macro POP_GS pop=0 |
121 | pushl %edi; \ | 122 | addl $(4 + \pop), %esp |
122 | CFI_ADJUST_CFA_OFFSET 4;\ | 123 | CFI_ADJUST_CFA_OFFSET -(4 + \pop) |
123 | CFI_REL_OFFSET edi, 0;\ | 124 | .endm |
124 | pushl %esi; \ | 125 | .macro POP_GS_EX |
125 | CFI_ADJUST_CFA_OFFSET 4;\ | 126 | .endm |
126 | CFI_REL_OFFSET esi, 0;\ | 127 | |
127 | pushl %edx; \ | 128 | /* all the rest are no-op */ |
128 | CFI_ADJUST_CFA_OFFSET 4;\ | 129 | .macro PTGS_TO_GS |
129 | CFI_REL_OFFSET edx, 0;\ | 130 | .endm |
130 | pushl %ecx; \ | 131 | .macro PTGS_TO_GS_EX |
131 | CFI_ADJUST_CFA_OFFSET 4;\ | 132 | .endm |
132 | CFI_REL_OFFSET ecx, 0;\ | 133 | .macro GS_TO_REG reg |
133 | pushl %ebx; \ | 134 | .endm |
134 | CFI_ADJUST_CFA_OFFSET 4;\ | 135 | .macro REG_TO_PTGS reg |
135 | CFI_REL_OFFSET ebx, 0;\ | 136 | .endm |
136 | movl $(__USER_DS), %edx; \ | 137 | .macro SET_KERNEL_GS reg |
137 | movl %edx, %ds; \ | 138 | .endm |
138 | movl %edx, %es; \ | 139 | |
139 | movl $(__KERNEL_PERCPU), %edx; \ | 140 | #else /* CONFIG_X86_32_LAZY_GS */ |
141 | |||
142 | .macro PUSH_GS | ||
143 | pushl %gs | ||
144 | CFI_ADJUST_CFA_OFFSET 4 | ||
145 | /*CFI_REL_OFFSET gs, 0*/ | ||
146 | .endm | ||
147 | |||
148 | .macro POP_GS pop=0 | ||
149 | 98: popl %gs | ||
150 | CFI_ADJUST_CFA_OFFSET -4 | ||
151 | /*CFI_RESTORE gs*/ | ||
152 | .if \pop <> 0 | ||
153 | add $\pop, %esp | ||
154 | CFI_ADJUST_CFA_OFFSET -\pop | ||
155 | .endif | ||
156 | .endm | ||
157 | .macro POP_GS_EX | ||
158 | .pushsection .fixup, "ax" | ||
159 | 99: movl $0, (%esp) | ||
160 | jmp 98b | ||
161 | .section __ex_table, "a" | ||
162 | .align 4 | ||
163 | .long 98b, 99b | ||
164 | .popsection | ||
165 | .endm | ||
166 | |||
167 | .macro PTGS_TO_GS | ||
168 | 98: mov PT_GS(%esp), %gs | ||
169 | .endm | ||
170 | .macro PTGS_TO_GS_EX | ||
171 | .pushsection .fixup, "ax" | ||
172 | 99: movl $0, PT_GS(%esp) | ||
173 | jmp 98b | ||
174 | .section __ex_table, "a" | ||
175 | .align 4 | ||
176 | .long 98b, 99b | ||
177 | .popsection | ||
178 | .endm | ||
179 | |||
180 | .macro GS_TO_REG reg | ||
181 | movl %gs, \reg | ||
182 | /*CFI_REGISTER gs, \reg*/ | ||
183 | .endm | ||
184 | .macro REG_TO_PTGS reg | ||
185 | movl \reg, PT_GS(%esp) | ||
186 | /*CFI_REL_OFFSET gs, PT_GS*/ | ||
187 | .endm | ||
188 | .macro SET_KERNEL_GS reg | ||
189 | movl $(__KERNEL_STACK_CANARY), \reg | ||
190 | movl \reg, %gs | ||
191 | .endm | ||
192 | |||
193 | #endif /* CONFIG_X86_32_LAZY_GS */ | ||
194 | |||
195 | .macro SAVE_ALL | ||
196 | cld | ||
197 | PUSH_GS | ||
198 | pushl %fs | ||
199 | CFI_ADJUST_CFA_OFFSET 4 | ||
200 | /*CFI_REL_OFFSET fs, 0;*/ | ||
201 | pushl %es | ||
202 | CFI_ADJUST_CFA_OFFSET 4 | ||
203 | /*CFI_REL_OFFSET es, 0;*/ | ||
204 | pushl %ds | ||
205 | CFI_ADJUST_CFA_OFFSET 4 | ||
206 | /*CFI_REL_OFFSET ds, 0;*/ | ||
207 | pushl %eax | ||
208 | CFI_ADJUST_CFA_OFFSET 4 | ||
209 | CFI_REL_OFFSET eax, 0 | ||
210 | pushl %ebp | ||
211 | CFI_ADJUST_CFA_OFFSET 4 | ||
212 | CFI_REL_OFFSET ebp, 0 | ||
213 | pushl %edi | ||
214 | CFI_ADJUST_CFA_OFFSET 4 | ||
215 | CFI_REL_OFFSET edi, 0 | ||
216 | pushl %esi | ||
217 | CFI_ADJUST_CFA_OFFSET 4 | ||
218 | CFI_REL_OFFSET esi, 0 | ||
219 | pushl %edx | ||
220 | CFI_ADJUST_CFA_OFFSET 4 | ||
221 | CFI_REL_OFFSET edx, 0 | ||
222 | pushl %ecx | ||
223 | CFI_ADJUST_CFA_OFFSET 4 | ||
224 | CFI_REL_OFFSET ecx, 0 | ||
225 | pushl %ebx | ||
226 | CFI_ADJUST_CFA_OFFSET 4 | ||
227 | CFI_REL_OFFSET ebx, 0 | ||
228 | movl $(__USER_DS), %edx | ||
229 | movl %edx, %ds | ||
230 | movl %edx, %es | ||
231 | movl $(__KERNEL_PERCPU), %edx | ||
140 | movl %edx, %fs | 232 | movl %edx, %fs |
233 | SET_KERNEL_GS %edx | ||
234 | .endm | ||
141 | 235 | ||
142 | #define RESTORE_INT_REGS \ | 236 | .macro RESTORE_INT_REGS |
143 | popl %ebx; \ | 237 | popl %ebx |
144 | CFI_ADJUST_CFA_OFFSET -4;\ | 238 | CFI_ADJUST_CFA_OFFSET -4 |
145 | CFI_RESTORE ebx;\ | 239 | CFI_RESTORE ebx |
146 | popl %ecx; \ | 240 | popl %ecx |
147 | CFI_ADJUST_CFA_OFFSET -4;\ | 241 | CFI_ADJUST_CFA_OFFSET -4 |
148 | CFI_RESTORE ecx;\ | 242 | CFI_RESTORE ecx |
149 | popl %edx; \ | 243 | popl %edx |
150 | CFI_ADJUST_CFA_OFFSET -4;\ | 244 | CFI_ADJUST_CFA_OFFSET -4 |
151 | CFI_RESTORE edx;\ | 245 | CFI_RESTORE edx |
152 | popl %esi; \ | 246 | popl %esi |
153 | CFI_ADJUST_CFA_OFFSET -4;\ | 247 | CFI_ADJUST_CFA_OFFSET -4 |
154 | CFI_RESTORE esi;\ | 248 | CFI_RESTORE esi |
155 | popl %edi; \ | 249 | popl %edi |
156 | CFI_ADJUST_CFA_OFFSET -4;\ | 250 | CFI_ADJUST_CFA_OFFSET -4 |
157 | CFI_RESTORE edi;\ | 251 | CFI_RESTORE edi |
158 | popl %ebp; \ | 252 | popl %ebp |
159 | CFI_ADJUST_CFA_OFFSET -4;\ | 253 | CFI_ADJUST_CFA_OFFSET -4 |
160 | CFI_RESTORE ebp;\ | 254 | CFI_RESTORE ebp |
161 | popl %eax; \ | 255 | popl %eax |
162 | CFI_ADJUST_CFA_OFFSET -4;\ | 256 | CFI_ADJUST_CFA_OFFSET -4 |
163 | CFI_RESTORE eax | 257 | CFI_RESTORE eax |
258 | .endm | ||
164 | 259 | ||
165 | #define RESTORE_REGS \ | 260 | .macro RESTORE_REGS pop=0 |
166 | RESTORE_INT_REGS; \ | 261 | RESTORE_INT_REGS |
167 | 1: popl %ds; \ | 262 | 1: popl %ds |
168 | CFI_ADJUST_CFA_OFFSET -4;\ | 263 | CFI_ADJUST_CFA_OFFSET -4 |
169 | /*CFI_RESTORE ds;*/\ | 264 | /*CFI_RESTORE ds;*/ |
170 | 2: popl %es; \ | 265 | 2: popl %es |
171 | CFI_ADJUST_CFA_OFFSET -4;\ | 266 | CFI_ADJUST_CFA_OFFSET -4 |
172 | /*CFI_RESTORE es;*/\ | 267 | /*CFI_RESTORE es;*/ |
173 | 3: popl %fs; \ | 268 | 3: popl %fs |
174 | CFI_ADJUST_CFA_OFFSET -4;\ | 269 | CFI_ADJUST_CFA_OFFSET -4 |
175 | /*CFI_RESTORE fs;*/\ | 270 | /*CFI_RESTORE fs;*/ |
176 | .pushsection .fixup,"ax"; \ | 271 | POP_GS \pop |
177 | 4: movl $0,(%esp); \ | 272 | .pushsection .fixup, "ax" |
178 | jmp 1b; \ | 273 | 4: movl $0, (%esp) |
179 | 5: movl $0,(%esp); \ | 274 | jmp 1b |
180 | jmp 2b; \ | 275 | 5: movl $0, (%esp) |
181 | 6: movl $0,(%esp); \ | 276 | jmp 2b |
182 | jmp 3b; \ | 277 | 6: movl $0, (%esp) |
183 | .section __ex_table,"a";\ | 278 | jmp 3b |
184 | .align 4; \ | 279 | .section __ex_table, "a" |
185 | .long 1b,4b; \ | 280 | .align 4 |
186 | .long 2b,5b; \ | 281 | .long 1b, 4b |
187 | .long 3b,6b; \ | 282 | .long 2b, 5b |
283 | .long 3b, 6b | ||
188 | .popsection | 284 | .popsection |
285 | POP_GS_EX | ||
286 | .endm | ||
189 | 287 | ||
190 | #define RING0_INT_FRAME \ | 288 | .macro RING0_INT_FRAME |
191 | CFI_STARTPROC simple;\ | 289 | CFI_STARTPROC simple |
192 | CFI_SIGNAL_FRAME;\ | 290 | CFI_SIGNAL_FRAME |
193 | CFI_DEF_CFA esp, 3*4;\ | 291 | CFI_DEF_CFA esp, 3*4 |
194 | /*CFI_OFFSET cs, -2*4;*/\ | 292 | /*CFI_OFFSET cs, -2*4;*/ |
195 | CFI_OFFSET eip, -3*4 | 293 | CFI_OFFSET eip, -3*4 |
294 | .endm | ||
196 | 295 | ||
197 | #define RING0_EC_FRAME \ | 296 | .macro RING0_EC_FRAME |
198 | CFI_STARTPROC simple;\ | 297 | CFI_STARTPROC simple |
199 | CFI_SIGNAL_FRAME;\ | 298 | CFI_SIGNAL_FRAME |
200 | CFI_DEF_CFA esp, 4*4;\ | 299 | CFI_DEF_CFA esp, 4*4 |
201 | /*CFI_OFFSET cs, -2*4;*/\ | 300 | /*CFI_OFFSET cs, -2*4;*/ |
202 | CFI_OFFSET eip, -3*4 | 301 | CFI_OFFSET eip, -3*4 |
302 | .endm | ||
203 | 303 | ||
204 | #define RING0_PTREGS_FRAME \ | 304 | .macro RING0_PTREGS_FRAME |
205 | CFI_STARTPROC simple;\ | 305 | CFI_STARTPROC simple |
206 | CFI_SIGNAL_FRAME;\ | 306 | CFI_SIGNAL_FRAME |
207 | CFI_DEF_CFA esp, PT_OLDESP-PT_EBX;\ | 307 | CFI_DEF_CFA esp, PT_OLDESP-PT_EBX |
208 | /*CFI_OFFSET cs, PT_CS-PT_OLDESP;*/\ | 308 | /*CFI_OFFSET cs, PT_CS-PT_OLDESP;*/ |
209 | CFI_OFFSET eip, PT_EIP-PT_OLDESP;\ | 309 | CFI_OFFSET eip, PT_EIP-PT_OLDESP |
210 | /*CFI_OFFSET es, PT_ES-PT_OLDESP;*/\ | 310 | /*CFI_OFFSET es, PT_ES-PT_OLDESP;*/ |
211 | /*CFI_OFFSET ds, PT_DS-PT_OLDESP;*/\ | 311 | /*CFI_OFFSET ds, PT_DS-PT_OLDESP;*/ |
212 | CFI_OFFSET eax, PT_EAX-PT_OLDESP;\ | 312 | CFI_OFFSET eax, PT_EAX-PT_OLDESP |
213 | CFI_OFFSET ebp, PT_EBP-PT_OLDESP;\ | 313 | CFI_OFFSET ebp, PT_EBP-PT_OLDESP |
214 | CFI_OFFSET edi, PT_EDI-PT_OLDESP;\ | 314 | CFI_OFFSET edi, PT_EDI-PT_OLDESP |
215 | CFI_OFFSET esi, PT_ESI-PT_OLDESP;\ | 315 | CFI_OFFSET esi, PT_ESI-PT_OLDESP |
216 | CFI_OFFSET edx, PT_EDX-PT_OLDESP;\ | 316 | CFI_OFFSET edx, PT_EDX-PT_OLDESP |
217 | CFI_OFFSET ecx, PT_ECX-PT_OLDESP;\ | 317 | CFI_OFFSET ecx, PT_ECX-PT_OLDESP |
218 | CFI_OFFSET ebx, PT_EBX-PT_OLDESP | 318 | CFI_OFFSET ebx, PT_EBX-PT_OLDESP |
319 | .endm | ||
219 | 320 | ||
220 | ENTRY(ret_from_fork) | 321 | ENTRY(ret_from_fork) |
221 | CFI_STARTPROC | 322 | CFI_STARTPROC |
@@ -362,6 +463,7 @@ sysenter_exit: | |||
362 | xorl %ebp,%ebp | 463 | xorl %ebp,%ebp |
363 | TRACE_IRQS_ON | 464 | TRACE_IRQS_ON |
364 | 1: mov PT_FS(%esp), %fs | 465 | 1: mov PT_FS(%esp), %fs |
466 | PTGS_TO_GS | ||
365 | ENABLE_INTERRUPTS_SYSEXIT | 467 | ENABLE_INTERRUPTS_SYSEXIT |
366 | 468 | ||
367 | #ifdef CONFIG_AUDITSYSCALL | 469 | #ifdef CONFIG_AUDITSYSCALL |
@@ -410,6 +512,7 @@ sysexit_audit: | |||
410 | .align 4 | 512 | .align 4 |
411 | .long 1b,2b | 513 | .long 1b,2b |
412 | .popsection | 514 | .popsection |
515 | PTGS_TO_GS_EX | ||
413 | ENDPROC(ia32_sysenter_target) | 516 | ENDPROC(ia32_sysenter_target) |
414 | 517 | ||
415 | # system call handler stub | 518 | # system call handler stub |
@@ -452,8 +555,7 @@ restore_all: | |||
452 | restore_nocheck: | 555 | restore_nocheck: |
453 | TRACE_IRQS_IRET | 556 | TRACE_IRQS_IRET |
454 | restore_nocheck_notrace: | 557 | restore_nocheck_notrace: |
455 | RESTORE_REGS | 558 | RESTORE_REGS 4 # skip orig_eax/error_code |
456 | addl $4, %esp # skip orig_eax/error_code | ||
457 | CFI_ADJUST_CFA_OFFSET -4 | 559 | CFI_ADJUST_CFA_OFFSET -4 |
458 | irq_return: | 560 | irq_return: |
459 | INTERRUPT_RETURN | 561 | INTERRUPT_RETURN |
@@ -595,28 +697,50 @@ syscall_badsys: | |||
595 | END(syscall_badsys) | 697 | END(syscall_badsys) |
596 | CFI_ENDPROC | 698 | CFI_ENDPROC |
597 | 699 | ||
598 | #define FIXUP_ESPFIX_STACK \ | 700 | /* |
599 | /* since we are on a wrong stack, we cant make it a C code :( */ \ | 701 | * System calls that need a pt_regs pointer. |
600 | PER_CPU(gdt_page, %ebx); \ | 702 | */ |
601 | GET_DESC_BASE(GDT_ENTRY_ESPFIX_SS, %ebx, %eax, %ax, %al, %ah); \ | 703 | #define PTREGSCALL(name) \ |
602 | addl %esp, %eax; \ | 704 | ALIGN; \ |
603 | pushl $__KERNEL_DS; \ | 705 | ptregs_##name: \ |
604 | CFI_ADJUST_CFA_OFFSET 4; \ | 706 | leal 4(%esp),%eax; \ |
605 | pushl %eax; \ | 707 | jmp sys_##name; |
606 | CFI_ADJUST_CFA_OFFSET 4; \ | 708 | |
607 | lss (%esp), %esp; \ | 709 | PTREGSCALL(iopl) |
608 | CFI_ADJUST_CFA_OFFSET -8; | 710 | PTREGSCALL(fork) |
609 | #define UNWIND_ESPFIX_STACK \ | 711 | PTREGSCALL(clone) |
610 | movl %ss, %eax; \ | 712 | PTREGSCALL(vfork) |
611 | /* see if on espfix stack */ \ | 713 | PTREGSCALL(execve) |
612 | cmpw $__ESPFIX_SS, %ax; \ | 714 | PTREGSCALL(sigaltstack) |
613 | jne 27f; \ | 715 | PTREGSCALL(sigreturn) |
614 | movl $__KERNEL_DS, %eax; \ | 716 | PTREGSCALL(rt_sigreturn) |
615 | movl %eax, %ds; \ | 717 | PTREGSCALL(vm86) |
616 | movl %eax, %es; \ | 718 | PTREGSCALL(vm86old) |
617 | /* switch to normal stack */ \ | 719 | |
618 | FIXUP_ESPFIX_STACK; \ | 720 | .macro FIXUP_ESPFIX_STACK |
619 | 27:; | 721 | /* since we are on a wrong stack, we cant make it a C code :( */ |
722 | PER_CPU(gdt_page, %ebx) | ||
723 | GET_DESC_BASE(GDT_ENTRY_ESPFIX_SS, %ebx, %eax, %ax, %al, %ah) | ||
724 | addl %esp, %eax | ||
725 | pushl $__KERNEL_DS | ||
726 | CFI_ADJUST_CFA_OFFSET 4 | ||
727 | pushl %eax | ||
728 | CFI_ADJUST_CFA_OFFSET 4 | ||
729 | lss (%esp), %esp | ||
730 | CFI_ADJUST_CFA_OFFSET -8 | ||
731 | .endm | ||
732 | .macro UNWIND_ESPFIX_STACK | ||
733 | movl %ss, %eax | ||
734 | /* see if on espfix stack */ | ||
735 | cmpw $__ESPFIX_SS, %ax | ||
736 | jne 27f | ||
737 | movl $__KERNEL_DS, %eax | ||
738 | movl %eax, %ds | ||
739 | movl %eax, %es | ||
740 | /* switch to normal stack */ | ||
741 | FIXUP_ESPFIX_STACK | ||
742 | 27: | ||
743 | .endm | ||
620 | 744 | ||
621 | /* | 745 | /* |
622 | * Build the entry stubs and pointer table with some assembler magic. | 746 | * Build the entry stubs and pointer table with some assembler magic. |
@@ -688,7 +812,7 @@ ENDPROC(name) | |||
688 | #define BUILD_INTERRUPT(name, nr) BUILD_INTERRUPT3(name, nr, smp_##name) | 812 | #define BUILD_INTERRUPT(name, nr) BUILD_INTERRUPT3(name, nr, smp_##name) |
689 | 813 | ||
690 | /* The include is where all of the SMP etc. interrupts come from */ | 814 | /* The include is where all of the SMP etc. interrupts come from */ |
691 | #include "entry_arch.h" | 815 | #include <asm/entry_arch.h> |
692 | 816 | ||
693 | ENTRY(coprocessor_error) | 817 | ENTRY(coprocessor_error) |
694 | RING0_INT_FRAME | 818 | RING0_INT_FRAME |
@@ -1070,7 +1194,10 @@ ENTRY(page_fault) | |||
1070 | CFI_ADJUST_CFA_OFFSET 4 | 1194 | CFI_ADJUST_CFA_OFFSET 4 |
1071 | ALIGN | 1195 | ALIGN |
1072 | error_code: | 1196 | error_code: |
1073 | /* the function address is in %fs's slot on the stack */ | 1197 | /* the function address is in %gs's slot on the stack */ |
1198 | pushl %fs | ||
1199 | CFI_ADJUST_CFA_OFFSET 4 | ||
1200 | /*CFI_REL_OFFSET fs, 0*/ | ||
1074 | pushl %es | 1201 | pushl %es |
1075 | CFI_ADJUST_CFA_OFFSET 4 | 1202 | CFI_ADJUST_CFA_OFFSET 4 |
1076 | /*CFI_REL_OFFSET es, 0*/ | 1203 | /*CFI_REL_OFFSET es, 0*/ |
@@ -1099,20 +1226,15 @@ error_code: | |||
1099 | CFI_ADJUST_CFA_OFFSET 4 | 1226 | CFI_ADJUST_CFA_OFFSET 4 |
1100 | CFI_REL_OFFSET ebx, 0 | 1227 | CFI_REL_OFFSET ebx, 0 |
1101 | cld | 1228 | cld |
1102 | pushl %fs | ||
1103 | CFI_ADJUST_CFA_OFFSET 4 | ||
1104 | /*CFI_REL_OFFSET fs, 0*/ | ||
1105 | movl $(__KERNEL_PERCPU), %ecx | 1229 | movl $(__KERNEL_PERCPU), %ecx |
1106 | movl %ecx, %fs | 1230 | movl %ecx, %fs |
1107 | UNWIND_ESPFIX_STACK | 1231 | UNWIND_ESPFIX_STACK |
1108 | popl %ecx | 1232 | GS_TO_REG %ecx |
1109 | CFI_ADJUST_CFA_OFFSET -4 | 1233 | movl PT_GS(%esp), %edi # get the function address |
1110 | /*CFI_REGISTER es, ecx*/ | ||
1111 | movl PT_FS(%esp), %edi # get the function address | ||
1112 | movl PT_ORIG_EAX(%esp), %edx # get the error code | 1234 | movl PT_ORIG_EAX(%esp), %edx # get the error code |
1113 | movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart | 1235 | movl $-1, PT_ORIG_EAX(%esp) # no syscall to restart |
1114 | mov %ecx, PT_FS(%esp) | 1236 | REG_TO_PTGS %ecx |
1115 | /*CFI_REL_OFFSET fs, ES*/ | 1237 | SET_KERNEL_GS %ecx |
1116 | movl $(__USER_DS), %ecx | 1238 | movl $(__USER_DS), %ecx |
1117 | movl %ecx, %ds | 1239 | movl %ecx, %ds |
1118 | movl %ecx, %es | 1240 | movl %ecx, %es |
@@ -1136,26 +1258,27 @@ END(page_fault) | |||
1136 | * by hand onto the new stack - while updating the return eip past | 1258 | * by hand onto the new stack - while updating the return eip past |
1137 | * the instruction that would have done it for sysenter. | 1259 | * the instruction that would have done it for sysenter. |
1138 | */ | 1260 | */ |
1139 | #define FIX_STACK(offset, ok, label) \ | 1261 | .macro FIX_STACK offset ok label |
1140 | cmpw $__KERNEL_CS,4(%esp); \ | 1262 | cmpw $__KERNEL_CS, 4(%esp) |
1141 | jne ok; \ | 1263 | jne \ok |
1142 | label: \ | 1264 | \label: |
1143 | movl TSS_sysenter_sp0+offset(%esp),%esp; \ | 1265 | movl TSS_sysenter_sp0 + \offset(%esp), %esp |
1144 | CFI_DEF_CFA esp, 0; \ | 1266 | CFI_DEF_CFA esp, 0 |
1145 | CFI_UNDEFINED eip; \ | 1267 | CFI_UNDEFINED eip |
1146 | pushfl; \ | 1268 | pushfl |
1147 | CFI_ADJUST_CFA_OFFSET 4; \ | 1269 | CFI_ADJUST_CFA_OFFSET 4 |
1148 | pushl $__KERNEL_CS; \ | 1270 | pushl $__KERNEL_CS |
1149 | CFI_ADJUST_CFA_OFFSET 4; \ | 1271 | CFI_ADJUST_CFA_OFFSET 4 |
1150 | pushl $sysenter_past_esp; \ | 1272 | pushl $sysenter_past_esp |
1151 | CFI_ADJUST_CFA_OFFSET 4; \ | 1273 | CFI_ADJUST_CFA_OFFSET 4 |
1152 | CFI_REL_OFFSET eip, 0 | 1274 | CFI_REL_OFFSET eip, 0 |
1275 | .endm | ||
1153 | 1276 | ||
1154 | ENTRY(debug) | 1277 | ENTRY(debug) |
1155 | RING0_INT_FRAME | 1278 | RING0_INT_FRAME |
1156 | cmpl $ia32_sysenter_target,(%esp) | 1279 | cmpl $ia32_sysenter_target,(%esp) |
1157 | jne debug_stack_correct | 1280 | jne debug_stack_correct |
1158 | FIX_STACK(12, debug_stack_correct, debug_esp_fix_insn) | 1281 | FIX_STACK 12, debug_stack_correct, debug_esp_fix_insn |
1159 | debug_stack_correct: | 1282 | debug_stack_correct: |
1160 | pushl $-1 # mark this as an int | 1283 | pushl $-1 # mark this as an int |
1161 | CFI_ADJUST_CFA_OFFSET 4 | 1284 | CFI_ADJUST_CFA_OFFSET 4 |
@@ -1213,7 +1336,7 @@ nmi_stack_correct: | |||
1213 | 1336 | ||
1214 | nmi_stack_fixup: | 1337 | nmi_stack_fixup: |
1215 | RING0_INT_FRAME | 1338 | RING0_INT_FRAME |
1216 | FIX_STACK(12,nmi_stack_correct, 1) | 1339 | FIX_STACK 12, nmi_stack_correct, 1 |
1217 | jmp nmi_stack_correct | 1340 | jmp nmi_stack_correct |
1218 | 1341 | ||
1219 | nmi_debug_stack_check: | 1342 | nmi_debug_stack_check: |
@@ -1224,7 +1347,7 @@ nmi_debug_stack_check: | |||
1224 | jb nmi_stack_correct | 1347 | jb nmi_stack_correct |
1225 | cmpl $debug_esp_fix_insn,(%esp) | 1348 | cmpl $debug_esp_fix_insn,(%esp) |
1226 | ja nmi_stack_correct | 1349 | ja nmi_stack_correct |
1227 | FIX_STACK(24,nmi_stack_correct, 1) | 1350 | FIX_STACK 24, nmi_stack_correct, 1 |
1228 | jmp nmi_stack_correct | 1351 | jmp nmi_stack_correct |
1229 | 1352 | ||
1230 | nmi_espfix_stack: | 1353 | nmi_espfix_stack: |
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 8f8f61a1fce8..860afce9660a 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S | |||
@@ -410,6 +410,8 @@ END(save_paranoid) | |||
410 | ENTRY(ret_from_fork) | 410 | ENTRY(ret_from_fork) |
411 | DEFAULT_FRAME | 411 | DEFAULT_FRAME |
412 | 412 | ||
413 | LOCK ; btr $TIF_FORK,TI_flags(%r8) | ||
414 | |||
413 | push kernel_eflags(%rip) | 415 | push kernel_eflags(%rip) |
414 | CFI_ADJUST_CFA_OFFSET 8 | 416 | CFI_ADJUST_CFA_OFFSET 8 |
415 | popf # reset kernel eflags | 417 | popf # reset kernel eflags |
@@ -1146,7 +1148,7 @@ ENTRY(native_load_gs_index) | |||
1146 | CFI_STARTPROC | 1148 | CFI_STARTPROC |
1147 | pushf | 1149 | pushf |
1148 | CFI_ADJUST_CFA_OFFSET 8 | 1150 | CFI_ADJUST_CFA_OFFSET 8 |
1149 | DISABLE_INTERRUPTS(CLBR_ANY | ~(CLBR_RDI)) | 1151 | DISABLE_INTERRUPTS(CLBR_ANY & ~CLBR_RDI) |
1150 | SWAPGS | 1152 | SWAPGS |
1151 | gs_change: | 1153 | gs_change: |
1152 | movl %edi,%gs | 1154 | movl %edi,%gs |
diff --git a/arch/x86/kernel/es7000_32.c b/arch/x86/kernel/es7000_32.c index 53699c931ad4..55515d73d9c2 100644 --- a/arch/x86/kernel/es7000_32.c +++ b/arch/x86/kernel/es7000_32.c | |||
@@ -40,7 +40,6 @@ | |||
40 | #include <asm/smp.h> | 40 | #include <asm/smp.h> |
41 | #include <asm/atomic.h> | 41 | #include <asm/atomic.h> |
42 | #include <asm/apicdef.h> | 42 | #include <asm/apicdef.h> |
43 | #include <mach_mpparse.h> | ||
44 | #include <asm/genapic.h> | 43 | #include <asm/genapic.h> |
45 | #include <asm/setup.h> | 44 | #include <asm/setup.h> |
46 | 45 | ||
@@ -182,20 +181,16 @@ static int wakeup_secondary_cpu_via_mip(int cpu, unsigned long eip) | |||
182 | return 0; | 181 | return 0; |
183 | } | 182 | } |
184 | 183 | ||
185 | static void noop_wait_for_deassert(atomic_t *deassert_not_used) | ||
186 | { | ||
187 | } | ||
188 | |||
189 | static int __init es7000_update_genapic(void) | 184 | static int __init es7000_update_genapic(void) |
190 | { | 185 | { |
191 | genapic->wakeup_cpu = wakeup_secondary_cpu_via_mip; | 186 | apic->wakeup_cpu = wakeup_secondary_cpu_via_mip; |
192 | 187 | ||
193 | /* MPENTIUMIII */ | 188 | /* MPENTIUMIII */ |
194 | if (boot_cpu_data.x86 == 6 && | 189 | if (boot_cpu_data.x86 == 6 && |
195 | (boot_cpu_data.x86_model >= 7 || boot_cpu_data.x86_model <= 11)) { | 190 | (boot_cpu_data.x86_model >= 7 || boot_cpu_data.x86_model <= 11)) { |
196 | es7000_update_genapic_to_cluster(); | 191 | es7000_update_genapic_to_cluster(); |
197 | genapic->wait_for_init_deassert = noop_wait_for_deassert; | 192 | apic->wait_for_init_deassert = NULL; |
198 | genapic->wakeup_cpu = wakeup_secondary_cpu_via_mip; | 193 | apic->wakeup_cpu = wakeup_secondary_cpu_via_mip; |
199 | } | 194 | } |
200 | 195 | ||
201 | return 0; | 196 | return 0; |
@@ -292,24 +287,31 @@ int __init find_unisys_acpi_oem_table(unsigned long *oem_addr) | |||
292 | { | 287 | { |
293 | struct acpi_table_header *header = NULL; | 288 | struct acpi_table_header *header = NULL; |
294 | int i = 0; | 289 | int i = 0; |
290 | acpi_size tbl_size; | ||
295 | 291 | ||
296 | while (ACPI_SUCCESS(acpi_get_table("OEM1", i++, &header))) { | 292 | while (ACPI_SUCCESS(acpi_get_table_with_size("OEM1", i++, &header, &tbl_size))) { |
297 | if (!memcmp((char *) &header->oem_id, "UNISYS", 6)) { | 293 | if (!memcmp((char *) &header->oem_id, "UNISYS", 6)) { |
298 | struct oem_table *t = (struct oem_table *)header; | 294 | struct oem_table *t = (struct oem_table *)header; |
299 | 295 | ||
300 | oem_addrX = t->OEMTableAddr; | 296 | oem_addrX = t->OEMTableAddr; |
301 | oem_size = t->OEMTableSize; | 297 | oem_size = t->OEMTableSize; |
298 | early_acpi_os_unmap_memory(header, tbl_size); | ||
302 | 299 | ||
303 | *oem_addr = (unsigned long)__acpi_map_table(oem_addrX, | 300 | *oem_addr = (unsigned long)__acpi_map_table(oem_addrX, |
304 | oem_size); | 301 | oem_size); |
305 | return 0; | 302 | return 0; |
306 | } | 303 | } |
304 | early_acpi_os_unmap_memory(header, tbl_size); | ||
307 | } | 305 | } |
308 | return -1; | 306 | return -1; |
309 | } | 307 | } |
310 | 308 | ||
311 | void __init unmap_unisys_acpi_oem_table(unsigned long oem_addr) | 309 | void __init unmap_unisys_acpi_oem_table(unsigned long oem_addr) |
312 | { | 310 | { |
311 | if (!oem_addr) | ||
312 | return; | ||
313 | |||
314 | __acpi_unmap_table((char *)oem_addr, oem_size); | ||
313 | } | 315 | } |
314 | #endif | 316 | #endif |
315 | 317 | ||
@@ -359,20 +361,449 @@ es7000_mip_write(struct mip_reg *mip_reg) | |||
359 | return status; | 361 | return status; |
360 | } | 362 | } |
361 | 363 | ||
362 | void __init | 364 | void __init es7000_enable_apic_mode(void) |
363 | es7000_sw_apic(void) | 365 | { |
364 | { | 366 | struct mip_reg es7000_mip_reg; |
365 | if (es7000_plat) { | 367 | int mip_status; |
366 | int mip_status; | 368 | |
367 | struct mip_reg es7000_mip_reg; | 369 | if (!es7000_plat) |
368 | |||
369 | printk("ES7000: Enabling APIC mode.\n"); | ||
370 | memset(&es7000_mip_reg, 0, sizeof(struct mip_reg)); | ||
371 | es7000_mip_reg.off_0 = MIP_SW_APIC; | ||
372 | es7000_mip_reg.off_38 = (MIP_VALID); | ||
373 | while ((mip_status = es7000_mip_write(&es7000_mip_reg)) != 0) | ||
374 | printk("es7000_sw_apic: command failed, status = %x\n", | ||
375 | mip_status); | ||
376 | return; | 370 | return; |
371 | |||
372 | printk("ES7000: Enabling APIC mode.\n"); | ||
373 | memset(&es7000_mip_reg, 0, sizeof(struct mip_reg)); | ||
374 | es7000_mip_reg.off_0 = MIP_SW_APIC; | ||
375 | es7000_mip_reg.off_38 = MIP_VALID; | ||
376 | |||
377 | while ((mip_status = es7000_mip_write(&es7000_mip_reg)) != 0) { | ||
378 | printk("es7000_enable_apic_mode: command failed, status = %x\n", | ||
379 | mip_status); | ||
380 | } | ||
381 | } | ||
382 | |||
383 | /* | ||
384 | * APIC driver for the Unisys ES7000 chipset. | ||
385 | */ | ||
386 | #define APIC_DEFINITION 1 | ||
387 | #include <linux/threads.h> | ||
388 | #include <linux/cpumask.h> | ||
389 | #include <asm/mpspec.h> | ||
390 | #include <asm/genapic.h> | ||
391 | #include <asm/fixmap.h> | ||
392 | #include <asm/apicdef.h> | ||
393 | #include <linux/kernel.h> | ||
394 | #include <linux/string.h> | ||
395 | #include <linux/init.h> | ||
396 | #include <linux/acpi.h> | ||
397 | #include <linux/smp.h> | ||
398 | #include <asm/ipi.h> | ||
399 | |||
400 | #define APIC_DFR_VALUE_CLUSTER (APIC_DFR_CLUSTER) | ||
401 | #define INT_DELIVERY_MODE_CLUSTER (dest_LowestPrio) | ||
402 | #define INT_DEST_MODE_CLUSTER (1) /* logical delivery broadcast to all procs */ | ||
403 | |||
404 | #define APIC_DFR_VALUE (APIC_DFR_FLAT) | ||
405 | |||
406 | extern void es7000_enable_apic_mode(void); | ||
407 | extern int apic_version [MAX_APICS]; | ||
408 | extern u8 cpu_2_logical_apicid[]; | ||
409 | extern unsigned int boot_cpu_physical_apicid; | ||
410 | |||
411 | extern int parse_unisys_oem (char *oemptr); | ||
412 | extern int find_unisys_acpi_oem_table(unsigned long *oem_addr); | ||
413 | extern void unmap_unisys_acpi_oem_table(unsigned long oem_addr); | ||
414 | extern void setup_unisys(void); | ||
415 | |||
416 | #define apicid_cluster(apicid) (apicid & 0xF0) | ||
417 | #define xapic_phys_to_log_apicid(cpu) per_cpu(x86_bios_cpu_apicid, cpu) | ||
418 | |||
419 | static void es7000_vector_allocation_domain(int cpu, cpumask_t *retmask) | ||
420 | { | ||
421 | /* Careful. Some cpus do not strictly honor the set of cpus | ||
422 | * specified in the interrupt destination when using lowest | ||
423 | * priority interrupt delivery mode. | ||
424 | * | ||
425 | * In particular there was a hyperthreading cpu observed to | ||
426 | * deliver interrupts to the wrong hyperthread when only one | ||
427 | * hyperthread was specified in the interrupt desitination. | ||
428 | */ | ||
429 | *retmask = (cpumask_t){ { [0] = APIC_ALL_CPUS, } }; | ||
430 | } | ||
431 | |||
432 | |||
433 | static void es7000_wait_for_init_deassert(atomic_t *deassert) | ||
434 | { | ||
435 | #ifndef CONFIG_ES7000_CLUSTERED_APIC | ||
436 | while (!atomic_read(deassert)) | ||
437 | cpu_relax(); | ||
438 | #endif | ||
439 | return; | ||
440 | } | ||
441 | |||
442 | static unsigned int es7000_get_apic_id(unsigned long x) | ||
443 | { | ||
444 | return (x >> 24) & 0xFF; | ||
445 | } | ||
446 | |||
447 | #ifdef CONFIG_ACPI | ||
448 | static int es7000_check_dsdt(void) | ||
449 | { | ||
450 | struct acpi_table_header header; | ||
451 | |||
452 | if (ACPI_SUCCESS(acpi_get_table_header(ACPI_SIG_DSDT, 0, &header)) && | ||
453 | !strncmp(header.oem_id, "UNISYS", 6)) | ||
454 | return 1; | ||
455 | return 0; | ||
456 | } | ||
457 | #endif | ||
458 | |||
459 | static void es7000_send_IPI_mask(const struct cpumask *mask, int vector) | ||
460 | { | ||
461 | default_send_IPI_mask_sequence_phys(mask, vector); | ||
462 | } | ||
463 | |||
464 | static void es7000_send_IPI_allbutself(int vector) | ||
465 | { | ||
466 | default_send_IPI_mask_allbutself_phys(cpu_online_mask, vector); | ||
467 | } | ||
468 | |||
469 | static void es7000_send_IPI_all(int vector) | ||
470 | { | ||
471 | es7000_send_IPI_mask(cpu_online_mask, vector); | ||
472 | } | ||
473 | |||
474 | static int es7000_apic_id_registered(void) | ||
475 | { | ||
476 | return 1; | ||
477 | } | ||
478 | |||
479 | static const cpumask_t *target_cpus_cluster(void) | ||
480 | { | ||
481 | return &CPU_MASK_ALL; | ||
482 | } | ||
483 | |||
484 | static const cpumask_t *es7000_target_cpus(void) | ||
485 | { | ||
486 | return &cpumask_of_cpu(smp_processor_id()); | ||
487 | } | ||
488 | |||
489 | static unsigned long | ||
490 | es7000_check_apicid_used(physid_mask_t bitmap, int apicid) | ||
491 | { | ||
492 | return 0; | ||
493 | } | ||
494 | static unsigned long es7000_check_apicid_present(int bit) | ||
495 | { | ||
496 | return physid_isset(bit, phys_cpu_present_map); | ||
497 | } | ||
498 | |||
499 | static unsigned long calculate_ldr(int cpu) | ||
500 | { | ||
501 | unsigned long id = xapic_phys_to_log_apicid(cpu); | ||
502 | |||
503 | return (SET_APIC_LOGICAL_ID(id)); | ||
504 | } | ||
505 | |||
506 | /* | ||
507 | * Set up the logical destination ID. | ||
508 | * | ||
509 | * Intel recommends to set DFR, LdR and TPR before enabling | ||
510 | * an APIC. See e.g. "AP-388 82489DX User's Manual" (Intel | ||
511 | * document number 292116). So here it goes... | ||
512 | */ | ||
513 | static void es7000_init_apic_ldr_cluster(void) | ||
514 | { | ||
515 | unsigned long val; | ||
516 | int cpu = smp_processor_id(); | ||
517 | |||
518 | apic_write(APIC_DFR, APIC_DFR_VALUE_CLUSTER); | ||
519 | val = calculate_ldr(cpu); | ||
520 | apic_write(APIC_LDR, val); | ||
521 | } | ||
522 | |||
523 | static void es7000_init_apic_ldr(void) | ||
524 | { | ||
525 | unsigned long val; | ||
526 | int cpu = smp_processor_id(); | ||
527 | |||
528 | apic_write(APIC_DFR, APIC_DFR_VALUE); | ||
529 | val = calculate_ldr(cpu); | ||
530 | apic_write(APIC_LDR, val); | ||
531 | } | ||
532 | |||
533 | static void es7000_setup_apic_routing(void) | ||
534 | { | ||
535 | int apic = per_cpu(x86_bios_cpu_apicid, smp_processor_id()); | ||
536 | printk("Enabling APIC mode: %s. Using %d I/O APICs, target cpus %lx\n", | ||
537 | (apic_version[apic] == 0x14) ? | ||
538 | "Physical Cluster" : "Logical Cluster", | ||
539 | nr_ioapics, cpus_addr(*es7000_target_cpus())[0]); | ||
540 | } | ||
541 | |||
542 | static int es7000_apicid_to_node(int logical_apicid) | ||
543 | { | ||
544 | return 0; | ||
545 | } | ||
546 | |||
547 | |||
548 | static int es7000_cpu_present_to_apicid(int mps_cpu) | ||
549 | { | ||
550 | if (!mps_cpu) | ||
551 | return boot_cpu_physical_apicid; | ||
552 | else if (mps_cpu < nr_cpu_ids) | ||
553 | return (int) per_cpu(x86_bios_cpu_apicid, mps_cpu); | ||
554 | else | ||
555 | return BAD_APICID; | ||
556 | } | ||
557 | |||
558 | static physid_mask_t es7000_apicid_to_cpu_present(int phys_apicid) | ||
559 | { | ||
560 | static int id = 0; | ||
561 | physid_mask_t mask; | ||
562 | |||
563 | mask = physid_mask_of_physid(id); | ||
564 | ++id; | ||
565 | |||
566 | return mask; | ||
567 | } | ||
568 | |||
569 | /* Mapping from cpu number to logical apicid */ | ||
570 | static int es7000_cpu_to_logical_apicid(int cpu) | ||
571 | { | ||
572 | #ifdef CONFIG_SMP | ||
573 | if (cpu >= nr_cpu_ids) | ||
574 | return BAD_APICID; | ||
575 | return (int)cpu_2_logical_apicid[cpu]; | ||
576 | #else | ||
577 | return logical_smp_processor_id(); | ||
578 | #endif | ||
579 | } | ||
580 | |||
581 | static physid_mask_t es7000_ioapic_phys_id_map(physid_mask_t phys_map) | ||
582 | { | ||
583 | /* For clustered we don't have a good way to do this yet - hack */ | ||
584 | return physids_promote(0xff); | ||
585 | } | ||
586 | |||
587 | static int es7000_check_phys_apicid_present(int cpu_physical_apicid) | ||
588 | { | ||
589 | boot_cpu_physical_apicid = read_apic_id(); | ||
590 | return (1); | ||
591 | } | ||
592 | |||
593 | static unsigned int | ||
594 | es7000_cpu_mask_to_apicid_cluster(const struct cpumask *cpumask) | ||
595 | { | ||
596 | int cpus_found = 0; | ||
597 | int num_bits_set; | ||
598 | int apicid; | ||
599 | int cpu; | ||
600 | |||
601 | num_bits_set = cpumask_weight(cpumask); | ||
602 | /* Return id to all */ | ||
603 | if (num_bits_set == nr_cpu_ids) | ||
604 | return 0xFF; | ||
605 | /* | ||
606 | * The cpus in the mask must all be on the apic cluster. If are not | ||
607 | * on the same apicid cluster return default value of target_cpus(): | ||
608 | */ | ||
609 | cpu = cpumask_first(cpumask); | ||
610 | apicid = es7000_cpu_to_logical_apicid(cpu); | ||
611 | |||
612 | while (cpus_found < num_bits_set) { | ||
613 | if (cpumask_test_cpu(cpu, cpumask)) { | ||
614 | int new_apicid = es7000_cpu_to_logical_apicid(cpu); | ||
615 | |||
616 | if (apicid_cluster(apicid) != | ||
617 | apicid_cluster(new_apicid)) { | ||
618 | printk ("%s: Not a valid mask!\n", __func__); | ||
619 | |||
620 | return 0xFF; | ||
621 | } | ||
622 | apicid = new_apicid; | ||
623 | cpus_found++; | ||
624 | } | ||
625 | cpu++; | ||
626 | } | ||
627 | return apicid; | ||
628 | } | ||
629 | |||
630 | static unsigned int es7000_cpu_mask_to_apicid(const cpumask_t *cpumask) | ||
631 | { | ||
632 | int cpus_found = 0; | ||
633 | int num_bits_set; | ||
634 | int apicid; | ||
635 | int cpu; | ||
636 | |||
637 | num_bits_set = cpus_weight(*cpumask); | ||
638 | /* Return id to all */ | ||
639 | if (num_bits_set == nr_cpu_ids) | ||
640 | return es7000_cpu_to_logical_apicid(0); | ||
641 | /* | ||
642 | * The cpus in the mask must all be on the apic cluster. If are not | ||
643 | * on the same apicid cluster return default value of target_cpus(): | ||
644 | */ | ||
645 | cpu = first_cpu(*cpumask); | ||
646 | apicid = es7000_cpu_to_logical_apicid(cpu); | ||
647 | while (cpus_found < num_bits_set) { | ||
648 | if (cpu_isset(cpu, *cpumask)) { | ||
649 | int new_apicid = es7000_cpu_to_logical_apicid(cpu); | ||
650 | |||
651 | if (apicid_cluster(apicid) != | ||
652 | apicid_cluster(new_apicid)) { | ||
653 | printk ("%s: Not a valid mask!\n", __func__); | ||
654 | |||
655 | return es7000_cpu_to_logical_apicid(0); | ||
656 | } | ||
657 | apicid = new_apicid; | ||
658 | cpus_found++; | ||
659 | } | ||
660 | cpu++; | ||
661 | } | ||
662 | return apicid; | ||
663 | } | ||
664 | |||
665 | static unsigned int | ||
666 | es7000_cpu_mask_to_apicid_and(const struct cpumask *inmask, | ||
667 | const struct cpumask *andmask) | ||
668 | { | ||
669 | int apicid = es7000_cpu_to_logical_apicid(0); | ||
670 | cpumask_var_t cpumask; | ||
671 | |||
672 | if (!alloc_cpumask_var(&cpumask, GFP_ATOMIC)) | ||
673 | return apicid; | ||
674 | |||
675 | cpumask_and(cpumask, inmask, andmask); | ||
676 | cpumask_and(cpumask, cpumask, cpu_online_mask); | ||
677 | apicid = es7000_cpu_mask_to_apicid(cpumask); | ||
678 | |||
679 | free_cpumask_var(cpumask); | ||
680 | |||
681 | return apicid; | ||
682 | } | ||
683 | |||
684 | static int es7000_phys_pkg_id(int cpuid_apic, int index_msb) | ||
685 | { | ||
686 | return cpuid_apic >> index_msb; | ||
687 | } | ||
688 | |||
689 | void __init es7000_update_genapic_to_cluster(void) | ||
690 | { | ||
691 | apic->target_cpus = target_cpus_cluster; | ||
692 | apic->irq_delivery_mode = INT_DELIVERY_MODE_CLUSTER; | ||
693 | apic->irq_dest_mode = INT_DEST_MODE_CLUSTER; | ||
694 | |||
695 | apic->init_apic_ldr = es7000_init_apic_ldr_cluster; | ||
696 | |||
697 | apic->cpu_mask_to_apicid = es7000_cpu_mask_to_apicid_cluster; | ||
698 | } | ||
699 | |||
700 | static int probe_es7000(void) | ||
701 | { | ||
702 | /* probed later in mptable/ACPI hooks */ | ||
703 | return 0; | ||
704 | } | ||
705 | |||
706 | static __init int | ||
707 | es7000_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid) | ||
708 | { | ||
709 | if (mpc->oemptr) { | ||
710 | struct mpc_oemtable *oem_table = | ||
711 | (struct mpc_oemtable *)mpc->oemptr; | ||
712 | |||
713 | if (!strncmp(oem, "UNISYS", 6)) | ||
714 | return parse_unisys_oem((char *)oem_table); | ||
715 | } | ||
716 | return 0; | ||
717 | } | ||
718 | |||
719 | #ifdef CONFIG_ACPI | ||
720 | /* Hook from generic ACPI tables.c */ | ||
721 | static int __init es7000_acpi_madt_oem_check(char *oem_id, char *oem_table_id) | ||
722 | { | ||
723 | unsigned long oem_addr = 0; | ||
724 | int check_dsdt; | ||
725 | int ret = 0; | ||
726 | |||
727 | /* check dsdt at first to avoid clear fix_map for oem_addr */ | ||
728 | check_dsdt = es7000_check_dsdt(); | ||
729 | |||
730 | if (!find_unisys_acpi_oem_table(&oem_addr)) { | ||
731 | if (check_dsdt) | ||
732 | ret = parse_unisys_oem((char *)oem_addr); | ||
733 | else { | ||
734 | setup_unisys(); | ||
735 | ret = 1; | ||
736 | } | ||
737 | /* | ||
738 | * we need to unmap it | ||
739 | */ | ||
740 | unmap_unisys_acpi_oem_table(oem_addr); | ||
377 | } | 741 | } |
742 | return ret; | ||
743 | } | ||
744 | #else | ||
745 | static int __init es7000_acpi_madt_oem_check(char *oem_id, char *oem_table_id) | ||
746 | { | ||
747 | return 0; | ||
378 | } | 748 | } |
749 | #endif | ||
750 | |||
751 | |||
752 | struct genapic apic_es7000 = { | ||
753 | |||
754 | .name = "es7000", | ||
755 | .probe = probe_es7000, | ||
756 | .acpi_madt_oem_check = es7000_acpi_madt_oem_check, | ||
757 | .apic_id_registered = es7000_apic_id_registered, | ||
758 | |||
759 | .irq_delivery_mode = dest_Fixed, | ||
760 | /* phys delivery to target CPUs: */ | ||
761 | .irq_dest_mode = 0, | ||
762 | |||
763 | .target_cpus = es7000_target_cpus, | ||
764 | .disable_esr = 1, | ||
765 | .dest_logical = 0, | ||
766 | .check_apicid_used = es7000_check_apicid_used, | ||
767 | .check_apicid_present = es7000_check_apicid_present, | ||
768 | |||
769 | .vector_allocation_domain = es7000_vector_allocation_domain, | ||
770 | .init_apic_ldr = es7000_init_apic_ldr, | ||
771 | |||
772 | .ioapic_phys_id_map = es7000_ioapic_phys_id_map, | ||
773 | .setup_apic_routing = es7000_setup_apic_routing, | ||
774 | .multi_timer_check = NULL, | ||
775 | .apicid_to_node = es7000_apicid_to_node, | ||
776 | .cpu_to_logical_apicid = es7000_cpu_to_logical_apicid, | ||
777 | .cpu_present_to_apicid = es7000_cpu_present_to_apicid, | ||
778 | .apicid_to_cpu_present = es7000_apicid_to_cpu_present, | ||
779 | .setup_portio_remap = NULL, | ||
780 | .check_phys_apicid_present = es7000_check_phys_apicid_present, | ||
781 | .enable_apic_mode = es7000_enable_apic_mode, | ||
782 | .phys_pkg_id = es7000_phys_pkg_id, | ||
783 | .mps_oem_check = es7000_mps_oem_check, | ||
784 | |||
785 | .get_apic_id = es7000_get_apic_id, | ||
786 | .set_apic_id = NULL, | ||
787 | .apic_id_mask = 0xFF << 24, | ||
788 | |||
789 | .cpu_mask_to_apicid = es7000_cpu_mask_to_apicid, | ||
790 | .cpu_mask_to_apicid_and = es7000_cpu_mask_to_apicid_and, | ||
791 | |||
792 | .send_IPI_mask = es7000_send_IPI_mask, | ||
793 | .send_IPI_mask_allbutself = NULL, | ||
794 | .send_IPI_allbutself = es7000_send_IPI_allbutself, | ||
795 | .send_IPI_all = es7000_send_IPI_all, | ||
796 | .send_IPI_self = default_send_IPI_self, | ||
797 | |||
798 | .wakeup_cpu = NULL, | ||
799 | |||
800 | .trampoline_phys_low = 0x467, | ||
801 | .trampoline_phys_high = 0x469, | ||
802 | |||
803 | .wait_for_init_deassert = es7000_wait_for_init_deassert, | ||
804 | |||
805 | /* Nothing to do for most platforms, since cleared by the INIT cycle: */ | ||
806 | .smp_callin_clear_local_apic = NULL, | ||
807 | .store_NMI_vector = NULL, | ||
808 | .inquire_remote_apic = default_inquire_remote_apic, | ||
809 | }; | ||
diff --git a/arch/x86/kernel/genapic_64.c b/arch/x86/kernel/genapic_64.c index e656c2721154..820dea5d0ebe 100644 --- a/arch/x86/kernel/genapic_64.c +++ b/arch/x86/kernel/genapic_64.c | |||
@@ -29,7 +29,7 @@ extern struct genapic apic_x2xpic_uv_x; | |||
29 | extern struct genapic apic_x2apic_phys; | 29 | extern struct genapic apic_x2apic_phys; |
30 | extern struct genapic apic_x2apic_cluster; | 30 | extern struct genapic apic_x2apic_cluster; |
31 | 31 | ||
32 | struct genapic __read_mostly *genapic = &apic_flat; | 32 | struct genapic __read_mostly *apic = &apic_flat; |
33 | 33 | ||
34 | static struct genapic *apic_probe[] __initdata = { | 34 | static struct genapic *apic_probe[] __initdata = { |
35 | #ifdef CONFIG_X86_UV | 35 | #ifdef CONFIG_X86_UV |
@@ -44,17 +44,17 @@ static struct genapic *apic_probe[] __initdata = { | |||
44 | /* | 44 | /* |
45 | * Check the APIC IDs in bios_cpu_apicid and choose the APIC mode. | 45 | * Check the APIC IDs in bios_cpu_apicid and choose the APIC mode. |
46 | */ | 46 | */ |
47 | void __init setup_apic_routing(void) | 47 | void __init default_setup_apic_routing(void) |
48 | { | 48 | { |
49 | if (genapic == &apic_x2apic_phys || genapic == &apic_x2apic_cluster) { | 49 | if (apic == &apic_x2apic_phys || apic == &apic_x2apic_cluster) { |
50 | if (!intr_remapping_enabled) | 50 | if (!intr_remapping_enabled) |
51 | genapic = &apic_flat; | 51 | apic = &apic_flat; |
52 | } | 52 | } |
53 | 53 | ||
54 | if (genapic == &apic_flat) { | 54 | if (apic == &apic_flat) { |
55 | if (max_physical_apicid >= 8) | 55 | if (max_physical_apicid >= 8) |
56 | genapic = &apic_physflat; | 56 | apic = &apic_physflat; |
57 | printk(KERN_INFO "Setting APIC routing to %s\n", genapic->name); | 57 | printk(KERN_INFO "Setting APIC routing to %s\n", apic->name); |
58 | } | 58 | } |
59 | 59 | ||
60 | if (x86_quirks->update_genapic) | 60 | if (x86_quirks->update_genapic) |
@@ -65,18 +65,18 @@ void __init setup_apic_routing(void) | |||
65 | 65 | ||
66 | void apic_send_IPI_self(int vector) | 66 | void apic_send_IPI_self(int vector) |
67 | { | 67 | { |
68 | __send_IPI_shortcut(APIC_DEST_SELF, vector, APIC_DEST_PHYSICAL); | 68 | __default_send_IPI_shortcut(APIC_DEST_SELF, vector, APIC_DEST_PHYSICAL); |
69 | } | 69 | } |
70 | 70 | ||
71 | int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id) | 71 | int __init default_acpi_madt_oem_check(char *oem_id, char *oem_table_id) |
72 | { | 72 | { |
73 | int i; | 73 | int i; |
74 | 74 | ||
75 | for (i = 0; apic_probe[i]; ++i) { | 75 | for (i = 0; apic_probe[i]; ++i) { |
76 | if (apic_probe[i]->acpi_madt_oem_check(oem_id, oem_table_id)) { | 76 | if (apic_probe[i]->acpi_madt_oem_check(oem_id, oem_table_id)) { |
77 | genapic = apic_probe[i]; | 77 | apic = apic_probe[i]; |
78 | printk(KERN_INFO "Setting APIC routing to %s.\n", | 78 | printk(KERN_INFO "Setting APIC routing to %s.\n", |
79 | genapic->name); | 79 | apic->name); |
80 | return 1; | 80 | return 1; |
81 | } | 81 | } |
82 | } | 82 | } |
diff --git a/arch/x86/kernel/genapic_flat_64.c b/arch/x86/kernel/genapic_flat_64.c index 34185488e4fb..249d2d3c034c 100644 --- a/arch/x86/kernel/genapic_flat_64.c +++ b/arch/x86/kernel/genapic_flat_64.c | |||
@@ -19,7 +19,6 @@ | |||
19 | #include <asm/smp.h> | 19 | #include <asm/smp.h> |
20 | #include <asm/ipi.h> | 20 | #include <asm/ipi.h> |
21 | #include <asm/genapic.h> | 21 | #include <asm/genapic.h> |
22 | #include <mach_apicdef.h> | ||
23 | 22 | ||
24 | #ifdef CONFIG_ACPI | 23 | #ifdef CONFIG_ACPI |
25 | #include <acpi/acpi_bus.h> | 24 | #include <acpi/acpi_bus.h> |
@@ -74,7 +73,7 @@ static inline void _flat_send_IPI_mask(unsigned long mask, int vector) | |||
74 | unsigned long flags; | 73 | unsigned long flags; |
75 | 74 | ||
76 | local_irq_save(flags); | 75 | local_irq_save(flags); |
77 | __send_IPI_dest_field(mask, vector, APIC_DEST_LOGICAL); | 76 | __default_send_IPI_dest_field(mask, vector, apic->dest_logical); |
78 | local_irq_restore(flags); | 77 | local_irq_restore(flags); |
79 | } | 78 | } |
80 | 79 | ||
@@ -85,14 +84,15 @@ static void flat_send_IPI_mask(const struct cpumask *cpumask, int vector) | |||
85 | _flat_send_IPI_mask(mask, vector); | 84 | _flat_send_IPI_mask(mask, vector); |
86 | } | 85 | } |
87 | 86 | ||
88 | static void flat_send_IPI_mask_allbutself(const struct cpumask *cpumask, | 87 | static void |
89 | int vector) | 88 | flat_send_IPI_mask_allbutself(const struct cpumask *cpumask, int vector) |
90 | { | 89 | { |
91 | unsigned long mask = cpumask_bits(cpumask)[0]; | 90 | unsigned long mask = cpumask_bits(cpumask)[0]; |
92 | int cpu = smp_processor_id(); | 91 | int cpu = smp_processor_id(); |
93 | 92 | ||
94 | if (cpu < BITS_PER_LONG) | 93 | if (cpu < BITS_PER_LONG) |
95 | clear_bit(cpu, &mask); | 94 | clear_bit(cpu, &mask); |
95 | |||
96 | _flat_send_IPI_mask(mask, vector); | 96 | _flat_send_IPI_mask(mask, vector); |
97 | } | 97 | } |
98 | 98 | ||
@@ -114,23 +114,27 @@ static void flat_send_IPI_allbutself(int vector) | |||
114 | _flat_send_IPI_mask(mask, vector); | 114 | _flat_send_IPI_mask(mask, vector); |
115 | } | 115 | } |
116 | } else if (num_online_cpus() > 1) { | 116 | } else if (num_online_cpus() > 1) { |
117 | __send_IPI_shortcut(APIC_DEST_ALLBUT, vector,APIC_DEST_LOGICAL); | 117 | __default_send_IPI_shortcut(APIC_DEST_ALLBUT, |
118 | vector, apic->dest_logical); | ||
118 | } | 119 | } |
119 | } | 120 | } |
120 | 121 | ||
121 | static void flat_send_IPI_all(int vector) | 122 | static void flat_send_IPI_all(int vector) |
122 | { | 123 | { |
123 | if (vector == NMI_VECTOR) | 124 | if (vector == NMI_VECTOR) { |
124 | flat_send_IPI_mask(cpu_online_mask, vector); | 125 | flat_send_IPI_mask(cpu_online_mask, vector); |
125 | else | 126 | } else { |
126 | __send_IPI_shortcut(APIC_DEST_ALLINC, vector, APIC_DEST_LOGICAL); | 127 | __default_send_IPI_shortcut(APIC_DEST_ALLINC, |
128 | vector, apic->dest_logical); | ||
129 | } | ||
127 | } | 130 | } |
128 | 131 | ||
129 | static unsigned int get_apic_id(unsigned long x) | 132 | static unsigned int flat_get_apic_id(unsigned long x) |
130 | { | 133 | { |
131 | unsigned int id; | 134 | unsigned int id; |
132 | 135 | ||
133 | id = (((x)>>24) & 0xFFu); | 136 | id = (((x)>>24) & 0xFFu); |
137 | |||
134 | return id; | 138 | return id; |
135 | } | 139 | } |
136 | 140 | ||
@@ -146,7 +150,7 @@ static unsigned int read_xapic_id(void) | |||
146 | { | 150 | { |
147 | unsigned int id; | 151 | unsigned int id; |
148 | 152 | ||
149 | id = get_apic_id(apic_read(APIC_ID)); | 153 | id = flat_get_apic_id(apic_read(APIC_ID)); |
150 | return id; | 154 | return id; |
151 | } | 155 | } |
152 | 156 | ||
@@ -169,31 +173,62 @@ static unsigned int flat_cpu_mask_to_apicid_and(const struct cpumask *cpumask, | |||
169 | return mask1 & mask2; | 173 | return mask1 & mask2; |
170 | } | 174 | } |
171 | 175 | ||
172 | static unsigned int phys_pkg_id(int index_msb) | 176 | static int flat_phys_pkg_id(int initial_apic_id, int index_msb) |
173 | { | 177 | { |
174 | return hard_smp_processor_id() >> index_msb; | 178 | return hard_smp_processor_id() >> index_msb; |
175 | } | 179 | } |
176 | 180 | ||
177 | struct genapic apic_flat = { | 181 | struct genapic apic_flat = { |
178 | .name = "flat", | 182 | .name = "flat", |
179 | .acpi_madt_oem_check = flat_acpi_madt_oem_check, | 183 | .probe = NULL, |
180 | .int_delivery_mode = dest_LowestPrio, | 184 | .acpi_madt_oem_check = flat_acpi_madt_oem_check, |
181 | .int_dest_mode = (APIC_DEST_LOGICAL != 0), | 185 | .apic_id_registered = flat_apic_id_registered, |
182 | .target_cpus = flat_target_cpus, | 186 | |
183 | .vector_allocation_domain = flat_vector_allocation_domain, | 187 | .irq_delivery_mode = dest_LowestPrio, |
184 | .apic_id_registered = flat_apic_id_registered, | 188 | .irq_dest_mode = 1, /* logical */ |
185 | .init_apic_ldr = flat_init_apic_ldr, | 189 | |
186 | .send_IPI_all = flat_send_IPI_all, | 190 | .target_cpus = flat_target_cpus, |
187 | .send_IPI_allbutself = flat_send_IPI_allbutself, | 191 | .disable_esr = 0, |
188 | .send_IPI_mask = flat_send_IPI_mask, | 192 | .dest_logical = APIC_DEST_LOGICAL, |
189 | .send_IPI_mask_allbutself = flat_send_IPI_mask_allbutself, | 193 | .check_apicid_used = NULL, |
190 | .send_IPI_self = apic_send_IPI_self, | 194 | .check_apicid_present = NULL, |
191 | .cpu_mask_to_apicid = flat_cpu_mask_to_apicid, | 195 | |
192 | .cpu_mask_to_apicid_and = flat_cpu_mask_to_apicid_and, | 196 | .vector_allocation_domain = flat_vector_allocation_domain, |
193 | .phys_pkg_id = phys_pkg_id, | 197 | .init_apic_ldr = flat_init_apic_ldr, |
194 | .get_apic_id = get_apic_id, | 198 | |
195 | .set_apic_id = set_apic_id, | 199 | .ioapic_phys_id_map = NULL, |
196 | .apic_id_mask = (0xFFu<<24), | 200 | .setup_apic_routing = NULL, |
201 | .multi_timer_check = NULL, | ||
202 | .apicid_to_node = NULL, | ||
203 | .cpu_to_logical_apicid = NULL, | ||
204 | .cpu_present_to_apicid = default_cpu_present_to_apicid, | ||
205 | .apicid_to_cpu_present = NULL, | ||
206 | .setup_portio_remap = NULL, | ||
207 | .check_phys_apicid_present = default_check_phys_apicid_present, | ||
208 | .enable_apic_mode = NULL, | ||
209 | .phys_pkg_id = flat_phys_pkg_id, | ||
210 | .mps_oem_check = NULL, | ||
211 | |||
212 | .get_apic_id = flat_get_apic_id, | ||
213 | .set_apic_id = set_apic_id, | ||
214 | .apic_id_mask = 0xFFu << 24, | ||
215 | |||
216 | .cpu_mask_to_apicid = flat_cpu_mask_to_apicid, | ||
217 | .cpu_mask_to_apicid_and = flat_cpu_mask_to_apicid_and, | ||
218 | |||
219 | .send_IPI_mask = flat_send_IPI_mask, | ||
220 | .send_IPI_mask_allbutself = flat_send_IPI_mask_allbutself, | ||
221 | .send_IPI_allbutself = flat_send_IPI_allbutself, | ||
222 | .send_IPI_all = flat_send_IPI_all, | ||
223 | .send_IPI_self = apic_send_IPI_self, | ||
224 | |||
225 | .wakeup_cpu = NULL, | ||
226 | .trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW, | ||
227 | .trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH, | ||
228 | .wait_for_init_deassert = NULL, | ||
229 | .smp_callin_clear_local_apic = NULL, | ||
230 | .store_NMI_vector = NULL, | ||
231 | .inquire_remote_apic = NULL, | ||
197 | }; | 232 | }; |
198 | 233 | ||
199 | /* | 234 | /* |
@@ -232,18 +267,18 @@ static void physflat_vector_allocation_domain(int cpu, struct cpumask *retmask) | |||
232 | 267 | ||
233 | static void physflat_send_IPI_mask(const struct cpumask *cpumask, int vector) | 268 | static void physflat_send_IPI_mask(const struct cpumask *cpumask, int vector) |
234 | { | 269 | { |
235 | send_IPI_mask_sequence(cpumask, vector); | 270 | default_send_IPI_mask_sequence_phys(cpumask, vector); |
236 | } | 271 | } |
237 | 272 | ||
238 | static void physflat_send_IPI_mask_allbutself(const struct cpumask *cpumask, | 273 | static void physflat_send_IPI_mask_allbutself(const struct cpumask *cpumask, |
239 | int vector) | 274 | int vector) |
240 | { | 275 | { |
241 | send_IPI_mask_allbutself(cpumask, vector); | 276 | default_send_IPI_mask_allbutself_phys(cpumask, vector); |
242 | } | 277 | } |
243 | 278 | ||
244 | static void physflat_send_IPI_allbutself(int vector) | 279 | static void physflat_send_IPI_allbutself(int vector) |
245 | { | 280 | { |
246 | send_IPI_mask_allbutself(cpu_online_mask, vector); | 281 | default_send_IPI_mask_allbutself_phys(cpu_online_mask, vector); |
247 | } | 282 | } |
248 | 283 | ||
249 | static void physflat_send_IPI_all(int vector) | 284 | static void physflat_send_IPI_all(int vector) |
@@ -276,32 +311,67 @@ physflat_cpu_mask_to_apicid_and(const struct cpumask *cpumask, | |||
276 | * We're using fixed IRQ delivery, can only return one phys APIC ID. | 311 | * We're using fixed IRQ delivery, can only return one phys APIC ID. |
277 | * May as well be the first. | 312 | * May as well be the first. |
278 | */ | 313 | */ |
279 | for_each_cpu_and(cpu, cpumask, andmask) | 314 | for_each_cpu_and(cpu, cpumask, andmask) { |
280 | if (cpumask_test_cpu(cpu, cpu_online_mask)) | 315 | if (cpumask_test_cpu(cpu, cpu_online_mask)) |
281 | break; | 316 | break; |
317 | } | ||
282 | if (cpu < nr_cpu_ids) | 318 | if (cpu < nr_cpu_ids) |
283 | return per_cpu(x86_cpu_to_apicid, cpu); | 319 | return per_cpu(x86_cpu_to_apicid, cpu); |
320 | |||
284 | return BAD_APICID; | 321 | return BAD_APICID; |
285 | } | 322 | } |
286 | 323 | ||
287 | struct genapic apic_physflat = { | 324 | struct genapic apic_physflat = { |
288 | .name = "physical flat", | 325 | |
289 | .acpi_madt_oem_check = physflat_acpi_madt_oem_check, | 326 | .name = "physical flat", |
290 | .int_delivery_mode = dest_Fixed, | 327 | .probe = NULL, |
291 | .int_dest_mode = (APIC_DEST_PHYSICAL != 0), | 328 | .acpi_madt_oem_check = physflat_acpi_madt_oem_check, |
292 | .target_cpus = physflat_target_cpus, | 329 | .apic_id_registered = flat_apic_id_registered, |
293 | .vector_allocation_domain = physflat_vector_allocation_domain, | 330 | |
294 | .apic_id_registered = flat_apic_id_registered, | 331 | .irq_delivery_mode = dest_Fixed, |
295 | .init_apic_ldr = flat_init_apic_ldr,/*not needed, but shouldn't hurt*/ | 332 | .irq_dest_mode = 0, /* physical */ |
296 | .send_IPI_all = physflat_send_IPI_all, | 333 | |
297 | .send_IPI_allbutself = physflat_send_IPI_allbutself, | 334 | .target_cpus = physflat_target_cpus, |
298 | .send_IPI_mask = physflat_send_IPI_mask, | 335 | .disable_esr = 0, |
299 | .send_IPI_mask_allbutself = physflat_send_IPI_mask_allbutself, | 336 | .dest_logical = 0, |
300 | .send_IPI_self = apic_send_IPI_self, | 337 | .check_apicid_used = NULL, |
301 | .cpu_mask_to_apicid = physflat_cpu_mask_to_apicid, | 338 | .check_apicid_present = NULL, |
302 | .cpu_mask_to_apicid_and = physflat_cpu_mask_to_apicid_and, | 339 | |
303 | .phys_pkg_id = phys_pkg_id, | 340 | .vector_allocation_domain = physflat_vector_allocation_domain, |
304 | .get_apic_id = get_apic_id, | 341 | /* not needed, but shouldn't hurt: */ |
305 | .set_apic_id = set_apic_id, | 342 | .init_apic_ldr = flat_init_apic_ldr, |
306 | .apic_id_mask = (0xFFu<<24), | 343 | |
344 | .ioapic_phys_id_map = NULL, | ||
345 | .setup_apic_routing = NULL, | ||
346 | .multi_timer_check = NULL, | ||
347 | .apicid_to_node = NULL, | ||
348 | .cpu_to_logical_apicid = NULL, | ||
349 | .cpu_present_to_apicid = default_cpu_present_to_apicid, | ||
350 | .apicid_to_cpu_present = NULL, | ||
351 | .setup_portio_remap = NULL, | ||
352 | .check_phys_apicid_present = default_check_phys_apicid_present, | ||
353 | .enable_apic_mode = NULL, | ||
354 | .phys_pkg_id = flat_phys_pkg_id, | ||
355 | .mps_oem_check = NULL, | ||
356 | |||
357 | .get_apic_id = flat_get_apic_id, | ||
358 | .set_apic_id = set_apic_id, | ||
359 | .apic_id_mask = 0xFFu << 24, | ||
360 | |||
361 | .cpu_mask_to_apicid = physflat_cpu_mask_to_apicid, | ||
362 | .cpu_mask_to_apicid_and = physflat_cpu_mask_to_apicid_and, | ||
363 | |||
364 | .send_IPI_mask = physflat_send_IPI_mask, | ||
365 | .send_IPI_mask_allbutself = physflat_send_IPI_mask_allbutself, | ||
366 | .send_IPI_allbutself = physflat_send_IPI_allbutself, | ||
367 | .send_IPI_all = physflat_send_IPI_all, | ||
368 | .send_IPI_self = apic_send_IPI_self, | ||
369 | |||
370 | .wakeup_cpu = NULL, | ||
371 | .trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW, | ||
372 | .trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH, | ||
373 | .wait_for_init_deassert = NULL, | ||
374 | .smp_callin_clear_local_apic = NULL, | ||
375 | .store_NMI_vector = NULL, | ||
376 | .inquire_remote_apic = NULL, | ||
307 | }; | 377 | }; |
diff --git a/arch/x86/kernel/genx2apic_cluster.c b/arch/x86/kernel/genx2apic_cluster.c index 6ce497cc372d..7c87156b6411 100644 --- a/arch/x86/kernel/genx2apic_cluster.c +++ b/arch/x86/kernel/genx2apic_cluster.c | |||
@@ -36,8 +36,8 @@ static void x2apic_vector_allocation_domain(int cpu, struct cpumask *retmask) | |||
36 | cpumask_set_cpu(cpu, retmask); | 36 | cpumask_set_cpu(cpu, retmask); |
37 | } | 37 | } |
38 | 38 | ||
39 | static void __x2apic_send_IPI_dest(unsigned int apicid, int vector, | 39 | static void |
40 | unsigned int dest) | 40 | __x2apic_send_IPI_dest(unsigned int apicid, int vector, unsigned int dest) |
41 | { | 41 | { |
42 | unsigned long cfg; | 42 | unsigned long cfg; |
43 | 43 | ||
@@ -57,45 +57,50 @@ static void __x2apic_send_IPI_dest(unsigned int apicid, int vector, | |||
57 | */ | 57 | */ |
58 | static void x2apic_send_IPI_mask(const struct cpumask *mask, int vector) | 58 | static void x2apic_send_IPI_mask(const struct cpumask *mask, int vector) |
59 | { | 59 | { |
60 | unsigned long flags; | ||
61 | unsigned long query_cpu; | 60 | unsigned long query_cpu; |
61 | unsigned long flags; | ||
62 | 62 | ||
63 | local_irq_save(flags); | 63 | local_irq_save(flags); |
64 | for_each_cpu(query_cpu, mask) | 64 | for_each_cpu(query_cpu, mask) { |
65 | __x2apic_send_IPI_dest( | 65 | __x2apic_send_IPI_dest( |
66 | per_cpu(x86_cpu_to_logical_apicid, query_cpu), | 66 | per_cpu(x86_cpu_to_logical_apicid, query_cpu), |
67 | vector, APIC_DEST_LOGICAL); | 67 | vector, apic->dest_logical); |
68 | } | ||
68 | local_irq_restore(flags); | 69 | local_irq_restore(flags); |
69 | } | 70 | } |
70 | 71 | ||
71 | static void x2apic_send_IPI_mask_allbutself(const struct cpumask *mask, | 72 | static void |
72 | int vector) | 73 | x2apic_send_IPI_mask_allbutself(const struct cpumask *mask, int vector) |
73 | { | 74 | { |
74 | unsigned long flags; | ||
75 | unsigned long query_cpu; | ||
76 | unsigned long this_cpu = smp_processor_id(); | 75 | unsigned long this_cpu = smp_processor_id(); |
76 | unsigned long query_cpu; | ||
77 | unsigned long flags; | ||
77 | 78 | ||
78 | local_irq_save(flags); | 79 | local_irq_save(flags); |
79 | for_each_cpu(query_cpu, mask) | 80 | for_each_cpu(query_cpu, mask) { |
80 | if (query_cpu != this_cpu) | 81 | if (query_cpu == this_cpu) |
81 | __x2apic_send_IPI_dest( | 82 | continue; |
83 | __x2apic_send_IPI_dest( | ||
82 | per_cpu(x86_cpu_to_logical_apicid, query_cpu), | 84 | per_cpu(x86_cpu_to_logical_apicid, query_cpu), |
83 | vector, APIC_DEST_LOGICAL); | 85 | vector, apic->dest_logical); |
86 | } | ||
84 | local_irq_restore(flags); | 87 | local_irq_restore(flags); |
85 | } | 88 | } |
86 | 89 | ||
87 | static void x2apic_send_IPI_allbutself(int vector) | 90 | static void x2apic_send_IPI_allbutself(int vector) |
88 | { | 91 | { |
89 | unsigned long flags; | ||
90 | unsigned long query_cpu; | ||
91 | unsigned long this_cpu = smp_processor_id(); | 92 | unsigned long this_cpu = smp_processor_id(); |
93 | unsigned long query_cpu; | ||
94 | unsigned long flags; | ||
92 | 95 | ||
93 | local_irq_save(flags); | 96 | local_irq_save(flags); |
94 | for_each_online_cpu(query_cpu) | 97 | for_each_online_cpu(query_cpu) { |
95 | if (query_cpu != this_cpu) | 98 | if (query_cpu == this_cpu) |
96 | __x2apic_send_IPI_dest( | 99 | continue; |
100 | __x2apic_send_IPI_dest( | ||
97 | per_cpu(x86_cpu_to_logical_apicid, query_cpu), | 101 | per_cpu(x86_cpu_to_logical_apicid, query_cpu), |
98 | vector, APIC_DEST_LOGICAL); | 102 | vector, apic->dest_logical); |
103 | } | ||
99 | local_irq_restore(flags); | 104 | local_irq_restore(flags); |
100 | } | 105 | } |
101 | 106 | ||
@@ -111,21 +116,21 @@ static int x2apic_apic_id_registered(void) | |||
111 | 116 | ||
112 | static unsigned int x2apic_cpu_mask_to_apicid(const struct cpumask *cpumask) | 117 | static unsigned int x2apic_cpu_mask_to_apicid(const struct cpumask *cpumask) |
113 | { | 118 | { |
114 | int cpu; | ||
115 | |||
116 | /* | 119 | /* |
117 | * We're using fixed IRQ delivery, can only return one logical APIC ID. | 120 | * We're using fixed IRQ delivery, can only return one logical APIC ID. |
118 | * May as well be the first. | 121 | * May as well be the first. |
119 | */ | 122 | */ |
120 | cpu = cpumask_first(cpumask); | 123 | int cpu = cpumask_first(cpumask); |
124 | |||
121 | if ((unsigned)cpu < nr_cpu_ids) | 125 | if ((unsigned)cpu < nr_cpu_ids) |
122 | return per_cpu(x86_cpu_to_logical_apicid, cpu); | 126 | return per_cpu(x86_cpu_to_logical_apicid, cpu); |
123 | else | 127 | else |
124 | return BAD_APICID; | 128 | return BAD_APICID; |
125 | } | 129 | } |
126 | 130 | ||
127 | static unsigned int x2apic_cpu_mask_to_apicid_and(const struct cpumask *cpumask, | 131 | static unsigned int |
128 | const struct cpumask *andmask) | 132 | x2apic_cpu_mask_to_apicid_and(const struct cpumask *cpumask, |
133 | const struct cpumask *andmask) | ||
129 | { | 134 | { |
130 | int cpu; | 135 | int cpu; |
131 | 136 | ||
@@ -133,15 +138,18 @@ static unsigned int x2apic_cpu_mask_to_apicid_and(const struct cpumask *cpumask, | |||
133 | * We're using fixed IRQ delivery, can only return one logical APIC ID. | 138 | * We're using fixed IRQ delivery, can only return one logical APIC ID. |
134 | * May as well be the first. | 139 | * May as well be the first. |
135 | */ | 140 | */ |
136 | for_each_cpu_and(cpu, cpumask, andmask) | 141 | for_each_cpu_and(cpu, cpumask, andmask) { |
137 | if (cpumask_test_cpu(cpu, cpu_online_mask)) | 142 | if (cpumask_test_cpu(cpu, cpu_online_mask)) |
138 | break; | 143 | break; |
144 | } | ||
145 | |||
139 | if (cpu < nr_cpu_ids) | 146 | if (cpu < nr_cpu_ids) |
140 | return per_cpu(x86_cpu_to_logical_apicid, cpu); | 147 | return per_cpu(x86_cpu_to_logical_apicid, cpu); |
148 | |||
141 | return BAD_APICID; | 149 | return BAD_APICID; |
142 | } | 150 | } |
143 | 151 | ||
144 | static unsigned int get_apic_id(unsigned long x) | 152 | static unsigned int x2apic_cluster_phys_get_apic_id(unsigned long x) |
145 | { | 153 | { |
146 | unsigned int id; | 154 | unsigned int id; |
147 | 155 | ||
@@ -157,7 +165,7 @@ static unsigned long set_apic_id(unsigned int id) | |||
157 | return x; | 165 | return x; |
158 | } | 166 | } |
159 | 167 | ||
160 | static unsigned int phys_pkg_id(int index_msb) | 168 | static int x2apic_cluster_phys_pkg_id(int initial_apicid, int index_msb) |
161 | { | 169 | { |
162 | return current_cpu_data.initial_apicid >> index_msb; | 170 | return current_cpu_data.initial_apicid >> index_msb; |
163 | } | 171 | } |
@@ -172,27 +180,58 @@ static void init_x2apic_ldr(void) | |||
172 | int cpu = smp_processor_id(); | 180 | int cpu = smp_processor_id(); |
173 | 181 | ||
174 | per_cpu(x86_cpu_to_logical_apicid, cpu) = apic_read(APIC_LDR); | 182 | per_cpu(x86_cpu_to_logical_apicid, cpu) = apic_read(APIC_LDR); |
175 | return; | ||
176 | } | 183 | } |
177 | 184 | ||
178 | struct genapic apic_x2apic_cluster = { | 185 | struct genapic apic_x2apic_cluster = { |
179 | .name = "cluster x2apic", | 186 | |
180 | .acpi_madt_oem_check = x2apic_acpi_madt_oem_check, | 187 | .name = "cluster x2apic", |
181 | .int_delivery_mode = dest_LowestPrio, | 188 | .probe = NULL, |
182 | .int_dest_mode = (APIC_DEST_LOGICAL != 0), | 189 | .acpi_madt_oem_check = x2apic_acpi_madt_oem_check, |
183 | .target_cpus = x2apic_target_cpus, | 190 | .apic_id_registered = x2apic_apic_id_registered, |
184 | .vector_allocation_domain = x2apic_vector_allocation_domain, | 191 | |
185 | .apic_id_registered = x2apic_apic_id_registered, | 192 | .irq_delivery_mode = dest_LowestPrio, |
186 | .init_apic_ldr = init_x2apic_ldr, | 193 | .irq_dest_mode = 1, /* logical */ |
187 | .send_IPI_all = x2apic_send_IPI_all, | 194 | |
188 | .send_IPI_allbutself = x2apic_send_IPI_allbutself, | 195 | .target_cpus = x2apic_target_cpus, |
189 | .send_IPI_mask = x2apic_send_IPI_mask, | 196 | .disable_esr = 0, |
190 | .send_IPI_mask_allbutself = x2apic_send_IPI_mask_allbutself, | 197 | .dest_logical = APIC_DEST_LOGICAL, |
191 | .send_IPI_self = x2apic_send_IPI_self, | 198 | .check_apicid_used = NULL, |
192 | .cpu_mask_to_apicid = x2apic_cpu_mask_to_apicid, | 199 | .check_apicid_present = NULL, |
193 | .cpu_mask_to_apicid_and = x2apic_cpu_mask_to_apicid_and, | 200 | |
194 | .phys_pkg_id = phys_pkg_id, | 201 | .vector_allocation_domain = x2apic_vector_allocation_domain, |
195 | .get_apic_id = get_apic_id, | 202 | .init_apic_ldr = init_x2apic_ldr, |
196 | .set_apic_id = set_apic_id, | 203 | |
197 | .apic_id_mask = (0xFFFFFFFFu), | 204 | .ioapic_phys_id_map = NULL, |
205 | .setup_apic_routing = NULL, | ||
206 | .multi_timer_check = NULL, | ||
207 | .apicid_to_node = NULL, | ||
208 | .cpu_to_logical_apicid = NULL, | ||
209 | .cpu_present_to_apicid = default_cpu_present_to_apicid, | ||
210 | .apicid_to_cpu_present = NULL, | ||
211 | .setup_portio_remap = NULL, | ||
212 | .check_phys_apicid_present = default_check_phys_apicid_present, | ||
213 | .enable_apic_mode = NULL, | ||
214 | .phys_pkg_id = x2apic_cluster_phys_pkg_id, | ||
215 | .mps_oem_check = NULL, | ||
216 | |||
217 | .get_apic_id = x2apic_cluster_phys_get_apic_id, | ||
218 | .set_apic_id = set_apic_id, | ||
219 | .apic_id_mask = 0xFFFFFFFFu, | ||
220 | |||
221 | .cpu_mask_to_apicid = x2apic_cpu_mask_to_apicid, | ||
222 | .cpu_mask_to_apicid_and = x2apic_cpu_mask_to_apicid_and, | ||
223 | |||
224 | .send_IPI_mask = x2apic_send_IPI_mask, | ||
225 | .send_IPI_mask_allbutself = x2apic_send_IPI_mask_allbutself, | ||
226 | .send_IPI_allbutself = x2apic_send_IPI_allbutself, | ||
227 | .send_IPI_all = x2apic_send_IPI_all, | ||
228 | .send_IPI_self = x2apic_send_IPI_self, | ||
229 | |||
230 | .wakeup_cpu = NULL, | ||
231 | .trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW, | ||
232 | .trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH, | ||
233 | .wait_for_init_deassert = NULL, | ||
234 | .smp_callin_clear_local_apic = NULL, | ||
235 | .store_NMI_vector = NULL, | ||
236 | .inquire_remote_apic = NULL, | ||
198 | }; | 237 | }; |
diff --git a/arch/x86/kernel/genx2apic_phys.c b/arch/x86/kernel/genx2apic_phys.c index 21bcc0e098ba..5cbae8aa0408 100644 --- a/arch/x86/kernel/genx2apic_phys.c +++ b/arch/x86/kernel/genx2apic_phys.c | |||
@@ -55,8 +55,8 @@ static void __x2apic_send_IPI_dest(unsigned int apicid, int vector, | |||
55 | 55 | ||
56 | static void x2apic_send_IPI_mask(const struct cpumask *mask, int vector) | 56 | static void x2apic_send_IPI_mask(const struct cpumask *mask, int vector) |
57 | { | 57 | { |
58 | unsigned long flags; | ||
59 | unsigned long query_cpu; | 58 | unsigned long query_cpu; |
59 | unsigned long flags; | ||
60 | 60 | ||
61 | local_irq_save(flags); | 61 | local_irq_save(flags); |
62 | for_each_cpu(query_cpu, mask) { | 62 | for_each_cpu(query_cpu, mask) { |
@@ -66,12 +66,12 @@ static void x2apic_send_IPI_mask(const struct cpumask *mask, int vector) | |||
66 | local_irq_restore(flags); | 66 | local_irq_restore(flags); |
67 | } | 67 | } |
68 | 68 | ||
69 | static void x2apic_send_IPI_mask_allbutself(const struct cpumask *mask, | 69 | static void |
70 | int vector) | 70 | x2apic_send_IPI_mask_allbutself(const struct cpumask *mask, int vector) |
71 | { | 71 | { |
72 | unsigned long flags; | ||
73 | unsigned long query_cpu; | ||
74 | unsigned long this_cpu = smp_processor_id(); | 72 | unsigned long this_cpu = smp_processor_id(); |
73 | unsigned long query_cpu; | ||
74 | unsigned long flags; | ||
75 | 75 | ||
76 | local_irq_save(flags); | 76 | local_irq_save(flags); |
77 | for_each_cpu(query_cpu, mask) { | 77 | for_each_cpu(query_cpu, mask) { |
@@ -85,16 +85,17 @@ static void x2apic_send_IPI_mask_allbutself(const struct cpumask *mask, | |||
85 | 85 | ||
86 | static void x2apic_send_IPI_allbutself(int vector) | 86 | static void x2apic_send_IPI_allbutself(int vector) |
87 | { | 87 | { |
88 | unsigned long flags; | ||
89 | unsigned long query_cpu; | ||
90 | unsigned long this_cpu = smp_processor_id(); | 88 | unsigned long this_cpu = smp_processor_id(); |
89 | unsigned long query_cpu; | ||
90 | unsigned long flags; | ||
91 | 91 | ||
92 | local_irq_save(flags); | 92 | local_irq_save(flags); |
93 | for_each_online_cpu(query_cpu) | 93 | for_each_online_cpu(query_cpu) { |
94 | if (query_cpu != this_cpu) | 94 | if (query_cpu == this_cpu) |
95 | __x2apic_send_IPI_dest( | 95 | continue; |
96 | per_cpu(x86_cpu_to_apicid, query_cpu), | 96 | __x2apic_send_IPI_dest(per_cpu(x86_cpu_to_apicid, query_cpu), |
97 | vector, APIC_DEST_PHYSICAL); | 97 | vector, APIC_DEST_PHYSICAL); |
98 | } | ||
98 | local_irq_restore(flags); | 99 | local_irq_restore(flags); |
99 | } | 100 | } |
100 | 101 | ||
@@ -110,21 +111,21 @@ static int x2apic_apic_id_registered(void) | |||
110 | 111 | ||
111 | static unsigned int x2apic_cpu_mask_to_apicid(const struct cpumask *cpumask) | 112 | static unsigned int x2apic_cpu_mask_to_apicid(const struct cpumask *cpumask) |
112 | { | 113 | { |
113 | int cpu; | ||
114 | |||
115 | /* | 114 | /* |
116 | * We're using fixed IRQ delivery, can only return one phys APIC ID. | 115 | * We're using fixed IRQ delivery, can only return one phys APIC ID. |
117 | * May as well be the first. | 116 | * May as well be the first. |
118 | */ | 117 | */ |
119 | cpu = cpumask_first(cpumask); | 118 | int cpu = cpumask_first(cpumask); |
119 | |||
120 | if ((unsigned)cpu < nr_cpu_ids) | 120 | if ((unsigned)cpu < nr_cpu_ids) |
121 | return per_cpu(x86_cpu_to_apicid, cpu); | 121 | return per_cpu(x86_cpu_to_apicid, cpu); |
122 | else | 122 | else |
123 | return BAD_APICID; | 123 | return BAD_APICID; |
124 | } | 124 | } |
125 | 125 | ||
126 | static unsigned int x2apic_cpu_mask_to_apicid_and(const struct cpumask *cpumask, | 126 | static unsigned int |
127 | const struct cpumask *andmask) | 127 | x2apic_cpu_mask_to_apicid_and(const struct cpumask *cpumask, |
128 | const struct cpumask *andmask) | ||
128 | { | 129 | { |
129 | int cpu; | 130 | int cpu; |
130 | 131 | ||
@@ -132,31 +133,28 @@ static unsigned int x2apic_cpu_mask_to_apicid_and(const struct cpumask *cpumask, | |||
132 | * We're using fixed IRQ delivery, can only return one phys APIC ID. | 133 | * We're using fixed IRQ delivery, can only return one phys APIC ID. |
133 | * May as well be the first. | 134 | * May as well be the first. |
134 | */ | 135 | */ |
135 | for_each_cpu_and(cpu, cpumask, andmask) | 136 | for_each_cpu_and(cpu, cpumask, andmask) { |
136 | if (cpumask_test_cpu(cpu, cpu_online_mask)) | 137 | if (cpumask_test_cpu(cpu, cpu_online_mask)) |
137 | break; | 138 | break; |
139 | } | ||
140 | |||
138 | if (cpu < nr_cpu_ids) | 141 | if (cpu < nr_cpu_ids) |
139 | return per_cpu(x86_cpu_to_apicid, cpu); | 142 | return per_cpu(x86_cpu_to_apicid, cpu); |
143 | |||
140 | return BAD_APICID; | 144 | return BAD_APICID; |
141 | } | 145 | } |
142 | 146 | ||
143 | static unsigned int get_apic_id(unsigned long x) | 147 | static unsigned int x2apic_phys_get_apic_id(unsigned long x) |
144 | { | 148 | { |
145 | unsigned int id; | 149 | return x; |
146 | |||
147 | id = x; | ||
148 | return id; | ||
149 | } | 150 | } |
150 | 151 | ||
151 | static unsigned long set_apic_id(unsigned int id) | 152 | static unsigned long set_apic_id(unsigned int id) |
152 | { | 153 | { |
153 | unsigned long x; | 154 | return id; |
154 | |||
155 | x = id; | ||
156 | return x; | ||
157 | } | 155 | } |
158 | 156 | ||
159 | static unsigned int phys_pkg_id(int index_msb) | 157 | static int x2apic_phys_pkg_id(int initial_apicid, int index_msb) |
160 | { | 158 | { |
161 | return current_cpu_data.initial_apicid >> index_msb; | 159 | return current_cpu_data.initial_apicid >> index_msb; |
162 | } | 160 | } |
@@ -168,27 +166,58 @@ static void x2apic_send_IPI_self(int vector) | |||
168 | 166 | ||
169 | static void init_x2apic_ldr(void) | 167 | static void init_x2apic_ldr(void) |
170 | { | 168 | { |
171 | return; | ||
172 | } | 169 | } |
173 | 170 | ||
174 | struct genapic apic_x2apic_phys = { | 171 | struct genapic apic_x2apic_phys = { |
175 | .name = "physical x2apic", | 172 | |
176 | .acpi_madt_oem_check = x2apic_acpi_madt_oem_check, | 173 | .name = "physical x2apic", |
177 | .int_delivery_mode = dest_Fixed, | 174 | .probe = NULL, |
178 | .int_dest_mode = (APIC_DEST_PHYSICAL != 0), | 175 | .acpi_madt_oem_check = x2apic_acpi_madt_oem_check, |
179 | .target_cpus = x2apic_target_cpus, | 176 | .apic_id_registered = x2apic_apic_id_registered, |
180 | .vector_allocation_domain = x2apic_vector_allocation_domain, | 177 | |
181 | .apic_id_registered = x2apic_apic_id_registered, | 178 | .irq_delivery_mode = dest_Fixed, |
182 | .init_apic_ldr = init_x2apic_ldr, | 179 | .irq_dest_mode = 0, /* physical */ |
183 | .send_IPI_all = x2apic_send_IPI_all, | 180 | |
184 | .send_IPI_allbutself = x2apic_send_IPI_allbutself, | 181 | .target_cpus = x2apic_target_cpus, |
185 | .send_IPI_mask = x2apic_send_IPI_mask, | 182 | .disable_esr = 0, |
186 | .send_IPI_mask_allbutself = x2apic_send_IPI_mask_allbutself, | 183 | .dest_logical = 0, |
187 | .send_IPI_self = x2apic_send_IPI_self, | 184 | .check_apicid_used = NULL, |
188 | .cpu_mask_to_apicid = x2apic_cpu_mask_to_apicid, | 185 | .check_apicid_present = NULL, |
189 | .cpu_mask_to_apicid_and = x2apic_cpu_mask_to_apicid_and, | 186 | |
190 | .phys_pkg_id = phys_pkg_id, | 187 | .vector_allocation_domain = x2apic_vector_allocation_domain, |
191 | .get_apic_id = get_apic_id, | 188 | .init_apic_ldr = init_x2apic_ldr, |
192 | .set_apic_id = set_apic_id, | 189 | |
193 | .apic_id_mask = (0xFFFFFFFFu), | 190 | .ioapic_phys_id_map = NULL, |
191 | .setup_apic_routing = NULL, | ||
192 | .multi_timer_check = NULL, | ||
193 | .apicid_to_node = NULL, | ||
194 | .cpu_to_logical_apicid = NULL, | ||
195 | .cpu_present_to_apicid = default_cpu_present_to_apicid, | ||
196 | .apicid_to_cpu_present = NULL, | ||
197 | .setup_portio_remap = NULL, | ||
198 | .check_phys_apicid_present = default_check_phys_apicid_present, | ||
199 | .enable_apic_mode = NULL, | ||
200 | .phys_pkg_id = x2apic_phys_pkg_id, | ||
201 | .mps_oem_check = NULL, | ||
202 | |||
203 | .get_apic_id = x2apic_phys_get_apic_id, | ||
204 | .set_apic_id = set_apic_id, | ||
205 | .apic_id_mask = 0xFFFFFFFFu, | ||
206 | |||
207 | .cpu_mask_to_apicid = x2apic_cpu_mask_to_apicid, | ||
208 | .cpu_mask_to_apicid_and = x2apic_cpu_mask_to_apicid_and, | ||
209 | |||
210 | .send_IPI_mask = x2apic_send_IPI_mask, | ||
211 | .send_IPI_mask_allbutself = x2apic_send_IPI_mask_allbutself, | ||
212 | .send_IPI_allbutself = x2apic_send_IPI_allbutself, | ||
213 | .send_IPI_all = x2apic_send_IPI_all, | ||
214 | .send_IPI_self = x2apic_send_IPI_self, | ||
215 | |||
216 | .wakeup_cpu = NULL, | ||
217 | .trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW, | ||
218 | .trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH, | ||
219 | .wait_for_init_deassert = NULL, | ||
220 | .smp_callin_clear_local_apic = NULL, | ||
221 | .store_NMI_vector = NULL, | ||
222 | .inquire_remote_apic = NULL, | ||
194 | }; | 223 | }; |
diff --git a/arch/x86/kernel/genx2apic_uv_x.c b/arch/x86/kernel/genx2apic_uv_x.c index bfe36249145c..6adb5e6f4d92 100644 --- a/arch/x86/kernel/genx2apic_uv_x.c +++ b/arch/x86/kernel/genx2apic_uv_x.c | |||
@@ -118,12 +118,13 @@ static void uv_send_IPI_one(int cpu, int vector) | |||
118 | int pnode; | 118 | int pnode; |
119 | 119 | ||
120 | apicid = per_cpu(x86_cpu_to_apicid, cpu); | 120 | apicid = per_cpu(x86_cpu_to_apicid, cpu); |
121 | lapicid = apicid & 0x3f; /* ZZZ macro needed */ | 121 | lapicid = apicid & 0x3f; /* ZZZ macro needed */ |
122 | pnode = uv_apicid_to_pnode(apicid); | 122 | pnode = uv_apicid_to_pnode(apicid); |
123 | val = | 123 | |
124 | (1UL << UVH_IPI_INT_SEND_SHFT) | (lapicid << | 124 | val = ( 1UL << UVH_IPI_INT_SEND_SHFT ) | |
125 | UVH_IPI_INT_APIC_ID_SHFT) | | 125 | ( lapicid << UVH_IPI_INT_APIC_ID_SHFT ) | |
126 | (vector << UVH_IPI_INT_VECTOR_SHFT); | 126 | ( vector << UVH_IPI_INT_VECTOR_SHFT ); |
127 | |||
127 | uv_write_global_mmr64(pnode, UVH_IPI_INT, val); | 128 | uv_write_global_mmr64(pnode, UVH_IPI_INT, val); |
128 | } | 129 | } |
129 | 130 | ||
@@ -137,22 +138,24 @@ static void uv_send_IPI_mask(const struct cpumask *mask, int vector) | |||
137 | 138 | ||
138 | static void uv_send_IPI_mask_allbutself(const struct cpumask *mask, int vector) | 139 | static void uv_send_IPI_mask_allbutself(const struct cpumask *mask, int vector) |
139 | { | 140 | { |
140 | unsigned int cpu; | ||
141 | unsigned int this_cpu = smp_processor_id(); | 141 | unsigned int this_cpu = smp_processor_id(); |
142 | unsigned int cpu; | ||
142 | 143 | ||
143 | for_each_cpu(cpu, mask) | 144 | for_each_cpu(cpu, mask) { |
144 | if (cpu != this_cpu) | 145 | if (cpu != this_cpu) |
145 | uv_send_IPI_one(cpu, vector); | 146 | uv_send_IPI_one(cpu, vector); |
147 | } | ||
146 | } | 148 | } |
147 | 149 | ||
148 | static void uv_send_IPI_allbutself(int vector) | 150 | static void uv_send_IPI_allbutself(int vector) |
149 | { | 151 | { |
150 | unsigned int cpu; | ||
151 | unsigned int this_cpu = smp_processor_id(); | 152 | unsigned int this_cpu = smp_processor_id(); |
153 | unsigned int cpu; | ||
152 | 154 | ||
153 | for_each_online_cpu(cpu) | 155 | for_each_online_cpu(cpu) { |
154 | if (cpu != this_cpu) | 156 | if (cpu != this_cpu) |
155 | uv_send_IPI_one(cpu, vector); | 157 | uv_send_IPI_one(cpu, vector); |
158 | } | ||
156 | } | 159 | } |
157 | 160 | ||
158 | static void uv_send_IPI_all(int vector) | 161 | static void uv_send_IPI_all(int vector) |
@@ -171,21 +174,21 @@ static void uv_init_apic_ldr(void) | |||
171 | 174 | ||
172 | static unsigned int uv_cpu_mask_to_apicid(const struct cpumask *cpumask) | 175 | static unsigned int uv_cpu_mask_to_apicid(const struct cpumask *cpumask) |
173 | { | 176 | { |
174 | int cpu; | ||
175 | |||
176 | /* | 177 | /* |
177 | * We're using fixed IRQ delivery, can only return one phys APIC ID. | 178 | * We're using fixed IRQ delivery, can only return one phys APIC ID. |
178 | * May as well be the first. | 179 | * May as well be the first. |
179 | */ | 180 | */ |
180 | cpu = cpumask_first(cpumask); | 181 | int cpu = cpumask_first(cpumask); |
182 | |||
181 | if ((unsigned)cpu < nr_cpu_ids) | 183 | if ((unsigned)cpu < nr_cpu_ids) |
182 | return per_cpu(x86_cpu_to_apicid, cpu); | 184 | return per_cpu(x86_cpu_to_apicid, cpu); |
183 | else | 185 | else |
184 | return BAD_APICID; | 186 | return BAD_APICID; |
185 | } | 187 | } |
186 | 188 | ||
187 | static unsigned int uv_cpu_mask_to_apicid_and(const struct cpumask *cpumask, | 189 | static unsigned int |
188 | const struct cpumask *andmask) | 190 | uv_cpu_mask_to_apicid_and(const struct cpumask *cpumask, |
191 | const struct cpumask *andmask) | ||
189 | { | 192 | { |
190 | int cpu; | 193 | int cpu; |
191 | 194 | ||
@@ -193,15 +196,17 @@ static unsigned int uv_cpu_mask_to_apicid_and(const struct cpumask *cpumask, | |||
193 | * We're using fixed IRQ delivery, can only return one phys APIC ID. | 196 | * We're using fixed IRQ delivery, can only return one phys APIC ID. |
194 | * May as well be the first. | 197 | * May as well be the first. |
195 | */ | 198 | */ |
196 | for_each_cpu_and(cpu, cpumask, andmask) | 199 | for_each_cpu_and(cpu, cpumask, andmask) { |
197 | if (cpumask_test_cpu(cpu, cpu_online_mask)) | 200 | if (cpumask_test_cpu(cpu, cpu_online_mask)) |
198 | break; | 201 | break; |
202 | } | ||
199 | if (cpu < nr_cpu_ids) | 203 | if (cpu < nr_cpu_ids) |
200 | return per_cpu(x86_cpu_to_apicid, cpu); | 204 | return per_cpu(x86_cpu_to_apicid, cpu); |
205 | |||
201 | return BAD_APICID; | 206 | return BAD_APICID; |
202 | } | 207 | } |
203 | 208 | ||
204 | static unsigned int get_apic_id(unsigned long x) | 209 | static unsigned int x2apic_get_apic_id(unsigned long x) |
205 | { | 210 | { |
206 | unsigned int id; | 211 | unsigned int id; |
207 | 212 | ||
@@ -223,10 +228,10 @@ static unsigned long set_apic_id(unsigned int id) | |||
223 | static unsigned int uv_read_apic_id(void) | 228 | static unsigned int uv_read_apic_id(void) |
224 | { | 229 | { |
225 | 230 | ||
226 | return get_apic_id(apic_read(APIC_ID)); | 231 | return x2apic_get_apic_id(apic_read(APIC_ID)); |
227 | } | 232 | } |
228 | 233 | ||
229 | static unsigned int phys_pkg_id(int index_msb) | 234 | static int uv_phys_pkg_id(int initial_apicid, int index_msb) |
230 | { | 235 | { |
231 | return uv_read_apic_id() >> index_msb; | 236 | return uv_read_apic_id() >> index_msb; |
232 | } | 237 | } |
@@ -237,25 +242,57 @@ static void uv_send_IPI_self(int vector) | |||
237 | } | 242 | } |
238 | 243 | ||
239 | struct genapic apic_x2apic_uv_x = { | 244 | struct genapic apic_x2apic_uv_x = { |
240 | .name = "UV large system", | 245 | |
241 | .acpi_madt_oem_check = uv_acpi_madt_oem_check, | 246 | .name = "UV large system", |
242 | .int_delivery_mode = dest_Fixed, | 247 | .probe = NULL, |
243 | .int_dest_mode = (APIC_DEST_PHYSICAL != 0), | 248 | .acpi_madt_oem_check = uv_acpi_madt_oem_check, |
244 | .target_cpus = uv_target_cpus, | 249 | .apic_id_registered = uv_apic_id_registered, |
245 | .vector_allocation_domain = uv_vector_allocation_domain, | 250 | |
246 | .apic_id_registered = uv_apic_id_registered, | 251 | .irq_delivery_mode = dest_Fixed, |
247 | .init_apic_ldr = uv_init_apic_ldr, | 252 | .irq_dest_mode = 1, /* logical */ |
248 | .send_IPI_all = uv_send_IPI_all, | 253 | |
249 | .send_IPI_allbutself = uv_send_IPI_allbutself, | 254 | .target_cpus = uv_target_cpus, |
250 | .send_IPI_mask = uv_send_IPI_mask, | 255 | .disable_esr = 0, |
251 | .send_IPI_mask_allbutself = uv_send_IPI_mask_allbutself, | 256 | .dest_logical = APIC_DEST_LOGICAL, |
252 | .send_IPI_self = uv_send_IPI_self, | 257 | .check_apicid_used = NULL, |
253 | .cpu_mask_to_apicid = uv_cpu_mask_to_apicid, | 258 | .check_apicid_present = NULL, |
254 | .cpu_mask_to_apicid_and = uv_cpu_mask_to_apicid_and, | 259 | |
255 | .phys_pkg_id = phys_pkg_id, | 260 | .vector_allocation_domain = uv_vector_allocation_domain, |
256 | .get_apic_id = get_apic_id, | 261 | .init_apic_ldr = uv_init_apic_ldr, |
257 | .set_apic_id = set_apic_id, | 262 | |
258 | .apic_id_mask = (0xFFFFFFFFu), | 263 | .ioapic_phys_id_map = NULL, |
264 | .setup_apic_routing = NULL, | ||
265 | .multi_timer_check = NULL, | ||
266 | .apicid_to_node = NULL, | ||
267 | .cpu_to_logical_apicid = NULL, | ||
268 | .cpu_present_to_apicid = default_cpu_present_to_apicid, | ||
269 | .apicid_to_cpu_present = NULL, | ||
270 | .setup_portio_remap = NULL, | ||
271 | .check_phys_apicid_present = default_check_phys_apicid_present, | ||
272 | .enable_apic_mode = NULL, | ||
273 | .phys_pkg_id = uv_phys_pkg_id, | ||
274 | .mps_oem_check = NULL, | ||
275 | |||
276 | .get_apic_id = x2apic_get_apic_id, | ||
277 | .set_apic_id = set_apic_id, | ||
278 | .apic_id_mask = 0xFFFFFFFFu, | ||
279 | |||
280 | .cpu_mask_to_apicid = uv_cpu_mask_to_apicid, | ||
281 | .cpu_mask_to_apicid_and = uv_cpu_mask_to_apicid_and, | ||
282 | |||
283 | .send_IPI_mask = uv_send_IPI_mask, | ||
284 | .send_IPI_mask_allbutself = uv_send_IPI_mask_allbutself, | ||
285 | .send_IPI_allbutself = uv_send_IPI_allbutself, | ||
286 | .send_IPI_all = uv_send_IPI_all, | ||
287 | .send_IPI_self = uv_send_IPI_self, | ||
288 | |||
289 | .wakeup_cpu = NULL, | ||
290 | .trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW, | ||
291 | .trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH, | ||
292 | .wait_for_init_deassert = NULL, | ||
293 | .smp_callin_clear_local_apic = NULL, | ||
294 | .store_NMI_vector = NULL, | ||
295 | .inquire_remote_apic = NULL, | ||
259 | }; | 296 | }; |
260 | 297 | ||
261 | static __cpuinit void set_x2apic_extra_bits(int pnode) | 298 | static __cpuinit void set_x2apic_extra_bits(int pnode) |
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index 24c0e5cd71e3..2a0aad7718d5 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S | |||
@@ -19,6 +19,7 @@ | |||
19 | #include <asm/asm-offsets.h> | 19 | #include <asm/asm-offsets.h> |
20 | #include <asm/setup.h> | 20 | #include <asm/setup.h> |
21 | #include <asm/processor-flags.h> | 21 | #include <asm/processor-flags.h> |
22 | #include <asm/percpu.h> | ||
22 | 23 | ||
23 | /* Physical address */ | 24 | /* Physical address */ |
24 | #define pa(X) ((X) - __PAGE_OFFSET) | 25 | #define pa(X) ((X) - __PAGE_OFFSET) |
@@ -437,8 +438,26 @@ is386: movl $2,%ecx # set MP | |||
437 | movl $(__KERNEL_PERCPU), %eax | 438 | movl $(__KERNEL_PERCPU), %eax |
438 | movl %eax,%fs # set this cpu's percpu | 439 | movl %eax,%fs # set this cpu's percpu |
439 | 440 | ||
440 | xorl %eax,%eax # Clear GS and LDT | 441 | #ifdef CONFIG_CC_STACKPROTECTOR |
442 | /* | ||
443 | * The linker can't handle this by relocation. Manually set | ||
444 | * base address in stack canary segment descriptor. | ||
445 | */ | ||
446 | cmpb $0,ready | ||
447 | jne 1f | ||
448 | movl $per_cpu__gdt_page,%eax | ||
449 | movl $per_cpu__stack_canary,%ecx | ||
450 | subl $20, %ecx | ||
451 | movw %cx, 8 * GDT_ENTRY_STACK_CANARY + 2(%eax) | ||
452 | shrl $16, %ecx | ||
453 | movb %cl, 8 * GDT_ENTRY_STACK_CANARY + 4(%eax) | ||
454 | movb %ch, 8 * GDT_ENTRY_STACK_CANARY + 7(%eax) | ||
455 | 1: | ||
456 | #endif | ||
457 | movl $(__KERNEL_STACK_CANARY),%eax | ||
441 | movl %eax,%gs | 458 | movl %eax,%gs |
459 | |||
460 | xorl %eax,%eax # Clear LDT | ||
442 | lldt %ax | 461 | lldt %ax |
443 | 462 | ||
444 | cld # gcc2 wants the direction flag cleared at all times | 463 | cld # gcc2 wants the direction flag cleared at all times |
@@ -548,12 +567,8 @@ early_fault: | |||
548 | pushl %eax | 567 | pushl %eax |
549 | pushl %edx /* trapno */ | 568 | pushl %edx /* trapno */ |
550 | pushl $fault_msg | 569 | pushl $fault_msg |
551 | #ifdef CONFIG_EARLY_PRINTK | ||
552 | call early_printk | ||
553 | #else | ||
554 | call printk | 570 | call printk |
555 | #endif | 571 | #endif |
556 | #endif | ||
557 | call dump_stack | 572 | call dump_stack |
558 | hlt_loop: | 573 | hlt_loop: |
559 | hlt | 574 | hlt |
@@ -580,11 +595,10 @@ ignore_int: | |||
580 | pushl 32(%esp) | 595 | pushl 32(%esp) |
581 | pushl 40(%esp) | 596 | pushl 40(%esp) |
582 | pushl $int_msg | 597 | pushl $int_msg |
583 | #ifdef CONFIG_EARLY_PRINTK | ||
584 | call early_printk | ||
585 | #else | ||
586 | call printk | 598 | call printk |
587 | #endif | 599 | |
600 | call dump_stack | ||
601 | |||
588 | addl $(5*4),%esp | 602 | addl $(5*4),%esp |
589 | popl %ds | 603 | popl %ds |
590 | popl %es | 604 | popl %es |
@@ -660,7 +674,7 @@ early_recursion_flag: | |||
660 | .long 0 | 674 | .long 0 |
661 | 675 | ||
662 | int_msg: | 676 | int_msg: |
663 | .asciz "Unknown interrupt or fault at EIP %p %p %p\n" | 677 | .asciz "Unknown interrupt or fault at: %p %p %p\n" |
664 | 678 | ||
665 | fault_msg: | 679 | fault_msg: |
666 | /* fault info: */ | 680 | /* fault info: */ |
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index a0a2b5ca9b7d..2e648e3a5ea4 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S | |||
@@ -205,19 +205,6 @@ ENTRY(secondary_startup_64) | |||
205 | pushq $0 | 205 | pushq $0 |
206 | popfq | 206 | popfq |
207 | 207 | ||
208 | #ifdef CONFIG_SMP | ||
209 | /* | ||
210 | * Fix up static pointers that need __per_cpu_load added. The assembler | ||
211 | * is unable to do this directly. This is only needed for the boot cpu. | ||
212 | * These values are set up with the correct base addresses by C code for | ||
213 | * secondary cpus. | ||
214 | */ | ||
215 | movq initial_gs(%rip), %rax | ||
216 | cmpl $0, per_cpu__cpu_number(%rax) | ||
217 | jne 1f | ||
218 | addq %rax, early_gdt_descr_base(%rip) | ||
219 | 1: | ||
220 | #endif | ||
221 | /* | 208 | /* |
222 | * We must switch to a new descriptor in kernel space for the GDT | 209 | * We must switch to a new descriptor in kernel space for the GDT |
223 | * because soon the kernel won't have access anymore to the userspace | 210 | * because soon the kernel won't have access anymore to the userspace |
@@ -275,11 +262,7 @@ ENTRY(secondary_startup_64) | |||
275 | ENTRY(initial_code) | 262 | ENTRY(initial_code) |
276 | .quad x86_64_start_kernel | 263 | .quad x86_64_start_kernel |
277 | ENTRY(initial_gs) | 264 | ENTRY(initial_gs) |
278 | #ifdef CONFIG_SMP | 265 | .quad INIT_PER_CPU_VAR(irq_stack_union) |
279 | .quad __per_cpu_load | ||
280 | #else | ||
281 | .quad PER_CPU_VAR(irq_stack_union) | ||
282 | #endif | ||
283 | __FINITDATA | 266 | __FINITDATA |
284 | 267 | ||
285 | ENTRY(stack_start) | 268 | ENTRY(stack_start) |
@@ -425,7 +408,7 @@ NEXT_PAGE(level2_spare_pgt) | |||
425 | early_gdt_descr: | 408 | early_gdt_descr: |
426 | .word GDT_ENTRIES*8-1 | 409 | .word GDT_ENTRIES*8-1 |
427 | early_gdt_descr_base: | 410 | early_gdt_descr_base: |
428 | .quad per_cpu__gdt_page | 411 | .quad INIT_PER_CPU_VAR(gdt_page) |
429 | 412 | ||
430 | ENTRY(phys_base) | 413 | ENTRY(phys_base) |
431 | /* This must match the first entry in level2_kernel_pgt */ | 414 | /* This must match the first entry in level2_kernel_pgt */ |
diff --git a/arch/x86/kernel/hpet.c b/arch/x86/kernel/hpet.c index 388254f69a2a..a00545fe5cdd 100644 --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c | |||
@@ -269,6 +269,8 @@ static void hpet_set_mode(enum clock_event_mode mode, | |||
269 | now = hpet_readl(HPET_COUNTER); | 269 | now = hpet_readl(HPET_COUNTER); |
270 | cmp = now + (unsigned long) delta; | 270 | cmp = now + (unsigned long) delta; |
271 | cfg = hpet_readl(HPET_Tn_CFG(timer)); | 271 | cfg = hpet_readl(HPET_Tn_CFG(timer)); |
272 | /* Make sure we use edge triggered interrupts */ | ||
273 | cfg &= ~HPET_TN_LEVEL; | ||
272 | cfg |= HPET_TN_ENABLE | HPET_TN_PERIODIC | | 274 | cfg |= HPET_TN_ENABLE | HPET_TN_PERIODIC | |
273 | HPET_TN_SETVAL | HPET_TN_32BIT; | 275 | HPET_TN_SETVAL | HPET_TN_32BIT; |
274 | hpet_writel(cfg, HPET_Tn_CFG(timer)); | 276 | hpet_writel(cfg, HPET_Tn_CFG(timer)); |
diff --git a/arch/x86/kernel/io_apic.c b/arch/x86/kernel/io_apic.c index f61d945620b3..7248ca11bdcd 100644 --- a/arch/x86/kernel/io_apic.c +++ b/arch/x86/kernel/io_apic.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Intel IO-APIC support for multi-Pentium hosts. | 2 | * Intel IO-APIC support for multi-Pentium hosts. |
3 | * | 3 | * |
4 | * Copyright (C) 1997, 1998, 1999, 2000 Ingo Molnar, Hajnalka Szabo | 4 | * Copyright (C) 1997, 1998, 1999, 2000, 2009 Ingo Molnar, Hajnalka Szabo |
5 | * | 5 | * |
6 | * Many thanks to Stig Venaas for trying out countless experimental | 6 | * Many thanks to Stig Venaas for trying out countless experimental |
7 | * patches and reporting/debugging problems patiently! | 7 | * patches and reporting/debugging problems patiently! |
@@ -62,9 +62,7 @@ | |||
62 | #include <asm/uv/uv_hub.h> | 62 | #include <asm/uv/uv_hub.h> |
63 | #include <asm/uv/uv_irq.h> | 63 | #include <asm/uv/uv_irq.h> |
64 | 64 | ||
65 | #include <mach_ipi.h> | 65 | #include <asm/genapic.h> |
66 | #include <mach_apic.h> | ||
67 | #include <mach_apicdef.h> | ||
68 | 66 | ||
69 | #define __apicdebuginit(type) static type __init | 67 | #define __apicdebuginit(type) static type __init |
70 | 68 | ||
@@ -100,10 +98,19 @@ DECLARE_BITMAP(mp_bus_not_pci, MAX_MP_BUSSES); | |||
100 | 98 | ||
101 | int skip_ioapic_setup; | 99 | int skip_ioapic_setup; |
102 | 100 | ||
101 | void arch_disable_smp_support(void) | ||
102 | { | ||
103 | #ifdef CONFIG_PCI | ||
104 | noioapicquirk = 1; | ||
105 | noioapicreroute = -1; | ||
106 | #endif | ||
107 | skip_ioapic_setup = 1; | ||
108 | } | ||
109 | |||
103 | static int __init parse_noapic(char *str) | 110 | static int __init parse_noapic(char *str) |
104 | { | 111 | { |
105 | /* disable IO-APIC */ | 112 | /* disable IO-APIC */ |
106 | disable_ioapic_setup(); | 113 | arch_disable_smp_support(); |
107 | return 0; | 114 | return 0; |
108 | } | 115 | } |
109 | early_param("noapic", parse_noapic); | 116 | early_param("noapic", parse_noapic); |
@@ -479,7 +486,7 @@ __ioapic_write_entry(int apic, int pin, struct IO_APIC_route_entry e) | |||
479 | io_apic_write(apic, 0x10 + 2*pin, eu.w1); | 486 | io_apic_write(apic, 0x10 + 2*pin, eu.w1); |
480 | } | 487 | } |
481 | 488 | ||
482 | static void ioapic_write_entry(int apic, int pin, struct IO_APIC_route_entry e) | 489 | void ioapic_write_entry(int apic, int pin, struct IO_APIC_route_entry e) |
483 | { | 490 | { |
484 | unsigned long flags; | 491 | unsigned long flags; |
485 | spin_lock_irqsave(&ioapic_lock, flags); | 492 | spin_lock_irqsave(&ioapic_lock, flags); |
@@ -514,11 +521,11 @@ static void send_cleanup_vector(struct irq_cfg *cfg) | |||
514 | for_each_cpu_and(i, cfg->old_domain, cpu_online_mask) | 521 | for_each_cpu_and(i, cfg->old_domain, cpu_online_mask) |
515 | cfg->move_cleanup_count++; | 522 | cfg->move_cleanup_count++; |
516 | for_each_cpu_and(i, cfg->old_domain, cpu_online_mask) | 523 | for_each_cpu_and(i, cfg->old_domain, cpu_online_mask) |
517 | send_IPI_mask(cpumask_of(i), IRQ_MOVE_CLEANUP_VECTOR); | 524 | apic->send_IPI_mask(cpumask_of(i), IRQ_MOVE_CLEANUP_VECTOR); |
518 | } else { | 525 | } else { |
519 | cpumask_and(cleanup_mask, cfg->old_domain, cpu_online_mask); | 526 | cpumask_and(cleanup_mask, cfg->old_domain, cpu_online_mask); |
520 | cfg->move_cleanup_count = cpumask_weight(cleanup_mask); | 527 | cfg->move_cleanup_count = cpumask_weight(cleanup_mask); |
521 | send_IPI_mask(cleanup_mask, IRQ_MOVE_CLEANUP_VECTOR); | 528 | apic->send_IPI_mask(cleanup_mask, IRQ_MOVE_CLEANUP_VECTOR); |
522 | free_cpumask_var(cleanup_mask); | 529 | free_cpumask_var(cleanup_mask); |
523 | } | 530 | } |
524 | cfg->move_in_progress = 0; | 531 | cfg->move_in_progress = 0; |
@@ -563,8 +570,9 @@ static int | |||
563 | assign_irq_vector(int irq, struct irq_cfg *cfg, const struct cpumask *mask); | 570 | assign_irq_vector(int irq, struct irq_cfg *cfg, const struct cpumask *mask); |
564 | 571 | ||
565 | /* | 572 | /* |
566 | * Either sets desc->affinity to a valid value, and returns cpu_mask_to_apicid | 573 | * Either sets desc->affinity to a valid value, and returns |
567 | * of that, or returns BAD_APICID and leaves desc->affinity untouched. | 574 | * ->cpu_mask_to_apicid of that, or returns BAD_APICID and |
575 | * leaves desc->affinity untouched. | ||
568 | */ | 576 | */ |
569 | static unsigned int | 577 | static unsigned int |
570 | set_desc_affinity(struct irq_desc *desc, const struct cpumask *mask) | 578 | set_desc_affinity(struct irq_desc *desc, const struct cpumask *mask) |
@@ -582,7 +590,8 @@ set_desc_affinity(struct irq_desc *desc, const struct cpumask *mask) | |||
582 | 590 | ||
583 | cpumask_and(desc->affinity, cfg->domain, mask); | 591 | cpumask_and(desc->affinity, cfg->domain, mask); |
584 | set_extra_move_desc(desc, mask); | 592 | set_extra_move_desc(desc, mask); |
585 | return cpu_mask_to_apicid_and(desc->affinity, cpu_online_mask); | 593 | |
594 | return apic->cpu_mask_to_apicid_and(desc->affinity, cpu_online_mask); | ||
586 | } | 595 | } |
587 | 596 | ||
588 | static void | 597 | static void |
@@ -797,23 +806,6 @@ static void clear_IO_APIC (void) | |||
797 | clear_IO_APIC_pin(apic, pin); | 806 | clear_IO_APIC_pin(apic, pin); |
798 | } | 807 | } |
799 | 808 | ||
800 | #if !defined(CONFIG_SMP) && defined(CONFIG_X86_32) | ||
801 | void send_IPI_self(int vector) | ||
802 | { | ||
803 | unsigned int cfg; | ||
804 | |||
805 | /* | ||
806 | * Wait for idle. | ||
807 | */ | ||
808 | apic_wait_icr_idle(); | ||
809 | cfg = APIC_DM_FIXED | APIC_DEST_SELF | vector | APIC_DEST_LOGICAL; | ||
810 | /* | ||
811 | * Send the IPI. The write to APIC_ICR fires this off. | ||
812 | */ | ||
813 | apic_write(APIC_ICR, cfg); | ||
814 | } | ||
815 | #endif /* !CONFIG_SMP && CONFIG_X86_32*/ | ||
816 | |||
817 | #ifdef CONFIG_X86_32 | 809 | #ifdef CONFIG_X86_32 |
818 | /* | 810 | /* |
819 | * support for broken MP BIOSs, enables hand-redirection of PIRQ0-7 to | 811 | * support for broken MP BIOSs, enables hand-redirection of PIRQ0-7 to |
@@ -1316,7 +1308,7 @@ __assign_irq_vector(int irq, struct irq_cfg *cfg, const struct cpumask *mask) | |||
1316 | int new_cpu; | 1308 | int new_cpu; |
1317 | int vector, offset; | 1309 | int vector, offset; |
1318 | 1310 | ||
1319 | vector_allocation_domain(cpu, tmp_mask); | 1311 | apic->vector_allocation_domain(cpu, tmp_mask); |
1320 | 1312 | ||
1321 | vector = current_vector; | 1313 | vector = current_vector; |
1322 | offset = current_offset; | 1314 | offset = current_offset; |
@@ -1486,10 +1478,10 @@ static void ioapic_register_intr(int irq, struct irq_desc *desc, unsigned long t | |||
1486 | handle_edge_irq, "edge"); | 1478 | handle_edge_irq, "edge"); |
1487 | } | 1479 | } |
1488 | 1480 | ||
1489 | static int setup_ioapic_entry(int apic, int irq, | 1481 | int setup_ioapic_entry(int apic_id, int irq, |
1490 | struct IO_APIC_route_entry *entry, | 1482 | struct IO_APIC_route_entry *entry, |
1491 | unsigned int destination, int trigger, | 1483 | unsigned int destination, int trigger, |
1492 | int polarity, int vector) | 1484 | int polarity, int vector) |
1493 | { | 1485 | { |
1494 | /* | 1486 | /* |
1495 | * add it to the IO-APIC irq-routing table: | 1487 | * add it to the IO-APIC irq-routing table: |
@@ -1498,25 +1490,25 @@ static int setup_ioapic_entry(int apic, int irq, | |||
1498 | 1490 | ||
1499 | #ifdef CONFIG_INTR_REMAP | 1491 | #ifdef CONFIG_INTR_REMAP |
1500 | if (intr_remapping_enabled) { | 1492 | if (intr_remapping_enabled) { |
1501 | struct intel_iommu *iommu = map_ioapic_to_ir(apic); | 1493 | struct intel_iommu *iommu = map_ioapic_to_ir(apic_id); |
1502 | struct irte irte; | 1494 | struct irte irte; |
1503 | struct IR_IO_APIC_route_entry *ir_entry = | 1495 | struct IR_IO_APIC_route_entry *ir_entry = |
1504 | (struct IR_IO_APIC_route_entry *) entry; | 1496 | (struct IR_IO_APIC_route_entry *) entry; |
1505 | int index; | 1497 | int index; |
1506 | 1498 | ||
1507 | if (!iommu) | 1499 | if (!iommu) |
1508 | panic("No mapping iommu for ioapic %d\n", apic); | 1500 | panic("No mapping iommu for ioapic %d\n", apic_id); |
1509 | 1501 | ||
1510 | index = alloc_irte(iommu, irq, 1); | 1502 | index = alloc_irte(iommu, irq, 1); |
1511 | if (index < 0) | 1503 | if (index < 0) |
1512 | panic("Failed to allocate IRTE for ioapic %d\n", apic); | 1504 | panic("Failed to allocate IRTE for ioapic %d\n", apic_id); |
1513 | 1505 | ||
1514 | memset(&irte, 0, sizeof(irte)); | 1506 | memset(&irte, 0, sizeof(irte)); |
1515 | 1507 | ||
1516 | irte.present = 1; | 1508 | irte.present = 1; |
1517 | irte.dst_mode = INT_DEST_MODE; | 1509 | irte.dst_mode = apic->irq_dest_mode; |
1518 | irte.trigger_mode = trigger; | 1510 | irte.trigger_mode = trigger; |
1519 | irte.dlvry_mode = INT_DELIVERY_MODE; | 1511 | irte.dlvry_mode = apic->irq_delivery_mode; |
1520 | irte.vector = vector; | 1512 | irte.vector = vector; |
1521 | irte.dest_id = IRTE_DEST(destination); | 1513 | irte.dest_id = IRTE_DEST(destination); |
1522 | 1514 | ||
@@ -1529,8 +1521,8 @@ static int setup_ioapic_entry(int apic, int irq, | |||
1529 | } else | 1521 | } else |
1530 | #endif | 1522 | #endif |
1531 | { | 1523 | { |
1532 | entry->delivery_mode = INT_DELIVERY_MODE; | 1524 | entry->delivery_mode = apic->irq_delivery_mode; |
1533 | entry->dest_mode = INT_DEST_MODE; | 1525 | entry->dest_mode = apic->irq_dest_mode; |
1534 | entry->dest = destination; | 1526 | entry->dest = destination; |
1535 | } | 1527 | } |
1536 | 1528 | ||
@@ -1547,7 +1539,7 @@ static int setup_ioapic_entry(int apic, int irq, | |||
1547 | return 0; | 1539 | return 0; |
1548 | } | 1540 | } |
1549 | 1541 | ||
1550 | static void setup_IO_APIC_irq(int apic, int pin, unsigned int irq, struct irq_desc *desc, | 1542 | static void setup_IO_APIC_irq(int apic_id, int pin, unsigned int irq, struct irq_desc *desc, |
1551 | int trigger, int polarity) | 1543 | int trigger, int polarity) |
1552 | { | 1544 | { |
1553 | struct irq_cfg *cfg; | 1545 | struct irq_cfg *cfg; |
@@ -1559,22 +1551,22 @@ static void setup_IO_APIC_irq(int apic, int pin, unsigned int irq, struct irq_de | |||
1559 | 1551 | ||
1560 | cfg = desc->chip_data; | 1552 | cfg = desc->chip_data; |
1561 | 1553 | ||
1562 | if (assign_irq_vector(irq, cfg, TARGET_CPUS)) | 1554 | if (assign_irq_vector(irq, cfg, apic->target_cpus())) |
1563 | return; | 1555 | return; |
1564 | 1556 | ||
1565 | dest = cpu_mask_to_apicid_and(cfg->domain, TARGET_CPUS); | 1557 | dest = apic->cpu_mask_to_apicid_and(cfg->domain, apic->target_cpus()); |
1566 | 1558 | ||
1567 | apic_printk(APIC_VERBOSE,KERN_DEBUG | 1559 | apic_printk(APIC_VERBOSE,KERN_DEBUG |
1568 | "IOAPIC[%d]: Set routing entry (%d-%d -> 0x%x -> " | 1560 | "IOAPIC[%d]: Set routing entry (%d-%d -> 0x%x -> " |
1569 | "IRQ %d Mode:%i Active:%i)\n", | 1561 | "IRQ %d Mode:%i Active:%i)\n", |
1570 | apic, mp_ioapics[apic].apicid, pin, cfg->vector, | 1562 | apic_id, mp_ioapics[apic_id].apicid, pin, cfg->vector, |
1571 | irq, trigger, polarity); | 1563 | irq, trigger, polarity); |
1572 | 1564 | ||
1573 | 1565 | ||
1574 | if (setup_ioapic_entry(mp_ioapics[apic].apicid, irq, &entry, | 1566 | if (setup_ioapic_entry(mp_ioapics[apic_id].apicid, irq, &entry, |
1575 | dest, trigger, polarity, cfg->vector)) { | 1567 | dest, trigger, polarity, cfg->vector)) { |
1576 | printk("Failed to setup ioapic entry for ioapic %d, pin %d\n", | 1568 | printk("Failed to setup ioapic entry for ioapic %d, pin %d\n", |
1577 | mp_ioapics[apic].apicid, pin); | 1569 | mp_ioapics[apic_id].apicid, pin); |
1578 | __clear_irq_vector(irq, cfg); | 1570 | __clear_irq_vector(irq, cfg); |
1579 | return; | 1571 | return; |
1580 | } | 1572 | } |
@@ -1583,12 +1575,12 @@ static void setup_IO_APIC_irq(int apic, int pin, unsigned int irq, struct irq_de | |||
1583 | if (irq < NR_IRQS_LEGACY) | 1575 | if (irq < NR_IRQS_LEGACY) |
1584 | disable_8259A_irq(irq); | 1576 | disable_8259A_irq(irq); |
1585 | 1577 | ||
1586 | ioapic_write_entry(apic, pin, entry); | 1578 | ioapic_write_entry(apic_id, pin, entry); |
1587 | } | 1579 | } |
1588 | 1580 | ||
1589 | static void __init setup_IO_APIC_irqs(void) | 1581 | static void __init setup_IO_APIC_irqs(void) |
1590 | { | 1582 | { |
1591 | int apic, pin, idx, irq; | 1583 | int apic_id, pin, idx, irq; |
1592 | int notcon = 0; | 1584 | int notcon = 0; |
1593 | struct irq_desc *desc; | 1585 | struct irq_desc *desc; |
1594 | struct irq_cfg *cfg; | 1586 | struct irq_cfg *cfg; |
@@ -1596,19 +1588,19 @@ static void __init setup_IO_APIC_irqs(void) | |||
1596 | 1588 | ||
1597 | apic_printk(APIC_VERBOSE, KERN_DEBUG "init IO_APIC IRQs\n"); | 1589 | apic_printk(APIC_VERBOSE, KERN_DEBUG "init IO_APIC IRQs\n"); |
1598 | 1590 | ||
1599 | for (apic = 0; apic < nr_ioapics; apic++) { | 1591 | for (apic_id = 0; apic_id < nr_ioapics; apic_id++) { |
1600 | for (pin = 0; pin < nr_ioapic_registers[apic]; pin++) { | 1592 | for (pin = 0; pin < nr_ioapic_registers[apic_id]; pin++) { |
1601 | 1593 | ||
1602 | idx = find_irq_entry(apic, pin, mp_INT); | 1594 | idx = find_irq_entry(apic_id, pin, mp_INT); |
1603 | if (idx == -1) { | 1595 | if (idx == -1) { |
1604 | if (!notcon) { | 1596 | if (!notcon) { |
1605 | notcon = 1; | 1597 | notcon = 1; |
1606 | apic_printk(APIC_VERBOSE, | 1598 | apic_printk(APIC_VERBOSE, |
1607 | KERN_DEBUG " %d-%d", | 1599 | KERN_DEBUG " %d-%d", |
1608 | mp_ioapics[apic].apicid, pin); | 1600 | mp_ioapics[apic_id].apicid, pin); |
1609 | } else | 1601 | } else |
1610 | apic_printk(APIC_VERBOSE, " %d-%d", | 1602 | apic_printk(APIC_VERBOSE, " %d-%d", |
1611 | mp_ioapics[apic].apicid, pin); | 1603 | mp_ioapics[apic_id].apicid, pin); |
1612 | continue; | 1604 | continue; |
1613 | } | 1605 | } |
1614 | if (notcon) { | 1606 | if (notcon) { |
@@ -1617,20 +1609,25 @@ static void __init setup_IO_APIC_irqs(void) | |||
1617 | notcon = 0; | 1609 | notcon = 0; |
1618 | } | 1610 | } |
1619 | 1611 | ||
1620 | irq = pin_2_irq(idx, apic, pin); | 1612 | irq = pin_2_irq(idx, apic_id, pin); |
1621 | #ifdef CONFIG_X86_32 | 1613 | |
1622 | if (multi_timer_check(apic, irq)) | 1614 | /* |
1615 | * Skip the timer IRQ if there's a quirk handler | ||
1616 | * installed and if it returns 1: | ||
1617 | */ | ||
1618 | if (apic->multi_timer_check && | ||
1619 | apic->multi_timer_check(apic_id, irq)) | ||
1623 | continue; | 1620 | continue; |
1624 | #endif | 1621 | |
1625 | desc = irq_to_desc_alloc_cpu(irq, cpu); | 1622 | desc = irq_to_desc_alloc_cpu(irq, cpu); |
1626 | if (!desc) { | 1623 | if (!desc) { |
1627 | printk(KERN_INFO "can not get irq_desc for %d\n", irq); | 1624 | printk(KERN_INFO "can not get irq_desc for %d\n", irq); |
1628 | continue; | 1625 | continue; |
1629 | } | 1626 | } |
1630 | cfg = desc->chip_data; | 1627 | cfg = desc->chip_data; |
1631 | add_pin_to_irq_cpu(cfg, cpu, apic, pin); | 1628 | add_pin_to_irq_cpu(cfg, cpu, apic_id, pin); |
1632 | 1629 | ||
1633 | setup_IO_APIC_irq(apic, pin, irq, desc, | 1630 | setup_IO_APIC_irq(apic_id, pin, irq, desc, |
1634 | irq_trigger(idx), irq_polarity(idx)); | 1631 | irq_trigger(idx), irq_polarity(idx)); |
1635 | } | 1632 | } |
1636 | } | 1633 | } |
@@ -1643,7 +1640,7 @@ static void __init setup_IO_APIC_irqs(void) | |||
1643 | /* | 1640 | /* |
1644 | * Set up the timer pin, possibly with the 8259A-master behind. | 1641 | * Set up the timer pin, possibly with the 8259A-master behind. |
1645 | */ | 1642 | */ |
1646 | static void __init setup_timer_IRQ0_pin(unsigned int apic, unsigned int pin, | 1643 | static void __init setup_timer_IRQ0_pin(unsigned int apic_id, unsigned int pin, |
1647 | int vector) | 1644 | int vector) |
1648 | { | 1645 | { |
1649 | struct IO_APIC_route_entry entry; | 1646 | struct IO_APIC_route_entry entry; |
@@ -1659,10 +1656,10 @@ static void __init setup_timer_IRQ0_pin(unsigned int apic, unsigned int pin, | |||
1659 | * We use logical delivery to get the timer IRQ | 1656 | * We use logical delivery to get the timer IRQ |
1660 | * to the first CPU. | 1657 | * to the first CPU. |
1661 | */ | 1658 | */ |
1662 | entry.dest_mode = INT_DEST_MODE; | 1659 | entry.dest_mode = apic->irq_dest_mode; |
1663 | entry.mask = 1; /* mask IRQ now */ | 1660 | entry.mask = 0; /* don't mask IRQ for edge */ |
1664 | entry.dest = cpu_mask_to_apicid(TARGET_CPUS); | 1661 | entry.dest = apic->cpu_mask_to_apicid(apic->target_cpus()); |
1665 | entry.delivery_mode = INT_DELIVERY_MODE; | 1662 | entry.delivery_mode = apic->irq_delivery_mode; |
1666 | entry.polarity = 0; | 1663 | entry.polarity = 0; |
1667 | entry.trigger = 0; | 1664 | entry.trigger = 0; |
1668 | entry.vector = vector; | 1665 | entry.vector = vector; |
@@ -1676,7 +1673,7 @@ static void __init setup_timer_IRQ0_pin(unsigned int apic, unsigned int pin, | |||
1676 | /* | 1673 | /* |
1677 | * Add it to the IO-APIC irq-routing table: | 1674 | * Add it to the IO-APIC irq-routing table: |
1678 | */ | 1675 | */ |
1679 | ioapic_write_entry(apic, pin, entry); | 1676 | ioapic_write_entry(apic_id, pin, entry); |
1680 | } | 1677 | } |
1681 | 1678 | ||
1682 | 1679 | ||
@@ -2089,7 +2086,7 @@ static void __init setup_ioapic_ids_from_mpc(void) | |||
2089 | { | 2086 | { |
2090 | union IO_APIC_reg_00 reg_00; | 2087 | union IO_APIC_reg_00 reg_00; |
2091 | physid_mask_t phys_id_present_map; | 2088 | physid_mask_t phys_id_present_map; |
2092 | int apic; | 2089 | int apic_id; |
2093 | int i; | 2090 | int i; |
2094 | unsigned char old_id; | 2091 | unsigned char old_id; |
2095 | unsigned long flags; | 2092 | unsigned long flags; |
@@ -2108,26 +2105,26 @@ static void __init setup_ioapic_ids_from_mpc(void) | |||
2108 | * This is broken; anything with a real cpu count has to | 2105 | * This is broken; anything with a real cpu count has to |
2109 | * circumvent this idiocy regardless. | 2106 | * circumvent this idiocy regardless. |
2110 | */ | 2107 | */ |
2111 | phys_id_present_map = ioapic_phys_id_map(phys_cpu_present_map); | 2108 | phys_id_present_map = apic->ioapic_phys_id_map(phys_cpu_present_map); |
2112 | 2109 | ||
2113 | /* | 2110 | /* |
2114 | * Set the IOAPIC ID to the value stored in the MPC table. | 2111 | * Set the IOAPIC ID to the value stored in the MPC table. |
2115 | */ | 2112 | */ |
2116 | for (apic = 0; apic < nr_ioapics; apic++) { | 2113 | for (apic_id = 0; apic_id < nr_ioapics; apic_id++) { |
2117 | 2114 | ||
2118 | /* Read the register 0 value */ | 2115 | /* Read the register 0 value */ |
2119 | spin_lock_irqsave(&ioapic_lock, flags); | 2116 | spin_lock_irqsave(&ioapic_lock, flags); |
2120 | reg_00.raw = io_apic_read(apic, 0); | 2117 | reg_00.raw = io_apic_read(apic_id, 0); |
2121 | spin_unlock_irqrestore(&ioapic_lock, flags); | 2118 | spin_unlock_irqrestore(&ioapic_lock, flags); |
2122 | 2119 | ||
2123 | old_id = mp_ioapics[apic].apicid; | 2120 | old_id = mp_ioapics[apic_id].apicid; |
2124 | 2121 | ||
2125 | if (mp_ioapics[apic].apicid >= get_physical_broadcast()) { | 2122 | if (mp_ioapics[apic_id].apicid >= get_physical_broadcast()) { |
2126 | printk(KERN_ERR "BIOS bug, IO-APIC#%d ID is %d in the MPC table!...\n", | 2123 | printk(KERN_ERR "BIOS bug, IO-APIC#%d ID is %d in the MPC table!...\n", |
2127 | apic, mp_ioapics[apic].apicid); | 2124 | apic_id, mp_ioapics[apic_id].apicid); |
2128 | printk(KERN_ERR "... fixing up to %d. (tell your hw vendor)\n", | 2125 | printk(KERN_ERR "... fixing up to %d. (tell your hw vendor)\n", |
2129 | reg_00.bits.ID); | 2126 | reg_00.bits.ID); |
2130 | mp_ioapics[apic].apicid = reg_00.bits.ID; | 2127 | mp_ioapics[apic_id].apicid = reg_00.bits.ID; |
2131 | } | 2128 | } |
2132 | 2129 | ||
2133 | /* | 2130 | /* |
@@ -2135,10 +2132,10 @@ static void __init setup_ioapic_ids_from_mpc(void) | |||
2135 | * system must have a unique ID or we get lots of nice | 2132 | * system must have a unique ID or we get lots of nice |
2136 | * 'stuck on smp_invalidate_needed IPI wait' messages. | 2133 | * 'stuck on smp_invalidate_needed IPI wait' messages. |
2137 | */ | 2134 | */ |
2138 | if (check_apicid_used(phys_id_present_map, | 2135 | if (apic->check_apicid_used(phys_id_present_map, |
2139 | mp_ioapics[apic].apicid)) { | 2136 | mp_ioapics[apic_id].apicid)) { |
2140 | printk(KERN_ERR "BIOS bug, IO-APIC#%d ID %d is already used!...\n", | 2137 | printk(KERN_ERR "BIOS bug, IO-APIC#%d ID %d is already used!...\n", |
2141 | apic, mp_ioapics[apic].apicid); | 2138 | apic_id, mp_ioapics[apic_id].apicid); |
2142 | for (i = 0; i < get_physical_broadcast(); i++) | 2139 | for (i = 0; i < get_physical_broadcast(); i++) |
2143 | if (!physid_isset(i, phys_id_present_map)) | 2140 | if (!physid_isset(i, phys_id_present_map)) |
2144 | break; | 2141 | break; |
@@ -2147,13 +2144,13 @@ static void __init setup_ioapic_ids_from_mpc(void) | |||
2147 | printk(KERN_ERR "... fixing up to %d. (tell your hw vendor)\n", | 2144 | printk(KERN_ERR "... fixing up to %d. (tell your hw vendor)\n", |
2148 | i); | 2145 | i); |
2149 | physid_set(i, phys_id_present_map); | 2146 | physid_set(i, phys_id_present_map); |
2150 | mp_ioapics[apic].apicid = i; | 2147 | mp_ioapics[apic_id].apicid = i; |
2151 | } else { | 2148 | } else { |
2152 | physid_mask_t tmp; | 2149 | physid_mask_t tmp; |
2153 | tmp = apicid_to_cpu_present(mp_ioapics[apic].apicid); | 2150 | tmp = apic->apicid_to_cpu_present(mp_ioapics[apic_id].apicid); |
2154 | apic_printk(APIC_VERBOSE, "Setting %d in the " | 2151 | apic_printk(APIC_VERBOSE, "Setting %d in the " |
2155 | "phys_id_present_map\n", | 2152 | "phys_id_present_map\n", |
2156 | mp_ioapics[apic].apicid); | 2153 | mp_ioapics[apic_id].apicid); |
2157 | physids_or(phys_id_present_map, phys_id_present_map, tmp); | 2154 | physids_or(phys_id_present_map, phys_id_present_map, tmp); |
2158 | } | 2155 | } |
2159 | 2156 | ||
@@ -2162,11 +2159,11 @@ static void __init setup_ioapic_ids_from_mpc(void) | |||
2162 | * We need to adjust the IRQ routing table | 2159 | * We need to adjust the IRQ routing table |
2163 | * if the ID changed. | 2160 | * if the ID changed. |
2164 | */ | 2161 | */ |
2165 | if (old_id != mp_ioapics[apic].apicid) | 2162 | if (old_id != mp_ioapics[apic_id].apicid) |
2166 | for (i = 0; i < mp_irq_entries; i++) | 2163 | for (i = 0; i < mp_irq_entries; i++) |
2167 | if (mp_irqs[i].dstapic == old_id) | 2164 | if (mp_irqs[i].dstapic == old_id) |
2168 | mp_irqs[i].dstapic | 2165 | mp_irqs[i].dstapic |
2169 | = mp_ioapics[apic].apicid; | 2166 | = mp_ioapics[apic_id].apicid; |
2170 | 2167 | ||
2171 | /* | 2168 | /* |
2172 | * Read the right value from the MPC table and | 2169 | * Read the right value from the MPC table and |
@@ -2174,20 +2171,20 @@ static void __init setup_ioapic_ids_from_mpc(void) | |||
2174 | */ | 2171 | */ |
2175 | apic_printk(APIC_VERBOSE, KERN_INFO | 2172 | apic_printk(APIC_VERBOSE, KERN_INFO |
2176 | "...changing IO-APIC physical APIC ID to %d ...", | 2173 | "...changing IO-APIC physical APIC ID to %d ...", |
2177 | mp_ioapics[apic].apicid); | 2174 | mp_ioapics[apic_id].apicid); |
2178 | 2175 | ||
2179 | reg_00.bits.ID = mp_ioapics[apic].apicid; | 2176 | reg_00.bits.ID = mp_ioapics[apic_id].apicid; |
2180 | spin_lock_irqsave(&ioapic_lock, flags); | 2177 | spin_lock_irqsave(&ioapic_lock, flags); |
2181 | io_apic_write(apic, 0, reg_00.raw); | 2178 | io_apic_write(apic_id, 0, reg_00.raw); |
2182 | spin_unlock_irqrestore(&ioapic_lock, flags); | 2179 | spin_unlock_irqrestore(&ioapic_lock, flags); |
2183 | 2180 | ||
2184 | /* | 2181 | /* |
2185 | * Sanity check | 2182 | * Sanity check |
2186 | */ | 2183 | */ |
2187 | spin_lock_irqsave(&ioapic_lock, flags); | 2184 | spin_lock_irqsave(&ioapic_lock, flags); |
2188 | reg_00.raw = io_apic_read(apic, 0); | 2185 | reg_00.raw = io_apic_read(apic_id, 0); |
2189 | spin_unlock_irqrestore(&ioapic_lock, flags); | 2186 | spin_unlock_irqrestore(&ioapic_lock, flags); |
2190 | if (reg_00.bits.ID != mp_ioapics[apic].apicid) | 2187 | if (reg_00.bits.ID != mp_ioapics[apic_id].apicid) |
2191 | printk("could not set ID!\n"); | 2188 | printk("could not set ID!\n"); |
2192 | else | 2189 | else |
2193 | apic_printk(APIC_VERBOSE, " ok.\n"); | 2190 | apic_printk(APIC_VERBOSE, " ok.\n"); |
@@ -2290,7 +2287,7 @@ static int ioapic_retrigger_irq(unsigned int irq) | |||
2290 | unsigned long flags; | 2287 | unsigned long flags; |
2291 | 2288 | ||
2292 | spin_lock_irqsave(&vector_lock, flags); | 2289 | spin_lock_irqsave(&vector_lock, flags); |
2293 | send_IPI_mask(cpumask_of(cpumask_first(cfg->domain)), cfg->vector); | 2290 | apic->send_IPI_mask(cpumask_of(cpumask_first(cfg->domain)), cfg->vector); |
2294 | spin_unlock_irqrestore(&vector_lock, flags); | 2291 | spin_unlock_irqrestore(&vector_lock, flags); |
2295 | 2292 | ||
2296 | return 1; | 2293 | return 1; |
@@ -2298,7 +2295,7 @@ static int ioapic_retrigger_irq(unsigned int irq) | |||
2298 | #else | 2295 | #else |
2299 | static int ioapic_retrigger_irq(unsigned int irq) | 2296 | static int ioapic_retrigger_irq(unsigned int irq) |
2300 | { | 2297 | { |
2301 | send_IPI_self(irq_cfg(irq)->vector); | 2298 | apic->send_IPI_self(irq_cfg(irq)->vector); |
2302 | 2299 | ||
2303 | return 1; | 2300 | return 1; |
2304 | } | 2301 | } |
@@ -2362,7 +2359,7 @@ migrate_ioapic_irq_desc(struct irq_desc *desc, const struct cpumask *mask) | |||
2362 | 2359 | ||
2363 | set_extra_move_desc(desc, mask); | 2360 | set_extra_move_desc(desc, mask); |
2364 | 2361 | ||
2365 | dest = cpu_mask_to_apicid_and(cfg->domain, mask); | 2362 | dest = apic->cpu_mask_to_apicid_and(cfg->domain, mask); |
2366 | 2363 | ||
2367 | modify_ioapic_rte = desc->status & IRQ_LEVEL; | 2364 | modify_ioapic_rte = desc->status & IRQ_LEVEL; |
2368 | if (modify_ioapic_rte) { | 2365 | if (modify_ioapic_rte) { |
@@ -2866,19 +2863,15 @@ static inline void __init check_timer(void) | |||
2866 | int cpu = boot_cpu_id; | 2863 | int cpu = boot_cpu_id; |
2867 | int apic1, pin1, apic2, pin2; | 2864 | int apic1, pin1, apic2, pin2; |
2868 | unsigned long flags; | 2865 | unsigned long flags; |
2869 | unsigned int ver; | ||
2870 | int no_pin1 = 0; | 2866 | int no_pin1 = 0; |
2871 | 2867 | ||
2872 | local_irq_save(flags); | 2868 | local_irq_save(flags); |
2873 | 2869 | ||
2874 | ver = apic_read(APIC_LVR); | ||
2875 | ver = GET_APIC_VERSION(ver); | ||
2876 | |||
2877 | /* | 2870 | /* |
2878 | * get/set the timer IRQ vector: | 2871 | * get/set the timer IRQ vector: |
2879 | */ | 2872 | */ |
2880 | disable_8259A_irq(0); | 2873 | disable_8259A_irq(0); |
2881 | assign_irq_vector(0, cfg, TARGET_CPUS); | 2874 | assign_irq_vector(0, cfg, apic->target_cpus()); |
2882 | 2875 | ||
2883 | /* | 2876 | /* |
2884 | * As IRQ0 is to be enabled in the 8259A, the virtual | 2877 | * As IRQ0 is to be enabled in the 8259A, the virtual |
@@ -2892,7 +2885,13 @@ static inline void __init check_timer(void) | |||
2892 | apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); | 2885 | apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_EXTINT); |
2893 | init_8259A(1); | 2886 | init_8259A(1); |
2894 | #ifdef CONFIG_X86_32 | 2887 | #ifdef CONFIG_X86_32 |
2895 | timer_ack = (nmi_watchdog == NMI_IO_APIC && !APIC_INTEGRATED(ver)); | 2888 | { |
2889 | unsigned int ver; | ||
2890 | |||
2891 | ver = apic_read(APIC_LVR); | ||
2892 | ver = GET_APIC_VERSION(ver); | ||
2893 | timer_ack = (nmi_watchdog == NMI_IO_APIC && !APIC_INTEGRATED(ver)); | ||
2894 | } | ||
2896 | #endif | 2895 | #endif |
2897 | 2896 | ||
2898 | pin1 = find_isa_irq_pin(0, mp_INT); | 2897 | pin1 = find_isa_irq_pin(0, mp_INT); |
@@ -2931,8 +2930,17 @@ static inline void __init check_timer(void) | |||
2931 | if (no_pin1) { | 2930 | if (no_pin1) { |
2932 | add_pin_to_irq_cpu(cfg, cpu, apic1, pin1); | 2931 | add_pin_to_irq_cpu(cfg, cpu, apic1, pin1); |
2933 | setup_timer_IRQ0_pin(apic1, pin1, cfg->vector); | 2932 | setup_timer_IRQ0_pin(apic1, pin1, cfg->vector); |
2933 | } else { | ||
2934 | /* for edge trigger, setup_IO_APIC_irq already | ||
2935 | * leave it unmasked. | ||
2936 | * so only need to unmask if it is level-trigger | ||
2937 | * do we really have level trigger timer? | ||
2938 | */ | ||
2939 | int idx; | ||
2940 | idx = find_irq_entry(apic1, pin1, mp_INT); | ||
2941 | if (idx != -1 && irq_trigger(idx)) | ||
2942 | unmask_IO_APIC_irq_desc(desc); | ||
2934 | } | 2943 | } |
2935 | unmask_IO_APIC_irq_desc(desc); | ||
2936 | if (timer_irq_works()) { | 2944 | if (timer_irq_works()) { |
2937 | if (nmi_watchdog == NMI_IO_APIC) { | 2945 | if (nmi_watchdog == NMI_IO_APIC) { |
2938 | setup_nmi(); | 2946 | setup_nmi(); |
@@ -2946,6 +2954,7 @@ static inline void __init check_timer(void) | |||
2946 | if (intr_remapping_enabled) | 2954 | if (intr_remapping_enabled) |
2947 | panic("timer doesn't work through Interrupt-remapped IO-APIC"); | 2955 | panic("timer doesn't work through Interrupt-remapped IO-APIC"); |
2948 | #endif | 2956 | #endif |
2957 | local_irq_disable(); | ||
2949 | clear_IO_APIC_pin(apic1, pin1); | 2958 | clear_IO_APIC_pin(apic1, pin1); |
2950 | if (!no_pin1) | 2959 | if (!no_pin1) |
2951 | apic_printk(APIC_QUIET, KERN_ERR "..MP-BIOS bug: " | 2960 | apic_printk(APIC_QUIET, KERN_ERR "..MP-BIOS bug: " |
@@ -2960,7 +2969,6 @@ static inline void __init check_timer(void) | |||
2960 | */ | 2969 | */ |
2961 | replace_pin_at_irq_cpu(cfg, cpu, apic1, pin1, apic2, pin2); | 2970 | replace_pin_at_irq_cpu(cfg, cpu, apic1, pin1, apic2, pin2); |
2962 | setup_timer_IRQ0_pin(apic2, pin2, cfg->vector); | 2971 | setup_timer_IRQ0_pin(apic2, pin2, cfg->vector); |
2963 | unmask_IO_APIC_irq_desc(desc); | ||
2964 | enable_8259A_irq(0); | 2972 | enable_8259A_irq(0); |
2965 | if (timer_irq_works()) { | 2973 | if (timer_irq_works()) { |
2966 | apic_printk(APIC_QUIET, KERN_INFO "....... works.\n"); | 2974 | apic_printk(APIC_QUIET, KERN_INFO "....... works.\n"); |
@@ -2975,6 +2983,7 @@ static inline void __init check_timer(void) | |||
2975 | /* | 2983 | /* |
2976 | * Cleanup, just in case ... | 2984 | * Cleanup, just in case ... |
2977 | */ | 2985 | */ |
2986 | local_irq_disable(); | ||
2978 | disable_8259A_irq(0); | 2987 | disable_8259A_irq(0); |
2979 | clear_IO_APIC_pin(apic2, pin2); | 2988 | clear_IO_APIC_pin(apic2, pin2); |
2980 | apic_printk(APIC_QUIET, KERN_INFO "....... failed.\n"); | 2989 | apic_printk(APIC_QUIET, KERN_INFO "....... failed.\n"); |
@@ -3000,6 +3009,7 @@ static inline void __init check_timer(void) | |||
3000 | apic_printk(APIC_QUIET, KERN_INFO "..... works.\n"); | 3009 | apic_printk(APIC_QUIET, KERN_INFO "..... works.\n"); |
3001 | goto out; | 3010 | goto out; |
3002 | } | 3011 | } |
3012 | local_irq_disable(); | ||
3003 | disable_8259A_irq(0); | 3013 | disable_8259A_irq(0); |
3004 | apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_FIXED | cfg->vector); | 3014 | apic_write(APIC_LVT0, APIC_LVT_MASKED | APIC_DM_FIXED | cfg->vector); |
3005 | apic_printk(APIC_QUIET, KERN_INFO "..... failed.\n"); | 3015 | apic_printk(APIC_QUIET, KERN_INFO "..... failed.\n"); |
@@ -3017,6 +3027,7 @@ static inline void __init check_timer(void) | |||
3017 | apic_printk(APIC_QUIET, KERN_INFO "..... works.\n"); | 3027 | apic_printk(APIC_QUIET, KERN_INFO "..... works.\n"); |
3018 | goto out; | 3028 | goto out; |
3019 | } | 3029 | } |
3030 | local_irq_disable(); | ||
3020 | apic_printk(APIC_QUIET, KERN_INFO "..... failed :(.\n"); | 3031 | apic_printk(APIC_QUIET, KERN_INFO "..... failed :(.\n"); |
3021 | panic("IO-APIC + timer doesn't work! Boot with apic=debug and send a " | 3032 | panic("IO-APIC + timer doesn't work! Boot with apic=debug and send a " |
3022 | "report. Then try booting with the 'noapic' option.\n"); | 3033 | "report. Then try booting with the 'noapic' option.\n"); |
@@ -3168,6 +3179,7 @@ static int __init ioapic_init_sysfs(void) | |||
3168 | 3179 | ||
3169 | device_initcall(ioapic_init_sysfs); | 3180 | device_initcall(ioapic_init_sysfs); |
3170 | 3181 | ||
3182 | static int nr_irqs_gsi = NR_IRQS_LEGACY; | ||
3171 | /* | 3183 | /* |
3172 | * Dynamic irq allocate and deallocation | 3184 | * Dynamic irq allocate and deallocation |
3173 | */ | 3185 | */ |
@@ -3182,11 +3194,11 @@ unsigned int create_irq_nr(unsigned int irq_want) | |||
3182 | struct irq_desc *desc_new = NULL; | 3194 | struct irq_desc *desc_new = NULL; |
3183 | 3195 | ||
3184 | irq = 0; | 3196 | irq = 0; |
3197 | if (irq_want < nr_irqs_gsi) | ||
3198 | irq_want = nr_irqs_gsi; | ||
3199 | |||
3185 | spin_lock_irqsave(&vector_lock, flags); | 3200 | spin_lock_irqsave(&vector_lock, flags); |
3186 | for (new = irq_want; new < nr_irqs; new++) { | 3201 | for (new = irq_want; new < nr_irqs; new++) { |
3187 | if (platform_legacy_irq(new)) | ||
3188 | continue; | ||
3189 | |||
3190 | desc_new = irq_to_desc_alloc_cpu(new, cpu); | 3202 | desc_new = irq_to_desc_alloc_cpu(new, cpu); |
3191 | if (!desc_new) { | 3203 | if (!desc_new) { |
3192 | printk(KERN_INFO "can not get irq_desc for %d\n", new); | 3204 | printk(KERN_INFO "can not get irq_desc for %d\n", new); |
@@ -3196,7 +3208,7 @@ unsigned int create_irq_nr(unsigned int irq_want) | |||
3196 | 3208 | ||
3197 | if (cfg_new->vector != 0) | 3209 | if (cfg_new->vector != 0) |
3198 | continue; | 3210 | continue; |
3199 | if (__assign_irq_vector(new, cfg_new, TARGET_CPUS) == 0) | 3211 | if (__assign_irq_vector(new, cfg_new, apic->target_cpus()) == 0) |
3200 | irq = new; | 3212 | irq = new; |
3201 | break; | 3213 | break; |
3202 | } | 3214 | } |
@@ -3211,7 +3223,6 @@ unsigned int create_irq_nr(unsigned int irq_want) | |||
3211 | return irq; | 3223 | return irq; |
3212 | } | 3224 | } |
3213 | 3225 | ||
3214 | static int nr_irqs_gsi = NR_IRQS_LEGACY; | ||
3215 | int create_irq(void) | 3226 | int create_irq(void) |
3216 | { | 3227 | { |
3217 | unsigned int irq_want; | 3228 | unsigned int irq_want; |
@@ -3262,11 +3273,11 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_ms | |||
3262 | return -ENXIO; | 3273 | return -ENXIO; |
3263 | 3274 | ||
3264 | cfg = irq_cfg(irq); | 3275 | cfg = irq_cfg(irq); |
3265 | err = assign_irq_vector(irq, cfg, TARGET_CPUS); | 3276 | err = assign_irq_vector(irq, cfg, apic->target_cpus()); |
3266 | if (err) | 3277 | if (err) |
3267 | return err; | 3278 | return err; |
3268 | 3279 | ||
3269 | dest = cpu_mask_to_apicid_and(cfg->domain, TARGET_CPUS); | 3280 | dest = apic->cpu_mask_to_apicid_and(cfg->domain, apic->target_cpus()); |
3270 | 3281 | ||
3271 | #ifdef CONFIG_INTR_REMAP | 3282 | #ifdef CONFIG_INTR_REMAP |
3272 | if (irq_remapped(irq)) { | 3283 | if (irq_remapped(irq)) { |
@@ -3280,9 +3291,9 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_ms | |||
3280 | memset (&irte, 0, sizeof(irte)); | 3291 | memset (&irte, 0, sizeof(irte)); |
3281 | 3292 | ||
3282 | irte.present = 1; | 3293 | irte.present = 1; |
3283 | irte.dst_mode = INT_DEST_MODE; | 3294 | irte.dst_mode = apic->irq_dest_mode; |
3284 | irte.trigger_mode = 0; /* edge */ | 3295 | irte.trigger_mode = 0; /* edge */ |
3285 | irte.dlvry_mode = INT_DELIVERY_MODE; | 3296 | irte.dlvry_mode = apic->irq_delivery_mode; |
3286 | irte.vector = cfg->vector; | 3297 | irte.vector = cfg->vector; |
3287 | irte.dest_id = IRTE_DEST(dest); | 3298 | irte.dest_id = IRTE_DEST(dest); |
3288 | 3299 | ||
@@ -3300,10 +3311,10 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_ms | |||
3300 | msg->address_hi = MSI_ADDR_BASE_HI; | 3311 | msg->address_hi = MSI_ADDR_BASE_HI; |
3301 | msg->address_lo = | 3312 | msg->address_lo = |
3302 | MSI_ADDR_BASE_LO | | 3313 | MSI_ADDR_BASE_LO | |
3303 | ((INT_DEST_MODE == 0) ? | 3314 | ((apic->irq_dest_mode == 0) ? |
3304 | MSI_ADDR_DEST_MODE_PHYSICAL: | 3315 | MSI_ADDR_DEST_MODE_PHYSICAL: |
3305 | MSI_ADDR_DEST_MODE_LOGICAL) | | 3316 | MSI_ADDR_DEST_MODE_LOGICAL) | |
3306 | ((INT_DELIVERY_MODE != dest_LowestPrio) ? | 3317 | ((apic->irq_delivery_mode != dest_LowestPrio) ? |
3307 | MSI_ADDR_REDIRECTION_CPU: | 3318 | MSI_ADDR_REDIRECTION_CPU: |
3308 | MSI_ADDR_REDIRECTION_LOWPRI) | | 3319 | MSI_ADDR_REDIRECTION_LOWPRI) | |
3309 | MSI_ADDR_DEST_ID(dest); | 3320 | MSI_ADDR_DEST_ID(dest); |
@@ -3311,7 +3322,7 @@ static int msi_compose_msg(struct pci_dev *pdev, unsigned int irq, struct msi_ms | |||
3311 | msg->data = | 3322 | msg->data = |
3312 | MSI_DATA_TRIGGER_EDGE | | 3323 | MSI_DATA_TRIGGER_EDGE | |
3313 | MSI_DATA_LEVEL_ASSERT | | 3324 | MSI_DATA_LEVEL_ASSERT | |
3314 | ((INT_DELIVERY_MODE != dest_LowestPrio) ? | 3325 | ((apic->irq_delivery_mode != dest_LowestPrio) ? |
3315 | MSI_DATA_DELIVERY_FIXED: | 3326 | MSI_DATA_DELIVERY_FIXED: |
3316 | MSI_DATA_DELIVERY_LOWPRI) | | 3327 | MSI_DATA_DELIVERY_LOWPRI) | |
3317 | MSI_DATA_VECTOR(cfg->vector); | 3328 | MSI_DATA_VECTOR(cfg->vector); |
@@ -3466,40 +3477,6 @@ static int setup_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc, int irq) | |||
3466 | return 0; | 3477 | return 0; |
3467 | } | 3478 | } |
3468 | 3479 | ||
3469 | int arch_setup_msi_irq(struct pci_dev *dev, struct msi_desc *msidesc) | ||
3470 | { | ||
3471 | unsigned int irq; | ||
3472 | int ret; | ||
3473 | unsigned int irq_want; | ||
3474 | |||
3475 | irq_want = nr_irqs_gsi; | ||
3476 | irq = create_irq_nr(irq_want); | ||
3477 | if (irq == 0) | ||
3478 | return -1; | ||
3479 | |||
3480 | #ifdef CONFIG_INTR_REMAP | ||
3481 | if (!intr_remapping_enabled) | ||
3482 | goto no_ir; | ||
3483 | |||
3484 | ret = msi_alloc_irte(dev, irq, 1); | ||
3485 | if (ret < 0) | ||
3486 | goto error; | ||
3487 | no_ir: | ||
3488 | #endif | ||
3489 | ret = setup_msi_irq(dev, msidesc, irq); | ||
3490 | if (ret < 0) { | ||
3491 | destroy_irq(irq); | ||
3492 | return ret; | ||
3493 | } | ||
3494 | return 0; | ||
3495 | |||
3496 | #ifdef CONFIG_INTR_REMAP | ||
3497 | error: | ||
3498 | destroy_irq(irq); | ||
3499 | return ret; | ||
3500 | #endif | ||
3501 | } | ||
3502 | |||
3503 | int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) | 3480 | int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) |
3504 | { | 3481 | { |
3505 | unsigned int irq; | 3482 | unsigned int irq; |
@@ -3516,9 +3493,9 @@ int arch_setup_msi_irqs(struct pci_dev *dev, int nvec, int type) | |||
3516 | sub_handle = 0; | 3493 | sub_handle = 0; |
3517 | list_for_each_entry(msidesc, &dev->msi_list, list) { | 3494 | list_for_each_entry(msidesc, &dev->msi_list, list) { |
3518 | irq = create_irq_nr(irq_want); | 3495 | irq = create_irq_nr(irq_want); |
3519 | irq_want++; | ||
3520 | if (irq == 0) | 3496 | if (irq == 0) |
3521 | return -1; | 3497 | return -1; |
3498 | irq_want = irq + 1; | ||
3522 | #ifdef CONFIG_INTR_REMAP | 3499 | #ifdef CONFIG_INTR_REMAP |
3523 | if (!intr_remapping_enabled) | 3500 | if (!intr_remapping_enabled) |
3524 | goto no_ir; | 3501 | goto no_ir; |
@@ -3733,12 +3710,13 @@ int arch_setup_ht_irq(unsigned int irq, struct pci_dev *dev) | |||
3733 | return -ENXIO; | 3710 | return -ENXIO; |
3734 | 3711 | ||
3735 | cfg = irq_cfg(irq); | 3712 | cfg = irq_cfg(irq); |
3736 | err = assign_irq_vector(irq, cfg, TARGET_CPUS); | 3713 | err = assign_irq_vector(irq, cfg, apic->target_cpus()); |
3737 | if (!err) { | 3714 | if (!err) { |
3738 | struct ht_irq_msg msg; | 3715 | struct ht_irq_msg msg; |
3739 | unsigned dest; | 3716 | unsigned dest; |
3740 | 3717 | ||
3741 | dest = cpu_mask_to_apicid_and(cfg->domain, TARGET_CPUS); | 3718 | dest = apic->cpu_mask_to_apicid_and(cfg->domain, |
3719 | apic->target_cpus()); | ||
3742 | 3720 | ||
3743 | msg.address_hi = HT_IRQ_HIGH_DEST_ID(dest); | 3721 | msg.address_hi = HT_IRQ_HIGH_DEST_ID(dest); |
3744 | 3722 | ||
@@ -3746,11 +3724,11 @@ int arch_setup_ht_irq(unsigned int irq, struct pci_dev *dev) | |||
3746 | HT_IRQ_LOW_BASE | | 3724 | HT_IRQ_LOW_BASE | |
3747 | HT_IRQ_LOW_DEST_ID(dest) | | 3725 | HT_IRQ_LOW_DEST_ID(dest) | |
3748 | HT_IRQ_LOW_VECTOR(cfg->vector) | | 3726 | HT_IRQ_LOW_VECTOR(cfg->vector) | |
3749 | ((INT_DEST_MODE == 0) ? | 3727 | ((apic->irq_dest_mode == 0) ? |
3750 | HT_IRQ_LOW_DM_PHYSICAL : | 3728 | HT_IRQ_LOW_DM_PHYSICAL : |
3751 | HT_IRQ_LOW_DM_LOGICAL) | | 3729 | HT_IRQ_LOW_DM_LOGICAL) | |
3752 | HT_IRQ_LOW_RQEOI_EDGE | | 3730 | HT_IRQ_LOW_RQEOI_EDGE | |
3753 | ((INT_DELIVERY_MODE != dest_LowestPrio) ? | 3731 | ((apic->irq_delivery_mode != dest_LowestPrio) ? |
3754 | HT_IRQ_LOW_MT_FIXED : | 3732 | HT_IRQ_LOW_MT_FIXED : |
3755 | HT_IRQ_LOW_MT_ARBITRATED) | | 3733 | HT_IRQ_LOW_MT_ARBITRATED) | |
3756 | HT_IRQ_LOW_IRQ_MASKED; | 3734 | HT_IRQ_LOW_IRQ_MASKED; |
@@ -3798,12 +3776,12 @@ int arch_enable_uv_irq(char *irq_name, unsigned int irq, int cpu, int mmr_blade, | |||
3798 | BUG_ON(sizeof(struct uv_IO_APIC_route_entry) != sizeof(unsigned long)); | 3776 | BUG_ON(sizeof(struct uv_IO_APIC_route_entry) != sizeof(unsigned long)); |
3799 | 3777 | ||
3800 | entry->vector = cfg->vector; | 3778 | entry->vector = cfg->vector; |
3801 | entry->delivery_mode = INT_DELIVERY_MODE; | 3779 | entry->delivery_mode = apic->irq_delivery_mode; |
3802 | entry->dest_mode = INT_DEST_MODE; | 3780 | entry->dest_mode = apic->irq_dest_mode; |
3803 | entry->polarity = 0; | 3781 | entry->polarity = 0; |
3804 | entry->trigger = 0; | 3782 | entry->trigger = 0; |
3805 | entry->mask = 0; | 3783 | entry->mask = 0; |
3806 | entry->dest = cpu_mask_to_apicid(eligible_cpu); | 3784 | entry->dest = apic->cpu_mask_to_apicid(eligible_cpu); |
3807 | 3785 | ||
3808 | mmr_pnode = uv_blade_to_pnode(mmr_blade); | 3786 | mmr_pnode = uv_blade_to_pnode(mmr_blade); |
3809 | uv_write_global_mmr64(mmr_pnode, mmr_offset, mmr_value); | 3787 | uv_write_global_mmr64(mmr_pnode, mmr_offset, mmr_value); |
@@ -3871,11 +3849,17 @@ int __init arch_probe_nr_irqs(void) | |||
3871 | { | 3849 | { |
3872 | int nr; | 3850 | int nr; |
3873 | 3851 | ||
3874 | nr = ((8 * nr_cpu_ids) > (32 * nr_ioapics) ? | 3852 | if (nr_irqs > (NR_VECTORS * nr_cpu_ids)) |
3875 | (NR_VECTORS + (8 * nr_cpu_ids)) : | 3853 | nr_irqs = NR_VECTORS * nr_cpu_ids; |
3876 | (NR_VECTORS + (32 * nr_ioapics))); | ||
3877 | 3854 | ||
3878 | if (nr < nr_irqs && nr > nr_irqs_gsi) | 3855 | nr = nr_irqs_gsi + 8 * nr_cpu_ids; |
3856 | #if defined(CONFIG_PCI_MSI) || defined(CONFIG_HT_IRQ) | ||
3857 | /* | ||
3858 | * for MSI and HT dyn irq | ||
3859 | */ | ||
3860 | nr += nr_irqs_gsi * 16; | ||
3861 | #endif | ||
3862 | if (nr < nr_irqs) | ||
3879 | nr_irqs = nr; | 3863 | nr_irqs = nr; |
3880 | 3864 | ||
3881 | return 0; | 3865 | return 0; |
@@ -3907,7 +3891,7 @@ int __init io_apic_get_unique_id(int ioapic, int apic_id) | |||
3907 | */ | 3891 | */ |
3908 | 3892 | ||
3909 | if (physids_empty(apic_id_map)) | 3893 | if (physids_empty(apic_id_map)) |
3910 | apic_id_map = ioapic_phys_id_map(phys_cpu_present_map); | 3894 | apic_id_map = apic->ioapic_phys_id_map(phys_cpu_present_map); |
3911 | 3895 | ||
3912 | spin_lock_irqsave(&ioapic_lock, flags); | 3896 | spin_lock_irqsave(&ioapic_lock, flags); |
3913 | reg_00.raw = io_apic_read(ioapic, 0); | 3897 | reg_00.raw = io_apic_read(ioapic, 0); |
@@ -3923,10 +3907,10 @@ int __init io_apic_get_unique_id(int ioapic, int apic_id) | |||
3923 | * Every APIC in a system must have a unique ID or we get lots of nice | 3907 | * Every APIC in a system must have a unique ID or we get lots of nice |
3924 | * 'stuck on smp_invalidate_needed IPI wait' messages. | 3908 | * 'stuck on smp_invalidate_needed IPI wait' messages. |
3925 | */ | 3909 | */ |
3926 | if (check_apicid_used(apic_id_map, apic_id)) { | 3910 | if (apic->check_apicid_used(apic_id_map, apic_id)) { |
3927 | 3911 | ||
3928 | for (i = 0; i < get_physical_broadcast(); i++) { | 3912 | for (i = 0; i < get_physical_broadcast(); i++) { |
3929 | if (!check_apicid_used(apic_id_map, i)) | 3913 | if (!apic->check_apicid_used(apic_id_map, i)) |
3930 | break; | 3914 | break; |
3931 | } | 3915 | } |
3932 | 3916 | ||
@@ -3939,7 +3923,7 @@ int __init io_apic_get_unique_id(int ioapic, int apic_id) | |||
3939 | apic_id = i; | 3923 | apic_id = i; |
3940 | } | 3924 | } |
3941 | 3925 | ||
3942 | tmp = apicid_to_cpu_present(apic_id); | 3926 | tmp = apic->apicid_to_cpu_present(apic_id); |
3943 | physids_or(apic_id_map, apic_id_map, tmp); | 3927 | physids_or(apic_id_map, apic_id_map, tmp); |
3944 | 3928 | ||
3945 | if (reg_00.bits.ID != apic_id) { | 3929 | if (reg_00.bits.ID != apic_id) { |
@@ -4032,7 +4016,7 @@ int acpi_get_override_irq(int bus_irq, int *trigger, int *polarity) | |||
4032 | /* | 4016 | /* |
4033 | * This function currently is only a helper for the i386 smp boot process where | 4017 | * This function currently is only a helper for the i386 smp boot process where |
4034 | * we need to reprogram the ioredtbls to cater for the cpus which have come online | 4018 | * we need to reprogram the ioredtbls to cater for the cpus which have come online |
4035 | * so mask in all cases should simply be TARGET_CPUS | 4019 | * so mask in all cases should simply be apic->target_cpus() |
4036 | */ | 4020 | */ |
4037 | #ifdef CONFIG_SMP | 4021 | #ifdef CONFIG_SMP |
4038 | void __init setup_ioapic_dest(void) | 4022 | void __init setup_ioapic_dest(void) |
@@ -4073,7 +4057,7 @@ void __init setup_ioapic_dest(void) | |||
4073 | (IRQ_NO_BALANCING | IRQ_AFFINITY_SET)) | 4057 | (IRQ_NO_BALANCING | IRQ_AFFINITY_SET)) |
4074 | mask = desc->affinity; | 4058 | mask = desc->affinity; |
4075 | else | 4059 | else |
4076 | mask = TARGET_CPUS; | 4060 | mask = apic->target_cpus(); |
4077 | 4061 | ||
4078 | #ifdef CONFIG_INTR_REMAP | 4062 | #ifdef CONFIG_INTR_REMAP |
4079 | if (intr_remapping_enabled) | 4063 | if (intr_remapping_enabled) |
diff --git a/arch/x86/kernel/ioport.c b/arch/x86/kernel/ioport.c index b12208f4dfee..e41980a373ab 100644 --- a/arch/x86/kernel/ioport.c +++ b/arch/x86/kernel/ioport.c | |||
@@ -131,9 +131,8 @@ static int do_iopl(unsigned int level, struct pt_regs *regs) | |||
131 | } | 131 | } |
132 | 132 | ||
133 | #ifdef CONFIG_X86_32 | 133 | #ifdef CONFIG_X86_32 |
134 | asmlinkage long sys_iopl(unsigned long regsp) | 134 | long sys_iopl(struct pt_regs *regs) |
135 | { | 135 | { |
136 | struct pt_regs *regs = (struct pt_regs *)®sp; | ||
137 | unsigned int level = regs->bx; | 136 | unsigned int level = regs->bx; |
138 | struct thread_struct *t = ¤t->thread; | 137 | struct thread_struct *t = ¤t->thread; |
139 | int rc; | 138 | int rc; |
diff --git a/arch/x86/kernel/ipi.c b/arch/x86/kernel/ipi.c index 285bbf8831fa..dbf5445727a9 100644 --- a/arch/x86/kernel/ipi.c +++ b/arch/x86/kernel/ipi.c | |||
@@ -17,147 +17,121 @@ | |||
17 | #include <asm/mmu_context.h> | 17 | #include <asm/mmu_context.h> |
18 | #include <asm/apic.h> | 18 | #include <asm/apic.h> |
19 | #include <asm/proto.h> | 19 | #include <asm/proto.h> |
20 | #include <asm/ipi.h> | ||
20 | 21 | ||
21 | #ifdef CONFIG_X86_32 | 22 | void default_send_IPI_mask_sequence_phys(const struct cpumask *mask, int vector) |
22 | #include <mach_apic.h> | ||
23 | #include <mach_ipi.h> | ||
24 | |||
25 | /* | ||
26 | * the following functions deal with sending IPIs between CPUs. | ||
27 | * | ||
28 | * We use 'broadcast', CPU->CPU IPIs and self-IPIs too. | ||
29 | */ | ||
30 | |||
31 | static inline int __prepare_ICR(unsigned int shortcut, int vector) | ||
32 | { | 23 | { |
33 | unsigned int icr = shortcut | APIC_DEST_LOGICAL; | 24 | unsigned long query_cpu; |
34 | 25 | unsigned long flags; | |
35 | switch (vector) { | 26 | |
36 | default: | 27 | /* |
37 | icr |= APIC_DM_FIXED | vector; | 28 | * Hack. The clustered APIC addressing mode doesn't allow us to send |
38 | break; | 29 | * to an arbitrary mask, so I do a unicast to each CPU instead. |
39 | case NMI_VECTOR: | 30 | * - mbligh |
40 | icr |= APIC_DM_NMI; | 31 | */ |
41 | break; | 32 | local_irq_save(flags); |
33 | for_each_cpu(query_cpu, mask) { | ||
34 | __default_send_IPI_dest_field(per_cpu(x86_cpu_to_apicid, | ||
35 | query_cpu), vector, APIC_DEST_PHYSICAL); | ||
42 | } | 36 | } |
43 | return icr; | 37 | local_irq_restore(flags); |
44 | } | 38 | } |
45 | 39 | ||
46 | static inline int __prepare_ICR2(unsigned int mask) | 40 | void default_send_IPI_mask_allbutself_phys(const struct cpumask *mask, |
41 | int vector) | ||
47 | { | 42 | { |
48 | return SET_APIC_DEST_FIELD(mask); | 43 | unsigned int this_cpu = smp_processor_id(); |
49 | } | 44 | unsigned int query_cpu; |
45 | unsigned long flags; | ||
50 | 46 | ||
51 | void __send_IPI_shortcut(unsigned int shortcut, int vector) | 47 | /* See Hack comment above */ |
52 | { | ||
53 | /* | ||
54 | * Subtle. In the case of the 'never do double writes' workaround | ||
55 | * we have to lock out interrupts to be safe. As we don't care | ||
56 | * of the value read we use an atomic rmw access to avoid costly | ||
57 | * cli/sti. Otherwise we use an even cheaper single atomic write | ||
58 | * to the APIC. | ||
59 | */ | ||
60 | unsigned int cfg; | ||
61 | 48 | ||
62 | /* | 49 | local_irq_save(flags); |
63 | * Wait for idle. | 50 | for_each_cpu(query_cpu, mask) { |
64 | */ | 51 | if (query_cpu == this_cpu) |
65 | apic_wait_icr_idle(); | 52 | continue; |
53 | __default_send_IPI_dest_field(per_cpu(x86_cpu_to_apicid, | ||
54 | query_cpu), vector, APIC_DEST_PHYSICAL); | ||
55 | } | ||
56 | local_irq_restore(flags); | ||
57 | } | ||
66 | 58 | ||
67 | /* | 59 | void default_send_IPI_mask_sequence_logical(const struct cpumask *mask, |
68 | * No need to touch the target chip field | 60 | int vector) |
69 | */ | 61 | { |
70 | cfg = __prepare_ICR(shortcut, vector); | 62 | unsigned long flags; |
63 | unsigned int query_cpu; | ||
71 | 64 | ||
72 | /* | 65 | /* |
73 | * Send the IPI. The write to APIC_ICR fires this off. | 66 | * Hack. The clustered APIC addressing mode doesn't allow us to send |
67 | * to an arbitrary mask, so I do a unicasts to each CPU instead. This | ||
68 | * should be modified to do 1 message per cluster ID - mbligh | ||
74 | */ | 69 | */ |
75 | apic_write(APIC_ICR, cfg); | ||
76 | } | ||
77 | 70 | ||
78 | void send_IPI_self(int vector) | 71 | local_irq_save(flags); |
79 | { | 72 | for_each_cpu(query_cpu, mask) |
80 | __send_IPI_shortcut(APIC_DEST_SELF, vector); | 73 | __default_send_IPI_dest_field( |
74 | apic->cpu_to_logical_apicid(query_cpu), vector, | ||
75 | apic->dest_logical); | ||
76 | local_irq_restore(flags); | ||
81 | } | 77 | } |
82 | 78 | ||
83 | /* | 79 | void default_send_IPI_mask_allbutself_logical(const struct cpumask *mask, |
84 | * This is used to send an IPI with no shorthand notation (the destination is | 80 | int vector) |
85 | * specified in bits 56 to 63 of the ICR). | ||
86 | */ | ||
87 | static inline void __send_IPI_dest_field(unsigned long mask, int vector) | ||
88 | { | 81 | { |
89 | unsigned long cfg; | 82 | unsigned long flags; |
90 | 83 | unsigned int query_cpu; | |
91 | /* | 84 | unsigned int this_cpu = smp_processor_id(); |
92 | * Wait for idle. | ||
93 | */ | ||
94 | if (unlikely(vector == NMI_VECTOR)) | ||
95 | safe_apic_wait_icr_idle(); | ||
96 | else | ||
97 | apic_wait_icr_idle(); | ||
98 | |||
99 | /* | ||
100 | * prepare target chip field | ||
101 | */ | ||
102 | cfg = __prepare_ICR2(mask); | ||
103 | apic_write(APIC_ICR2, cfg); | ||
104 | 85 | ||
105 | /* | 86 | /* See Hack comment above */ |
106 | * program the ICR | ||
107 | */ | ||
108 | cfg = __prepare_ICR(0, vector); | ||
109 | 87 | ||
110 | /* | 88 | local_irq_save(flags); |
111 | * Send the IPI. The write to APIC_ICR fires this off. | 89 | for_each_cpu(query_cpu, mask) { |
112 | */ | 90 | if (query_cpu == this_cpu) |
113 | apic_write(APIC_ICR, cfg); | 91 | continue; |
92 | __default_send_IPI_dest_field( | ||
93 | apic->cpu_to_logical_apicid(query_cpu), vector, | ||
94 | apic->dest_logical); | ||
95 | } | ||
96 | local_irq_restore(flags); | ||
114 | } | 97 | } |
115 | 98 | ||
99 | #ifdef CONFIG_X86_32 | ||
100 | |||
116 | /* | 101 | /* |
117 | * This is only used on smaller machines. | 102 | * This is only used on smaller machines. |
118 | */ | 103 | */ |
119 | void send_IPI_mask_bitmask(const struct cpumask *cpumask, int vector) | 104 | void default_send_IPI_mask_logical(const struct cpumask *cpumask, int vector) |
120 | { | 105 | { |
121 | unsigned long mask = cpumask_bits(cpumask)[0]; | 106 | unsigned long mask = cpumask_bits(cpumask)[0]; |
122 | unsigned long flags; | 107 | unsigned long flags; |
123 | 108 | ||
124 | local_irq_save(flags); | 109 | local_irq_save(flags); |
125 | WARN_ON(mask & ~cpumask_bits(cpu_online_mask)[0]); | 110 | WARN_ON(mask & ~cpumask_bits(cpu_online_mask)[0]); |
126 | __send_IPI_dest_field(mask, vector); | 111 | __default_send_IPI_dest_field(mask, vector, apic->dest_logical); |
127 | local_irq_restore(flags); | 112 | local_irq_restore(flags); |
128 | } | 113 | } |
129 | 114 | ||
130 | void send_IPI_mask_sequence(const struct cpumask *mask, int vector) | 115 | void default_send_IPI_allbutself(int vector) |
131 | { | 116 | { |
132 | unsigned long flags; | ||
133 | unsigned int query_cpu; | ||
134 | |||
135 | /* | 117 | /* |
136 | * Hack. The clustered APIC addressing mode doesn't allow us to send | 118 | * if there are no other CPUs in the system then we get an APIC send |
137 | * to an arbitrary mask, so I do a unicasts to each CPU instead. This | 119 | * error if we try to broadcast, thus avoid sending IPIs in this case. |
138 | * should be modified to do 1 message per cluster ID - mbligh | ||
139 | */ | 120 | */ |
121 | if (!(num_online_cpus() > 1)) | ||
122 | return; | ||
140 | 123 | ||
141 | local_irq_save(flags); | 124 | __default_local_send_IPI_allbutself(vector); |
142 | for_each_cpu(query_cpu, mask) | ||
143 | __send_IPI_dest_field(cpu_to_logical_apicid(query_cpu), vector); | ||
144 | local_irq_restore(flags); | ||
145 | } | 125 | } |
146 | 126 | ||
147 | void send_IPI_mask_allbutself(const struct cpumask *mask, int vector) | 127 | void default_send_IPI_all(int vector) |
148 | { | 128 | { |
149 | unsigned long flags; | 129 | __default_local_send_IPI_all(vector); |
150 | unsigned int query_cpu; | 130 | } |
151 | unsigned int this_cpu = smp_processor_id(); | ||
152 | |||
153 | /* See Hack comment above */ | ||
154 | 131 | ||
155 | local_irq_save(flags); | 132 | void default_send_IPI_self(int vector) |
156 | for_each_cpu(query_cpu, mask) | 133 | { |
157 | if (query_cpu != this_cpu) | 134 | __default_send_IPI_shortcut(APIC_DEST_SELF, vector, apic->dest_logical); |
158 | __send_IPI_dest_field(cpu_to_logical_apicid(query_cpu), | ||
159 | vector); | ||
160 | local_irq_restore(flags); | ||
161 | } | 135 | } |
162 | 136 | ||
163 | /* must come after the send_IPI functions above for inlining */ | 137 | /* must come after the send_IPI functions above for inlining */ |
diff --git a/arch/x86/kernel/irq.c b/arch/x86/kernel/irq.c index a6bca1d33a8a..7c95c8918a8f 100644 --- a/arch/x86/kernel/irq.c +++ b/arch/x86/kernel/irq.c | |||
@@ -6,10 +6,12 @@ | |||
6 | #include <linux/kernel_stat.h> | 6 | #include <linux/kernel_stat.h> |
7 | #include <linux/seq_file.h> | 7 | #include <linux/seq_file.h> |
8 | #include <linux/smp.h> | 8 | #include <linux/smp.h> |
9 | #include <linux/ftrace.h> | ||
9 | 10 | ||
10 | #include <asm/apic.h> | 11 | #include <asm/apic.h> |
11 | #include <asm/io_apic.h> | 12 | #include <asm/io_apic.h> |
12 | #include <asm/irq.h> | 13 | #include <asm/irq.h> |
14 | #include <asm/idle.h> | ||
13 | 15 | ||
14 | atomic_t irq_err_count; | 16 | atomic_t irq_err_count; |
15 | 17 | ||
@@ -193,4 +195,40 @@ u64 arch_irq_stat(void) | |||
193 | return sum; | 195 | return sum; |
194 | } | 196 | } |
195 | 197 | ||
198 | |||
199 | /* | ||
200 | * do_IRQ handles all normal device IRQ's (the special | ||
201 | * SMP cross-CPU interrupts have their own specific | ||
202 | * handlers). | ||
203 | */ | ||
204 | unsigned int __irq_entry do_IRQ(struct pt_regs *regs) | ||
205 | { | ||
206 | struct pt_regs *old_regs = set_irq_regs(regs); | ||
207 | |||
208 | /* high bit used in ret_from_ code */ | ||
209 | unsigned vector = ~regs->orig_ax; | ||
210 | unsigned irq; | ||
211 | |||
212 | exit_idle(); | ||
213 | irq_enter(); | ||
214 | |||
215 | irq = __get_cpu_var(vector_irq)[vector]; | ||
216 | |||
217 | if (!handle_irq(irq, regs)) { | ||
218 | #ifdef CONFIG_X86_64 | ||
219 | if (!disable_apic) | ||
220 | ack_APIC_irq(); | ||
221 | #endif | ||
222 | |||
223 | if (printk_ratelimit()) | ||
224 | printk(KERN_EMERG "%s: %d.%d No irq handler for vector (irq %d)\n", | ||
225 | __func__, smp_processor_id(), vector, irq); | ||
226 | } | ||
227 | |||
228 | irq_exit(); | ||
229 | |||
230 | set_irq_regs(old_regs); | ||
231 | return 1; | ||
232 | } | ||
233 | |||
196 | EXPORT_SYMBOL_GPL(vector_used_by_percpu_irq); | 234 | EXPORT_SYMBOL_GPL(vector_used_by_percpu_irq); |
diff --git a/arch/x86/kernel/irq_32.c b/arch/x86/kernel/irq_32.c index e0f29be8ab0b..4beb9a13873d 100644 --- a/arch/x86/kernel/irq_32.c +++ b/arch/x86/kernel/irq_32.c | |||
@@ -191,33 +191,16 @@ static inline int | |||
191 | execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq) { return 0; } | 191 | execute_on_irq_stack(int overflow, struct irq_desc *desc, int irq) { return 0; } |
192 | #endif | 192 | #endif |
193 | 193 | ||
194 | /* | 194 | bool handle_irq(unsigned irq, struct pt_regs *regs) |
195 | * do_IRQ handles all normal device IRQ's (the special | ||
196 | * SMP cross-CPU interrupts have their own specific | ||
197 | * handlers). | ||
198 | */ | ||
199 | unsigned int do_IRQ(struct pt_regs *regs) | ||
200 | { | 195 | { |
201 | struct pt_regs *old_regs; | ||
202 | /* high bit used in ret_from_ code */ | ||
203 | int overflow; | ||
204 | unsigned vector = ~regs->orig_ax; | ||
205 | struct irq_desc *desc; | 196 | struct irq_desc *desc; |
206 | unsigned irq; | 197 | int overflow; |
207 | |||
208 | |||
209 | old_regs = set_irq_regs(regs); | ||
210 | irq_enter(); | ||
211 | irq = __get_cpu_var(vector_irq)[vector]; | ||
212 | 198 | ||
213 | overflow = check_stack_overflow(); | 199 | overflow = check_stack_overflow(); |
214 | 200 | ||
215 | desc = irq_to_desc(irq); | 201 | desc = irq_to_desc(irq); |
216 | if (unlikely(!desc)) { | 202 | if (unlikely(!desc)) |
217 | printk(KERN_EMERG "%s: cannot handle IRQ %d vector %#x cpu %d\n", | 203 | return false; |
218 | __func__, irq, vector, smp_processor_id()); | ||
219 | BUG(); | ||
220 | } | ||
221 | 204 | ||
222 | if (!execute_on_irq_stack(overflow, desc, irq)) { | 205 | if (!execute_on_irq_stack(overflow, desc, irq)) { |
223 | if (unlikely(overflow)) | 206 | if (unlikely(overflow)) |
@@ -225,13 +208,11 @@ unsigned int do_IRQ(struct pt_regs *regs) | |||
225 | desc->handle_irq(irq, desc); | 208 | desc->handle_irq(irq, desc); |
226 | } | 209 | } |
227 | 210 | ||
228 | irq_exit(); | 211 | return true; |
229 | set_irq_regs(old_regs); | ||
230 | return 1; | ||
231 | } | 212 | } |
232 | 213 | ||
233 | #ifdef CONFIG_HOTPLUG_CPU | 214 | #ifdef CONFIG_HOTPLUG_CPU |
234 | #include <mach_apic.h> | 215 | #include <asm/genapic.h> |
235 | 216 | ||
236 | /* A cpu has been removed from cpu_online_mask. Reset irq affinities. */ | 217 | /* A cpu has been removed from cpu_online_mask. Reset irq affinities. */ |
237 | void fixup_irqs(void) | 218 | void fixup_irqs(void) |
diff --git a/arch/x86/kernel/irq_64.c b/arch/x86/kernel/irq_64.c index 018963aa6ee3..977d8b43a0dd 100644 --- a/arch/x86/kernel/irq_64.c +++ b/arch/x86/kernel/irq_64.c | |||
@@ -48,42 +48,18 @@ static inline void stack_overflow_check(struct pt_regs *regs) | |||
48 | #endif | 48 | #endif |
49 | } | 49 | } |
50 | 50 | ||
51 | /* | 51 | bool handle_irq(unsigned irq, struct pt_regs *regs) |
52 | * do_IRQ handles all normal device IRQ's (the special | ||
53 | * SMP cross-CPU interrupts have their own specific | ||
54 | * handlers). | ||
55 | */ | ||
56 | asmlinkage unsigned int __irq_entry do_IRQ(struct pt_regs *regs) | ||
57 | { | 52 | { |
58 | struct pt_regs *old_regs = set_irq_regs(regs); | ||
59 | struct irq_desc *desc; | 53 | struct irq_desc *desc; |
60 | 54 | ||
61 | /* high bit used in ret_from_ code */ | ||
62 | unsigned vector = ~regs->orig_ax; | ||
63 | unsigned irq; | ||
64 | |||
65 | exit_idle(); | ||
66 | irq_enter(); | ||
67 | irq = __get_cpu_var(vector_irq)[vector]; | ||
68 | |||
69 | stack_overflow_check(regs); | 55 | stack_overflow_check(regs); |
70 | 56 | ||
71 | desc = irq_to_desc(irq); | 57 | desc = irq_to_desc(irq); |
72 | if (likely(desc)) | 58 | if (unlikely(!desc)) |
73 | generic_handle_irq_desc(irq, desc); | 59 | return false; |
74 | else { | ||
75 | if (!disable_apic) | ||
76 | ack_APIC_irq(); | ||
77 | |||
78 | if (printk_ratelimit()) | ||
79 | printk(KERN_EMERG "%s: %d.%d No irq handler for vector\n", | ||
80 | __func__, smp_processor_id(), vector); | ||
81 | } | ||
82 | |||
83 | irq_exit(); | ||
84 | 60 | ||
85 | set_irq_regs(old_regs); | 61 | generic_handle_irq_desc(irq, desc); |
86 | return 1; | 62 | return true; |
87 | } | 63 | } |
88 | 64 | ||
89 | #ifdef CONFIG_HOTPLUG_CPU | 65 | #ifdef CONFIG_HOTPLUG_CPU |
diff --git a/arch/x86/kernel/irqinit_32.c b/arch/x86/kernel/irqinit_32.c index f6ff71cdaba8..520e6c1c5d22 100644 --- a/arch/x86/kernel/irqinit_32.c +++ b/arch/x86/kernel/irqinit_32.c | |||
@@ -78,6 +78,15 @@ void __init init_ISA_irqs(void) | |||
78 | } | 78 | } |
79 | } | 79 | } |
80 | 80 | ||
81 | /* | ||
82 | * IRQ2 is cascade interrupt to second interrupt controller | ||
83 | */ | ||
84 | static struct irqaction irq2 = { | ||
85 | .handler = no_action, | ||
86 | .mask = CPU_MASK_NONE, | ||
87 | .name = "cascade", | ||
88 | }; | ||
89 | |||
81 | DEFINE_PER_CPU(vector_irq_t, vector_irq) = { | 90 | DEFINE_PER_CPU(vector_irq_t, vector_irq) = { |
82 | [0 ... IRQ0_VECTOR - 1] = -1, | 91 | [0 ... IRQ0_VECTOR - 1] = -1, |
83 | [IRQ0_VECTOR] = 0, | 92 | [IRQ0_VECTOR] = 0, |
@@ -189,6 +198,9 @@ void __init native_init_IRQ(void) | |||
189 | set_intr_gate(vector, interrupt[i]); | 198 | set_intr_gate(vector, interrupt[i]); |
190 | } | 199 | } |
191 | 200 | ||
201 | if (!acpi_ioapic) | ||
202 | setup_irq(2, &irq2); | ||
203 | |||
192 | /* setup after call gates are initialised (usually add in | 204 | /* setup after call gates are initialised (usually add in |
193 | * the architecture specific gates) | 205 | * the architecture specific gates) |
194 | */ | 206 | */ |
diff --git a/arch/x86/kernel/kgdb.c b/arch/x86/kernel/kgdb.c index 10435a120d22..5c4f55483849 100644 --- a/arch/x86/kernel/kgdb.c +++ b/arch/x86/kernel/kgdb.c | |||
@@ -46,7 +46,7 @@ | |||
46 | #include <asm/apicdef.h> | 46 | #include <asm/apicdef.h> |
47 | #include <asm/system.h> | 47 | #include <asm/system.h> |
48 | 48 | ||
49 | #include <mach_ipi.h> | 49 | #include <asm/genapic.h> |
50 | 50 | ||
51 | /* | 51 | /* |
52 | * Put the error code here just in case the user cares: | 52 | * Put the error code here just in case the user cares: |
@@ -347,7 +347,7 @@ void kgdb_post_primary_code(struct pt_regs *regs, int e_vector, int err_code) | |||
347 | */ | 347 | */ |
348 | void kgdb_roundup_cpus(unsigned long flags) | 348 | void kgdb_roundup_cpus(unsigned long flags) |
349 | { | 349 | { |
350 | send_IPI_allbutself(APIC_DM_NMI); | 350 | apic->send_IPI_allbutself(APIC_DM_NMI); |
351 | } | 351 | } |
352 | #endif | 352 | #endif |
353 | 353 | ||
diff --git a/arch/x86/kernel/machine_kexec_64.c b/arch/x86/kernel/machine_kexec_64.c index c43caa3a91f3..6993d51b7fd8 100644 --- a/arch/x86/kernel/machine_kexec_64.c +++ b/arch/x86/kernel/machine_kexec_64.c | |||
@@ -18,15 +18,6 @@ | |||
18 | #include <asm/mmu_context.h> | 18 | #include <asm/mmu_context.h> |
19 | #include <asm/io.h> | 19 | #include <asm/io.h> |
20 | 20 | ||
21 | #define PAGE_ALIGNED __attribute__ ((__aligned__(PAGE_SIZE))) | ||
22 | static u64 kexec_pgd[512] PAGE_ALIGNED; | ||
23 | static u64 kexec_pud0[512] PAGE_ALIGNED; | ||
24 | static u64 kexec_pmd0[512] PAGE_ALIGNED; | ||
25 | static u64 kexec_pte0[512] PAGE_ALIGNED; | ||
26 | static u64 kexec_pud1[512] PAGE_ALIGNED; | ||
27 | static u64 kexec_pmd1[512] PAGE_ALIGNED; | ||
28 | static u64 kexec_pte1[512] PAGE_ALIGNED; | ||
29 | |||
30 | static void init_level2_page(pmd_t *level2p, unsigned long addr) | 21 | static void init_level2_page(pmd_t *level2p, unsigned long addr) |
31 | { | 22 | { |
32 | unsigned long end_addr; | 23 | unsigned long end_addr; |
@@ -107,12 +98,65 @@ out: | |||
107 | return result; | 98 | return result; |
108 | } | 99 | } |
109 | 100 | ||
101 | static void free_transition_pgtable(struct kimage *image) | ||
102 | { | ||
103 | free_page((unsigned long)image->arch.pud); | ||
104 | free_page((unsigned long)image->arch.pmd); | ||
105 | free_page((unsigned long)image->arch.pte); | ||
106 | } | ||
107 | |||
108 | static int init_transition_pgtable(struct kimage *image, pgd_t *pgd) | ||
109 | { | ||
110 | pud_t *pud; | ||
111 | pmd_t *pmd; | ||
112 | pte_t *pte; | ||
113 | unsigned long vaddr, paddr; | ||
114 | int result = -ENOMEM; | ||
115 | |||
116 | vaddr = (unsigned long)relocate_kernel; | ||
117 | paddr = __pa(page_address(image->control_code_page)+PAGE_SIZE); | ||
118 | pgd += pgd_index(vaddr); | ||
119 | if (!pgd_present(*pgd)) { | ||
120 | pud = (pud_t *)get_zeroed_page(GFP_KERNEL); | ||
121 | if (!pud) | ||
122 | goto err; | ||
123 | image->arch.pud = pud; | ||
124 | set_pgd(pgd, __pgd(__pa(pud) | _KERNPG_TABLE)); | ||
125 | } | ||
126 | pud = pud_offset(pgd, vaddr); | ||
127 | if (!pud_present(*pud)) { | ||
128 | pmd = (pmd_t *)get_zeroed_page(GFP_KERNEL); | ||
129 | if (!pmd) | ||
130 | goto err; | ||
131 | image->arch.pmd = pmd; | ||
132 | set_pud(pud, __pud(__pa(pmd) | _KERNPG_TABLE)); | ||
133 | } | ||
134 | pmd = pmd_offset(pud, vaddr); | ||
135 | if (!pmd_present(*pmd)) { | ||
136 | pte = (pte_t *)get_zeroed_page(GFP_KERNEL); | ||
137 | if (!pte) | ||
138 | goto err; | ||
139 | image->arch.pte = pte; | ||
140 | set_pmd(pmd, __pmd(__pa(pte) | _KERNPG_TABLE)); | ||
141 | } | ||
142 | pte = pte_offset_kernel(pmd, vaddr); | ||
143 | set_pte(pte, pfn_pte(paddr >> PAGE_SHIFT, PAGE_KERNEL_EXEC)); | ||
144 | return 0; | ||
145 | err: | ||
146 | free_transition_pgtable(image); | ||
147 | return result; | ||
148 | } | ||
149 | |||
110 | 150 | ||
111 | static int init_pgtable(struct kimage *image, unsigned long start_pgtable) | 151 | static int init_pgtable(struct kimage *image, unsigned long start_pgtable) |
112 | { | 152 | { |
113 | pgd_t *level4p; | 153 | pgd_t *level4p; |
154 | int result; | ||
114 | level4p = (pgd_t *)__va(start_pgtable); | 155 | level4p = (pgd_t *)__va(start_pgtable); |
115 | return init_level4_page(image, level4p, 0, max_pfn << PAGE_SHIFT); | 156 | result = init_level4_page(image, level4p, 0, max_pfn << PAGE_SHIFT); |
157 | if (result) | ||
158 | return result; | ||
159 | return init_transition_pgtable(image, level4p); | ||
116 | } | 160 | } |
117 | 161 | ||
118 | static void set_idt(void *newidt, u16 limit) | 162 | static void set_idt(void *newidt, u16 limit) |
@@ -174,7 +218,7 @@ int machine_kexec_prepare(struct kimage *image) | |||
174 | 218 | ||
175 | void machine_kexec_cleanup(struct kimage *image) | 219 | void machine_kexec_cleanup(struct kimage *image) |
176 | { | 220 | { |
177 | return; | 221 | free_transition_pgtable(image); |
178 | } | 222 | } |
179 | 223 | ||
180 | /* | 224 | /* |
@@ -195,22 +239,6 @@ void machine_kexec(struct kimage *image) | |||
195 | memcpy(control_page, relocate_kernel, PAGE_SIZE); | 239 | memcpy(control_page, relocate_kernel, PAGE_SIZE); |
196 | 240 | ||
197 | page_list[PA_CONTROL_PAGE] = virt_to_phys(control_page); | 241 | page_list[PA_CONTROL_PAGE] = virt_to_phys(control_page); |
198 | page_list[VA_CONTROL_PAGE] = (unsigned long)relocate_kernel; | ||
199 | page_list[PA_PGD] = virt_to_phys(&kexec_pgd); | ||
200 | page_list[VA_PGD] = (unsigned long)kexec_pgd; | ||
201 | page_list[PA_PUD_0] = virt_to_phys(&kexec_pud0); | ||
202 | page_list[VA_PUD_0] = (unsigned long)kexec_pud0; | ||
203 | page_list[PA_PMD_0] = virt_to_phys(&kexec_pmd0); | ||
204 | page_list[VA_PMD_0] = (unsigned long)kexec_pmd0; | ||
205 | page_list[PA_PTE_0] = virt_to_phys(&kexec_pte0); | ||
206 | page_list[VA_PTE_0] = (unsigned long)kexec_pte0; | ||
207 | page_list[PA_PUD_1] = virt_to_phys(&kexec_pud1); | ||
208 | page_list[VA_PUD_1] = (unsigned long)kexec_pud1; | ||
209 | page_list[PA_PMD_1] = virt_to_phys(&kexec_pmd1); | ||
210 | page_list[VA_PMD_1] = (unsigned long)kexec_pmd1; | ||
211 | page_list[PA_PTE_1] = virt_to_phys(&kexec_pte1); | ||
212 | page_list[VA_PTE_1] = (unsigned long)kexec_pte1; | ||
213 | |||
214 | page_list[PA_TABLE_PAGE] = | 242 | page_list[PA_TABLE_PAGE] = |
215 | (unsigned long)__pa(page_address(image->control_code_page)); | 243 | (unsigned long)__pa(page_address(image->control_code_page)); |
216 | 244 | ||
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index fa6bb263892e..200764453195 100644 --- a/arch/x86/kernel/mpparse.c +++ b/arch/x86/kernel/mpparse.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * compliant MP-table parsing routines. | 3 | * compliant MP-table parsing routines. |
4 | * | 4 | * |
5 | * (c) 1995 Alan Cox, Building #3 <alan@lxorguk.ukuu.org.uk> | 5 | * (c) 1995 Alan Cox, Building #3 <alan@lxorguk.ukuu.org.uk> |
6 | * (c) 1998, 1999, 2000 Ingo Molnar <mingo@redhat.com> | 6 | * (c) 1998, 1999, 2000, 2009 Ingo Molnar <mingo@redhat.com> |
7 | * (c) 2008 Alexey Starikovskiy <astarikovskiy@suse.de> | 7 | * (c) 2008 Alexey Starikovskiy <astarikovskiy@suse.de> |
8 | */ | 8 | */ |
9 | 9 | ||
@@ -29,12 +29,7 @@ | |||
29 | #include <asm/setup.h> | 29 | #include <asm/setup.h> |
30 | #include <asm/smp.h> | 30 | #include <asm/smp.h> |
31 | 31 | ||
32 | #include <mach_apic.h> | 32 | #include <asm/genapic.h> |
33 | #ifdef CONFIG_X86_32 | ||
34 | #include <mach_apicdef.h> | ||
35 | #include <mach_mpparse.h> | ||
36 | #endif | ||
37 | |||
38 | /* | 33 | /* |
39 | * Checksum an MP configuration block. | 34 | * Checksum an MP configuration block. |
40 | */ | 35 | */ |
@@ -292,16 +287,7 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early) | |||
292 | return 0; | 287 | return 0; |
293 | 288 | ||
294 | #ifdef CONFIG_X86_32 | 289 | #ifdef CONFIG_X86_32 |
295 | /* | 290 | generic_mps_oem_check(mpc, oem, str); |
296 | * need to make sure summit and es7000's mps_oem_check is safe to be | ||
297 | * called early via genericarch 's mps_oem_check | ||
298 | */ | ||
299 | if (early) { | ||
300 | #ifdef CONFIG_X86_NUMAQ | ||
301 | numaq_mps_oem_check(mpc, oem, str); | ||
302 | #endif | ||
303 | } else | ||
304 | mps_oem_check(mpc, oem, str); | ||
305 | #endif | 291 | #endif |
306 | /* save the local APIC address, it might be non-default */ | 292 | /* save the local APIC address, it might be non-default */ |
307 | if (!acpi_lapic) | 293 | if (!acpi_lapic) |
@@ -386,13 +372,13 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early) | |||
386 | (*x86_quirks->mpc_record)++; | 372 | (*x86_quirks->mpc_record)++; |
387 | } | 373 | } |
388 | 374 | ||
389 | #ifdef CONFIG_X86_GENERICARCH | 375 | #ifdef CONFIG_X86_BIGSMP |
390 | generic_bigsmp_probe(); | 376 | generic_bigsmp_probe(); |
391 | #endif | 377 | #endif |
392 | 378 | ||
393 | #ifdef CONFIG_X86_32 | 379 | if (apic->setup_apic_routing) |
394 | setup_apic_routing(); | 380 | apic->setup_apic_routing(); |
395 | #endif | 381 | |
396 | if (!num_processors) | 382 | if (!num_processors) |
397 | printk(KERN_ERR "MPTABLE: no processors registered!\n"); | 383 | printk(KERN_ERR "MPTABLE: no processors registered!\n"); |
398 | return num_processors; | 384 | return num_processors; |
@@ -706,8 +692,8 @@ static int __init smp_scan_config(unsigned long base, unsigned long length, | |||
706 | #endif | 692 | #endif |
707 | mpf_found = mpf; | 693 | mpf_found = mpf; |
708 | 694 | ||
709 | printk(KERN_INFO "found SMP MP-table at [%p] %08lx\n", | 695 | printk(KERN_INFO "found SMP MP-table at [%p] %llx\n", |
710 | mpf, virt_to_phys(mpf)); | 696 | mpf, (u64)virt_to_phys(mpf)); |
711 | 697 | ||
712 | if (!reserve) | 698 | if (!reserve) |
713 | return 1; | 699 | return 1; |
@@ -1025,7 +1011,7 @@ static int __init update_mp_table(void) | |||
1025 | if (!smp_check_mpc(mpc, oem, str)) | 1011 | if (!smp_check_mpc(mpc, oem, str)) |
1026 | return 0; | 1012 | return 0; |
1027 | 1013 | ||
1028 | printk(KERN_INFO "mpf: %lx\n", virt_to_phys(mpf)); | 1014 | printk(KERN_INFO "mpf: %llx\n", (u64)virt_to_phys(mpf)); |
1029 | printk(KERN_INFO "physptr: %x\n", mpf->physptr); | 1015 | printk(KERN_INFO "physptr: %x\n", mpf->physptr); |
1030 | 1016 | ||
1031 | if (mpc_new_phys && mpc->length > mpc_new_length) { | 1017 | if (mpc_new_phys && mpc->length > mpc_new_length) { |
diff --git a/arch/x86/kernel/nmi.c b/arch/x86/kernel/nmi.c index 23b6d9e6e4f5..bdfad80c3cf1 100644 --- a/arch/x86/kernel/nmi.c +++ b/arch/x86/kernel/nmi.c | |||
@@ -34,7 +34,7 @@ | |||
34 | 34 | ||
35 | #include <asm/mce.h> | 35 | #include <asm/mce.h> |
36 | 36 | ||
37 | #include <mach_traps.h> | 37 | #include <asm/mach_traps.h> |
38 | 38 | ||
39 | int unknown_nmi_panic; | 39 | int unknown_nmi_panic; |
40 | int nmi_watchdog_enabled; | 40 | int nmi_watchdog_enabled; |
diff --git a/arch/x86/kernel/numaq_32.c b/arch/x86/kernel/numaq_32.c index f2191d4f2717..0cc41a1d2550 100644 --- a/arch/x86/kernel/numaq_32.c +++ b/arch/x86/kernel/numaq_32.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * | 3 | * |
4 | * Copyright (C) 2002, IBM Corp. | 4 | * Copyright (C) 2002, IBM Corp. |
5 | * | 5 | * |
6 | * All rights reserved. | 6 | * All rights reserved. |
7 | * | 7 | * |
8 | * This program is free software; you can redistribute it and/or modify | 8 | * This program is free software; you can redistribute it and/or modify |
9 | * it under the terms of the GNU General Public License as published by | 9 | * it under the terms of the GNU General Public License as published by |
@@ -23,17 +23,18 @@ | |||
23 | * Send feedback to <gone@us.ibm.com> | 23 | * Send feedback to <gone@us.ibm.com> |
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include <linux/mm.h> | 26 | #include <linux/nodemask.h> |
27 | #include <linux/bootmem.h> | 27 | #include <linux/bootmem.h> |
28 | #include <linux/mmzone.h> | 28 | #include <linux/mmzone.h> |
29 | #include <linux/module.h> | 29 | #include <linux/module.h> |
30 | #include <linux/nodemask.h> | 30 | #include <linux/mm.h> |
31 | #include <asm/numaq.h> | 31 | |
32 | #include <asm/topology.h> | ||
33 | #include <asm/processor.h> | 32 | #include <asm/processor.h> |
33 | #include <asm/topology.h> | ||
34 | #include <asm/genapic.h> | 34 | #include <asm/genapic.h> |
35 | #include <asm/e820.h> | 35 | #include <asm/numaq.h> |
36 | #include <asm/setup.h> | 36 | #include <asm/setup.h> |
37 | #include <asm/e820.h> | ||
37 | 38 | ||
38 | #define MB_TO_PAGES(addr) ((addr) << (20 - PAGE_SHIFT)) | 39 | #define MB_TO_PAGES(addr) ((addr) << (20 - PAGE_SHIFT)) |
39 | 40 | ||
@@ -91,19 +92,20 @@ static int __init numaq_pre_time_init(void) | |||
91 | } | 92 | } |
92 | 93 | ||
93 | int found_numaq; | 94 | int found_numaq; |
95 | |||
94 | /* | 96 | /* |
95 | * Have to match translation table entries to main table entries by counter | 97 | * Have to match translation table entries to main table entries by counter |
96 | * hence the mpc_record variable .... can't see a less disgusting way of | 98 | * hence the mpc_record variable .... can't see a less disgusting way of |
97 | * doing this .... | 99 | * doing this .... |
98 | */ | 100 | */ |
99 | struct mpc_config_translation { | 101 | struct mpc_config_translation { |
100 | unsigned char mpc_type; | 102 | unsigned char mpc_type; |
101 | unsigned char trans_len; | 103 | unsigned char trans_len; |
102 | unsigned char trans_type; | 104 | unsigned char trans_type; |
103 | unsigned char trans_quad; | 105 | unsigned char trans_quad; |
104 | unsigned char trans_global; | 106 | unsigned char trans_global; |
105 | unsigned char trans_local; | 107 | unsigned char trans_local; |
106 | unsigned short trans_reserved; | 108 | unsigned short trans_reserved; |
107 | }; | 109 | }; |
108 | 110 | ||
109 | /* x86_quirks member */ | 111 | /* x86_quirks member */ |
@@ -236,7 +238,7 @@ static int __init numaq_setup_ioapic_ids(void) | |||
236 | 238 | ||
237 | static int __init numaq_update_genapic(void) | 239 | static int __init numaq_update_genapic(void) |
238 | { | 240 | { |
239 | genapic->wakeup_cpu = wakeup_secondary_cpu_via_nmi; | 241 | apic->wakeup_cpu = wakeup_secondary_cpu_via_nmi; |
240 | 242 | ||
241 | return 0; | 243 | return 0; |
242 | } | 244 | } |
@@ -291,3 +293,280 @@ int __init get_memcfg_numaq(void) | |||
291 | smp_dump_qct(); | 293 | smp_dump_qct(); |
292 | return 1; | 294 | return 1; |
293 | } | 295 | } |
296 | |||
297 | /* | ||
298 | * APIC driver for the IBM NUMAQ chipset. | ||
299 | */ | ||
300 | #define APIC_DEFINITION 1 | ||
301 | #include <linux/threads.h> | ||
302 | #include <linux/cpumask.h> | ||
303 | #include <asm/mpspec.h> | ||
304 | #include <asm/genapic.h> | ||
305 | #include <asm/fixmap.h> | ||
306 | #include <asm/apicdef.h> | ||
307 | #include <asm/ipi.h> | ||
308 | #include <linux/kernel.h> | ||
309 | #include <linux/string.h> | ||
310 | #include <linux/init.h> | ||
311 | #include <linux/numa.h> | ||
312 | #include <linux/smp.h> | ||
313 | #include <asm/numaq.h> | ||
314 | #include <asm/io.h> | ||
315 | #include <linux/mmzone.h> | ||
316 | #include <linux/nodemask.h> | ||
317 | |||
318 | #define NUMAQ_APIC_DFR_VALUE (APIC_DFR_CLUSTER) | ||
319 | |||
320 | static inline unsigned int numaq_get_apic_id(unsigned long x) | ||
321 | { | ||
322 | return (x >> 24) & 0x0F; | ||
323 | } | ||
324 | |||
325 | static inline void numaq_send_IPI_mask(const struct cpumask *mask, int vector) | ||
326 | { | ||
327 | default_send_IPI_mask_sequence_logical(mask, vector); | ||
328 | } | ||
329 | |||
330 | static inline void numaq_send_IPI_allbutself(int vector) | ||
331 | { | ||
332 | default_send_IPI_mask_allbutself_logical(cpu_online_mask, vector); | ||
333 | } | ||
334 | |||
335 | static inline void numaq_send_IPI_all(int vector) | ||
336 | { | ||
337 | numaq_send_IPI_mask(cpu_online_mask, vector); | ||
338 | } | ||
339 | |||
340 | extern void numaq_mps_oem_check(struct mpc_table *, char *, char *); | ||
341 | |||
342 | #define NUMAQ_TRAMPOLINE_PHYS_LOW (0x8) | ||
343 | #define NUMAQ_TRAMPOLINE_PHYS_HIGH (0xa) | ||
344 | |||
345 | /* | ||
346 | * Because we use NMIs rather than the INIT-STARTUP sequence to | ||
347 | * bootstrap the CPUs, the APIC may be in a weird state. Kick it: | ||
348 | */ | ||
349 | static inline void numaq_smp_callin_clear_local_apic(void) | ||
350 | { | ||
351 | clear_local_APIC(); | ||
352 | } | ||
353 | |||
354 | static inline void | ||
355 | numaq_store_NMI_vector(unsigned short *high, unsigned short *low) | ||
356 | { | ||
357 | printk("Storing NMI vector\n"); | ||
358 | *high = | ||
359 | *((volatile unsigned short *)phys_to_virt(NUMAQ_TRAMPOLINE_PHYS_HIGH)); | ||
360 | *low = | ||
361 | *((volatile unsigned short *)phys_to_virt(NUMAQ_TRAMPOLINE_PHYS_LOW)); | ||
362 | } | ||
363 | |||
364 | static inline const cpumask_t *numaq_target_cpus(void) | ||
365 | { | ||
366 | return &CPU_MASK_ALL; | ||
367 | } | ||
368 | |||
369 | static inline unsigned long | ||
370 | numaq_check_apicid_used(physid_mask_t bitmap, int apicid) | ||
371 | { | ||
372 | return physid_isset(apicid, bitmap); | ||
373 | } | ||
374 | |||
375 | static inline unsigned long numaq_check_apicid_present(int bit) | ||
376 | { | ||
377 | return physid_isset(bit, phys_cpu_present_map); | ||
378 | } | ||
379 | |||
380 | #define apicid_cluster(apicid) (apicid & 0xF0) | ||
381 | |||
382 | static inline int numaq_apic_id_registered(void) | ||
383 | { | ||
384 | return 1; | ||
385 | } | ||
386 | |||
387 | static inline void numaq_init_apic_ldr(void) | ||
388 | { | ||
389 | /* Already done in NUMA-Q firmware */ | ||
390 | } | ||
391 | |||
392 | static inline void numaq_setup_apic_routing(void) | ||
393 | { | ||
394 | printk("Enabling APIC mode: %s. Using %d I/O APICs\n", | ||
395 | "NUMA-Q", nr_ioapics); | ||
396 | } | ||
397 | |||
398 | /* | ||
399 | * Skip adding the timer int on secondary nodes, which causes | ||
400 | * a small but painful rift in the time-space continuum. | ||
401 | */ | ||
402 | static inline int numaq_multi_timer_check(int apic, int irq) | ||
403 | { | ||
404 | return apic != 0 && irq == 0; | ||
405 | } | ||
406 | |||
407 | static inline physid_mask_t numaq_ioapic_phys_id_map(physid_mask_t phys_map) | ||
408 | { | ||
409 | /* We don't have a good way to do this yet - hack */ | ||
410 | return physids_promote(0xFUL); | ||
411 | } | ||
412 | |||
413 | /* Mapping from cpu number to logical apicid */ | ||
414 | extern u8 cpu_2_logical_apicid[]; | ||
415 | |||
416 | static inline int numaq_cpu_to_logical_apicid(int cpu) | ||
417 | { | ||
418 | if (cpu >= nr_cpu_ids) | ||
419 | return BAD_APICID; | ||
420 | return (int)cpu_2_logical_apicid[cpu]; | ||
421 | } | ||
422 | |||
423 | /* | ||
424 | * Supporting over 60 cpus on NUMA-Q requires a locality-dependent | ||
425 | * cpu to APIC ID relation to properly interact with the intelligent | ||
426 | * mode of the cluster controller. | ||
427 | */ | ||
428 | static inline int numaq_cpu_present_to_apicid(int mps_cpu) | ||
429 | { | ||
430 | if (mps_cpu < 60) | ||
431 | return ((mps_cpu >> 2) << 4) | (1 << (mps_cpu & 0x3)); | ||
432 | else | ||
433 | return BAD_APICID; | ||
434 | } | ||
435 | |||
436 | static inline int numaq_apicid_to_node(int logical_apicid) | ||
437 | { | ||
438 | return logical_apicid >> 4; | ||
439 | } | ||
440 | |||
441 | static inline physid_mask_t numaq_apicid_to_cpu_present(int logical_apicid) | ||
442 | { | ||
443 | int node = numaq_apicid_to_node(logical_apicid); | ||
444 | int cpu = __ffs(logical_apicid & 0xf); | ||
445 | |||
446 | return physid_mask_of_physid(cpu + 4*node); | ||
447 | } | ||
448 | |||
449 | /* Where the IO area was mapped on multiquad, always 0 otherwise */ | ||
450 | void *xquad_portio; | ||
451 | |||
452 | static inline int numaq_check_phys_apicid_present(int boot_cpu_physical_apicid) | ||
453 | { | ||
454 | return 1; | ||
455 | } | ||
456 | |||
457 | /* | ||
458 | * We use physical apicids here, not logical, so just return the default | ||
459 | * physical broadcast to stop people from breaking us | ||
460 | */ | ||
461 | static inline unsigned int numaq_cpu_mask_to_apicid(const cpumask_t *cpumask) | ||
462 | { | ||
463 | return 0x0F; | ||
464 | } | ||
465 | |||
466 | static inline unsigned int | ||
467 | numaq_cpu_mask_to_apicid_and(const struct cpumask *cpumask, | ||
468 | const struct cpumask *andmask) | ||
469 | { | ||
470 | return 0x0F; | ||
471 | } | ||
472 | |||
473 | /* No NUMA-Q box has a HT CPU, but it can't hurt to use the default code. */ | ||
474 | static inline int numaq_phys_pkg_id(int cpuid_apic, int index_msb) | ||
475 | { | ||
476 | return cpuid_apic >> index_msb; | ||
477 | } | ||
478 | static int __numaq_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid) | ||
479 | { | ||
480 | numaq_mps_oem_check(mpc, oem, productid); | ||
481 | return found_numaq; | ||
482 | } | ||
483 | |||
484 | static int probe_numaq(void) | ||
485 | { | ||
486 | /* already know from get_memcfg_numaq() */ | ||
487 | return found_numaq; | ||
488 | } | ||
489 | |||
490 | static void numaq_vector_allocation_domain(int cpu, cpumask_t *retmask) | ||
491 | { | ||
492 | /* Careful. Some cpus do not strictly honor the set of cpus | ||
493 | * specified in the interrupt destination when using lowest | ||
494 | * priority interrupt delivery mode. | ||
495 | * | ||
496 | * In particular there was a hyperthreading cpu observed to | ||
497 | * deliver interrupts to the wrong hyperthread when only one | ||
498 | * hyperthread was specified in the interrupt desitination. | ||
499 | */ | ||
500 | *retmask = (cpumask_t){ { [0] = APIC_ALL_CPUS, } }; | ||
501 | } | ||
502 | |||
503 | static void numaq_setup_portio_remap(void) | ||
504 | { | ||
505 | int num_quads = num_online_nodes(); | ||
506 | |||
507 | if (num_quads <= 1) | ||
508 | return; | ||
509 | |||
510 | printk("Remapping cross-quad port I/O for %d quads\n", num_quads); | ||
511 | xquad_portio = ioremap(XQUAD_PORTIO_BASE, num_quads*XQUAD_PORTIO_QUAD); | ||
512 | printk("xquad_portio vaddr 0x%08lx, len %08lx\n", | ||
513 | (u_long) xquad_portio, (u_long) num_quads*XQUAD_PORTIO_QUAD); | ||
514 | } | ||
515 | |||
516 | struct genapic apic_numaq = { | ||
517 | |||
518 | .name = "NUMAQ", | ||
519 | .probe = probe_numaq, | ||
520 | .acpi_madt_oem_check = NULL, | ||
521 | .apic_id_registered = numaq_apic_id_registered, | ||
522 | |||
523 | .irq_delivery_mode = dest_LowestPrio, | ||
524 | /* physical delivery on LOCAL quad: */ | ||
525 | .irq_dest_mode = 0, | ||
526 | |||
527 | .target_cpus = numaq_target_cpus, | ||
528 | .disable_esr = 1, | ||
529 | .dest_logical = APIC_DEST_LOGICAL, | ||
530 | .check_apicid_used = numaq_check_apicid_used, | ||
531 | .check_apicid_present = numaq_check_apicid_present, | ||
532 | |||
533 | .vector_allocation_domain = numaq_vector_allocation_domain, | ||
534 | .init_apic_ldr = numaq_init_apic_ldr, | ||
535 | |||
536 | .ioapic_phys_id_map = numaq_ioapic_phys_id_map, | ||
537 | .setup_apic_routing = numaq_setup_apic_routing, | ||
538 | .multi_timer_check = numaq_multi_timer_check, | ||
539 | .apicid_to_node = numaq_apicid_to_node, | ||
540 | .cpu_to_logical_apicid = numaq_cpu_to_logical_apicid, | ||
541 | .cpu_present_to_apicid = numaq_cpu_present_to_apicid, | ||
542 | .apicid_to_cpu_present = numaq_apicid_to_cpu_present, | ||
543 | .setup_portio_remap = numaq_setup_portio_remap, | ||
544 | .check_phys_apicid_present = numaq_check_phys_apicid_present, | ||
545 | .enable_apic_mode = NULL, | ||
546 | .phys_pkg_id = numaq_phys_pkg_id, | ||
547 | .mps_oem_check = __numaq_mps_oem_check, | ||
548 | |||
549 | .get_apic_id = numaq_get_apic_id, | ||
550 | .set_apic_id = NULL, | ||
551 | .apic_id_mask = 0x0F << 24, | ||
552 | |||
553 | .cpu_mask_to_apicid = numaq_cpu_mask_to_apicid, | ||
554 | .cpu_mask_to_apicid_and = numaq_cpu_mask_to_apicid_and, | ||
555 | |||
556 | .send_IPI_mask = numaq_send_IPI_mask, | ||
557 | .send_IPI_mask_allbutself = NULL, | ||
558 | .send_IPI_allbutself = numaq_send_IPI_allbutself, | ||
559 | .send_IPI_all = numaq_send_IPI_all, | ||
560 | .send_IPI_self = default_send_IPI_self, | ||
561 | |||
562 | .wakeup_cpu = NULL, | ||
563 | .trampoline_phys_low = NUMAQ_TRAMPOLINE_PHYS_LOW, | ||
564 | .trampoline_phys_high = NUMAQ_TRAMPOLINE_PHYS_HIGH, | ||
565 | |||
566 | /* We don't do anything here because we use NMI's to boot instead */ | ||
567 | .wait_for_init_deassert = NULL, | ||
568 | |||
569 | .smp_callin_clear_local_apic = numaq_smp_callin_clear_local_apic, | ||
570 | .store_NMI_vector = numaq_store_NMI_vector, | ||
571 | .inquire_remote_apic = NULL, | ||
572 | }; | ||
diff --git a/arch/x86/kernel/paravirt-spinlocks.c b/arch/x86/kernel/paravirt-spinlocks.c index 95777b0faa73..3a7c5a44082e 100644 --- a/arch/x86/kernel/paravirt-spinlocks.c +++ b/arch/x86/kernel/paravirt-spinlocks.c | |||
@@ -26,13 +26,3 @@ struct pv_lock_ops pv_lock_ops = { | |||
26 | }; | 26 | }; |
27 | EXPORT_SYMBOL(pv_lock_ops); | 27 | EXPORT_SYMBOL(pv_lock_ops); |
28 | 28 | ||
29 | void __init paravirt_use_bytelocks(void) | ||
30 | { | ||
31 | #ifdef CONFIG_SMP | ||
32 | pv_lock_ops.spin_is_locked = __byte_spin_is_locked; | ||
33 | pv_lock_ops.spin_is_contended = __byte_spin_is_contended; | ||
34 | pv_lock_ops.spin_lock = __byte_spin_lock; | ||
35 | pv_lock_ops.spin_trylock = __byte_spin_trylock; | ||
36 | pv_lock_ops.spin_unlock = __byte_spin_unlock; | ||
37 | #endif | ||
38 | } | ||
diff --git a/arch/x86/kernel/paravirt.c b/arch/x86/kernel/paravirt.c index e4c8fb608873..6dc4dca255e4 100644 --- a/arch/x86/kernel/paravirt.c +++ b/arch/x86/kernel/paravirt.c | |||
@@ -44,6 +44,17 @@ void _paravirt_nop(void) | |||
44 | { | 44 | { |
45 | } | 45 | } |
46 | 46 | ||
47 | /* identity function, which can be inlined */ | ||
48 | u32 _paravirt_ident_32(u32 x) | ||
49 | { | ||
50 | return x; | ||
51 | } | ||
52 | |||
53 | u64 _paravirt_ident_64(u64 x) | ||
54 | { | ||
55 | return x; | ||
56 | } | ||
57 | |||
47 | static void __init default_banner(void) | 58 | static void __init default_banner(void) |
48 | { | 59 | { |
49 | printk(KERN_INFO "Booting paravirtualized kernel on %s\n", | 60 | printk(KERN_INFO "Booting paravirtualized kernel on %s\n", |
@@ -138,9 +149,16 @@ unsigned paravirt_patch_default(u8 type, u16 clobbers, void *insnbuf, | |||
138 | if (opfunc == NULL) | 149 | if (opfunc == NULL) |
139 | /* If there's no function, patch it with a ud2a (BUG) */ | 150 | /* If there's no function, patch it with a ud2a (BUG) */ |
140 | ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a)); | 151 | ret = paravirt_patch_insns(insnbuf, len, ud2a, ud2a+sizeof(ud2a)); |
141 | else if (opfunc == paravirt_nop) | 152 | else if (opfunc == _paravirt_nop) |
142 | /* If the operation is a nop, then nop the callsite */ | 153 | /* If the operation is a nop, then nop the callsite */ |
143 | ret = paravirt_patch_nop(); | 154 | ret = paravirt_patch_nop(); |
155 | |||
156 | /* identity functions just return their single argument */ | ||
157 | else if (opfunc == _paravirt_ident_32) | ||
158 | ret = paravirt_patch_ident_32(insnbuf, len); | ||
159 | else if (opfunc == _paravirt_ident_64) | ||
160 | ret = paravirt_patch_ident_64(insnbuf, len); | ||
161 | |||
144 | else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) || | 162 | else if (type == PARAVIRT_PATCH(pv_cpu_ops.iret) || |
145 | type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) || | 163 | type == PARAVIRT_PATCH(pv_cpu_ops.irq_enable_sysexit) || |
146 | type == PARAVIRT_PATCH(pv_cpu_ops.usergs_sysret32) || | 164 | type == PARAVIRT_PATCH(pv_cpu_ops.usergs_sysret32) || |
@@ -268,6 +286,32 @@ enum paravirt_lazy_mode paravirt_get_lazy_mode(void) | |||
268 | return __get_cpu_var(paravirt_lazy_mode); | 286 | return __get_cpu_var(paravirt_lazy_mode); |
269 | } | 287 | } |
270 | 288 | ||
289 | void arch_flush_lazy_mmu_mode(void) | ||
290 | { | ||
291 | preempt_disable(); | ||
292 | |||
293 | if (paravirt_get_lazy_mode() == PARAVIRT_LAZY_MMU) { | ||
294 | WARN_ON(preempt_count() == 1); | ||
295 | arch_leave_lazy_mmu_mode(); | ||
296 | arch_enter_lazy_mmu_mode(); | ||
297 | } | ||
298 | |||
299 | preempt_enable(); | ||
300 | } | ||
301 | |||
302 | void arch_flush_lazy_cpu_mode(void) | ||
303 | { | ||
304 | preempt_disable(); | ||
305 | |||
306 | if (paravirt_get_lazy_mode() == PARAVIRT_LAZY_CPU) { | ||
307 | WARN_ON(preempt_count() == 1); | ||
308 | arch_leave_lazy_cpu_mode(); | ||
309 | arch_enter_lazy_cpu_mode(); | ||
310 | } | ||
311 | |||
312 | preempt_enable(); | ||
313 | } | ||
314 | |||
271 | struct pv_info pv_info = { | 315 | struct pv_info pv_info = { |
272 | .name = "bare hardware", | 316 | .name = "bare hardware", |
273 | .paravirt_enabled = 0, | 317 | .paravirt_enabled = 0, |
@@ -292,10 +336,10 @@ struct pv_time_ops pv_time_ops = { | |||
292 | 336 | ||
293 | struct pv_irq_ops pv_irq_ops = { | 337 | struct pv_irq_ops pv_irq_ops = { |
294 | .init_IRQ = native_init_IRQ, | 338 | .init_IRQ = native_init_IRQ, |
295 | .save_fl = native_save_fl, | 339 | .save_fl = __PV_IS_CALLEE_SAVE(native_save_fl), |
296 | .restore_fl = native_restore_fl, | 340 | .restore_fl = __PV_IS_CALLEE_SAVE(native_restore_fl), |
297 | .irq_disable = native_irq_disable, | 341 | .irq_disable = __PV_IS_CALLEE_SAVE(native_irq_disable), |
298 | .irq_enable = native_irq_enable, | 342 | .irq_enable = __PV_IS_CALLEE_SAVE(native_irq_enable), |
299 | .safe_halt = native_safe_halt, | 343 | .safe_halt = native_safe_halt, |
300 | .halt = native_halt, | 344 | .halt = native_halt, |
301 | #ifdef CONFIG_X86_64 | 345 | #ifdef CONFIG_X86_64 |
@@ -373,6 +417,14 @@ struct pv_apic_ops pv_apic_ops = { | |||
373 | #endif | 417 | #endif |
374 | }; | 418 | }; |
375 | 419 | ||
420 | #if defined(CONFIG_X86_32) && !defined(CONFIG_X86_PAE) | ||
421 | /* 32-bit pagetable entries */ | ||
422 | #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_32) | ||
423 | #else | ||
424 | /* 64-bit pagetable entries */ | ||
425 | #define PTE_IDENT __PV_IS_CALLEE_SAVE(_paravirt_ident_64) | ||
426 | #endif | ||
427 | |||
376 | struct pv_mmu_ops pv_mmu_ops = { | 428 | struct pv_mmu_ops pv_mmu_ops = { |
377 | #ifndef CONFIG_X86_64 | 429 | #ifndef CONFIG_X86_64 |
378 | .pagetable_setup_start = native_pagetable_setup_start, | 430 | .pagetable_setup_start = native_pagetable_setup_start, |
@@ -424,22 +476,23 @@ struct pv_mmu_ops pv_mmu_ops = { | |||
424 | .pmd_clear = native_pmd_clear, | 476 | .pmd_clear = native_pmd_clear, |
425 | #endif | 477 | #endif |
426 | .set_pud = native_set_pud, | 478 | .set_pud = native_set_pud, |
427 | .pmd_val = native_pmd_val, | 479 | |
428 | .make_pmd = native_make_pmd, | 480 | .pmd_val = PTE_IDENT, |
481 | .make_pmd = PTE_IDENT, | ||
429 | 482 | ||
430 | #if PAGETABLE_LEVELS == 4 | 483 | #if PAGETABLE_LEVELS == 4 |
431 | .pud_val = native_pud_val, | 484 | .pud_val = PTE_IDENT, |
432 | .make_pud = native_make_pud, | 485 | .make_pud = PTE_IDENT, |
486 | |||
433 | .set_pgd = native_set_pgd, | 487 | .set_pgd = native_set_pgd, |
434 | #endif | 488 | #endif |
435 | #endif /* PAGETABLE_LEVELS >= 3 */ | 489 | #endif /* PAGETABLE_LEVELS >= 3 */ |
436 | 490 | ||
437 | .pte_val = native_pte_val, | 491 | .pte_val = PTE_IDENT, |
438 | .pte_flags = native_pte_flags, | 492 | .pgd_val = PTE_IDENT, |
439 | .pgd_val = native_pgd_val, | ||
440 | 493 | ||
441 | .make_pte = native_make_pte, | 494 | .make_pte = PTE_IDENT, |
442 | .make_pgd = native_make_pgd, | 495 | .make_pgd = PTE_IDENT, |
443 | 496 | ||
444 | .dup_mmap = paravirt_nop, | 497 | .dup_mmap = paravirt_nop, |
445 | .exit_mmap = paravirt_nop, | 498 | .exit_mmap = paravirt_nop, |
diff --git a/arch/x86/kernel/paravirt_patch_32.c b/arch/x86/kernel/paravirt_patch_32.c index 9fe644f4861d..d9f32e6d6ab6 100644 --- a/arch/x86/kernel/paravirt_patch_32.c +++ b/arch/x86/kernel/paravirt_patch_32.c | |||
@@ -12,6 +12,18 @@ DEF_NATIVE(pv_mmu_ops, read_cr3, "mov %cr3, %eax"); | |||
12 | DEF_NATIVE(pv_cpu_ops, clts, "clts"); | 12 | DEF_NATIVE(pv_cpu_ops, clts, "clts"); |
13 | DEF_NATIVE(pv_cpu_ops, read_tsc, "rdtsc"); | 13 | DEF_NATIVE(pv_cpu_ops, read_tsc, "rdtsc"); |
14 | 14 | ||
15 | unsigned paravirt_patch_ident_32(void *insnbuf, unsigned len) | ||
16 | { | ||
17 | /* arg in %eax, return in %eax */ | ||
18 | return 0; | ||
19 | } | ||
20 | |||
21 | unsigned paravirt_patch_ident_64(void *insnbuf, unsigned len) | ||
22 | { | ||
23 | /* arg in %edx:%eax, return in %edx:%eax */ | ||
24 | return 0; | ||
25 | } | ||
26 | |||
15 | unsigned native_patch(u8 type, u16 clobbers, void *ibuf, | 27 | unsigned native_patch(u8 type, u16 clobbers, void *ibuf, |
16 | unsigned long addr, unsigned len) | 28 | unsigned long addr, unsigned len) |
17 | { | 29 | { |
diff --git a/arch/x86/kernel/paravirt_patch_64.c b/arch/x86/kernel/paravirt_patch_64.c index 061d01df9ae6..3f08f34f93eb 100644 --- a/arch/x86/kernel/paravirt_patch_64.c +++ b/arch/x86/kernel/paravirt_patch_64.c | |||
@@ -19,6 +19,21 @@ DEF_NATIVE(pv_cpu_ops, usergs_sysret64, "swapgs; sysretq"); | |||
19 | DEF_NATIVE(pv_cpu_ops, usergs_sysret32, "swapgs; sysretl"); | 19 | DEF_NATIVE(pv_cpu_ops, usergs_sysret32, "swapgs; sysretl"); |
20 | DEF_NATIVE(pv_cpu_ops, swapgs, "swapgs"); | 20 | DEF_NATIVE(pv_cpu_ops, swapgs, "swapgs"); |
21 | 21 | ||
22 | DEF_NATIVE(, mov32, "mov %edi, %eax"); | ||
23 | DEF_NATIVE(, mov64, "mov %rdi, %rax"); | ||
24 | |||
25 | unsigned paravirt_patch_ident_32(void *insnbuf, unsigned len) | ||
26 | { | ||
27 | return paravirt_patch_insns(insnbuf, len, | ||
28 | start__mov32, end__mov32); | ||
29 | } | ||
30 | |||
31 | unsigned paravirt_patch_ident_64(void *insnbuf, unsigned len) | ||
32 | { | ||
33 | return paravirt_patch_insns(insnbuf, len, | ||
34 | start__mov64, end__mov64); | ||
35 | } | ||
36 | |||
22 | unsigned native_patch(u8 type, u16 clobbers, void *ibuf, | 37 | unsigned native_patch(u8 type, u16 clobbers, void *ibuf, |
23 | unsigned long addr, unsigned len) | 38 | unsigned long addr, unsigned len) |
24 | { | 39 | { |
diff --git a/arch/x86/kernel/probe_32.c b/arch/x86/kernel/probe_32.c new file mode 100644 index 000000000000..22337b75de62 --- /dev/null +++ b/arch/x86/kernel/probe_32.c | |||
@@ -0,0 +1,411 @@ | |||
1 | /* | ||
2 | * Default generic APIC driver. This handles up to 8 CPUs. | ||
3 | * | ||
4 | * Copyright 2003 Andi Kleen, SuSE Labs. | ||
5 | * Subject to the GNU Public License, v.2 | ||
6 | * | ||
7 | * Generic x86 APIC driver probe layer. | ||
8 | */ | ||
9 | #include <linux/threads.h> | ||
10 | #include <linux/cpumask.h> | ||
11 | #include <linux/string.h> | ||
12 | #include <linux/kernel.h> | ||
13 | #include <linux/ctype.h> | ||
14 | #include <linux/init.h> | ||
15 | #include <linux/errno.h> | ||
16 | #include <asm/fixmap.h> | ||
17 | #include <asm/mpspec.h> | ||
18 | #include <asm/apicdef.h> | ||
19 | #include <asm/genapic.h> | ||
20 | #include <asm/setup.h> | ||
21 | |||
22 | #include <linux/threads.h> | ||
23 | #include <linux/cpumask.h> | ||
24 | #include <asm/mpspec.h> | ||
25 | #include <asm/genapic.h> | ||
26 | #include <asm/fixmap.h> | ||
27 | #include <asm/apicdef.h> | ||
28 | #include <linux/kernel.h> | ||
29 | #include <linux/string.h> | ||
30 | #include <linux/smp.h> | ||
31 | #include <linux/init.h> | ||
32 | #include <asm/genapic.h> | ||
33 | #include <asm/ipi.h> | ||
34 | |||
35 | #include <linux/smp.h> | ||
36 | #include <linux/init.h> | ||
37 | #include <linux/interrupt.h> | ||
38 | #include <asm/acpi.h> | ||
39 | #include <asm/arch_hooks.h> | ||
40 | #include <asm/e820.h> | ||
41 | #include <asm/setup.h> | ||
42 | |||
43 | #include <asm/genapic.h> | ||
44 | |||
45 | #ifdef CONFIG_HOTPLUG_CPU | ||
46 | #define DEFAULT_SEND_IPI (1) | ||
47 | #else | ||
48 | #define DEFAULT_SEND_IPI (0) | ||
49 | #endif | ||
50 | |||
51 | int no_broadcast = DEFAULT_SEND_IPI; | ||
52 | |||
53 | #ifdef CONFIG_X86_LOCAL_APIC | ||
54 | |||
55 | static void default_vector_allocation_domain(int cpu, struct cpumask *retmask) | ||
56 | { | ||
57 | /* | ||
58 | * Careful. Some cpus do not strictly honor the set of cpus | ||
59 | * specified in the interrupt destination when using lowest | ||
60 | * priority interrupt delivery mode. | ||
61 | * | ||
62 | * In particular there was a hyperthreading cpu observed to | ||
63 | * deliver interrupts to the wrong hyperthread when only one | ||
64 | * hyperthread was specified in the interrupt desitination. | ||
65 | */ | ||
66 | *retmask = (cpumask_t) { { [0] = APIC_ALL_CPUS } }; | ||
67 | } | ||
68 | |||
69 | /* should be called last. */ | ||
70 | static int probe_default(void) | ||
71 | { | ||
72 | return 1; | ||
73 | } | ||
74 | |||
75 | struct genapic apic_default = { | ||
76 | |||
77 | .name = "default", | ||
78 | .probe = probe_default, | ||
79 | .acpi_madt_oem_check = NULL, | ||
80 | .apic_id_registered = default_apic_id_registered, | ||
81 | |||
82 | .irq_delivery_mode = dest_LowestPrio, | ||
83 | /* logical delivery broadcast to all CPUs: */ | ||
84 | .irq_dest_mode = 1, | ||
85 | |||
86 | .target_cpus = default_target_cpus, | ||
87 | .disable_esr = 0, | ||
88 | .dest_logical = APIC_DEST_LOGICAL, | ||
89 | .check_apicid_used = default_check_apicid_used, | ||
90 | .check_apicid_present = default_check_apicid_present, | ||
91 | |||
92 | .vector_allocation_domain = default_vector_allocation_domain, | ||
93 | .init_apic_ldr = default_init_apic_ldr, | ||
94 | |||
95 | .ioapic_phys_id_map = default_ioapic_phys_id_map, | ||
96 | .setup_apic_routing = default_setup_apic_routing, | ||
97 | .multi_timer_check = NULL, | ||
98 | .apicid_to_node = default_apicid_to_node, | ||
99 | .cpu_to_logical_apicid = default_cpu_to_logical_apicid, | ||
100 | .cpu_present_to_apicid = default_cpu_present_to_apicid, | ||
101 | .apicid_to_cpu_present = default_apicid_to_cpu_present, | ||
102 | .setup_portio_remap = NULL, | ||
103 | .check_phys_apicid_present = default_check_phys_apicid_present, | ||
104 | .enable_apic_mode = NULL, | ||
105 | .phys_pkg_id = default_phys_pkg_id, | ||
106 | .mps_oem_check = NULL, | ||
107 | |||
108 | .get_apic_id = default_get_apic_id, | ||
109 | .set_apic_id = NULL, | ||
110 | .apic_id_mask = 0x0F << 24, | ||
111 | |||
112 | .cpu_mask_to_apicid = default_cpu_mask_to_apicid, | ||
113 | .cpu_mask_to_apicid_and = default_cpu_mask_to_apicid_and, | ||
114 | |||
115 | .send_IPI_mask = default_send_IPI_mask_logical, | ||
116 | .send_IPI_mask_allbutself = default_send_IPI_mask_allbutself_logical, | ||
117 | .send_IPI_allbutself = default_send_IPI_allbutself, | ||
118 | .send_IPI_all = default_send_IPI_all, | ||
119 | .send_IPI_self = default_send_IPI_self, | ||
120 | |||
121 | .wakeup_cpu = NULL, | ||
122 | .trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW, | ||
123 | .trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH, | ||
124 | |||
125 | .wait_for_init_deassert = default_wait_for_init_deassert, | ||
126 | |||
127 | .smp_callin_clear_local_apic = NULL, | ||
128 | .store_NMI_vector = NULL, | ||
129 | .inquire_remote_apic = default_inquire_remote_apic, | ||
130 | }; | ||
131 | |||
132 | extern struct genapic apic_numaq; | ||
133 | extern struct genapic apic_summit; | ||
134 | extern struct genapic apic_bigsmp; | ||
135 | extern struct genapic apic_es7000; | ||
136 | extern struct genapic apic_default; | ||
137 | |||
138 | struct genapic *apic = &apic_default; | ||
139 | |||
140 | static struct genapic *apic_probe[] __initdata = { | ||
141 | #ifdef CONFIG_X86_NUMAQ | ||
142 | &apic_numaq, | ||
143 | #endif | ||
144 | #ifdef CONFIG_X86_SUMMIT | ||
145 | &apic_summit, | ||
146 | #endif | ||
147 | #ifdef CONFIG_X86_BIGSMP | ||
148 | &apic_bigsmp, | ||
149 | #endif | ||
150 | #ifdef CONFIG_X86_ES7000 | ||
151 | &apic_es7000, | ||
152 | #endif | ||
153 | &apic_default, /* must be last */ | ||
154 | NULL, | ||
155 | }; | ||
156 | |||
157 | static int cmdline_apic __initdata; | ||
158 | static int __init parse_apic(char *arg) | ||
159 | { | ||
160 | int i; | ||
161 | |||
162 | if (!arg) | ||
163 | return -EINVAL; | ||
164 | |||
165 | for (i = 0; apic_probe[i]; i++) { | ||
166 | if (!strcmp(apic_probe[i]->name, arg)) { | ||
167 | apic = apic_probe[i]; | ||
168 | cmdline_apic = 1; | ||
169 | return 0; | ||
170 | } | ||
171 | } | ||
172 | |||
173 | if (x86_quirks->update_genapic) | ||
174 | x86_quirks->update_genapic(); | ||
175 | |||
176 | /* Parsed again by __setup for debug/verbose */ | ||
177 | return 0; | ||
178 | } | ||
179 | early_param("apic", parse_apic); | ||
180 | |||
181 | void __init generic_bigsmp_probe(void) | ||
182 | { | ||
183 | #ifdef CONFIG_X86_BIGSMP | ||
184 | /* | ||
185 | * This routine is used to switch to bigsmp mode when | ||
186 | * - There is no apic= option specified by the user | ||
187 | * - generic_apic_probe() has chosen apic_default as the sub_arch | ||
188 | * - we find more than 8 CPUs in acpi LAPIC listing with xAPIC support | ||
189 | */ | ||
190 | |||
191 | if (!cmdline_apic && apic == &apic_default) { | ||
192 | if (apic_bigsmp.probe()) { | ||
193 | apic = &apic_bigsmp; | ||
194 | if (x86_quirks->update_genapic) | ||
195 | x86_quirks->update_genapic(); | ||
196 | printk(KERN_INFO "Overriding APIC driver with %s\n", | ||
197 | apic->name); | ||
198 | } | ||
199 | } | ||
200 | #endif | ||
201 | } | ||
202 | |||
203 | void __init generic_apic_probe(void) | ||
204 | { | ||
205 | if (!cmdline_apic) { | ||
206 | int i; | ||
207 | for (i = 0; apic_probe[i]; i++) { | ||
208 | if (apic_probe[i]->probe()) { | ||
209 | apic = apic_probe[i]; | ||
210 | break; | ||
211 | } | ||
212 | } | ||
213 | /* Not visible without early console */ | ||
214 | if (!apic_probe[i]) | ||
215 | panic("Didn't find an APIC driver"); | ||
216 | |||
217 | if (x86_quirks->update_genapic) | ||
218 | x86_quirks->update_genapic(); | ||
219 | } | ||
220 | printk(KERN_INFO "Using APIC driver %s\n", apic->name); | ||
221 | } | ||
222 | |||
223 | /* These functions can switch the APIC even after the initial ->probe() */ | ||
224 | |||
225 | int __init | ||
226 | generic_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid) | ||
227 | { | ||
228 | int i; | ||
229 | |||
230 | for (i = 0; apic_probe[i]; ++i) { | ||
231 | if (!apic_probe[i]->mps_oem_check) | ||
232 | continue; | ||
233 | if (!apic_probe[i]->mps_oem_check(mpc, oem, productid)) | ||
234 | continue; | ||
235 | |||
236 | if (!cmdline_apic) { | ||
237 | apic = apic_probe[i]; | ||
238 | if (x86_quirks->update_genapic) | ||
239 | x86_quirks->update_genapic(); | ||
240 | printk(KERN_INFO "Switched to APIC driver `%s'.\n", | ||
241 | apic->name); | ||
242 | } | ||
243 | return 1; | ||
244 | } | ||
245 | return 0; | ||
246 | } | ||
247 | |||
248 | int __init default_acpi_madt_oem_check(char *oem_id, char *oem_table_id) | ||
249 | { | ||
250 | int i; | ||
251 | |||
252 | for (i = 0; apic_probe[i]; ++i) { | ||
253 | if (!apic_probe[i]->acpi_madt_oem_check) | ||
254 | continue; | ||
255 | if (!apic_probe[i]->acpi_madt_oem_check(oem_id, oem_table_id)) | ||
256 | continue; | ||
257 | |||
258 | if (!cmdline_apic) { | ||
259 | apic = apic_probe[i]; | ||
260 | if (x86_quirks->update_genapic) | ||
261 | x86_quirks->update_genapic(); | ||
262 | printk(KERN_INFO "Switched to APIC driver `%s'.\n", | ||
263 | apic->name); | ||
264 | } | ||
265 | return 1; | ||
266 | } | ||
267 | return 0; | ||
268 | } | ||
269 | |||
270 | #endif /* CONFIG_X86_LOCAL_APIC */ | ||
271 | |||
272 | /** | ||
273 | * pre_intr_init_hook - initialisation prior to setting up interrupt vectors | ||
274 | * | ||
275 | * Description: | ||
276 | * Perform any necessary interrupt initialisation prior to setting up | ||
277 | * the "ordinary" interrupt call gates. For legacy reasons, the ISA | ||
278 | * interrupts should be initialised here if the machine emulates a PC | ||
279 | * in any way. | ||
280 | **/ | ||
281 | void __init pre_intr_init_hook(void) | ||
282 | { | ||
283 | if (x86_quirks->arch_pre_intr_init) { | ||
284 | if (x86_quirks->arch_pre_intr_init()) | ||
285 | return; | ||
286 | } | ||
287 | init_ISA_irqs(); | ||
288 | } | ||
289 | |||
290 | /** | ||
291 | * intr_init_hook - post gate setup interrupt initialisation | ||
292 | * | ||
293 | * Description: | ||
294 | * Fill in any interrupts that may have been left out by the general | ||
295 | * init_IRQ() routine. interrupts having to do with the machine rather | ||
296 | * than the devices on the I/O bus (like APIC interrupts in intel MP | ||
297 | * systems) are started here. | ||
298 | **/ | ||
299 | void __init intr_init_hook(void) | ||
300 | { | ||
301 | if (x86_quirks->arch_intr_init) { | ||
302 | if (x86_quirks->arch_intr_init()) | ||
303 | return; | ||
304 | } | ||
305 | } | ||
306 | |||
307 | /** | ||
308 | * pre_setup_arch_hook - hook called prior to any setup_arch() execution | ||
309 | * | ||
310 | * Description: | ||
311 | * generally used to activate any machine specific identification | ||
312 | * routines that may be needed before setup_arch() runs. On Voyager | ||
313 | * this is used to get the board revision and type. | ||
314 | **/ | ||
315 | void __init pre_setup_arch_hook(void) | ||
316 | { | ||
317 | } | ||
318 | |||
319 | /** | ||
320 | * trap_init_hook - initialise system specific traps | ||
321 | * | ||
322 | * Description: | ||
323 | * Called as the final act of trap_init(). Used in VISWS to initialise | ||
324 | * the various board specific APIC traps. | ||
325 | **/ | ||
326 | void __init trap_init_hook(void) | ||
327 | { | ||
328 | if (x86_quirks->arch_trap_init) { | ||
329 | if (x86_quirks->arch_trap_init()) | ||
330 | return; | ||
331 | } | ||
332 | } | ||
333 | |||
334 | static struct irqaction irq0 = { | ||
335 | .handler = timer_interrupt, | ||
336 | .flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_IRQPOLL, | ||
337 | .mask = CPU_MASK_NONE, | ||
338 | .name = "timer" | ||
339 | }; | ||
340 | |||
341 | /** | ||
342 | * pre_time_init_hook - do any specific initialisations before. | ||
343 | * | ||
344 | **/ | ||
345 | void __init pre_time_init_hook(void) | ||
346 | { | ||
347 | if (x86_quirks->arch_pre_time_init) | ||
348 | x86_quirks->arch_pre_time_init(); | ||
349 | } | ||
350 | |||
351 | /** | ||
352 | * time_init_hook - do any specific initialisations for the system timer. | ||
353 | * | ||
354 | * Description: | ||
355 | * Must plug the system timer interrupt source at HZ into the IRQ listed | ||
356 | * in irq_vectors.h:TIMER_IRQ | ||
357 | **/ | ||
358 | void __init time_init_hook(void) | ||
359 | { | ||
360 | if (x86_quirks->arch_time_init) { | ||
361 | /* | ||
362 | * A nonzero return code does not mean failure, it means | ||
363 | * that the architecture quirk does not want any | ||
364 | * generic (timer) setup to be performed after this: | ||
365 | */ | ||
366 | if (x86_quirks->arch_time_init()) | ||
367 | return; | ||
368 | } | ||
369 | |||
370 | irq0.mask = cpumask_of_cpu(0); | ||
371 | setup_irq(0, &irq0); | ||
372 | } | ||
373 | |||
374 | #ifdef CONFIG_MCA | ||
375 | /** | ||
376 | * mca_nmi_hook - hook into MCA specific NMI chain | ||
377 | * | ||
378 | * Description: | ||
379 | * The MCA (Microchannel Architecture) has an NMI chain for NMI sources | ||
380 | * along the MCA bus. Use this to hook into that chain if you will need | ||
381 | * it. | ||
382 | **/ | ||
383 | void mca_nmi_hook(void) | ||
384 | { | ||
385 | /* | ||
386 | * If I recall correctly, there's a whole bunch of other things that | ||
387 | * we can do to check for NMI problems, but that's all I know about | ||
388 | * at the moment. | ||
389 | */ | ||
390 | pr_warning("NMI generated from unknown source!\n"); | ||
391 | } | ||
392 | #endif | ||
393 | |||
394 | static __init int no_ipi_broadcast(char *str) | ||
395 | { | ||
396 | get_option(&str, &no_broadcast); | ||
397 | pr_info("Using %s mode\n", | ||
398 | no_broadcast ? "No IPI Broadcast" : "IPI Broadcast"); | ||
399 | return 1; | ||
400 | } | ||
401 | __setup("no_ipi_broadcast=", no_ipi_broadcast); | ||
402 | |||
403 | static int __init print_ipi_mode(void) | ||
404 | { | ||
405 | pr_info("Using IPI %s mode\n", | ||
406 | no_broadcast ? "No-Shortcut" : "Shortcut"); | ||
407 | return 0; | ||
408 | } | ||
409 | |||
410 | late_initcall(print_ipi_mode); | ||
411 | |||
diff --git a/arch/x86/kernel/probe_roms_32.c b/arch/x86/kernel/probe_roms_32.c index 675a48c404a5..071e7fea42e5 100644 --- a/arch/x86/kernel/probe_roms_32.c +++ b/arch/x86/kernel/probe_roms_32.c | |||
@@ -18,7 +18,7 @@ | |||
18 | #include <asm/setup.h> | 18 | #include <asm/setup.h> |
19 | #include <asm/sections.h> | 19 | #include <asm/sections.h> |
20 | #include <asm/io.h> | 20 | #include <asm/io.h> |
21 | #include <setup_arch.h> | 21 | #include <asm/setup_arch.h> |
22 | 22 | ||
23 | static struct resource system_rom_resource = { | 23 | static struct resource system_rom_resource = { |
24 | .name = "System ROM", | 24 | .name = "System ROM", |
diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 6d12f7e37f8c..87b69d4fac16 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c | |||
@@ -350,7 +350,7 @@ static void c1e_idle(void) | |||
350 | 350 | ||
351 | void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c) | 351 | void __cpuinit select_idle_routine(const struct cpuinfo_x86 *c) |
352 | { | 352 | { |
353 | #ifdef CONFIG_X86_SMP | 353 | #ifdef CONFIG_SMP |
354 | if (pm_idle == poll_idle && smp_num_siblings > 1) { | 354 | if (pm_idle == poll_idle && smp_num_siblings > 1) { |
355 | printk(KERN_WARNING "WARNING: polling idle and HT enabled," | 355 | printk(KERN_WARNING "WARNING: polling idle and HT enabled," |
356 | " performance may degrade.\n"); | 356 | " performance may degrade.\n"); |
diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index 1a1ae8edc40c..fec79ad85dc6 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c | |||
@@ -11,6 +11,7 @@ | |||
11 | 11 | ||
12 | #include <stdarg.h> | 12 | #include <stdarg.h> |
13 | 13 | ||
14 | #include <linux/stackprotector.h> | ||
14 | #include <linux/cpu.h> | 15 | #include <linux/cpu.h> |
15 | #include <linux/errno.h> | 16 | #include <linux/errno.h> |
16 | #include <linux/sched.h> | 17 | #include <linux/sched.h> |
@@ -91,6 +92,15 @@ void cpu_idle(void) | |||
91 | { | 92 | { |
92 | int cpu = smp_processor_id(); | 93 | int cpu = smp_processor_id(); |
93 | 94 | ||
95 | /* | ||
96 | * If we're the non-boot CPU, nothing set the stack canary up | ||
97 | * for us. CPU0 already has it initialized but no harm in | ||
98 | * doing it again. This is a good place for updating it, as | ||
99 | * we wont ever return from this function (so the invalid | ||
100 | * canaries already on the stack wont ever trigger). | ||
101 | */ | ||
102 | boot_init_stack_canary(); | ||
103 | |||
94 | current_thread_info()->status |= TS_POLLING; | 104 | current_thread_info()->status |= TS_POLLING; |
95 | 105 | ||
96 | /* endless idle loop with no priority at all */ | 106 | /* endless idle loop with no priority at all */ |
@@ -131,7 +141,7 @@ void __show_regs(struct pt_regs *regs, int all) | |||
131 | if (user_mode_vm(regs)) { | 141 | if (user_mode_vm(regs)) { |
132 | sp = regs->sp; | 142 | sp = regs->sp; |
133 | ss = regs->ss & 0xffff; | 143 | ss = regs->ss & 0xffff; |
134 | savesegment(gs, gs); | 144 | gs = get_user_gs(regs); |
135 | } else { | 145 | } else { |
136 | sp = (unsigned long) (®s->sp); | 146 | sp = (unsigned long) (®s->sp); |
137 | savesegment(ss, ss); | 147 | savesegment(ss, ss); |
@@ -212,6 +222,7 @@ int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags) | |||
212 | regs.ds = __USER_DS; | 222 | regs.ds = __USER_DS; |
213 | regs.es = __USER_DS; | 223 | regs.es = __USER_DS; |
214 | regs.fs = __KERNEL_PERCPU; | 224 | regs.fs = __KERNEL_PERCPU; |
225 | regs.gs = __KERNEL_STACK_CANARY; | ||
215 | regs.orig_ax = -1; | 226 | regs.orig_ax = -1; |
216 | regs.ip = (unsigned long) kernel_thread_helper; | 227 | regs.ip = (unsigned long) kernel_thread_helper; |
217 | regs.cs = __KERNEL_CS | get_kernel_rpl(); | 228 | regs.cs = __KERNEL_CS | get_kernel_rpl(); |
@@ -304,7 +315,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp, | |||
304 | 315 | ||
305 | p->thread.ip = (unsigned long) ret_from_fork; | 316 | p->thread.ip = (unsigned long) ret_from_fork; |
306 | 317 | ||
307 | savesegment(gs, p->thread.gs); | 318 | task_user_gs(p) = get_user_gs(regs); |
308 | 319 | ||
309 | tsk = current; | 320 | tsk = current; |
310 | if (unlikely(test_tsk_thread_flag(tsk, TIF_IO_BITMAP))) { | 321 | if (unlikely(test_tsk_thread_flag(tsk, TIF_IO_BITMAP))) { |
@@ -342,7 +353,7 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp, | |||
342 | void | 353 | void |
343 | start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp) | 354 | start_thread(struct pt_regs *regs, unsigned long new_ip, unsigned long new_sp) |
344 | { | 355 | { |
345 | __asm__("movl %0, %%gs" : : "r"(0)); | 356 | set_user_gs(regs, 0); |
346 | regs->fs = 0; | 357 | regs->fs = 0; |
347 | set_fs(USER_DS); | 358 | set_fs(USER_DS); |
348 | regs->ds = __USER_DS; | 359 | regs->ds = __USER_DS; |
@@ -539,7 +550,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) | |||
539 | * used %fs or %gs (it does not today), or if the kernel is | 550 | * used %fs or %gs (it does not today), or if the kernel is |
540 | * running inside of a hypervisor layer. | 551 | * running inside of a hypervisor layer. |
541 | */ | 552 | */ |
542 | savesegment(gs, prev->gs); | 553 | lazy_save_gs(prev->gs); |
543 | 554 | ||
544 | /* | 555 | /* |
545 | * Load the per-thread Thread-Local Storage descriptor. | 556 | * Load the per-thread Thread-Local Storage descriptor. |
@@ -585,31 +596,31 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) | |||
585 | * Restore %gs if needed (which is common) | 596 | * Restore %gs if needed (which is common) |
586 | */ | 597 | */ |
587 | if (prev->gs | next->gs) | 598 | if (prev->gs | next->gs) |
588 | loadsegment(gs, next->gs); | 599 | lazy_load_gs(next->gs); |
589 | 600 | ||
590 | percpu_write(current_task, next_p); | 601 | percpu_write(current_task, next_p); |
591 | 602 | ||
592 | return prev_p; | 603 | return prev_p; |
593 | } | 604 | } |
594 | 605 | ||
595 | asmlinkage int sys_fork(struct pt_regs regs) | 606 | int sys_fork(struct pt_regs *regs) |
596 | { | 607 | { |
597 | return do_fork(SIGCHLD, regs.sp, ®s, 0, NULL, NULL); | 608 | return do_fork(SIGCHLD, regs->sp, regs, 0, NULL, NULL); |
598 | } | 609 | } |
599 | 610 | ||
600 | asmlinkage int sys_clone(struct pt_regs regs) | 611 | int sys_clone(struct pt_regs *regs) |
601 | { | 612 | { |
602 | unsigned long clone_flags; | 613 | unsigned long clone_flags; |
603 | unsigned long newsp; | 614 | unsigned long newsp; |
604 | int __user *parent_tidptr, *child_tidptr; | 615 | int __user *parent_tidptr, *child_tidptr; |
605 | 616 | ||
606 | clone_flags = regs.bx; | 617 | clone_flags = regs->bx; |
607 | newsp = regs.cx; | 618 | newsp = regs->cx; |
608 | parent_tidptr = (int __user *)regs.dx; | 619 | parent_tidptr = (int __user *)regs->dx; |
609 | child_tidptr = (int __user *)regs.di; | 620 | child_tidptr = (int __user *)regs->di; |
610 | if (!newsp) | 621 | if (!newsp) |
611 | newsp = regs.sp; | 622 | newsp = regs->sp; |
612 | return do_fork(clone_flags, newsp, ®s, 0, parent_tidptr, child_tidptr); | 623 | return do_fork(clone_flags, newsp, regs, 0, parent_tidptr, child_tidptr); |
613 | } | 624 | } |
614 | 625 | ||
615 | /* | 626 | /* |
@@ -622,27 +633,27 @@ asmlinkage int sys_clone(struct pt_regs regs) | |||
622 | * do not have enough call-clobbered registers to hold all | 633 | * do not have enough call-clobbered registers to hold all |
623 | * the information you need. | 634 | * the information you need. |
624 | */ | 635 | */ |
625 | asmlinkage int sys_vfork(struct pt_regs regs) | 636 | int sys_vfork(struct pt_regs *regs) |
626 | { | 637 | { |
627 | return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, regs.sp, ®s, 0, NULL, NULL); | 638 | return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, regs->sp, regs, 0, NULL, NULL); |
628 | } | 639 | } |
629 | 640 | ||
630 | /* | 641 | /* |
631 | * sys_execve() executes a new program. | 642 | * sys_execve() executes a new program. |
632 | */ | 643 | */ |
633 | asmlinkage int sys_execve(struct pt_regs regs) | 644 | int sys_execve(struct pt_regs *regs) |
634 | { | 645 | { |
635 | int error; | 646 | int error; |
636 | char *filename; | 647 | char *filename; |
637 | 648 | ||
638 | filename = getname((char __user *) regs.bx); | 649 | filename = getname((char __user *) regs->bx); |
639 | error = PTR_ERR(filename); | 650 | error = PTR_ERR(filename); |
640 | if (IS_ERR(filename)) | 651 | if (IS_ERR(filename)) |
641 | goto out; | 652 | goto out; |
642 | error = do_execve(filename, | 653 | error = do_execve(filename, |
643 | (char __user * __user *) regs.cx, | 654 | (char __user * __user *) regs->cx, |
644 | (char __user * __user *) regs.dx, | 655 | (char __user * __user *) regs->dx, |
645 | ®s); | 656 | regs); |
646 | if (error == 0) { | 657 | if (error == 0) { |
647 | /* Make sure we don't return using sysenter.. */ | 658 | /* Make sure we don't return using sysenter.. */ |
648 | set_thread_flag(TIF_IRET); | 659 | set_thread_flag(TIF_IRET); |
diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 8eb169e45584..836ef6575f01 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c | |||
@@ -120,12 +120,11 @@ void cpu_idle(void) | |||
120 | current_thread_info()->status |= TS_POLLING; | 120 | current_thread_info()->status |= TS_POLLING; |
121 | 121 | ||
122 | /* | 122 | /* |
123 | * If we're the non-boot CPU, nothing set the PDA stack | 123 | * If we're the non-boot CPU, nothing set the stack canary up |
124 | * canary up for us - and if we are the boot CPU we have | 124 | * for us. CPU0 already has it initialized but no harm in |
125 | * a 0 stack canary. This is a good place for updating | 125 | * doing it again. This is a good place for updating it, as |
126 | * it, as we wont ever return from this function (so the | 126 | * we wont ever return from this function (so the invalid |
127 | * invalid canaries already on the stack wont ever | 127 | * canaries already on the stack wont ever trigger). |
128 | * trigger): | ||
129 | */ | 128 | */ |
130 | boot_init_stack_canary(); | 129 | boot_init_stack_canary(); |
131 | 130 | ||
diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c index 0a5df5f82fb9..d2f7cd5b2c83 100644 --- a/arch/x86/kernel/ptrace.c +++ b/arch/x86/kernel/ptrace.c | |||
@@ -75,10 +75,7 @@ static inline bool invalid_selector(u16 value) | |||
75 | static unsigned long *pt_regs_access(struct pt_regs *regs, unsigned long regno) | 75 | static unsigned long *pt_regs_access(struct pt_regs *regs, unsigned long regno) |
76 | { | 76 | { |
77 | BUILD_BUG_ON(offsetof(struct pt_regs, bx) != 0); | 77 | BUILD_BUG_ON(offsetof(struct pt_regs, bx) != 0); |
78 | regno >>= 2; | 78 | return ®s->bx + (regno >> 2); |
79 | if (regno > FS) | ||
80 | --regno; | ||
81 | return ®s->bx + regno; | ||
82 | } | 79 | } |
83 | 80 | ||
84 | static u16 get_segment_reg(struct task_struct *task, unsigned long offset) | 81 | static u16 get_segment_reg(struct task_struct *task, unsigned long offset) |
@@ -90,9 +87,10 @@ static u16 get_segment_reg(struct task_struct *task, unsigned long offset) | |||
90 | if (offset != offsetof(struct user_regs_struct, gs)) | 87 | if (offset != offsetof(struct user_regs_struct, gs)) |
91 | retval = *pt_regs_access(task_pt_regs(task), offset); | 88 | retval = *pt_regs_access(task_pt_regs(task), offset); |
92 | else { | 89 | else { |
93 | retval = task->thread.gs; | ||
94 | if (task == current) | 90 | if (task == current) |
95 | savesegment(gs, retval); | 91 | retval = get_user_gs(task_pt_regs(task)); |
92 | else | ||
93 | retval = task_user_gs(task); | ||
96 | } | 94 | } |
97 | return retval; | 95 | return retval; |
98 | } | 96 | } |
@@ -126,13 +124,10 @@ static int set_segment_reg(struct task_struct *task, | |||
126 | break; | 124 | break; |
127 | 125 | ||
128 | case offsetof(struct user_regs_struct, gs): | 126 | case offsetof(struct user_regs_struct, gs): |
129 | task->thread.gs = value; | ||
130 | if (task == current) | 127 | if (task == current) |
131 | /* | 128 | set_user_gs(task_pt_regs(task), value); |
132 | * The user-mode %gs is not affected by | 129 | else |
133 | * kernel entry, so we must update the CPU. | 130 | task_user_gs(task) = value; |
134 | */ | ||
135 | loadsegment(gs, value); | ||
136 | } | 131 | } |
137 | 132 | ||
138 | return 0; | 133 | return 0; |
@@ -810,12 +805,16 @@ static void ptrace_bts_untrace(struct task_struct *child) | |||
810 | 805 | ||
811 | static void ptrace_bts_detach(struct task_struct *child) | 806 | static void ptrace_bts_detach(struct task_struct *child) |
812 | { | 807 | { |
813 | if (unlikely(child->bts)) { | 808 | /* |
814 | ds_release_bts(child->bts); | 809 | * Ptrace_detach() races with ptrace_untrace() in case |
815 | child->bts = NULL; | 810 | * the child dies and is reaped by another thread. |
816 | 811 | * | |
817 | ptrace_bts_free_buffer(child); | 812 | * We only do the memory accounting at this point and |
818 | } | 813 | * leave the buffer deallocation and the bts tracer |
814 | * release to ptrace_bts_untrace() which will be called | ||
815 | * later on with tasklist_lock held. | ||
816 | */ | ||
817 | release_locked_buffer(child->bts_buffer, child->bts_size); | ||
819 | } | 818 | } |
820 | #else | 819 | #else |
821 | static inline void ptrace_bts_fork(struct task_struct *tsk) {} | 820 | static inline void ptrace_bts_fork(struct task_struct *tsk) {} |
diff --git a/arch/x86/kernel/reboot.c b/arch/x86/kernel/reboot.c index f8536fee5c12..32e8f0af292c 100644 --- a/arch/x86/kernel/reboot.c +++ b/arch/x86/kernel/reboot.c | |||
@@ -24,7 +24,7 @@ | |||
24 | # include <asm/iommu.h> | 24 | # include <asm/iommu.h> |
25 | #endif | 25 | #endif |
26 | 26 | ||
27 | #include <mach_ipi.h> | 27 | #include <asm/genapic.h> |
28 | 28 | ||
29 | /* | 29 | /* |
30 | * Power off function, if any | 30 | * Power off function, if any |
@@ -651,7 +651,7 @@ static int crash_nmi_callback(struct notifier_block *self, | |||
651 | 651 | ||
652 | static void smp_send_nmi_allbutself(void) | 652 | static void smp_send_nmi_allbutself(void) |
653 | { | 653 | { |
654 | send_IPI_allbutself(NMI_VECTOR); | 654 | apic->send_IPI_allbutself(NMI_VECTOR); |
655 | } | 655 | } |
656 | 656 | ||
657 | static struct notifier_block crash_nmi_nb = { | 657 | static struct notifier_block crash_nmi_nb = { |
diff --git a/arch/x86/kernel/relocate_kernel_64.S b/arch/x86/kernel/relocate_kernel_64.S index f5afe665a82b..b0bbdd4829c9 100644 --- a/arch/x86/kernel/relocate_kernel_64.S +++ b/arch/x86/kernel/relocate_kernel_64.S | |||
@@ -29,122 +29,6 @@ relocate_kernel: | |||
29 | * %rdx start address | 29 | * %rdx start address |
30 | */ | 30 | */ |
31 | 31 | ||
32 | /* map the control page at its virtual address */ | ||
33 | |||
34 | movq $0x0000ff8000000000, %r10 /* mask */ | ||
35 | mov $(39 - 3), %cl /* bits to shift */ | ||
36 | movq PTR(VA_CONTROL_PAGE)(%rsi), %r11 /* address to map */ | ||
37 | |||
38 | movq %r11, %r9 | ||
39 | andq %r10, %r9 | ||
40 | shrq %cl, %r9 | ||
41 | |||
42 | movq PTR(VA_PGD)(%rsi), %r8 | ||
43 | addq %r8, %r9 | ||
44 | movq PTR(PA_PUD_0)(%rsi), %r8 | ||
45 | orq $PAGE_ATTR, %r8 | ||
46 | movq %r8, (%r9) | ||
47 | |||
48 | shrq $9, %r10 | ||
49 | sub $9, %cl | ||
50 | |||
51 | movq %r11, %r9 | ||
52 | andq %r10, %r9 | ||
53 | shrq %cl, %r9 | ||
54 | |||
55 | movq PTR(VA_PUD_0)(%rsi), %r8 | ||
56 | addq %r8, %r9 | ||
57 | movq PTR(PA_PMD_0)(%rsi), %r8 | ||
58 | orq $PAGE_ATTR, %r8 | ||
59 | movq %r8, (%r9) | ||
60 | |||
61 | shrq $9, %r10 | ||
62 | sub $9, %cl | ||
63 | |||
64 | movq %r11, %r9 | ||
65 | andq %r10, %r9 | ||
66 | shrq %cl, %r9 | ||
67 | |||
68 | movq PTR(VA_PMD_0)(%rsi), %r8 | ||
69 | addq %r8, %r9 | ||
70 | movq PTR(PA_PTE_0)(%rsi), %r8 | ||
71 | orq $PAGE_ATTR, %r8 | ||
72 | movq %r8, (%r9) | ||
73 | |||
74 | shrq $9, %r10 | ||
75 | sub $9, %cl | ||
76 | |||
77 | movq %r11, %r9 | ||
78 | andq %r10, %r9 | ||
79 | shrq %cl, %r9 | ||
80 | |||
81 | movq PTR(VA_PTE_0)(%rsi), %r8 | ||
82 | addq %r8, %r9 | ||
83 | movq PTR(PA_CONTROL_PAGE)(%rsi), %r8 | ||
84 | orq $PAGE_ATTR, %r8 | ||
85 | movq %r8, (%r9) | ||
86 | |||
87 | /* identity map the control page at its physical address */ | ||
88 | |||
89 | movq $0x0000ff8000000000, %r10 /* mask */ | ||
90 | mov $(39 - 3), %cl /* bits to shift */ | ||
91 | movq PTR(PA_CONTROL_PAGE)(%rsi), %r11 /* address to map */ | ||
92 | |||
93 | movq %r11, %r9 | ||
94 | andq %r10, %r9 | ||
95 | shrq %cl, %r9 | ||
96 | |||
97 | movq PTR(VA_PGD)(%rsi), %r8 | ||
98 | addq %r8, %r9 | ||
99 | movq PTR(PA_PUD_1)(%rsi), %r8 | ||
100 | orq $PAGE_ATTR, %r8 | ||
101 | movq %r8, (%r9) | ||
102 | |||
103 | shrq $9, %r10 | ||
104 | sub $9, %cl | ||
105 | |||
106 | movq %r11, %r9 | ||
107 | andq %r10, %r9 | ||
108 | shrq %cl, %r9 | ||
109 | |||
110 | movq PTR(VA_PUD_1)(%rsi), %r8 | ||
111 | addq %r8, %r9 | ||
112 | movq PTR(PA_PMD_1)(%rsi), %r8 | ||
113 | orq $PAGE_ATTR, %r8 | ||
114 | movq %r8, (%r9) | ||
115 | |||
116 | shrq $9, %r10 | ||
117 | sub $9, %cl | ||
118 | |||
119 | movq %r11, %r9 | ||
120 | andq %r10, %r9 | ||
121 | shrq %cl, %r9 | ||
122 | |||
123 | movq PTR(VA_PMD_1)(%rsi), %r8 | ||
124 | addq %r8, %r9 | ||
125 | movq PTR(PA_PTE_1)(%rsi), %r8 | ||
126 | orq $PAGE_ATTR, %r8 | ||
127 | movq %r8, (%r9) | ||
128 | |||
129 | shrq $9, %r10 | ||
130 | sub $9, %cl | ||
131 | |||
132 | movq %r11, %r9 | ||
133 | andq %r10, %r9 | ||
134 | shrq %cl, %r9 | ||
135 | |||
136 | movq PTR(VA_PTE_1)(%rsi), %r8 | ||
137 | addq %r8, %r9 | ||
138 | movq PTR(PA_CONTROL_PAGE)(%rsi), %r8 | ||
139 | orq $PAGE_ATTR, %r8 | ||
140 | movq %r8, (%r9) | ||
141 | |||
142 | relocate_new_kernel: | ||
143 | /* %rdi indirection_page | ||
144 | * %rsi page_list | ||
145 | * %rdx start address | ||
146 | */ | ||
147 | |||
148 | /* zero out flags, and disable interrupts */ | 32 | /* zero out flags, and disable interrupts */ |
149 | pushq $0 | 33 | pushq $0 |
150 | popfq | 34 | popfq |
@@ -156,9 +40,8 @@ relocate_new_kernel: | |||
156 | /* get physical address of page table now too */ | 40 | /* get physical address of page table now too */ |
157 | movq PTR(PA_TABLE_PAGE)(%rsi), %rcx | 41 | movq PTR(PA_TABLE_PAGE)(%rsi), %rcx |
158 | 42 | ||
159 | /* switch to new set of page tables */ | 43 | /* Switch to the identity mapped page tables */ |
160 | movq PTR(PA_PGD)(%rsi), %r9 | 44 | movq %rcx, %cr3 |
161 | movq %r9, %cr3 | ||
162 | 45 | ||
163 | /* setup a new stack at the end of the physical control page */ | 46 | /* setup a new stack at the end of the physical control page */ |
164 | lea PAGE_SIZE(%r8), %rsp | 47 | lea PAGE_SIZE(%r8), %rsp |
@@ -194,9 +77,7 @@ identity_mapped: | |||
194 | jmp 1f | 77 | jmp 1f |
195 | 1: | 78 | 1: |
196 | 79 | ||
197 | /* Switch to the identity mapped page tables, | 80 | /* Flush the TLB (needed?) */ |
198 | * and flush the TLB. | ||
199 | */ | ||
200 | movq %rcx, %cr3 | 81 | movq %rcx, %cr3 |
201 | 82 | ||
202 | /* Do the copies */ | 83 | /* Do the copies */ |
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index d5d6693b706d..8fce6c714514 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c | |||
@@ -81,7 +81,7 @@ | |||
81 | #include <asm/io_apic.h> | 81 | #include <asm/io_apic.h> |
82 | #include <asm/ist.h> | 82 | #include <asm/ist.h> |
83 | #include <asm/vmi.h> | 83 | #include <asm/vmi.h> |
84 | #include <setup_arch.h> | 84 | #include <asm/setup_arch.h> |
85 | #include <asm/bios_ebda.h> | 85 | #include <asm/bios_ebda.h> |
86 | #include <asm/cacheflush.h> | 86 | #include <asm/cacheflush.h> |
87 | #include <asm/processor.h> | 87 | #include <asm/processor.h> |
@@ -97,7 +97,7 @@ | |||
97 | #include <asm/mmu_context.h> | 97 | #include <asm/mmu_context.h> |
98 | #include <asm/proto.h> | 98 | #include <asm/proto.h> |
99 | 99 | ||
100 | #include <mach_apic.h> | 100 | #include <asm/genapic.h> |
101 | #include <asm/paravirt.h> | 101 | #include <asm/paravirt.h> |
102 | #include <asm/hypervisor.h> | 102 | #include <asm/hypervisor.h> |
103 | 103 | ||
@@ -112,6 +112,20 @@ | |||
112 | #define ARCH_SETUP | 112 | #define ARCH_SETUP |
113 | #endif | 113 | #endif |
114 | 114 | ||
115 | unsigned int boot_cpu_id __read_mostly; | ||
116 | |||
117 | #ifdef CONFIG_X86_64 | ||
118 | int default_cpu_present_to_apicid(int mps_cpu) | ||
119 | { | ||
120 | return __default_cpu_present_to_apicid(mps_cpu); | ||
121 | } | ||
122 | |||
123 | int default_check_phys_apicid_present(int boot_cpu_physical_apicid) | ||
124 | { | ||
125 | return __default_check_phys_apicid_present(boot_cpu_physical_apicid); | ||
126 | } | ||
127 | #endif | ||
128 | |||
115 | #ifndef CONFIG_DEBUG_BOOT_PARAMS | 129 | #ifndef CONFIG_DEBUG_BOOT_PARAMS |
116 | struct boot_params __initdata boot_params; | 130 | struct boot_params __initdata boot_params; |
117 | #else | 131 | #else |
@@ -588,10 +602,9 @@ early_param("elfcorehdr", setup_elfcorehdr); | |||
588 | 602 | ||
589 | static int __init default_update_genapic(void) | 603 | static int __init default_update_genapic(void) |
590 | { | 604 | { |
591 | #ifdef CONFIG_X86_SMP | 605 | #ifdef CONFIG_SMP |
592 | # if defined(CONFIG_X86_GENERICARCH) || defined(CONFIG_X86_64) | 606 | if (!apic->wakeup_cpu) |
593 | genapic->wakeup_cpu = wakeup_secondary_cpu_via_init; | 607 | apic->wakeup_cpu = wakeup_secondary_cpu_via_init; |
594 | # endif | ||
595 | #endif | 608 | #endif |
596 | 609 | ||
597 | return 0; | 610 | return 0; |
@@ -892,12 +905,11 @@ void __init setup_arch(char **cmdline_p) | |||
892 | */ | 905 | */ |
893 | acpi_reserve_bootmem(); | 906 | acpi_reserve_bootmem(); |
894 | #endif | 907 | #endif |
895 | #ifdef CONFIG_X86_FIND_SMP_CONFIG | ||
896 | /* | 908 | /* |
897 | * Find and reserve possible boot-time SMP configuration: | 909 | * Find and reserve possible boot-time SMP configuration: |
898 | */ | 910 | */ |
899 | find_smp_config(); | 911 | find_smp_config(); |
900 | #endif | 912 | |
901 | reserve_crashkernel(); | 913 | reserve_crashkernel(); |
902 | 914 | ||
903 | #ifdef CONFIG_X86_64 | 915 | #ifdef CONFIG_X86_64 |
@@ -924,9 +936,7 @@ void __init setup_arch(char **cmdline_p) | |||
924 | map_vsyscall(); | 936 | map_vsyscall(); |
925 | #endif | 937 | #endif |
926 | 938 | ||
927 | #ifdef CONFIG_X86_GENERICARCH | ||
928 | generic_apic_probe(); | 939 | generic_apic_probe(); |
929 | #endif | ||
930 | 940 | ||
931 | early_quirks(); | 941 | early_quirks(); |
932 | 942 | ||
diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c index e553803cd2db..d992e6cff730 100644 --- a/arch/x86/kernel/setup_percpu.c +++ b/arch/x86/kernel/setup_percpu.c | |||
@@ -15,6 +15,8 @@ | |||
15 | #include <asm/highmem.h> | 15 | #include <asm/highmem.h> |
16 | #include <asm/proto.h> | 16 | #include <asm/proto.h> |
17 | #include <asm/cpumask.h> | 17 | #include <asm/cpumask.h> |
18 | #include <asm/cpu.h> | ||
19 | #include <asm/stackprotector.h> | ||
18 | 20 | ||
19 | #ifdef CONFIG_DEBUG_PER_CPU_MAPS | 21 | #ifdef CONFIG_DEBUG_PER_CPU_MAPS |
20 | # define DBG(x...) printk(KERN_DEBUG x) | 22 | # define DBG(x...) printk(KERN_DEBUG x) |
@@ -22,118 +24,36 @@ | |||
22 | # define DBG(x...) | 24 | # define DBG(x...) |
23 | #endif | 25 | #endif |
24 | 26 | ||
25 | /* | ||
26 | * Could be inside CONFIG_HAVE_SETUP_PER_CPU_AREA with other stuff but | ||
27 | * voyager wants cpu_number too. | ||
28 | */ | ||
29 | #ifdef CONFIG_SMP | ||
30 | DEFINE_PER_CPU(int, cpu_number); | 27 | DEFINE_PER_CPU(int, cpu_number); |
31 | EXPORT_PER_CPU_SYMBOL(cpu_number); | 28 | EXPORT_PER_CPU_SYMBOL(cpu_number); |
32 | #endif | ||
33 | |||
34 | #ifdef CONFIG_X86_LOCAL_APIC | ||
35 | unsigned int num_processors; | ||
36 | unsigned disabled_cpus __cpuinitdata; | ||
37 | /* Processor that is doing the boot up */ | ||
38 | unsigned int boot_cpu_physical_apicid = -1U; | ||
39 | EXPORT_SYMBOL(boot_cpu_physical_apicid); | ||
40 | unsigned int max_physical_apicid; | ||
41 | |||
42 | /* Bitmask of physically existing CPUs */ | ||
43 | physid_mask_t phys_cpu_present_map; | ||
44 | #endif | ||
45 | |||
46 | /* | ||
47 | * Map cpu index to physical APIC ID | ||
48 | */ | ||
49 | DEFINE_EARLY_PER_CPU(u16, x86_cpu_to_apicid, BAD_APICID); | ||
50 | DEFINE_EARLY_PER_CPU(u16, x86_bios_cpu_apicid, BAD_APICID); | ||
51 | EXPORT_EARLY_PER_CPU_SYMBOL(x86_cpu_to_apicid); | ||
52 | EXPORT_EARLY_PER_CPU_SYMBOL(x86_bios_cpu_apicid); | ||
53 | |||
54 | #if defined(CONFIG_NUMA) && defined(CONFIG_X86_64) | ||
55 | #define X86_64_NUMA 1 /* (used later) */ | ||
56 | DEFINE_PER_CPU(int, node_number) = 0; | ||
57 | EXPORT_PER_CPU_SYMBOL(node_number); | ||
58 | |||
59 | /* | ||
60 | * Map cpu index to node index | ||
61 | */ | ||
62 | DEFINE_EARLY_PER_CPU(int, x86_cpu_to_node_map, NUMA_NO_NODE); | ||
63 | EXPORT_EARLY_PER_CPU_SYMBOL(x86_cpu_to_node_map); | ||
64 | |||
65 | /* | ||
66 | * Which logical CPUs are on which nodes | ||
67 | */ | ||
68 | cpumask_t *node_to_cpumask_map; | ||
69 | EXPORT_SYMBOL(node_to_cpumask_map); | ||
70 | |||
71 | /* | ||
72 | * Setup node_to_cpumask_map | ||
73 | */ | ||
74 | static void __init setup_node_to_cpumask_map(void); | ||
75 | 29 | ||
30 | #ifdef CONFIG_X86_64 | ||
31 | #define BOOT_PERCPU_OFFSET ((unsigned long)__per_cpu_load) | ||
76 | #else | 32 | #else |
77 | static inline void setup_node_to_cpumask_map(void) { } | 33 | #define BOOT_PERCPU_OFFSET 0 |
78 | #endif | 34 | #endif |
79 | 35 | ||
80 | #ifdef CONFIG_X86_64 | 36 | DEFINE_PER_CPU(unsigned long, this_cpu_off) = BOOT_PERCPU_OFFSET; |
81 | 37 | EXPORT_PER_CPU_SYMBOL(this_cpu_off); | |
82 | /* correctly size the local cpu masks */ | ||
83 | static void __init setup_cpu_local_masks(void) | ||
84 | { | ||
85 | alloc_bootmem_cpumask_var(&cpu_initialized_mask); | ||
86 | alloc_bootmem_cpumask_var(&cpu_callin_mask); | ||
87 | alloc_bootmem_cpumask_var(&cpu_callout_mask); | ||
88 | alloc_bootmem_cpumask_var(&cpu_sibling_setup_mask); | ||
89 | } | ||
90 | |||
91 | #else /* CONFIG_X86_32 */ | ||
92 | |||
93 | static inline void setup_cpu_local_masks(void) | ||
94 | { | ||
95 | } | ||
96 | 38 | ||
97 | #endif /* CONFIG_X86_32 */ | 39 | unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = { |
40 | [0 ... NR_CPUS-1] = BOOT_PERCPU_OFFSET, | ||
41 | }; | ||
42 | EXPORT_SYMBOL(__per_cpu_offset); | ||
98 | 43 | ||
99 | #ifdef CONFIG_HAVE_SETUP_PER_CPU_AREA | 44 | static inline void setup_percpu_segment(int cpu) |
100 | /* | ||
101 | * Copy data used in early init routines from the initial arrays to the | ||
102 | * per cpu data areas. These arrays then become expendable and the | ||
103 | * *_early_ptr's are zeroed indicating that the static arrays are gone. | ||
104 | */ | ||
105 | static void __init setup_per_cpu_maps(void) | ||
106 | { | 45 | { |
107 | int cpu; | 46 | #ifdef CONFIG_X86_32 |
108 | 47 | struct desc_struct gdt; | |
109 | for_each_possible_cpu(cpu) { | ||
110 | per_cpu(x86_cpu_to_apicid, cpu) = | ||
111 | early_per_cpu_map(x86_cpu_to_apicid, cpu); | ||
112 | per_cpu(x86_bios_cpu_apicid, cpu) = | ||
113 | early_per_cpu_map(x86_bios_cpu_apicid, cpu); | ||
114 | #ifdef X86_64_NUMA | ||
115 | per_cpu(x86_cpu_to_node_map, cpu) = | ||
116 | early_per_cpu_map(x86_cpu_to_node_map, cpu); | ||
117 | #endif | ||
118 | } | ||
119 | 48 | ||
120 | /* indicate the early static arrays will soon be gone */ | 49 | pack_descriptor(&gdt, per_cpu_offset(cpu), 0xFFFFF, |
121 | early_per_cpu_ptr(x86_cpu_to_apicid) = NULL; | 50 | 0x2 | DESCTYPE_S, 0x8); |
122 | early_per_cpu_ptr(x86_bios_cpu_apicid) = NULL; | 51 | gdt.s = 1; |
123 | #ifdef X86_64_NUMA | 52 | write_gdt_entry(get_cpu_gdt_table(cpu), |
124 | early_per_cpu_ptr(x86_cpu_to_node_map) = NULL; | 53 | GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S); |
125 | #endif | 54 | #endif |
126 | } | 55 | } |
127 | 56 | ||
128 | #ifdef CONFIG_X86_64 | ||
129 | unsigned long __per_cpu_offset[NR_CPUS] __read_mostly = { | ||
130 | [0] = (unsigned long)__per_cpu_load, | ||
131 | }; | ||
132 | #else | ||
133 | unsigned long __per_cpu_offset[NR_CPUS] __read_mostly; | ||
134 | #endif | ||
135 | EXPORT_SYMBOL(__per_cpu_offset); | ||
136 | |||
137 | /* | 57 | /* |
138 | * Great future plan: | 58 | * Great future plan: |
139 | * Declare PDA itself and support (irqstack,tss,pgd) as per cpu data. | 59 | * Declare PDA itself and support (irqstack,tss,pgd) as per cpu data. |
@@ -141,15 +61,12 @@ EXPORT_SYMBOL(__per_cpu_offset); | |||
141 | */ | 61 | */ |
142 | void __init setup_per_cpu_areas(void) | 62 | void __init setup_per_cpu_areas(void) |
143 | { | 63 | { |
144 | ssize_t size, old_size; | 64 | ssize_t size; |
145 | char *ptr; | 65 | char *ptr; |
146 | int cpu; | 66 | int cpu; |
147 | unsigned long align = 1; | ||
148 | 67 | ||
149 | /* Copy section for each CPU (we discard the original) */ | 68 | /* Copy section for each CPU (we discard the original) */ |
150 | old_size = PERCPU_ENOUGH_ROOM; | 69 | size = roundup(PERCPU_ENOUGH_ROOM, PAGE_SIZE); |
151 | align = max_t(unsigned long, PAGE_SIZE, align); | ||
152 | size = roundup(old_size, align); | ||
153 | 70 | ||
154 | pr_info("NR_CPUS:%d nr_cpumask_bits:%d nr_cpu_ids:%d nr_node_ids:%d\n", | 71 | pr_info("NR_CPUS:%d nr_cpumask_bits:%d nr_cpu_ids:%d nr_node_ids:%d\n", |
155 | NR_CPUS, nr_cpumask_bits, nr_cpu_ids, nr_node_ids); | 72 | NR_CPUS, nr_cpumask_bits, nr_cpu_ids, nr_node_ids); |
@@ -158,20 +75,17 @@ void __init setup_per_cpu_areas(void) | |||
158 | 75 | ||
159 | for_each_possible_cpu(cpu) { | 76 | for_each_possible_cpu(cpu) { |
160 | #ifndef CONFIG_NEED_MULTIPLE_NODES | 77 | #ifndef CONFIG_NEED_MULTIPLE_NODES |
161 | ptr = __alloc_bootmem(size, align, | 78 | ptr = alloc_bootmem_pages(size); |
162 | __pa(MAX_DMA_ADDRESS)); | ||
163 | #else | 79 | #else |
164 | int node = early_cpu_to_node(cpu); | 80 | int node = early_cpu_to_node(cpu); |
165 | if (!node_online(node) || !NODE_DATA(node)) { | 81 | if (!node_online(node) || !NODE_DATA(node)) { |
166 | ptr = __alloc_bootmem(size, align, | 82 | ptr = alloc_bootmem_pages(size); |
167 | __pa(MAX_DMA_ADDRESS)); | ||
168 | pr_info("cpu %d has no node %d or node-local memory\n", | 83 | pr_info("cpu %d has no node %d or node-local memory\n", |
169 | cpu, node); | 84 | cpu, node); |
170 | pr_debug("per cpu data for cpu%d at %016lx\n", | 85 | pr_debug("per cpu data for cpu%d at %016lx\n", |
171 | cpu, __pa(ptr)); | 86 | cpu, __pa(ptr)); |
172 | } else { | 87 | } else { |
173 | ptr = __alloc_bootmem_node(NODE_DATA(node), size, align, | 88 | ptr = alloc_bootmem_pages_node(NODE_DATA(node), size); |
174 | __pa(MAX_DMA_ADDRESS)); | ||
175 | pr_debug("per cpu data for cpu%d on node%d at %016lx\n", | 89 | pr_debug("per cpu data for cpu%d on node%d at %016lx\n", |
176 | cpu, node, __pa(ptr)); | 90 | cpu, node, __pa(ptr)); |
177 | } | 91 | } |
@@ -181,22 +95,48 @@ void __init setup_per_cpu_areas(void) | |||
181 | per_cpu_offset(cpu) = ptr - __per_cpu_start; | 95 | per_cpu_offset(cpu) = ptr - __per_cpu_start; |
182 | per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu); | 96 | per_cpu(this_cpu_off, cpu) = per_cpu_offset(cpu); |
183 | per_cpu(cpu_number, cpu) = cpu; | 97 | per_cpu(cpu_number, cpu) = cpu; |
98 | setup_percpu_segment(cpu); | ||
99 | setup_stack_canary_segment(cpu); | ||
100 | /* | ||
101 | * Copy data used in early init routines from the | ||
102 | * initial arrays to the per cpu data areas. These | ||
103 | * arrays then become expendable and the *_early_ptr's | ||
104 | * are zeroed indicating that the static arrays are | ||
105 | * gone. | ||
106 | */ | ||
107 | #ifdef CONFIG_X86_LOCAL_APIC | ||
108 | per_cpu(x86_cpu_to_apicid, cpu) = | ||
109 | early_per_cpu_map(x86_cpu_to_apicid, cpu); | ||
110 | per_cpu(x86_bios_cpu_apicid, cpu) = | ||
111 | early_per_cpu_map(x86_bios_cpu_apicid, cpu); | ||
112 | #endif | ||
184 | #ifdef CONFIG_X86_64 | 113 | #ifdef CONFIG_X86_64 |
185 | per_cpu(irq_stack_ptr, cpu) = | 114 | per_cpu(irq_stack_ptr, cpu) = |
186 | per_cpu(irq_stack_union.irq_stack, cpu) + IRQ_STACK_SIZE - 64; | 115 | per_cpu(irq_stack_union.irq_stack, cpu) + |
116 | IRQ_STACK_SIZE - 64; | ||
117 | #ifdef CONFIG_NUMA | ||
118 | per_cpu(x86_cpu_to_node_map, cpu) = | ||
119 | early_per_cpu_map(x86_cpu_to_node_map, cpu); | ||
120 | #endif | ||
121 | #endif | ||
187 | /* | 122 | /* |
188 | * Up to this point, CPU0 has been using .data.init | 123 | * Up to this point, the boot CPU has been using .data.init |
189 | * area. Reload %gs offset for CPU0. | 124 | * area. Reload any changed state for the boot CPU. |
190 | */ | 125 | */ |
191 | if (cpu == 0) | 126 | if (cpu == boot_cpu_id) |
192 | load_gs_base(cpu); | 127 | switch_to_new_gdt(cpu); |
193 | #endif | ||
194 | 128 | ||
195 | DBG("PERCPU: cpu %4d %p\n", cpu, ptr); | 129 | DBG("PERCPU: cpu %4d %p\n", cpu, ptr); |
196 | } | 130 | } |
197 | 131 | ||
198 | /* Setup percpu data maps */ | 132 | /* indicate the early static arrays will soon be gone */ |
199 | setup_per_cpu_maps(); | 133 | #ifdef CONFIG_X86_LOCAL_APIC |
134 | early_per_cpu_ptr(x86_cpu_to_apicid) = NULL; | ||
135 | early_per_cpu_ptr(x86_bios_cpu_apicid) = NULL; | ||
136 | #endif | ||
137 | #if defined(CONFIG_X86_64) && defined(CONFIG_NUMA) | ||
138 | early_per_cpu_ptr(x86_cpu_to_node_map) = NULL; | ||
139 | #endif | ||
200 | 140 | ||
201 | /* Setup node to cpumask map */ | 141 | /* Setup node to cpumask map */ |
202 | setup_node_to_cpumask_map(); | 142 | setup_node_to_cpumask_map(); |
@@ -204,207 +144,3 @@ void __init setup_per_cpu_areas(void) | |||
204 | /* Setup cpu initialized, callin, callout masks */ | 144 | /* Setup cpu initialized, callin, callout masks */ |
205 | setup_cpu_local_masks(); | 145 | setup_cpu_local_masks(); |
206 | } | 146 | } |
207 | |||
208 | #endif | ||
209 | |||
210 | #ifdef X86_64_NUMA | ||
211 | |||
212 | /* | ||
213 | * Allocate node_to_cpumask_map based on number of available nodes | ||
214 | * Requires node_possible_map to be valid. | ||
215 | * | ||
216 | * Note: node_to_cpumask() is not valid until after this is done. | ||
217 | * (Use CONFIG_DEBUG_PER_CPU_MAPS to check this.) | ||
218 | */ | ||
219 | static void __init setup_node_to_cpumask_map(void) | ||
220 | { | ||
221 | unsigned int node, num = 0; | ||
222 | cpumask_t *map; | ||
223 | |||
224 | /* setup nr_node_ids if not done yet */ | ||
225 | if (nr_node_ids == MAX_NUMNODES) { | ||
226 | for_each_node_mask(node, node_possible_map) | ||
227 | num = node; | ||
228 | nr_node_ids = num + 1; | ||
229 | } | ||
230 | |||
231 | /* allocate the map */ | ||
232 | map = alloc_bootmem_low(nr_node_ids * sizeof(cpumask_t)); | ||
233 | DBG("node_to_cpumask_map at %p for %d nodes\n", map, nr_node_ids); | ||
234 | |||
235 | pr_debug("Node to cpumask map at %p for %d nodes\n", | ||
236 | map, nr_node_ids); | ||
237 | |||
238 | /* node_to_cpumask() will now work */ | ||
239 | node_to_cpumask_map = map; | ||
240 | } | ||
241 | |||
242 | void __cpuinit numa_set_node(int cpu, int node) | ||
243 | { | ||
244 | int *cpu_to_node_map = early_per_cpu_ptr(x86_cpu_to_node_map); | ||
245 | |||
246 | /* early setting, no percpu area yet */ | ||
247 | if (cpu_to_node_map) { | ||
248 | cpu_to_node_map[cpu] = node; | ||
249 | return; | ||
250 | } | ||
251 | |||
252 | #ifdef CONFIG_DEBUG_PER_CPU_MAPS | ||
253 | if (cpu >= nr_cpu_ids || !per_cpu_offset(cpu)) { | ||
254 | printk(KERN_ERR "numa_set_node: invalid cpu# (%d)\n", cpu); | ||
255 | dump_stack(); | ||
256 | return; | ||
257 | } | ||
258 | #endif | ||
259 | per_cpu(x86_cpu_to_node_map, cpu) = node; | ||
260 | |||
261 | if (node != NUMA_NO_NODE) | ||
262 | per_cpu(node_number, cpu) = node; | ||
263 | } | ||
264 | |||
265 | void __cpuinit numa_clear_node(int cpu) | ||
266 | { | ||
267 | numa_set_node(cpu, NUMA_NO_NODE); | ||
268 | } | ||
269 | |||
270 | #ifndef CONFIG_DEBUG_PER_CPU_MAPS | ||
271 | |||
272 | void __cpuinit numa_add_cpu(int cpu) | ||
273 | { | ||
274 | cpu_set(cpu, node_to_cpumask_map[early_cpu_to_node(cpu)]); | ||
275 | } | ||
276 | |||
277 | void __cpuinit numa_remove_cpu(int cpu) | ||
278 | { | ||
279 | cpu_clear(cpu, node_to_cpumask_map[early_cpu_to_node(cpu)]); | ||
280 | } | ||
281 | |||
282 | #else /* CONFIG_DEBUG_PER_CPU_MAPS */ | ||
283 | |||
284 | /* | ||
285 | * --------- debug versions of the numa functions --------- | ||
286 | */ | ||
287 | static void __cpuinit numa_set_cpumask(int cpu, int enable) | ||
288 | { | ||
289 | int node = early_cpu_to_node(cpu); | ||
290 | cpumask_t *mask; | ||
291 | char buf[64]; | ||
292 | |||
293 | if (node_to_cpumask_map == NULL) { | ||
294 | printk(KERN_ERR "node_to_cpumask_map NULL\n"); | ||
295 | dump_stack(); | ||
296 | return; | ||
297 | } | ||
298 | |||
299 | mask = &node_to_cpumask_map[node]; | ||
300 | if (enable) | ||
301 | cpu_set(cpu, *mask); | ||
302 | else | ||
303 | cpu_clear(cpu, *mask); | ||
304 | |||
305 | cpulist_scnprintf(buf, sizeof(buf), mask); | ||
306 | printk(KERN_DEBUG "%s cpu %d node %d: mask now %s\n", | ||
307 | enable ? "numa_add_cpu" : "numa_remove_cpu", cpu, node, buf); | ||
308 | } | ||
309 | |||
310 | void __cpuinit numa_add_cpu(int cpu) | ||
311 | { | ||
312 | numa_set_cpumask(cpu, 1); | ||
313 | } | ||
314 | |||
315 | void __cpuinit numa_remove_cpu(int cpu) | ||
316 | { | ||
317 | numa_set_cpumask(cpu, 0); | ||
318 | } | ||
319 | |||
320 | int cpu_to_node(int cpu) | ||
321 | { | ||
322 | if (early_per_cpu_ptr(x86_cpu_to_node_map)) { | ||
323 | printk(KERN_WARNING | ||
324 | "cpu_to_node(%d): usage too early!\n", cpu); | ||
325 | dump_stack(); | ||
326 | return early_per_cpu_ptr(x86_cpu_to_node_map)[cpu]; | ||
327 | } | ||
328 | return per_cpu(x86_cpu_to_node_map, cpu); | ||
329 | } | ||
330 | EXPORT_SYMBOL(cpu_to_node); | ||
331 | |||
332 | /* | ||
333 | * Same function as cpu_to_node() but used if called before the | ||
334 | * per_cpu areas are setup. | ||
335 | */ | ||
336 | int early_cpu_to_node(int cpu) | ||
337 | { | ||
338 | if (early_per_cpu_ptr(x86_cpu_to_node_map)) | ||
339 | return early_per_cpu_ptr(x86_cpu_to_node_map)[cpu]; | ||
340 | |||
341 | if (!per_cpu_offset(cpu)) { | ||
342 | printk(KERN_WARNING | ||
343 | "early_cpu_to_node(%d): no per_cpu area!\n", cpu); | ||
344 | dump_stack(); | ||
345 | return NUMA_NO_NODE; | ||
346 | } | ||
347 | return per_cpu(x86_cpu_to_node_map, cpu); | ||
348 | } | ||
349 | |||
350 | |||
351 | /* empty cpumask */ | ||
352 | static const cpumask_t cpu_mask_none; | ||
353 | |||
354 | /* | ||
355 | * Returns a pointer to the bitmask of CPUs on Node 'node'. | ||
356 | */ | ||
357 | const cpumask_t *cpumask_of_node(int node) | ||
358 | { | ||
359 | if (node_to_cpumask_map == NULL) { | ||
360 | printk(KERN_WARNING | ||
361 | "cpumask_of_node(%d): no node_to_cpumask_map!\n", | ||
362 | node); | ||
363 | dump_stack(); | ||
364 | return (const cpumask_t *)&cpu_online_map; | ||
365 | } | ||
366 | if (node >= nr_node_ids) { | ||
367 | printk(KERN_WARNING | ||
368 | "cpumask_of_node(%d): node > nr_node_ids(%d)\n", | ||
369 | node, nr_node_ids); | ||
370 | dump_stack(); | ||
371 | return &cpu_mask_none; | ||
372 | } | ||
373 | return &node_to_cpumask_map[node]; | ||
374 | } | ||
375 | EXPORT_SYMBOL(cpumask_of_node); | ||
376 | |||
377 | /* | ||
378 | * Returns a bitmask of CPUs on Node 'node'. | ||
379 | * | ||
380 | * Side note: this function creates the returned cpumask on the stack | ||
381 | * so with a high NR_CPUS count, excessive stack space is used. The | ||
382 | * node_to_cpumask_ptr function should be used whenever possible. | ||
383 | */ | ||
384 | cpumask_t node_to_cpumask(int node) | ||
385 | { | ||
386 | if (node_to_cpumask_map == NULL) { | ||
387 | printk(KERN_WARNING | ||
388 | "node_to_cpumask(%d): no node_to_cpumask_map!\n", node); | ||
389 | dump_stack(); | ||
390 | return cpu_online_map; | ||
391 | } | ||
392 | if (node >= nr_node_ids) { | ||
393 | printk(KERN_WARNING | ||
394 | "node_to_cpumask(%d): node > nr_node_ids(%d)\n", | ||
395 | node, nr_node_ids); | ||
396 | dump_stack(); | ||
397 | return cpu_mask_none; | ||
398 | } | ||
399 | return node_to_cpumask_map[node]; | ||
400 | } | ||
401 | EXPORT_SYMBOL(node_to_cpumask); | ||
402 | |||
403 | /* | ||
404 | * --------- end of debug versions of the numa functions --------- | ||
405 | */ | ||
406 | |||
407 | #endif /* CONFIG_DEBUG_PER_CPU_MAPS */ | ||
408 | |||
409 | #endif /* X86_64_NUMA */ | ||
410 | |||
diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c index 0bc73d67acfb..4d3441018065 100644 --- a/arch/x86/kernel/signal.c +++ b/arch/x86/kernel/signal.c | |||
@@ -50,27 +50,23 @@ | |||
50 | # define FIX_EFLAGS __FIX_EFLAGS | 50 | # define FIX_EFLAGS __FIX_EFLAGS |
51 | #endif | 51 | #endif |
52 | 52 | ||
53 | #define COPY(x) { \ | 53 | #define COPY(x) do { \ |
54 | err |= __get_user(regs->x, &sc->x); \ | 54 | get_user_ex(regs->x, &sc->x); \ |
55 | } | 55 | } while (0) |
56 | 56 | ||
57 | #define COPY_SEG(seg) { \ | 57 | #define GET_SEG(seg) ({ \ |
58 | unsigned short tmp; \ | 58 | unsigned short tmp; \ |
59 | err |= __get_user(tmp, &sc->seg); \ | 59 | get_user_ex(tmp, &sc->seg); \ |
60 | regs->seg = tmp; \ | 60 | tmp; \ |
61 | } | 61 | }) |
62 | 62 | ||
63 | #define COPY_SEG_CPL3(seg) { \ | 63 | #define COPY_SEG(seg) do { \ |
64 | unsigned short tmp; \ | 64 | regs->seg = GET_SEG(seg); \ |
65 | err |= __get_user(tmp, &sc->seg); \ | 65 | } while (0) |
66 | regs->seg = tmp | 3; \ | ||
67 | } | ||
68 | 66 | ||
69 | #define GET_SEG(seg) { \ | 67 | #define COPY_SEG_CPL3(seg) do { \ |
70 | unsigned short tmp; \ | 68 | regs->seg = GET_SEG(seg) | 3; \ |
71 | err |= __get_user(tmp, &sc->seg); \ | 69 | } while (0) |
72 | loadsegment(seg, tmp); \ | ||
73 | } | ||
74 | 70 | ||
75 | static int | 71 | static int |
76 | restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, | 72 | restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, |
@@ -83,45 +79,49 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, | |||
83 | /* Always make any pending restarted system calls return -EINTR */ | 79 | /* Always make any pending restarted system calls return -EINTR */ |
84 | current_thread_info()->restart_block.fn = do_no_restart_syscall; | 80 | current_thread_info()->restart_block.fn = do_no_restart_syscall; |
85 | 81 | ||
82 | get_user_try { | ||
83 | |||
86 | #ifdef CONFIG_X86_32 | 84 | #ifdef CONFIG_X86_32 |
87 | GET_SEG(gs); | 85 | set_user_gs(regs, GET_SEG(gs)); |
88 | COPY_SEG(fs); | 86 | COPY_SEG(fs); |
89 | COPY_SEG(es); | 87 | COPY_SEG(es); |
90 | COPY_SEG(ds); | 88 | COPY_SEG(ds); |
91 | #endif /* CONFIG_X86_32 */ | 89 | #endif /* CONFIG_X86_32 */ |
92 | 90 | ||
93 | COPY(di); COPY(si); COPY(bp); COPY(sp); COPY(bx); | 91 | COPY(di); COPY(si); COPY(bp); COPY(sp); COPY(bx); |
94 | COPY(dx); COPY(cx); COPY(ip); | 92 | COPY(dx); COPY(cx); COPY(ip); |
95 | 93 | ||
96 | #ifdef CONFIG_X86_64 | 94 | #ifdef CONFIG_X86_64 |
97 | COPY(r8); | 95 | COPY(r8); |
98 | COPY(r9); | 96 | COPY(r9); |
99 | COPY(r10); | 97 | COPY(r10); |
100 | COPY(r11); | 98 | COPY(r11); |
101 | COPY(r12); | 99 | COPY(r12); |
102 | COPY(r13); | 100 | COPY(r13); |
103 | COPY(r14); | 101 | COPY(r14); |
104 | COPY(r15); | 102 | COPY(r15); |
105 | #endif /* CONFIG_X86_64 */ | 103 | #endif /* CONFIG_X86_64 */ |
106 | 104 | ||
107 | #ifdef CONFIG_X86_32 | 105 | #ifdef CONFIG_X86_32 |
108 | COPY_SEG_CPL3(cs); | 106 | COPY_SEG_CPL3(cs); |
109 | COPY_SEG_CPL3(ss); | 107 | COPY_SEG_CPL3(ss); |
110 | #else /* !CONFIG_X86_32 */ | 108 | #else /* !CONFIG_X86_32 */ |
111 | /* Kernel saves and restores only the CS segment register on signals, | 109 | /* Kernel saves and restores only the CS segment register on signals, |
112 | * which is the bare minimum needed to allow mixed 32/64-bit code. | 110 | * which is the bare minimum needed to allow mixed 32/64-bit code. |
113 | * App's signal handler can save/restore other segments if needed. */ | 111 | * App's signal handler can save/restore other segments if needed. */ |
114 | COPY_SEG_CPL3(cs); | 112 | COPY_SEG_CPL3(cs); |
115 | #endif /* CONFIG_X86_32 */ | 113 | #endif /* CONFIG_X86_32 */ |
116 | 114 | ||
117 | err |= __get_user(tmpflags, &sc->flags); | 115 | get_user_ex(tmpflags, &sc->flags); |
118 | regs->flags = (regs->flags & ~FIX_EFLAGS) | (tmpflags & FIX_EFLAGS); | 116 | regs->flags = (regs->flags & ~FIX_EFLAGS) | (tmpflags & FIX_EFLAGS); |
119 | regs->orig_ax = -1; /* disable syscall checks */ | 117 | regs->orig_ax = -1; /* disable syscall checks */ |
118 | |||
119 | get_user_ex(buf, &sc->fpstate); | ||
120 | err |= restore_i387_xstate(buf); | ||
120 | 121 | ||
121 | err |= __get_user(buf, &sc->fpstate); | 122 | get_user_ex(*pax, &sc->ax); |
122 | err |= restore_i387_xstate(buf); | 123 | } get_user_catch(err); |
123 | 124 | ||
124 | err |= __get_user(*pax, &sc->ax); | ||
125 | return err; | 125 | return err; |
126 | } | 126 | } |
127 | 127 | ||
@@ -131,57 +131,55 @@ setup_sigcontext(struct sigcontext __user *sc, void __user *fpstate, | |||
131 | { | 131 | { |
132 | int err = 0; | 132 | int err = 0; |
133 | 133 | ||
134 | #ifdef CONFIG_X86_32 | 134 | put_user_try { |
135 | { | ||
136 | unsigned int tmp; | ||
137 | 135 | ||
138 | savesegment(gs, tmp); | 136 | #ifdef CONFIG_X86_32 |
139 | err |= __put_user(tmp, (unsigned int __user *)&sc->gs); | 137 | put_user_ex(get_user_gs(regs), (unsigned int __user *)&sc->gs); |
140 | } | 138 | put_user_ex(regs->fs, (unsigned int __user *)&sc->fs); |
141 | err |= __put_user(regs->fs, (unsigned int __user *)&sc->fs); | 139 | put_user_ex(regs->es, (unsigned int __user *)&sc->es); |
142 | err |= __put_user(regs->es, (unsigned int __user *)&sc->es); | 140 | put_user_ex(regs->ds, (unsigned int __user *)&sc->ds); |
143 | err |= __put_user(regs->ds, (unsigned int __user *)&sc->ds); | ||
144 | #endif /* CONFIG_X86_32 */ | 141 | #endif /* CONFIG_X86_32 */ |
145 | 142 | ||
146 | err |= __put_user(regs->di, &sc->di); | 143 | put_user_ex(regs->di, &sc->di); |
147 | err |= __put_user(regs->si, &sc->si); | 144 | put_user_ex(regs->si, &sc->si); |
148 | err |= __put_user(regs->bp, &sc->bp); | 145 | put_user_ex(regs->bp, &sc->bp); |
149 | err |= __put_user(regs->sp, &sc->sp); | 146 | put_user_ex(regs->sp, &sc->sp); |
150 | err |= __put_user(regs->bx, &sc->bx); | 147 | put_user_ex(regs->bx, &sc->bx); |
151 | err |= __put_user(regs->dx, &sc->dx); | 148 | put_user_ex(regs->dx, &sc->dx); |
152 | err |= __put_user(regs->cx, &sc->cx); | 149 | put_user_ex(regs->cx, &sc->cx); |
153 | err |= __put_user(regs->ax, &sc->ax); | 150 | put_user_ex(regs->ax, &sc->ax); |
154 | #ifdef CONFIG_X86_64 | 151 | #ifdef CONFIG_X86_64 |
155 | err |= __put_user(regs->r8, &sc->r8); | 152 | put_user_ex(regs->r8, &sc->r8); |
156 | err |= __put_user(regs->r9, &sc->r9); | 153 | put_user_ex(regs->r9, &sc->r9); |
157 | err |= __put_user(regs->r10, &sc->r10); | 154 | put_user_ex(regs->r10, &sc->r10); |
158 | err |= __put_user(regs->r11, &sc->r11); | 155 | put_user_ex(regs->r11, &sc->r11); |
159 | err |= __put_user(regs->r12, &sc->r12); | 156 | put_user_ex(regs->r12, &sc->r12); |
160 | err |= __put_user(regs->r13, &sc->r13); | 157 | put_user_ex(regs->r13, &sc->r13); |
161 | err |= __put_user(regs->r14, &sc->r14); | 158 | put_user_ex(regs->r14, &sc->r14); |
162 | err |= __put_user(regs->r15, &sc->r15); | 159 | put_user_ex(regs->r15, &sc->r15); |
163 | #endif /* CONFIG_X86_64 */ | 160 | #endif /* CONFIG_X86_64 */ |
164 | 161 | ||
165 | err |= __put_user(current->thread.trap_no, &sc->trapno); | 162 | put_user_ex(current->thread.trap_no, &sc->trapno); |
166 | err |= __put_user(current->thread.error_code, &sc->err); | 163 | put_user_ex(current->thread.error_code, &sc->err); |
167 | err |= __put_user(regs->ip, &sc->ip); | 164 | put_user_ex(regs->ip, &sc->ip); |
168 | #ifdef CONFIG_X86_32 | 165 | #ifdef CONFIG_X86_32 |
169 | err |= __put_user(regs->cs, (unsigned int __user *)&sc->cs); | 166 | put_user_ex(regs->cs, (unsigned int __user *)&sc->cs); |
170 | err |= __put_user(regs->flags, &sc->flags); | 167 | put_user_ex(regs->flags, &sc->flags); |
171 | err |= __put_user(regs->sp, &sc->sp_at_signal); | 168 | put_user_ex(regs->sp, &sc->sp_at_signal); |
172 | err |= __put_user(regs->ss, (unsigned int __user *)&sc->ss); | 169 | put_user_ex(regs->ss, (unsigned int __user *)&sc->ss); |
173 | #else /* !CONFIG_X86_32 */ | 170 | #else /* !CONFIG_X86_32 */ |
174 | err |= __put_user(regs->flags, &sc->flags); | 171 | put_user_ex(regs->flags, &sc->flags); |
175 | err |= __put_user(regs->cs, &sc->cs); | 172 | put_user_ex(regs->cs, &sc->cs); |
176 | err |= __put_user(0, &sc->gs); | 173 | put_user_ex(0, &sc->gs); |
177 | err |= __put_user(0, &sc->fs); | 174 | put_user_ex(0, &sc->fs); |
178 | #endif /* CONFIG_X86_32 */ | 175 | #endif /* CONFIG_X86_32 */ |
179 | 176 | ||
180 | err |= __put_user(fpstate, &sc->fpstate); | 177 | put_user_ex(fpstate, &sc->fpstate); |
181 | 178 | ||
182 | /* non-iBCS2 extensions.. */ | 179 | /* non-iBCS2 extensions.. */ |
183 | err |= __put_user(mask, &sc->oldmask); | 180 | put_user_ex(mask, &sc->oldmask); |
184 | err |= __put_user(current->thread.cr2, &sc->cr2); | 181 | put_user_ex(current->thread.cr2, &sc->cr2); |
182 | } put_user_catch(err); | ||
185 | 183 | ||
186 | return err; | 184 | return err; |
187 | } | 185 | } |
@@ -336,43 +334,41 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, | |||
336 | if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame))) | 334 | if (!access_ok(VERIFY_WRITE, frame, sizeof(*frame))) |
337 | return -EFAULT; | 335 | return -EFAULT; |
338 | 336 | ||
339 | err |= __put_user(sig, &frame->sig); | 337 | put_user_try { |
340 | err |= __put_user(&frame->info, &frame->pinfo); | 338 | put_user_ex(sig, &frame->sig); |
341 | err |= __put_user(&frame->uc, &frame->puc); | 339 | put_user_ex(&frame->info, &frame->pinfo); |
342 | err |= copy_siginfo_to_user(&frame->info, info); | 340 | put_user_ex(&frame->uc, &frame->puc); |
343 | if (err) | 341 | err |= copy_siginfo_to_user(&frame->info, info); |
344 | return -EFAULT; | ||
345 | |||
346 | /* Create the ucontext. */ | ||
347 | if (cpu_has_xsave) | ||
348 | err |= __put_user(UC_FP_XSTATE, &frame->uc.uc_flags); | ||
349 | else | ||
350 | err |= __put_user(0, &frame->uc.uc_flags); | ||
351 | err |= __put_user(0, &frame->uc.uc_link); | ||
352 | err |= __put_user(current->sas_ss_sp, &frame->uc.uc_stack.ss_sp); | ||
353 | err |= __put_user(sas_ss_flags(regs->sp), | ||
354 | &frame->uc.uc_stack.ss_flags); | ||
355 | err |= __put_user(current->sas_ss_size, &frame->uc.uc_stack.ss_size); | ||
356 | err |= setup_sigcontext(&frame->uc.uc_mcontext, fpstate, | ||
357 | regs, set->sig[0]); | ||
358 | err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set)); | ||
359 | if (err) | ||
360 | return -EFAULT; | ||
361 | 342 | ||
362 | /* Set up to return from userspace. */ | 343 | /* Create the ucontext. */ |
363 | restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn); | 344 | if (cpu_has_xsave) |
364 | if (ka->sa.sa_flags & SA_RESTORER) | 345 | put_user_ex(UC_FP_XSTATE, &frame->uc.uc_flags); |
365 | restorer = ka->sa.sa_restorer; | 346 | else |
366 | err |= __put_user(restorer, &frame->pretcode); | 347 | put_user_ex(0, &frame->uc.uc_flags); |
348 | put_user_ex(0, &frame->uc.uc_link); | ||
349 | put_user_ex(current->sas_ss_sp, &frame->uc.uc_stack.ss_sp); | ||
350 | put_user_ex(sas_ss_flags(regs->sp), | ||
351 | &frame->uc.uc_stack.ss_flags); | ||
352 | put_user_ex(current->sas_ss_size, &frame->uc.uc_stack.ss_size); | ||
353 | err |= setup_sigcontext(&frame->uc.uc_mcontext, fpstate, | ||
354 | regs, set->sig[0]); | ||
355 | err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set)); | ||
356 | |||
357 | /* Set up to return from userspace. */ | ||
358 | restorer = VDSO32_SYMBOL(current->mm->context.vdso, rt_sigreturn); | ||
359 | if (ka->sa.sa_flags & SA_RESTORER) | ||
360 | restorer = ka->sa.sa_restorer; | ||
361 | put_user_ex(restorer, &frame->pretcode); | ||
367 | 362 | ||
368 | /* | 363 | /* |
369 | * This is movl $__NR_rt_sigreturn, %ax ; int $0x80 | 364 | * This is movl $__NR_rt_sigreturn, %ax ; int $0x80 |
370 | * | 365 | * |
371 | * WE DO NOT USE IT ANY MORE! It's only left here for historical | 366 | * WE DO NOT USE IT ANY MORE! It's only left here for historical |
372 | * reasons and because gdb uses it as a signature to notice | 367 | * reasons and because gdb uses it as a signature to notice |
373 | * signal handler stack frames. | 368 | * signal handler stack frames. |
374 | */ | 369 | */ |
375 | err |= __put_user(*((u64 *)&rt_retcode), (u64 *)frame->retcode); | 370 | put_user_ex(*((u64 *)&rt_retcode), (u64 *)frame->retcode); |
371 | } put_user_catch(err); | ||
376 | 372 | ||
377 | if (err) | 373 | if (err) |
378 | return -EFAULT; | 374 | return -EFAULT; |
@@ -436,28 +432,30 @@ static int __setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info, | |||
436 | return -EFAULT; | 432 | return -EFAULT; |
437 | } | 433 | } |
438 | 434 | ||
439 | /* Create the ucontext. */ | 435 | put_user_try { |
440 | if (cpu_has_xsave) | 436 | /* Create the ucontext. */ |
441 | err |= __put_user(UC_FP_XSTATE, &frame->uc.uc_flags); | 437 | if (cpu_has_xsave) |
442 | else | 438 | put_user_ex(UC_FP_XSTATE, &frame->uc.uc_flags); |
443 | err |= __put_user(0, &frame->uc.uc_flags); | 439 | else |
444 | err |= __put_user(0, &frame->uc.uc_link); | 440 | put_user_ex(0, &frame->uc.uc_flags); |
445 | err |= __put_user(me->sas_ss_sp, &frame->uc.uc_stack.ss_sp); | 441 | put_user_ex(0, &frame->uc.uc_link); |
446 | err |= __put_user(sas_ss_flags(regs->sp), | 442 | put_user_ex(me->sas_ss_sp, &frame->uc.uc_stack.ss_sp); |
447 | &frame->uc.uc_stack.ss_flags); | 443 | put_user_ex(sas_ss_flags(regs->sp), |
448 | err |= __put_user(me->sas_ss_size, &frame->uc.uc_stack.ss_size); | 444 | &frame->uc.uc_stack.ss_flags); |
449 | err |= setup_sigcontext(&frame->uc.uc_mcontext, fp, regs, set->sig[0]); | 445 | put_user_ex(me->sas_ss_size, &frame->uc.uc_stack.ss_size); |
450 | err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set)); | 446 | err |= setup_sigcontext(&frame->uc.uc_mcontext, fp, regs, set->sig[0]); |
451 | 447 | err |= __copy_to_user(&frame->uc.uc_sigmask, set, sizeof(*set)); | |
452 | /* Set up to return from userspace. If provided, use a stub | 448 | |
453 | already in userspace. */ | 449 | /* Set up to return from userspace. If provided, use a stub |
454 | /* x86-64 should always use SA_RESTORER. */ | 450 | already in userspace. */ |
455 | if (ka->sa.sa_flags & SA_RESTORER) { | 451 | /* x86-64 should always use SA_RESTORER. */ |
456 | err |= __put_user(ka->sa.sa_restorer, &frame->pretcode); | 452 | if (ka->sa.sa_flags & SA_RESTORER) { |
457 | } else { | 453 | put_user_ex(ka->sa.sa_restorer, &frame->pretcode); |
458 | /* could use a vstub here */ | 454 | } else { |
459 | return -EFAULT; | 455 | /* could use a vstub here */ |
460 | } | 456 | err |= -EFAULT; |
457 | } | ||
458 | } put_user_catch(err); | ||
461 | 459 | ||
462 | if (err) | 460 | if (err) |
463 | return -EFAULT; | 461 | return -EFAULT; |
@@ -509,31 +507,41 @@ sys_sigaction(int sig, const struct old_sigaction __user *act, | |||
509 | struct old_sigaction __user *oact) | 507 | struct old_sigaction __user *oact) |
510 | { | 508 | { |
511 | struct k_sigaction new_ka, old_ka; | 509 | struct k_sigaction new_ka, old_ka; |
512 | int ret; | 510 | int ret = 0; |
513 | 511 | ||
514 | if (act) { | 512 | if (act) { |
515 | old_sigset_t mask; | 513 | old_sigset_t mask; |
516 | 514 | ||
517 | if (!access_ok(VERIFY_READ, act, sizeof(*act)) || | 515 | if (!access_ok(VERIFY_READ, act, sizeof(*act))) |
518 | __get_user(new_ka.sa.sa_handler, &act->sa_handler) || | ||
519 | __get_user(new_ka.sa.sa_restorer, &act->sa_restorer)) | ||
520 | return -EFAULT; | 516 | return -EFAULT; |
521 | 517 | ||
522 | __get_user(new_ka.sa.sa_flags, &act->sa_flags); | 518 | get_user_try { |
523 | __get_user(mask, &act->sa_mask); | 519 | get_user_ex(new_ka.sa.sa_handler, &act->sa_handler); |
520 | get_user_ex(new_ka.sa.sa_flags, &act->sa_flags); | ||
521 | get_user_ex(mask, &act->sa_mask); | ||
522 | get_user_ex(new_ka.sa.sa_restorer, &act->sa_restorer); | ||
523 | } get_user_catch(ret); | ||
524 | |||
525 | if (ret) | ||
526 | return -EFAULT; | ||
524 | siginitset(&new_ka.sa.sa_mask, mask); | 527 | siginitset(&new_ka.sa.sa_mask, mask); |
525 | } | 528 | } |
526 | 529 | ||
527 | ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL); | 530 | ret = do_sigaction(sig, act ? &new_ka : NULL, oact ? &old_ka : NULL); |
528 | 531 | ||
529 | if (!ret && oact) { | 532 | if (!ret && oact) { |
530 | if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact)) || | 533 | if (!access_ok(VERIFY_WRITE, oact, sizeof(*oact))) |
531 | __put_user(old_ka.sa.sa_handler, &oact->sa_handler) || | ||
532 | __put_user(old_ka.sa.sa_restorer, &oact->sa_restorer)) | ||
533 | return -EFAULT; | 534 | return -EFAULT; |
534 | 535 | ||
535 | __put_user(old_ka.sa.sa_flags, &oact->sa_flags); | 536 | put_user_try { |
536 | __put_user(old_ka.sa.sa_mask.sig[0], &oact->sa_mask); | 537 | put_user_ex(old_ka.sa.sa_handler, &oact->sa_handler); |
538 | put_user_ex(old_ka.sa.sa_flags, &oact->sa_flags); | ||
539 | put_user_ex(old_ka.sa.sa_mask.sig[0], &oact->sa_mask); | ||
540 | put_user_ex(old_ka.sa.sa_restorer, &oact->sa_restorer); | ||
541 | } put_user_catch(ret); | ||
542 | |||
543 | if (ret) | ||
544 | return -EFAULT; | ||
537 | } | 545 | } |
538 | 546 | ||
539 | return ret; | 547 | return ret; |
@@ -541,14 +549,9 @@ sys_sigaction(int sig, const struct old_sigaction __user *act, | |||
541 | #endif /* CONFIG_X86_32 */ | 549 | #endif /* CONFIG_X86_32 */ |
542 | 550 | ||
543 | #ifdef CONFIG_X86_32 | 551 | #ifdef CONFIG_X86_32 |
544 | asmlinkage int sys_sigaltstack(unsigned long bx) | 552 | int sys_sigaltstack(struct pt_regs *regs) |
545 | { | 553 | { |
546 | /* | 554 | const stack_t __user *uss = (const stack_t __user *)regs->bx; |
547 | * This is needed to make gcc realize it doesn't own the | ||
548 | * "struct pt_regs" | ||
549 | */ | ||
550 | struct pt_regs *regs = (struct pt_regs *)&bx; | ||
551 | const stack_t __user *uss = (const stack_t __user *)bx; | ||
552 | stack_t __user *uoss = (stack_t __user *)regs->cx; | 555 | stack_t __user *uoss = (stack_t __user *)regs->cx; |
553 | 556 | ||
554 | return do_sigaltstack(uss, uoss, regs->sp); | 557 | return do_sigaltstack(uss, uoss, regs->sp); |
@@ -566,14 +569,12 @@ sys_sigaltstack(const stack_t __user *uss, stack_t __user *uoss, | |||
566 | * Do a signal return; undo the signal stack. | 569 | * Do a signal return; undo the signal stack. |
567 | */ | 570 | */ |
568 | #ifdef CONFIG_X86_32 | 571 | #ifdef CONFIG_X86_32 |
569 | asmlinkage unsigned long sys_sigreturn(unsigned long __unused) | 572 | unsigned long sys_sigreturn(struct pt_regs *regs) |
570 | { | 573 | { |
571 | struct sigframe __user *frame; | 574 | struct sigframe __user *frame; |
572 | struct pt_regs *regs; | ||
573 | unsigned long ax; | 575 | unsigned long ax; |
574 | sigset_t set; | 576 | sigset_t set; |
575 | 577 | ||
576 | regs = (struct pt_regs *) &__unused; | ||
577 | frame = (struct sigframe __user *)(regs->sp - 8); | 578 | frame = (struct sigframe __user *)(regs->sp - 8); |
578 | 579 | ||
579 | if (!access_ok(VERIFY_READ, frame, sizeof(*frame))) | 580 | if (!access_ok(VERIFY_READ, frame, sizeof(*frame))) |
@@ -600,7 +601,7 @@ badframe: | |||
600 | } | 601 | } |
601 | #endif /* CONFIG_X86_32 */ | 602 | #endif /* CONFIG_X86_32 */ |
602 | 603 | ||
603 | static long do_rt_sigreturn(struct pt_regs *regs) | 604 | long sys_rt_sigreturn(struct pt_regs *regs) |
604 | { | 605 | { |
605 | struct rt_sigframe __user *frame; | 606 | struct rt_sigframe __user *frame; |
606 | unsigned long ax; | 607 | unsigned long ax; |
@@ -631,25 +632,6 @@ badframe: | |||
631 | return 0; | 632 | return 0; |
632 | } | 633 | } |
633 | 634 | ||
634 | #ifdef CONFIG_X86_32 | ||
635 | /* | ||
636 | * Note: do not pass in pt_regs directly as with tail-call optimization | ||
637 | * GCC will incorrectly stomp on the caller's frame and corrupt user-space | ||
638 | * register state: | ||
639 | */ | ||
640 | asmlinkage int sys_rt_sigreturn(unsigned long __unused) | ||
641 | { | ||
642 | struct pt_regs *regs = (struct pt_regs *)&__unused; | ||
643 | |||
644 | return do_rt_sigreturn(regs); | ||
645 | } | ||
646 | #else /* !CONFIG_X86_32 */ | ||
647 | asmlinkage long sys_rt_sigreturn(struct pt_regs *regs) | ||
648 | { | ||
649 | return do_rt_sigreturn(regs); | ||
650 | } | ||
651 | #endif /* CONFIG_X86_32 */ | ||
652 | |||
653 | /* | 635 | /* |
654 | * OK, we're invoking a handler: | 636 | * OK, we're invoking a handler: |
655 | */ | 637 | */ |
diff --git a/arch/x86/kernel/smp.c b/arch/x86/kernel/smp.c index e6faa3316bd2..eaaffae31cc0 100644 --- a/arch/x86/kernel/smp.c +++ b/arch/x86/kernel/smp.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * Intel SMP support routines. | 2 | * Intel SMP support routines. |
3 | * | 3 | * |
4 | * (c) 1995 Alan Cox, Building #3 <alan@lxorguk.ukuu.org.uk> | 4 | * (c) 1995 Alan Cox, Building #3 <alan@lxorguk.ukuu.org.uk> |
5 | * (c) 1998-99, 2000 Ingo Molnar <mingo@redhat.com> | 5 | * (c) 1998-99, 2000, 2009 Ingo Molnar <mingo@redhat.com> |
6 | * (c) 2002,2003 Andi Kleen, SuSE Labs. | 6 | * (c) 2002,2003 Andi Kleen, SuSE Labs. |
7 | * | 7 | * |
8 | * i386 and x86_64 integration by Glauber Costa <gcosta@redhat.com> | 8 | * i386 and x86_64 integration by Glauber Costa <gcosta@redhat.com> |
@@ -26,8 +26,7 @@ | |||
26 | #include <asm/tlbflush.h> | 26 | #include <asm/tlbflush.h> |
27 | #include <asm/mmu_context.h> | 27 | #include <asm/mmu_context.h> |
28 | #include <asm/proto.h> | 28 | #include <asm/proto.h> |
29 | #include <mach_ipi.h> | 29 | #include <asm/genapic.h> |
30 | #include <mach_apic.h> | ||
31 | /* | 30 | /* |
32 | * Some notes on x86 processor bugs affecting SMP operation: | 31 | * Some notes on x86 processor bugs affecting SMP operation: |
33 | * | 32 | * |
@@ -118,12 +117,12 @@ static void native_smp_send_reschedule(int cpu) | |||
118 | WARN_ON(1); | 117 | WARN_ON(1); |
119 | return; | 118 | return; |
120 | } | 119 | } |
121 | send_IPI_mask(cpumask_of(cpu), RESCHEDULE_VECTOR); | 120 | apic->send_IPI_mask(cpumask_of(cpu), RESCHEDULE_VECTOR); |
122 | } | 121 | } |
123 | 122 | ||
124 | void native_send_call_func_single_ipi(int cpu) | 123 | void native_send_call_func_single_ipi(int cpu) |
125 | { | 124 | { |
126 | send_IPI_mask(cpumask_of(cpu), CALL_FUNCTION_SINGLE_VECTOR); | 125 | apic->send_IPI_mask(cpumask_of(cpu), CALL_FUNCTION_SINGLE_VECTOR); |
127 | } | 126 | } |
128 | 127 | ||
129 | void native_send_call_func_ipi(const struct cpumask *mask) | 128 | void native_send_call_func_ipi(const struct cpumask *mask) |
@@ -131,7 +130,7 @@ void native_send_call_func_ipi(const struct cpumask *mask) | |||
131 | cpumask_var_t allbutself; | 130 | cpumask_var_t allbutself; |
132 | 131 | ||
133 | if (!alloc_cpumask_var(&allbutself, GFP_ATOMIC)) { | 132 | if (!alloc_cpumask_var(&allbutself, GFP_ATOMIC)) { |
134 | send_IPI_mask(mask, CALL_FUNCTION_VECTOR); | 133 | apic->send_IPI_mask(mask, CALL_FUNCTION_VECTOR); |
135 | return; | 134 | return; |
136 | } | 135 | } |
137 | 136 | ||
@@ -140,9 +139,9 @@ void native_send_call_func_ipi(const struct cpumask *mask) | |||
140 | 139 | ||
141 | if (cpumask_equal(mask, allbutself) && | 140 | if (cpumask_equal(mask, allbutself) && |
142 | cpumask_equal(cpu_online_mask, cpu_callout_mask)) | 141 | cpumask_equal(cpu_online_mask, cpu_callout_mask)) |
143 | send_IPI_allbutself(CALL_FUNCTION_VECTOR); | 142 | apic->send_IPI_allbutself(CALL_FUNCTION_VECTOR); |
144 | else | 143 | else |
145 | send_IPI_mask(mask, CALL_FUNCTION_VECTOR); | 144 | apic->send_IPI_mask(mask, CALL_FUNCTION_VECTOR); |
146 | 145 | ||
147 | free_cpumask_var(allbutself); | 146 | free_cpumask_var(allbutself); |
148 | } | 147 | } |
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index def770b57b5a..af57f88186e7 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c | |||
@@ -2,7 +2,7 @@ | |||
2 | * x86 SMP booting functions | 2 | * x86 SMP booting functions |
3 | * | 3 | * |
4 | * (c) 1995 Alan Cox, Building #3 <alan@lxorguk.ukuu.org.uk> | 4 | * (c) 1995 Alan Cox, Building #3 <alan@lxorguk.ukuu.org.uk> |
5 | * (c) 1998, 1999, 2000 Ingo Molnar <mingo@redhat.com> | 5 | * (c) 1998, 1999, 2000, 2009 Ingo Molnar <mingo@redhat.com> |
6 | * Copyright 2001 Andi Kleen, SuSE Labs. | 6 | * Copyright 2001 Andi Kleen, SuSE Labs. |
7 | * | 7 | * |
8 | * Much of the core SMP work is based on previous work by Thomas Radke, to | 8 | * Much of the core SMP work is based on previous work by Thomas Radke, to |
@@ -65,9 +65,8 @@ | |||
65 | #include <asm/uv/uv.h> | 65 | #include <asm/uv/uv.h> |
66 | #include <linux/mc146818rtc.h> | 66 | #include <linux/mc146818rtc.h> |
67 | 67 | ||
68 | #include <mach_apic.h> | 68 | #include <asm/genapic.h> |
69 | #include <mach_wakecpu.h> | 69 | #include <asm/smpboot_hooks.h> |
70 | #include <smpboot_hooks.h> | ||
71 | 70 | ||
72 | #ifdef CONFIG_X86_32 | 71 | #ifdef CONFIG_X86_32 |
73 | u8 apicid_2_node[MAX_APICID]; | 72 | u8 apicid_2_node[MAX_APICID]; |
@@ -163,7 +162,7 @@ static void map_cpu_to_logical_apicid(void) | |||
163 | { | 162 | { |
164 | int cpu = smp_processor_id(); | 163 | int cpu = smp_processor_id(); |
165 | int apicid = logical_smp_processor_id(); | 164 | int apicid = logical_smp_processor_id(); |
166 | int node = apicid_to_node(apicid); | 165 | int node = apic->apicid_to_node(apicid); |
167 | 166 | ||
168 | if (!node_online(node)) | 167 | if (!node_online(node)) |
169 | node = first_online_node; | 168 | node = first_online_node; |
@@ -196,7 +195,8 @@ static void __cpuinit smp_callin(void) | |||
196 | * our local APIC. We have to wait for the IPI or we'll | 195 | * our local APIC. We have to wait for the IPI or we'll |
197 | * lock up on an APIC access. | 196 | * lock up on an APIC access. |
198 | */ | 197 | */ |
199 | wait_for_init_deassert(&init_deasserted); | 198 | if (apic->wait_for_init_deassert) |
199 | apic->wait_for_init_deassert(&init_deasserted); | ||
200 | 200 | ||
201 | /* | 201 | /* |
202 | * (This works even if the APIC is not enabled.) | 202 | * (This works even if the APIC is not enabled.) |
@@ -243,7 +243,8 @@ static void __cpuinit smp_callin(void) | |||
243 | */ | 243 | */ |
244 | 244 | ||
245 | pr_debug("CALLIN, before setup_local_APIC().\n"); | 245 | pr_debug("CALLIN, before setup_local_APIC().\n"); |
246 | smp_callin_clear_local_apic(); | 246 | if (apic->smp_callin_clear_local_apic) |
247 | apic->smp_callin_clear_local_apic(); | ||
247 | setup_local_APIC(); | 248 | setup_local_APIC(); |
248 | end_local_APIC_setup(); | 249 | end_local_APIC_setup(); |
249 | map_cpu_to_logical_apicid(); | 250 | map_cpu_to_logical_apicid(); |
@@ -583,7 +584,7 @@ wakeup_secondary_cpu_via_nmi(int logical_apicid, unsigned long start_eip) | |||
583 | /* Target chip */ | 584 | /* Target chip */ |
584 | /* Boot on the stack */ | 585 | /* Boot on the stack */ |
585 | /* Kick the second */ | 586 | /* Kick the second */ |
586 | apic_icr_write(APIC_DM_NMI | APIC_DEST_LOGICAL, logical_apicid); | 587 | apic_icr_write(APIC_DM_NMI | apic->dest_logical, logical_apicid); |
587 | 588 | ||
588 | pr_debug("Waiting for send to finish...\n"); | 589 | pr_debug("Waiting for send to finish...\n"); |
589 | send_status = safe_apic_wait_icr_idle(); | 590 | send_status = safe_apic_wait_icr_idle(); |
@@ -749,7 +750,7 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu) | |||
749 | /* | 750 | /* |
750 | * NOTE - on most systems this is a PHYSICAL apic ID, but on multiquad | 751 | * NOTE - on most systems this is a PHYSICAL apic ID, but on multiquad |
751 | * (ie clustered apic addressing mode), this is a LOGICAL apic ID. | 752 | * (ie clustered apic addressing mode), this is a LOGICAL apic ID. |
752 | * Returns zero if CPU booted OK, else error code from wakeup_secondary_cpu. | 753 | * Returns zero if CPU booted OK, else error code from ->wakeup_cpu. |
753 | */ | 754 | */ |
754 | { | 755 | { |
755 | unsigned long boot_error = 0; | 756 | unsigned long boot_error = 0; |
@@ -793,7 +794,6 @@ static int __cpuinit do_boot_cpu(int apicid, int cpu) | |||
793 | do_rest: | 794 | do_rest: |
794 | per_cpu(current_task, cpu) = c_idle.idle; | 795 | per_cpu(current_task, cpu) = c_idle.idle; |
795 | #ifdef CONFIG_X86_32 | 796 | #ifdef CONFIG_X86_32 |
796 | init_gdt(cpu); | ||
797 | /* Stack for startup_32 can be just as for start_secondary onwards */ | 797 | /* Stack for startup_32 can be just as for start_secondary onwards */ |
798 | irq_ctx_init(cpu); | 798 | irq_ctx_init(cpu); |
799 | #else | 799 | #else |
@@ -825,7 +825,8 @@ do_rest: | |||
825 | 825 | ||
826 | pr_debug("Setting warm reset code and vector.\n"); | 826 | pr_debug("Setting warm reset code and vector.\n"); |
827 | 827 | ||
828 | store_NMI_vector(&nmi_high, &nmi_low); | 828 | if (apic->store_NMI_vector) |
829 | apic->store_NMI_vector(&nmi_high, &nmi_low); | ||
829 | 830 | ||
830 | smpboot_setup_warm_reset_vector(start_ip); | 831 | smpboot_setup_warm_reset_vector(start_ip); |
831 | /* | 832 | /* |
@@ -840,7 +841,7 @@ do_rest: | |||
840 | /* | 841 | /* |
841 | * Starting actual IPI sequence... | 842 | * Starting actual IPI sequence... |
842 | */ | 843 | */ |
843 | boot_error = wakeup_secondary_cpu(apicid, start_ip); | 844 | boot_error = apic->wakeup_cpu(apicid, start_ip); |
844 | 845 | ||
845 | if (!boot_error) { | 846 | if (!boot_error) { |
846 | /* | 847 | /* |
@@ -874,8 +875,8 @@ do_rest: | |||
874 | else | 875 | else |
875 | /* trampoline code not run */ | 876 | /* trampoline code not run */ |
876 | printk(KERN_ERR "Not responding.\n"); | 877 | printk(KERN_ERR "Not responding.\n"); |
877 | if (get_uv_system_type() != UV_NON_UNIQUE_APIC) | 878 | if (apic->inquire_remote_apic) |
878 | inquire_remote_apic(apicid); | 879 | apic->inquire_remote_apic(apicid); |
879 | } | 880 | } |
880 | } | 881 | } |
881 | 882 | ||
@@ -906,7 +907,7 @@ do_rest: | |||
906 | 907 | ||
907 | int __cpuinit native_cpu_up(unsigned int cpu) | 908 | int __cpuinit native_cpu_up(unsigned int cpu) |
908 | { | 909 | { |
909 | int apicid = cpu_present_to_apicid(cpu); | 910 | int apicid = apic->cpu_present_to_apicid(cpu); |
910 | unsigned long flags; | 911 | unsigned long flags; |
911 | int err; | 912 | int err; |
912 | 913 | ||
@@ -999,14 +1000,14 @@ static int __init smp_sanity_check(unsigned max_cpus) | |||
999 | { | 1000 | { |
1000 | preempt_disable(); | 1001 | preempt_disable(); |
1001 | 1002 | ||
1002 | #if defined(CONFIG_X86_PC) && defined(CONFIG_X86_32) | 1003 | #if !defined(CONFIG_X86_BIGSMP) && defined(CONFIG_X86_32) |
1003 | if (def_to_bigsmp && nr_cpu_ids > 8) { | 1004 | if (def_to_bigsmp && nr_cpu_ids > 8) { |
1004 | unsigned int cpu; | 1005 | unsigned int cpu; |
1005 | unsigned nr; | 1006 | unsigned nr; |
1006 | 1007 | ||
1007 | printk(KERN_WARNING | 1008 | printk(KERN_WARNING |
1008 | "More than 8 CPUs detected - skipping them.\n" | 1009 | "More than 8 CPUs detected - skipping them.\n" |
1009 | "Use CONFIG_X86_GENERICARCH and CONFIG_X86_BIGSMP.\n"); | 1010 | "Use CONFIG_X86_BIGSMP.\n"); |
1010 | 1011 | ||
1011 | nr = 0; | 1012 | nr = 0; |
1012 | for_each_present_cpu(cpu) { | 1013 | for_each_present_cpu(cpu) { |
@@ -1052,7 +1053,7 @@ static int __init smp_sanity_check(unsigned max_cpus) | |||
1052 | * Should not be necessary because the MP table should list the boot | 1053 | * Should not be necessary because the MP table should list the boot |
1053 | * CPU too, but we do it for the sake of robustness anyway. | 1054 | * CPU too, but we do it for the sake of robustness anyway. |
1054 | */ | 1055 | */ |
1055 | if (!check_phys_apicid_present(boot_cpu_physical_apicid)) { | 1056 | if (!apic->check_phys_apicid_present(boot_cpu_physical_apicid)) { |
1056 | printk(KERN_NOTICE | 1057 | printk(KERN_NOTICE |
1057 | "weird, boot CPU (#%d) not listed by the BIOS.\n", | 1058 | "weird, boot CPU (#%d) not listed by the BIOS.\n", |
1058 | boot_cpu_physical_apicid); | 1059 | boot_cpu_physical_apicid); |
@@ -1070,7 +1071,7 @@ static int __init smp_sanity_check(unsigned max_cpus) | |||
1070 | printk(KERN_ERR "... forcing use of dummy APIC emulation." | 1071 | printk(KERN_ERR "... forcing use of dummy APIC emulation." |
1071 | "(tell your hw vendor)\n"); | 1072 | "(tell your hw vendor)\n"); |
1072 | smpboot_clear_io_apic(); | 1073 | smpboot_clear_io_apic(); |
1073 | disable_ioapic_setup(); | 1074 | arch_disable_smp_support(); |
1074 | return -1; | 1075 | return -1; |
1075 | } | 1076 | } |
1076 | 1077 | ||
@@ -1129,7 +1130,7 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) | |||
1129 | 1130 | ||
1130 | #ifdef CONFIG_X86_64 | 1131 | #ifdef CONFIG_X86_64 |
1131 | enable_IR_x2apic(); | 1132 | enable_IR_x2apic(); |
1132 | setup_apic_routing(); | 1133 | default_setup_apic_routing(); |
1133 | #endif | 1134 | #endif |
1134 | 1135 | ||
1135 | if (smp_sanity_check(max_cpus) < 0) { | 1136 | if (smp_sanity_check(max_cpus) < 0) { |
@@ -1164,7 +1165,8 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) | |||
1164 | 1165 | ||
1165 | map_cpu_to_logical_apicid(); | 1166 | map_cpu_to_logical_apicid(); |
1166 | 1167 | ||
1167 | setup_portio_remap(); | 1168 | if (apic->setup_portio_remap) |
1169 | apic->setup_portio_remap(); | ||
1168 | 1170 | ||
1169 | smpboot_setup_io_apic(); | 1171 | smpboot_setup_io_apic(); |
1170 | /* | 1172 | /* |
@@ -1186,10 +1188,7 @@ out: | |||
1186 | void __init native_smp_prepare_boot_cpu(void) | 1188 | void __init native_smp_prepare_boot_cpu(void) |
1187 | { | 1189 | { |
1188 | int me = smp_processor_id(); | 1190 | int me = smp_processor_id(); |
1189 | #ifdef CONFIG_X86_32 | 1191 | switch_to_new_gdt(me); |
1190 | init_gdt(me); | ||
1191 | #endif | ||
1192 | switch_to_new_gdt(); | ||
1193 | /* already set me in cpu_online_mask in boot_cpu_init() */ | 1192 | /* already set me in cpu_online_mask in boot_cpu_init() */ |
1194 | cpumask_set_cpu(me, cpu_callout_mask); | 1193 | cpumask_set_cpu(me, cpu_callout_mask); |
1195 | per_cpu(cpu_state, me) = CPU_ONLINE; | 1194 | per_cpu(cpu_state, me) = CPU_ONLINE; |
diff --git a/arch/x86/kernel/smpcommon.c b/arch/x86/kernel/smpcommon.c deleted file mode 100644 index add36b4e37c9..000000000000 --- a/arch/x86/kernel/smpcommon.c +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | /* | ||
2 | * SMP stuff which is common to all sub-architectures. | ||
3 | */ | ||
4 | #include <linux/module.h> | ||
5 | #include <asm/smp.h> | ||
6 | #include <asm/sections.h> | ||
7 | |||
8 | #ifdef CONFIG_X86_64 | ||
9 | DEFINE_PER_CPU(unsigned long, this_cpu_off) = (unsigned long)__per_cpu_load; | ||
10 | #else | ||
11 | DEFINE_PER_CPU(unsigned long, this_cpu_off); | ||
12 | #endif | ||
13 | EXPORT_PER_CPU_SYMBOL(this_cpu_off); | ||
14 | |||
15 | #ifdef CONFIG_X86_32 | ||
16 | /* | ||
17 | * Initialize the CPU's GDT. This is either the boot CPU doing itself | ||
18 | * (still using the master per-cpu area), or a CPU doing it for a | ||
19 | * secondary which will soon come up. | ||
20 | */ | ||
21 | __cpuinit void init_gdt(int cpu) | ||
22 | { | ||
23 | struct desc_struct gdt; | ||
24 | |||
25 | pack_descriptor(&gdt, __per_cpu_offset[cpu], 0xFFFFF, | ||
26 | 0x2 | DESCTYPE_S, 0x8); | ||
27 | gdt.s = 1; | ||
28 | |||
29 | write_gdt_entry(get_cpu_gdt_table(cpu), | ||
30 | GDT_ENTRY_PERCPU, &gdt, DESCTYPE_S); | ||
31 | } | ||
32 | #endif | ||
diff --git a/arch/x86/kernel/stacktrace.c b/arch/x86/kernel/stacktrace.c index 10786af95545..f7bddc2e37d1 100644 --- a/arch/x86/kernel/stacktrace.c +++ b/arch/x86/kernel/stacktrace.c | |||
@@ -1,7 +1,7 @@ | |||
1 | /* | 1 | /* |
2 | * Stack trace management functions | 2 | * Stack trace management functions |
3 | * | 3 | * |
4 | * Copyright (C) 2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com> | 4 | * Copyright (C) 2006-2009 Red Hat, Inc., Ingo Molnar <mingo@redhat.com> |
5 | */ | 5 | */ |
6 | #include <linux/sched.h> | 6 | #include <linux/sched.h> |
7 | #include <linux/stacktrace.h> | 7 | #include <linux/stacktrace.h> |
diff --git a/arch/x86/kernel/summit_32.c b/arch/x86/kernel/summit_32.c index 7b987852e876..1e733eff9b33 100644 --- a/arch/x86/kernel/summit_32.c +++ b/arch/x86/kernel/summit_32.c | |||
@@ -30,8 +30,364 @@ | |||
30 | #include <linux/init.h> | 30 | #include <linux/init.h> |
31 | #include <asm/io.h> | 31 | #include <asm/io.h> |
32 | #include <asm/bios_ebda.h> | 32 | #include <asm/bios_ebda.h> |
33 | #include <asm/summit/mpparse.h> | ||
34 | 33 | ||
34 | /* | ||
35 | * APIC driver for the IBM "Summit" chipset. | ||
36 | */ | ||
37 | #define APIC_DEFINITION 1 | ||
38 | #include <linux/threads.h> | ||
39 | #include <linux/cpumask.h> | ||
40 | #include <asm/mpspec.h> | ||
41 | #include <asm/apic.h> | ||
42 | #include <asm/smp.h> | ||
43 | #include <asm/genapic.h> | ||
44 | #include <asm/fixmap.h> | ||
45 | #include <asm/apicdef.h> | ||
46 | #include <asm/ipi.h> | ||
47 | #include <linux/kernel.h> | ||
48 | #include <linux/string.h> | ||
49 | #include <linux/init.h> | ||
50 | #include <linux/gfp.h> | ||
51 | #include <linux/smp.h> | ||
52 | |||
53 | static inline unsigned summit_get_apic_id(unsigned long x) | ||
54 | { | ||
55 | return (x >> 24) & 0xFF; | ||
56 | } | ||
57 | |||
58 | static inline void summit_send_IPI_mask(const cpumask_t *mask, int vector) | ||
59 | { | ||
60 | default_send_IPI_mask_sequence_logical(mask, vector); | ||
61 | } | ||
62 | |||
63 | static inline void summit_send_IPI_allbutself(int vector) | ||
64 | { | ||
65 | cpumask_t mask = cpu_online_map; | ||
66 | cpu_clear(smp_processor_id(), mask); | ||
67 | |||
68 | if (!cpus_empty(mask)) | ||
69 | summit_send_IPI_mask(&mask, vector); | ||
70 | } | ||
71 | |||
72 | static inline void summit_send_IPI_all(int vector) | ||
73 | { | ||
74 | summit_send_IPI_mask(&cpu_online_map, vector); | ||
75 | } | ||
76 | |||
77 | #include <asm/tsc.h> | ||
78 | |||
79 | extern int use_cyclone; | ||
80 | |||
81 | #ifdef CONFIG_X86_SUMMIT_NUMA | ||
82 | extern void setup_summit(void); | ||
83 | #else | ||
84 | #define setup_summit() {} | ||
85 | #endif | ||
86 | |||
87 | static inline int | ||
88 | summit_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid) | ||
89 | { | ||
90 | if (!strncmp(oem, "IBM ENSW", 8) && | ||
91 | (!strncmp(productid, "VIGIL SMP", 9) | ||
92 | || !strncmp(productid, "EXA", 3) | ||
93 | || !strncmp(productid, "RUTHLESS SMP", 12))){ | ||
94 | mark_tsc_unstable("Summit based system"); | ||
95 | use_cyclone = 1; /*enable cyclone-timer*/ | ||
96 | setup_summit(); | ||
97 | return 1; | ||
98 | } | ||
99 | return 0; | ||
100 | } | ||
101 | |||
102 | /* Hook from generic ACPI tables.c */ | ||
103 | static inline int summit_acpi_madt_oem_check(char *oem_id, char *oem_table_id) | ||
104 | { | ||
105 | if (!strncmp(oem_id, "IBM", 3) && | ||
106 | (!strncmp(oem_table_id, "SERVIGIL", 8) | ||
107 | || !strncmp(oem_table_id, "EXA", 3))){ | ||
108 | mark_tsc_unstable("Summit based system"); | ||
109 | use_cyclone = 1; /*enable cyclone-timer*/ | ||
110 | setup_summit(); | ||
111 | return 1; | ||
112 | } | ||
113 | return 0; | ||
114 | } | ||
115 | |||
116 | struct rio_table_hdr { | ||
117 | unsigned char version; /* Version number of this data structure */ | ||
118 | /* Version 3 adds chassis_num & WP_index */ | ||
119 | unsigned char num_scal_dev; /* # of Scalability devices (Twisters for Vigil) */ | ||
120 | unsigned char num_rio_dev; /* # of RIO I/O devices (Cyclones and Winnipegs) */ | ||
121 | } __attribute__((packed)); | ||
122 | |||
123 | struct scal_detail { | ||
124 | unsigned char node_id; /* Scalability Node ID */ | ||
125 | unsigned long CBAR; /* Address of 1MB register space */ | ||
126 | unsigned char port0node; /* Node ID port connected to: 0xFF=None */ | ||
127 | unsigned char port0port; /* Port num port connected to: 0,1,2, or 0xFF=None */ | ||
128 | unsigned char port1node; /* Node ID port connected to: 0xFF = None */ | ||
129 | unsigned char port1port; /* Port num port connected to: 0,1,2, or 0xFF=None */ | ||
130 | unsigned char port2node; /* Node ID port connected to: 0xFF = None */ | ||
131 | unsigned char port2port; /* Port num port connected to: 0,1,2, or 0xFF=None */ | ||
132 | unsigned char chassis_num; /* 1 based Chassis number (1 = boot node) */ | ||
133 | } __attribute__((packed)); | ||
134 | |||
135 | struct rio_detail { | ||
136 | unsigned char node_id; /* RIO Node ID */ | ||
137 | unsigned long BBAR; /* Address of 1MB register space */ | ||
138 | unsigned char type; /* Type of device */ | ||
139 | unsigned char owner_id; /* For WPEG: Node ID of Cyclone that owns this WPEG*/ | ||
140 | /* For CYC: Node ID of Twister that owns this CYC */ | ||
141 | unsigned char port0node; /* Node ID port connected to: 0xFF=None */ | ||
142 | unsigned char port0port; /* Port num port connected to: 0,1,2, or 0xFF=None */ | ||
143 | unsigned char port1node; /* Node ID port connected to: 0xFF=None */ | ||
144 | unsigned char port1port; /* Port num port connected to: 0,1,2, or 0xFF=None */ | ||
145 | unsigned char first_slot; /* For WPEG: Lowest slot number below this WPEG */ | ||
146 | /* For CYC: 0 */ | ||
147 | unsigned char status; /* For WPEG: Bit 0 = 1 : the XAPIC is used */ | ||
148 | /* = 0 : the XAPIC is not used, ie:*/ | ||
149 | /* ints fwded to another XAPIC */ | ||
150 | /* Bits1:7 Reserved */ | ||
151 | /* For CYC: Bits0:7 Reserved */ | ||
152 | unsigned char WP_index; /* For WPEG: WPEG instance index - lower ones have */ | ||
153 | /* lower slot numbers/PCI bus numbers */ | ||
154 | /* For CYC: No meaning */ | ||
155 | unsigned char chassis_num; /* 1 based Chassis number */ | ||
156 | /* For LookOut WPEGs this field indicates the */ | ||
157 | /* Expansion Chassis #, enumerated from Boot */ | ||
158 | /* Node WPEG external port, then Boot Node CYC */ | ||
159 | /* external port, then Next Vigil chassis WPEG */ | ||
160 | /* external port, etc. */ | ||
161 | /* Shared Lookouts have only 1 chassis number (the */ | ||
162 | /* first one assigned) */ | ||
163 | } __attribute__((packed)); | ||
164 | |||
165 | |||
166 | typedef enum { | ||
167 | CompatTwister = 0, /* Compatibility Twister */ | ||
168 | AltTwister = 1, /* Alternate Twister of internal 8-way */ | ||
169 | CompatCyclone = 2, /* Compatibility Cyclone */ | ||
170 | AltCyclone = 3, /* Alternate Cyclone of internal 8-way */ | ||
171 | CompatWPEG = 4, /* Compatibility WPEG */ | ||
172 | AltWPEG = 5, /* Second Planar WPEG */ | ||
173 | LookOutAWPEG = 6, /* LookOut WPEG */ | ||
174 | LookOutBWPEG = 7, /* LookOut WPEG */ | ||
175 | } node_type; | ||
176 | |||
177 | static inline int is_WPEG(struct rio_detail *rio){ | ||
178 | return (rio->type == CompatWPEG || rio->type == AltWPEG || | ||
179 | rio->type == LookOutAWPEG || rio->type == LookOutBWPEG); | ||
180 | } | ||
181 | |||
182 | |||
183 | /* In clustered mode, the high nibble of APIC ID is a cluster number. | ||
184 | * The low nibble is a 4-bit bitmap. */ | ||
185 | #define XAPIC_DEST_CPUS_SHIFT 4 | ||
186 | #define XAPIC_DEST_CPUS_MASK ((1u << XAPIC_DEST_CPUS_SHIFT) - 1) | ||
187 | #define XAPIC_DEST_CLUSTER_MASK (XAPIC_DEST_CPUS_MASK << XAPIC_DEST_CPUS_SHIFT) | ||
188 | |||
189 | #define SUMMIT_APIC_DFR_VALUE (APIC_DFR_CLUSTER) | ||
190 | |||
191 | static inline const cpumask_t *summit_target_cpus(void) | ||
192 | { | ||
193 | /* CPU_MASK_ALL (0xff) has undefined behaviour with | ||
194 | * dest_LowestPrio mode logical clustered apic interrupt routing | ||
195 | * Just start on cpu 0. IRQ balancing will spread load | ||
196 | */ | ||
197 | return &cpumask_of_cpu(0); | ||
198 | } | ||
199 | |||
200 | static inline unsigned long | ||
201 | summit_check_apicid_used(physid_mask_t bitmap, int apicid) | ||
202 | { | ||
203 | return 0; | ||
204 | } | ||
205 | |||
206 | /* we don't use the phys_cpu_present_map to indicate apicid presence */ | ||
207 | static inline unsigned long summit_check_apicid_present(int bit) | ||
208 | { | ||
209 | return 1; | ||
210 | } | ||
211 | |||
212 | #define apicid_cluster(apicid) ((apicid) & XAPIC_DEST_CLUSTER_MASK) | ||
213 | |||
214 | extern u8 cpu_2_logical_apicid[]; | ||
215 | |||
216 | static inline void summit_init_apic_ldr(void) | ||
217 | { | ||
218 | unsigned long val, id; | ||
219 | int count = 0; | ||
220 | u8 my_id = (u8)hard_smp_processor_id(); | ||
221 | u8 my_cluster = (u8)apicid_cluster(my_id); | ||
222 | #ifdef CONFIG_SMP | ||
223 | u8 lid; | ||
224 | int i; | ||
225 | |||
226 | /* Create logical APIC IDs by counting CPUs already in cluster. */ | ||
227 | for (count = 0, i = nr_cpu_ids; --i >= 0; ) { | ||
228 | lid = cpu_2_logical_apicid[i]; | ||
229 | if (lid != BAD_APICID && apicid_cluster(lid) == my_cluster) | ||
230 | ++count; | ||
231 | } | ||
232 | #endif | ||
233 | /* We only have a 4 wide bitmap in cluster mode. If a deranged | ||
234 | * BIOS puts 5 CPUs in one APIC cluster, we're hosed. */ | ||
235 | BUG_ON(count >= XAPIC_DEST_CPUS_SHIFT); | ||
236 | id = my_cluster | (1UL << count); | ||
237 | apic_write(APIC_DFR, SUMMIT_APIC_DFR_VALUE); | ||
238 | val = apic_read(APIC_LDR) & ~APIC_LDR_MASK; | ||
239 | val |= SET_APIC_LOGICAL_ID(id); | ||
240 | apic_write(APIC_LDR, val); | ||
241 | } | ||
242 | |||
243 | static inline int summit_apic_id_registered(void) | ||
244 | { | ||
245 | return 1; | ||
246 | } | ||
247 | |||
248 | static inline void summit_setup_apic_routing(void) | ||
249 | { | ||
250 | printk("Enabling APIC mode: Summit. Using %d I/O APICs\n", | ||
251 | nr_ioapics); | ||
252 | } | ||
253 | |||
254 | static inline int summit_apicid_to_node(int logical_apicid) | ||
255 | { | ||
256 | #ifdef CONFIG_SMP | ||
257 | return apicid_2_node[hard_smp_processor_id()]; | ||
258 | #else | ||
259 | return 0; | ||
260 | #endif | ||
261 | } | ||
262 | |||
263 | /* Mapping from cpu number to logical apicid */ | ||
264 | static inline int summit_cpu_to_logical_apicid(int cpu) | ||
265 | { | ||
266 | #ifdef CONFIG_SMP | ||
267 | if (cpu >= nr_cpu_ids) | ||
268 | return BAD_APICID; | ||
269 | return (int)cpu_2_logical_apicid[cpu]; | ||
270 | #else | ||
271 | return logical_smp_processor_id(); | ||
272 | #endif | ||
273 | } | ||
274 | |||
275 | static inline int summit_cpu_present_to_apicid(int mps_cpu) | ||
276 | { | ||
277 | if (mps_cpu < nr_cpu_ids) | ||
278 | return (int)per_cpu(x86_bios_cpu_apicid, mps_cpu); | ||
279 | else | ||
280 | return BAD_APICID; | ||
281 | } | ||
282 | |||
283 | static inline physid_mask_t | ||
284 | summit_ioapic_phys_id_map(physid_mask_t phys_id_map) | ||
285 | { | ||
286 | /* For clustered we don't have a good way to do this yet - hack */ | ||
287 | return physids_promote(0x0F); | ||
288 | } | ||
289 | |||
290 | static inline physid_mask_t summit_apicid_to_cpu_present(int apicid) | ||
291 | { | ||
292 | return physid_mask_of_physid(0); | ||
293 | } | ||
294 | |||
295 | static inline void summit_setup_portio_remap(void) | ||
296 | { | ||
297 | } | ||
298 | |||
299 | static inline int summit_check_phys_apicid_present(int boot_cpu_physical_apicid) | ||
300 | { | ||
301 | return 1; | ||
302 | } | ||
303 | |||
304 | static inline unsigned int summit_cpu_mask_to_apicid(const cpumask_t *cpumask) | ||
305 | { | ||
306 | int cpus_found = 0; | ||
307 | int num_bits_set; | ||
308 | int apicid; | ||
309 | int cpu; | ||
310 | |||
311 | num_bits_set = cpus_weight(*cpumask); | ||
312 | /* Return id to all */ | ||
313 | if (num_bits_set >= nr_cpu_ids) | ||
314 | return 0xFF; | ||
315 | /* | ||
316 | * The cpus in the mask must all be on the apic cluster. If are not | ||
317 | * on the same apicid cluster return default value of target_cpus(): | ||
318 | */ | ||
319 | cpu = first_cpu(*cpumask); | ||
320 | apicid = summit_cpu_to_logical_apicid(cpu); | ||
321 | |||
322 | while (cpus_found < num_bits_set) { | ||
323 | if (cpu_isset(cpu, *cpumask)) { | ||
324 | int new_apicid = summit_cpu_to_logical_apicid(cpu); | ||
325 | |||
326 | if (apicid_cluster(apicid) != | ||
327 | apicid_cluster(new_apicid)) { | ||
328 | printk ("%s: Not a valid mask!\n", __func__); | ||
329 | |||
330 | return 0xFF; | ||
331 | } | ||
332 | apicid = apicid | new_apicid; | ||
333 | cpus_found++; | ||
334 | } | ||
335 | cpu++; | ||
336 | } | ||
337 | return apicid; | ||
338 | } | ||
339 | |||
340 | static inline unsigned int | ||
341 | summit_cpu_mask_to_apicid_and(const struct cpumask *inmask, | ||
342 | const struct cpumask *andmask) | ||
343 | { | ||
344 | int apicid = summit_cpu_to_logical_apicid(0); | ||
345 | cpumask_var_t cpumask; | ||
346 | |||
347 | if (!alloc_cpumask_var(&cpumask, GFP_ATOMIC)) | ||
348 | return apicid; | ||
349 | |||
350 | cpumask_and(cpumask, inmask, andmask); | ||
351 | cpumask_and(cpumask, cpumask, cpu_online_mask); | ||
352 | apicid = summit_cpu_mask_to_apicid(cpumask); | ||
353 | |||
354 | free_cpumask_var(cpumask); | ||
355 | |||
356 | return apicid; | ||
357 | } | ||
358 | |||
359 | /* | ||
360 | * cpuid returns the value latched in the HW at reset, not the APIC ID | ||
361 | * register's value. For any box whose BIOS changes APIC IDs, like | ||
362 | * clustered APIC systems, we must use hard_smp_processor_id. | ||
363 | * | ||
364 | * See Intel's IA-32 SW Dev's Manual Vol2 under CPUID. | ||
365 | */ | ||
366 | static inline int summit_phys_pkg_id(int cpuid_apic, int index_msb) | ||
367 | { | ||
368 | return hard_smp_processor_id() >> index_msb; | ||
369 | } | ||
370 | |||
371 | static int probe_summit(void) | ||
372 | { | ||
373 | /* probed later in mptable/ACPI hooks */ | ||
374 | return 0; | ||
375 | } | ||
376 | |||
377 | static void summit_vector_allocation_domain(int cpu, cpumask_t *retmask) | ||
378 | { | ||
379 | /* Careful. Some cpus do not strictly honor the set of cpus | ||
380 | * specified in the interrupt destination when using lowest | ||
381 | * priority interrupt delivery mode. | ||
382 | * | ||
383 | * In particular there was a hyperthreading cpu observed to | ||
384 | * deliver interrupts to the wrong hyperthread when only one | ||
385 | * hyperthread was specified in the interrupt desitination. | ||
386 | */ | ||
387 | *retmask = (cpumask_t){ { [0] = APIC_ALL_CPUS, } }; | ||
388 | } | ||
389 | |||
390 | #ifdef CONFIG_X86_SUMMIT_NUMA | ||
35 | static struct rio_table_hdr *rio_table_hdr __initdata; | 391 | static struct rio_table_hdr *rio_table_hdr __initdata; |
36 | static struct scal_detail *scal_devs[MAX_NUMNODES] __initdata; | 392 | static struct scal_detail *scal_devs[MAX_NUMNODES] __initdata; |
37 | static struct rio_detail *rio_devs[MAX_NUMNODES*4] __initdata; | 393 | static struct rio_detail *rio_devs[MAX_NUMNODES*4] __initdata; |
@@ -186,3 +542,61 @@ void __init setup_summit(void) | |||
186 | next_wpeg = 0; | 542 | next_wpeg = 0; |
187 | } while (next_wpeg != 0); | 543 | } while (next_wpeg != 0); |
188 | } | 544 | } |
545 | #endif | ||
546 | |||
547 | struct genapic apic_summit = { | ||
548 | |||
549 | .name = "summit", | ||
550 | .probe = probe_summit, | ||
551 | .acpi_madt_oem_check = summit_acpi_madt_oem_check, | ||
552 | .apic_id_registered = summit_apic_id_registered, | ||
553 | |||
554 | .irq_delivery_mode = dest_LowestPrio, | ||
555 | /* logical delivery broadcast to all CPUs: */ | ||
556 | .irq_dest_mode = 1, | ||
557 | |||
558 | .target_cpus = summit_target_cpus, | ||
559 | .disable_esr = 1, | ||
560 | .dest_logical = APIC_DEST_LOGICAL, | ||
561 | .check_apicid_used = summit_check_apicid_used, | ||
562 | .check_apicid_present = summit_check_apicid_present, | ||
563 | |||
564 | .vector_allocation_domain = summit_vector_allocation_domain, | ||
565 | .init_apic_ldr = summit_init_apic_ldr, | ||
566 | |||
567 | .ioapic_phys_id_map = summit_ioapic_phys_id_map, | ||
568 | .setup_apic_routing = summit_setup_apic_routing, | ||
569 | .multi_timer_check = NULL, | ||
570 | .apicid_to_node = summit_apicid_to_node, | ||
571 | .cpu_to_logical_apicid = summit_cpu_to_logical_apicid, | ||
572 | .cpu_present_to_apicid = summit_cpu_present_to_apicid, | ||
573 | .apicid_to_cpu_present = summit_apicid_to_cpu_present, | ||
574 | .setup_portio_remap = NULL, | ||
575 | .check_phys_apicid_present = summit_check_phys_apicid_present, | ||
576 | .enable_apic_mode = NULL, | ||
577 | .phys_pkg_id = summit_phys_pkg_id, | ||
578 | .mps_oem_check = summit_mps_oem_check, | ||
579 | |||
580 | .get_apic_id = summit_get_apic_id, | ||
581 | .set_apic_id = NULL, | ||
582 | .apic_id_mask = 0xFF << 24, | ||
583 | |||
584 | .cpu_mask_to_apicid = summit_cpu_mask_to_apicid, | ||
585 | .cpu_mask_to_apicid_and = summit_cpu_mask_to_apicid_and, | ||
586 | |||
587 | .send_IPI_mask = summit_send_IPI_mask, | ||
588 | .send_IPI_mask_allbutself = NULL, | ||
589 | .send_IPI_allbutself = summit_send_IPI_allbutself, | ||
590 | .send_IPI_all = summit_send_IPI_all, | ||
591 | .send_IPI_self = default_send_IPI_self, | ||
592 | |||
593 | .wakeup_cpu = NULL, | ||
594 | .trampoline_phys_low = DEFAULT_TRAMPOLINE_PHYS_LOW, | ||
595 | .trampoline_phys_high = DEFAULT_TRAMPOLINE_PHYS_HIGH, | ||
596 | |||
597 | .wait_for_init_deassert = default_wait_for_init_deassert, | ||
598 | |||
599 | .smp_callin_clear_local_apic = NULL, | ||
600 | .store_NMI_vector = NULL, | ||
601 | .inquire_remote_apic = default_inquire_remote_apic, | ||
602 | }; | ||
diff --git a/arch/x86/kernel/syscall_table_32.S b/arch/x86/kernel/syscall_table_32.S index 0c4d601bc853..b7607c4f2042 100644 --- a/arch/x86/kernel/syscall_table_32.S +++ b/arch/x86/kernel/syscall_table_32.S | |||
@@ -1,7 +1,7 @@ | |||
1 | ENTRY(sys_call_table) | 1 | ENTRY(sys_call_table) |
2 | .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */ | 2 | .long sys_restart_syscall /* 0 - old "setup()" system call, used for restarting */ |
3 | .long sys_exit | 3 | .long sys_exit |
4 | .long sys_fork | 4 | .long ptregs_fork |
5 | .long sys_read | 5 | .long sys_read |
6 | .long sys_write | 6 | .long sys_write |
7 | .long sys_open /* 5 */ | 7 | .long sys_open /* 5 */ |
@@ -10,7 +10,7 @@ ENTRY(sys_call_table) | |||
10 | .long sys_creat | 10 | .long sys_creat |
11 | .long sys_link | 11 | .long sys_link |
12 | .long sys_unlink /* 10 */ | 12 | .long sys_unlink /* 10 */ |
13 | .long sys_execve | 13 | .long ptregs_execve |
14 | .long sys_chdir | 14 | .long sys_chdir |
15 | .long sys_time | 15 | .long sys_time |
16 | .long sys_mknod | 16 | .long sys_mknod |
@@ -109,17 +109,17 @@ ENTRY(sys_call_table) | |||
109 | .long sys_newlstat | 109 | .long sys_newlstat |
110 | .long sys_newfstat | 110 | .long sys_newfstat |
111 | .long sys_uname | 111 | .long sys_uname |
112 | .long sys_iopl /* 110 */ | 112 | .long ptregs_iopl /* 110 */ |
113 | .long sys_vhangup | 113 | .long sys_vhangup |
114 | .long sys_ni_syscall /* old "idle" system call */ | 114 | .long sys_ni_syscall /* old "idle" system call */ |
115 | .long sys_vm86old | 115 | .long ptregs_vm86old |
116 | .long sys_wait4 | 116 | .long sys_wait4 |
117 | .long sys_swapoff /* 115 */ | 117 | .long sys_swapoff /* 115 */ |
118 | .long sys_sysinfo | 118 | .long sys_sysinfo |
119 | .long sys_ipc | 119 | .long sys_ipc |
120 | .long sys_fsync | 120 | .long sys_fsync |
121 | .long sys_sigreturn | 121 | .long ptregs_sigreturn |
122 | .long sys_clone /* 120 */ | 122 | .long ptregs_clone /* 120 */ |
123 | .long sys_setdomainname | 123 | .long sys_setdomainname |
124 | .long sys_newuname | 124 | .long sys_newuname |
125 | .long sys_modify_ldt | 125 | .long sys_modify_ldt |
@@ -165,14 +165,14 @@ ENTRY(sys_call_table) | |||
165 | .long sys_mremap | 165 | .long sys_mremap |
166 | .long sys_setresuid16 | 166 | .long sys_setresuid16 |
167 | .long sys_getresuid16 /* 165 */ | 167 | .long sys_getresuid16 /* 165 */ |
168 | .long sys_vm86 | 168 | .long ptregs_vm86 |
169 | .long sys_ni_syscall /* Old sys_query_module */ | 169 | .long sys_ni_syscall /* Old sys_query_module */ |
170 | .long sys_poll | 170 | .long sys_poll |
171 | .long sys_nfsservctl | 171 | .long sys_nfsservctl |
172 | .long sys_setresgid16 /* 170 */ | 172 | .long sys_setresgid16 /* 170 */ |
173 | .long sys_getresgid16 | 173 | .long sys_getresgid16 |
174 | .long sys_prctl | 174 | .long sys_prctl |
175 | .long sys_rt_sigreturn | 175 | .long ptregs_rt_sigreturn |
176 | .long sys_rt_sigaction | 176 | .long sys_rt_sigaction |
177 | .long sys_rt_sigprocmask /* 175 */ | 177 | .long sys_rt_sigprocmask /* 175 */ |
178 | .long sys_rt_sigpending | 178 | .long sys_rt_sigpending |
@@ -185,11 +185,11 @@ ENTRY(sys_call_table) | |||
185 | .long sys_getcwd | 185 | .long sys_getcwd |
186 | .long sys_capget | 186 | .long sys_capget |
187 | .long sys_capset /* 185 */ | 187 | .long sys_capset /* 185 */ |
188 | .long sys_sigaltstack | 188 | .long ptregs_sigaltstack |
189 | .long sys_sendfile | 189 | .long sys_sendfile |
190 | .long sys_ni_syscall /* reserved for streams1 */ | 190 | .long sys_ni_syscall /* reserved for streams1 */ |
191 | .long sys_ni_syscall /* reserved for streams2 */ | 191 | .long sys_ni_syscall /* reserved for streams2 */ |
192 | .long sys_vfork /* 190 */ | 192 | .long ptregs_vfork /* 190 */ |
193 | .long sys_getrlimit | 193 | .long sys_getrlimit |
194 | .long sys_mmap2 | 194 | .long sys_mmap2 |
195 | .long sys_truncate64 | 195 | .long sys_truncate64 |
diff --git a/arch/x86/kernel/time_32.c b/arch/x86/kernel/time_32.c index 3985cac0ed47..764c74e871f2 100644 --- a/arch/x86/kernel/time_32.c +++ b/arch/x86/kernel/time_32.c | |||
@@ -38,7 +38,7 @@ | |||
38 | #include <asm/time.h> | 38 | #include <asm/time.h> |
39 | #include <asm/timer.h> | 39 | #include <asm/timer.h> |
40 | 40 | ||
41 | #include "do_timer.h" | 41 | #include <asm/do_timer.h> |
42 | 42 | ||
43 | int timer_ack; | 43 | int timer_ack; |
44 | 44 | ||
diff --git a/arch/x86/kernel/tlb_uv.c b/arch/x86/kernel/tlb_uv.c index 89fce1b6d01f..f396e61bcb34 100644 --- a/arch/x86/kernel/tlb_uv.c +++ b/arch/x86/kernel/tlb_uv.c | |||
@@ -20,7 +20,7 @@ | |||
20 | #include <asm/tsc.h> | 20 | #include <asm/tsc.h> |
21 | #include <asm/irq_vectors.h> | 21 | #include <asm/irq_vectors.h> |
22 | 22 | ||
23 | #include <mach_apic.h> | 23 | #include <asm/genapic.h> |
24 | 24 | ||
25 | static struct bau_control **uv_bau_table_bases __read_mostly; | 25 | static struct bau_control **uv_bau_table_bases __read_mostly; |
26 | static int uv_bau_retry_limit __read_mostly; | 26 | static int uv_bau_retry_limit __read_mostly; |
@@ -259,7 +259,7 @@ const struct cpumask *uv_flush_send_and_wait(int cpu, int this_blade, | |||
259 | * the cpu's, all of which are still in the mask. | 259 | * the cpu's, all of which are still in the mask. |
260 | */ | 260 | */ |
261 | __get_cpu_var(ptcstats).ptc_i++; | 261 | __get_cpu_var(ptcstats).ptc_i++; |
262 | return 0; | 262 | return flush_mask; |
263 | } | 263 | } |
264 | 264 | ||
265 | /* | 265 | /* |
diff --git a/arch/x86/kernel/trampoline_64.S b/arch/x86/kernel/trampoline_64.S index 894293c598db..95a012a4664e 100644 --- a/arch/x86/kernel/trampoline_64.S +++ b/arch/x86/kernel/trampoline_64.S | |||
@@ -29,6 +29,7 @@ | |||
29 | #include <asm/page.h> | 29 | #include <asm/page.h> |
30 | #include <asm/msr.h> | 30 | #include <asm/msr.h> |
31 | #include <asm/segment.h> | 31 | #include <asm/segment.h> |
32 | #include <asm/processor-flags.h> | ||
32 | 33 | ||
33 | .section .rodata, "a", @progbits | 34 | .section .rodata, "a", @progbits |
34 | 35 | ||
@@ -37,7 +38,7 @@ | |||
37 | ENTRY(trampoline_data) | 38 | ENTRY(trampoline_data) |
38 | r_base = . | 39 | r_base = . |
39 | cli # We should be safe anyway | 40 | cli # We should be safe anyway |
40 | wbinvd | 41 | wbinvd |
41 | mov %cs, %ax # Code and data in the same place | 42 | mov %cs, %ax # Code and data in the same place |
42 | mov %ax, %ds | 43 | mov %ax, %ds |
43 | mov %ax, %es | 44 | mov %ax, %es |
@@ -73,9 +74,8 @@ r_base = . | |||
73 | lidtl tidt - r_base # load idt with 0, 0 | 74 | lidtl tidt - r_base # load idt with 0, 0 |
74 | lgdtl tgdt - r_base # load gdt with whatever is appropriate | 75 | lgdtl tgdt - r_base # load gdt with whatever is appropriate |
75 | 76 | ||
76 | xor %ax, %ax | 77 | mov $X86_CR0_PE, %ax # protected mode (PE) bit |
77 | inc %ax # protected mode (PE) bit | 78 | lmsw %ax # into protected mode |
78 | lmsw %ax # into protected mode | ||
79 | 79 | ||
80 | # flush prefetch and jump to startup_32 | 80 | # flush prefetch and jump to startup_32 |
81 | ljmpl *(startup_32_vector - r_base) | 81 | ljmpl *(startup_32_vector - r_base) |
@@ -86,9 +86,8 @@ startup_32: | |||
86 | movl $__KERNEL_DS, %eax # Initialize the %ds segment register | 86 | movl $__KERNEL_DS, %eax # Initialize the %ds segment register |
87 | movl %eax, %ds | 87 | movl %eax, %ds |
88 | 88 | ||
89 | xorl %eax, %eax | 89 | movl $X86_CR4_PAE, %eax |
90 | btsl $5, %eax # Enable PAE mode | 90 | movl %eax, %cr4 # Enable PAE mode |
91 | movl %eax, %cr4 | ||
92 | 91 | ||
93 | # Setup trampoline 4 level pagetables | 92 | # Setup trampoline 4 level pagetables |
94 | leal (trampoline_level4_pgt - r_base)(%esi), %eax | 93 | leal (trampoline_level4_pgt - r_base)(%esi), %eax |
@@ -99,9 +98,9 @@ startup_32: | |||
99 | xorl %edx, %edx | 98 | xorl %edx, %edx |
100 | wrmsr | 99 | wrmsr |
101 | 100 | ||
102 | xorl %eax, %eax | 101 | # Enable paging and in turn activate Long Mode |
103 | btsl $31, %eax # Enable paging and in turn activate Long Mode | 102 | # Enable protected mode |
104 | btsl $0, %eax # Enable protected mode | 103 | movl $(X86_CR0_PG | X86_CR0_PE), %eax |
105 | movl %eax, %cr0 | 104 | movl %eax, %cr0 |
106 | 105 | ||
107 | /* | 106 | /* |
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 17483fe98e9c..6cba7abf3518 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c | |||
@@ -54,7 +54,7 @@ | |||
54 | #include <asm/desc.h> | 54 | #include <asm/desc.h> |
55 | #include <asm/i387.h> | 55 | #include <asm/i387.h> |
56 | 56 | ||
57 | #include <mach_traps.h> | 57 | #include <asm/mach_traps.h> |
58 | 58 | ||
59 | #ifdef CONFIG_X86_64 | 59 | #ifdef CONFIG_X86_64 |
60 | #include <asm/pgalloc.h> | 60 | #include <asm/pgalloc.h> |
@@ -905,19 +905,20 @@ void math_emulate(struct math_emu_info *info) | |||
905 | } | 905 | } |
906 | #endif /* CONFIG_MATH_EMULATION */ | 906 | #endif /* CONFIG_MATH_EMULATION */ |
907 | 907 | ||
908 | dotraplinkage void __kprobes do_device_not_available(struct pt_regs regs) | 908 | dotraplinkage void __kprobes |
909 | do_device_not_available(struct pt_regs *regs, long error_code) | ||
909 | { | 910 | { |
910 | #ifdef CONFIG_X86_32 | 911 | #ifdef CONFIG_X86_32 |
911 | if (read_cr0() & X86_CR0_EM) { | 912 | if (read_cr0() & X86_CR0_EM) { |
912 | struct math_emu_info info = { }; | 913 | struct math_emu_info info = { }; |
913 | 914 | ||
914 | conditional_sti(®s); | 915 | conditional_sti(regs); |
915 | 916 | ||
916 | info.regs = ®s; | 917 | info.regs = regs; |
917 | math_emulate(&info); | 918 | math_emulate(&info); |
918 | } else { | 919 | } else { |
919 | math_state_restore(); /* interrupts still off */ | 920 | math_state_restore(); /* interrupts still off */ |
920 | conditional_sti(®s); | 921 | conditional_sti(regs); |
921 | } | 922 | } |
922 | #else | 923 | #else |
923 | math_state_restore(); | 924 | math_state_restore(); |
diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c index 599e58168631..83d53ce5d4c4 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c | |||
@@ -773,7 +773,7 @@ __cpuinit int unsynchronized_tsc(void) | |||
773 | if (!cpu_has_tsc || tsc_unstable) | 773 | if (!cpu_has_tsc || tsc_unstable) |
774 | return 1; | 774 | return 1; |
775 | 775 | ||
776 | #ifdef CONFIG_X86_SMP | 776 | #ifdef CONFIG_SMP |
777 | if (apic_is_clustered_box()) | 777 | if (apic_is_clustered_box()) |
778 | return 1; | 778 | return 1; |
779 | #endif | 779 | #endif |
diff --git a/arch/x86/kernel/visws_quirks.c b/arch/x86/kernel/visws_quirks.c index d801d06af068..4fd646e6dd43 100644 --- a/arch/x86/kernel/visws_quirks.c +++ b/arch/x86/kernel/visws_quirks.c | |||
@@ -32,9 +32,9 @@ | |||
32 | #include <asm/e820.h> | 32 | #include <asm/e820.h> |
33 | #include <asm/io.h> | 33 | #include <asm/io.h> |
34 | 34 | ||
35 | #include <mach_ipi.h> | 35 | #include <asm/genapic.h> |
36 | 36 | ||
37 | #include "mach_apic.h" | 37 | #include <asm/genapic.h> |
38 | 38 | ||
39 | #include <linux/kernel_stat.h> | 39 | #include <linux/kernel_stat.h> |
40 | 40 | ||
@@ -200,7 +200,7 @@ static void __init MP_processor_info(struct mpc_cpu *m) | |||
200 | return; | 200 | return; |
201 | } | 201 | } |
202 | 202 | ||
203 | apic_cpus = apicid_to_cpu_present(m->apicid); | 203 | apic_cpus = apic->apicid_to_cpu_present(m->apicid); |
204 | physids_or(phys_cpu_present_map, phys_cpu_present_map, apic_cpus); | 204 | physids_or(phys_cpu_present_map, phys_cpu_present_map, apic_cpus); |
205 | /* | 205 | /* |
206 | * Validate version | 206 | * Validate version |
diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c index 4eeb5cf9720d..d7ac84e7fc1c 100644 --- a/arch/x86/kernel/vm86_32.c +++ b/arch/x86/kernel/vm86_32.c | |||
@@ -158,7 +158,7 @@ struct pt_regs *save_v86_state(struct kernel_vm86_regs *regs) | |||
158 | ret = KVM86->regs32; | 158 | ret = KVM86->regs32; |
159 | 159 | ||
160 | ret->fs = current->thread.saved_fs; | 160 | ret->fs = current->thread.saved_fs; |
161 | loadsegment(gs, current->thread.saved_gs); | 161 | set_user_gs(ret, current->thread.saved_gs); |
162 | 162 | ||
163 | return ret; | 163 | return ret; |
164 | } | 164 | } |
@@ -197,9 +197,9 @@ out: | |||
197 | static int do_vm86_irq_handling(int subfunction, int irqnumber); | 197 | static int do_vm86_irq_handling(int subfunction, int irqnumber); |
198 | static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk); | 198 | static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk); |
199 | 199 | ||
200 | asmlinkage int sys_vm86old(struct pt_regs regs) | 200 | int sys_vm86old(struct pt_regs *regs) |
201 | { | 201 | { |
202 | struct vm86_struct __user *v86 = (struct vm86_struct __user *)regs.bx; | 202 | struct vm86_struct __user *v86 = (struct vm86_struct __user *)regs->bx; |
203 | struct kernel_vm86_struct info; /* declare this _on top_, | 203 | struct kernel_vm86_struct info; /* declare this _on top_, |
204 | * this avoids wasting of stack space. | 204 | * this avoids wasting of stack space. |
205 | * This remains on the stack until we | 205 | * This remains on the stack until we |
@@ -218,7 +218,7 @@ asmlinkage int sys_vm86old(struct pt_regs regs) | |||
218 | if (tmp) | 218 | if (tmp) |
219 | goto out; | 219 | goto out; |
220 | memset(&info.vm86plus, 0, (int)&info.regs32 - (int)&info.vm86plus); | 220 | memset(&info.vm86plus, 0, (int)&info.regs32 - (int)&info.vm86plus); |
221 | info.regs32 = ®s; | 221 | info.regs32 = regs; |
222 | tsk->thread.vm86_info = v86; | 222 | tsk->thread.vm86_info = v86; |
223 | do_sys_vm86(&info, tsk); | 223 | do_sys_vm86(&info, tsk); |
224 | ret = 0; /* we never return here */ | 224 | ret = 0; /* we never return here */ |
@@ -227,7 +227,7 @@ out: | |||
227 | } | 227 | } |
228 | 228 | ||
229 | 229 | ||
230 | asmlinkage int sys_vm86(struct pt_regs regs) | 230 | int sys_vm86(struct pt_regs *regs) |
231 | { | 231 | { |
232 | struct kernel_vm86_struct info; /* declare this _on top_, | 232 | struct kernel_vm86_struct info; /* declare this _on top_, |
233 | * this avoids wasting of stack space. | 233 | * this avoids wasting of stack space. |
@@ -239,12 +239,12 @@ asmlinkage int sys_vm86(struct pt_regs regs) | |||
239 | struct vm86plus_struct __user *v86; | 239 | struct vm86plus_struct __user *v86; |
240 | 240 | ||
241 | tsk = current; | 241 | tsk = current; |
242 | switch (regs.bx) { | 242 | switch (regs->bx) { |
243 | case VM86_REQUEST_IRQ: | 243 | case VM86_REQUEST_IRQ: |
244 | case VM86_FREE_IRQ: | 244 | case VM86_FREE_IRQ: |
245 | case VM86_GET_IRQ_BITS: | 245 | case VM86_GET_IRQ_BITS: |
246 | case VM86_GET_AND_RESET_IRQ: | 246 | case VM86_GET_AND_RESET_IRQ: |
247 | ret = do_vm86_irq_handling(regs.bx, (int)regs.cx); | 247 | ret = do_vm86_irq_handling(regs->bx, (int)regs->cx); |
248 | goto out; | 248 | goto out; |
249 | case VM86_PLUS_INSTALL_CHECK: | 249 | case VM86_PLUS_INSTALL_CHECK: |
250 | /* | 250 | /* |
@@ -261,14 +261,14 @@ asmlinkage int sys_vm86(struct pt_regs regs) | |||
261 | ret = -EPERM; | 261 | ret = -EPERM; |
262 | if (tsk->thread.saved_sp0) | 262 | if (tsk->thread.saved_sp0) |
263 | goto out; | 263 | goto out; |
264 | v86 = (struct vm86plus_struct __user *)regs.cx; | 264 | v86 = (struct vm86plus_struct __user *)regs->cx; |
265 | tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs, | 265 | tmp = copy_vm86_regs_from_user(&info.regs, &v86->regs, |
266 | offsetof(struct kernel_vm86_struct, regs32) - | 266 | offsetof(struct kernel_vm86_struct, regs32) - |
267 | sizeof(info.regs)); | 267 | sizeof(info.regs)); |
268 | ret = -EFAULT; | 268 | ret = -EFAULT; |
269 | if (tmp) | 269 | if (tmp) |
270 | goto out; | 270 | goto out; |
271 | info.regs32 = ®s; | 271 | info.regs32 = regs; |
272 | info.vm86plus.is_vm86pus = 1; | 272 | info.vm86plus.is_vm86pus = 1; |
273 | tsk->thread.vm86_info = (struct vm86_struct __user *)v86; | 273 | tsk->thread.vm86_info = (struct vm86_struct __user *)v86; |
274 | do_sys_vm86(&info, tsk); | 274 | do_sys_vm86(&info, tsk); |
@@ -323,7 +323,7 @@ static void do_sys_vm86(struct kernel_vm86_struct *info, struct task_struct *tsk | |||
323 | info->regs32->ax = 0; | 323 | info->regs32->ax = 0; |
324 | tsk->thread.saved_sp0 = tsk->thread.sp0; | 324 | tsk->thread.saved_sp0 = tsk->thread.sp0; |
325 | tsk->thread.saved_fs = info->regs32->fs; | 325 | tsk->thread.saved_fs = info->regs32->fs; |
326 | savesegment(gs, tsk->thread.saved_gs); | 326 | tsk->thread.saved_gs = get_user_gs(info->regs32); |
327 | 327 | ||
328 | tss = &per_cpu(init_tss, get_cpu()); | 328 | tss = &per_cpu(init_tss, get_cpu()); |
329 | tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0; | 329 | tsk->thread.sp0 = (unsigned long) &info->VM86_TSS_ESP0; |
diff --git a/arch/x86/kernel/vmi_32.c b/arch/x86/kernel/vmi_32.c index bef58b4982db..f052c84ecbe4 100644 --- a/arch/x86/kernel/vmi_32.c +++ b/arch/x86/kernel/vmi_32.c | |||
@@ -680,10 +680,11 @@ static inline int __init activate_vmi(void) | |||
680 | para_fill(pv_mmu_ops.write_cr2, SetCR2); | 680 | para_fill(pv_mmu_ops.write_cr2, SetCR2); |
681 | para_fill(pv_mmu_ops.write_cr3, SetCR3); | 681 | para_fill(pv_mmu_ops.write_cr3, SetCR3); |
682 | para_fill(pv_cpu_ops.write_cr4, SetCR4); | 682 | para_fill(pv_cpu_ops.write_cr4, SetCR4); |
683 | para_fill(pv_irq_ops.save_fl, GetInterruptMask); | 683 | |
684 | para_fill(pv_irq_ops.restore_fl, SetInterruptMask); | 684 | para_fill(pv_irq_ops.save_fl.func, GetInterruptMask); |
685 | para_fill(pv_irq_ops.irq_disable, DisableInterrupts); | 685 | para_fill(pv_irq_ops.restore_fl.func, SetInterruptMask); |
686 | para_fill(pv_irq_ops.irq_enable, EnableInterrupts); | 686 | para_fill(pv_irq_ops.irq_disable.func, DisableInterrupts); |
687 | para_fill(pv_irq_ops.irq_enable.func, EnableInterrupts); | ||
687 | 688 | ||
688 | para_fill(pv_cpu_ops.wbinvd, WBINVD); | 689 | para_fill(pv_cpu_ops.wbinvd, WBINVD); |
689 | para_fill(pv_cpu_ops.read_tsc, RDTSC); | 690 | para_fill(pv_cpu_ops.read_tsc, RDTSC); |
diff --git a/arch/x86/kernel/vmiclock_32.c b/arch/x86/kernel/vmiclock_32.c index c4c1f9e09402..a4791ef412d1 100644 --- a/arch/x86/kernel/vmiclock_32.c +++ b/arch/x86/kernel/vmiclock_32.c | |||
@@ -256,7 +256,7 @@ void __devinit vmi_time_bsp_init(void) | |||
256 | */ | 256 | */ |
257 | clockevents_notify(CLOCK_EVT_NOTIFY_SUSPEND, NULL); | 257 | clockevents_notify(CLOCK_EVT_NOTIFY_SUSPEND, NULL); |
258 | local_irq_disable(); | 258 | local_irq_disable(); |
259 | #ifdef CONFIG_X86_SMP | 259 | #ifdef CONFIG_SMP |
260 | /* | 260 | /* |
261 | * XXX handle_percpu_irq only defined for SMP; we need to switch over | 261 | * XXX handle_percpu_irq only defined for SMP; we need to switch over |
262 | * to using it, since this is a local interrupt, which each CPU must | 262 | * to using it, since this is a local interrupt, which each CPU must |
diff --git a/arch/x86/kernel/vmlinux_64.lds.S b/arch/x86/kernel/vmlinux_64.lds.S index c9740996430a..087a7f2c639b 100644 --- a/arch/x86/kernel/vmlinux_64.lds.S +++ b/arch/x86/kernel/vmlinux_64.lds.S | |||
@@ -22,6 +22,7 @@ PHDRS { | |||
22 | #ifdef CONFIG_SMP | 22 | #ifdef CONFIG_SMP |
23 | percpu PT_LOAD FLAGS(7); /* RWE */ | 23 | percpu PT_LOAD FLAGS(7); /* RWE */ |
24 | #endif | 24 | #endif |
25 | data.init2 PT_LOAD FLAGS(7); /* RWE */ | ||
25 | note PT_NOTE FLAGS(0); /* ___ */ | 26 | note PT_NOTE FLAGS(0); /* ___ */ |
26 | } | 27 | } |
27 | SECTIONS | 28 | SECTIONS |
@@ -215,7 +216,7 @@ SECTIONS | |||
215 | /* | 216 | /* |
216 | * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the | 217 | * percpu offsets are zero-based on SMP. PERCPU_VADDR() changes the |
217 | * output PHDR, so the next output section - __data_nosave - should | 218 | * output PHDR, so the next output section - __data_nosave - should |
218 | * switch it back to data.init. Also, pda should be at the head of | 219 | * start another section data.init2. Also, pda should be at the head of |
219 | * percpu area. Preallocate it and define the percpu offset symbol | 220 | * percpu area. Preallocate it and define the percpu offset symbol |
220 | * so that it can be accessed as a percpu variable. | 221 | * so that it can be accessed as a percpu variable. |
221 | */ | 222 | */ |
@@ -232,7 +233,7 @@ SECTIONS | |||
232 | __nosave_begin = .; | 233 | __nosave_begin = .; |
233 | .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) { | 234 | .data_nosave : AT(ADDR(.data_nosave) - LOAD_OFFSET) { |
234 | *(.data.nosave) | 235 | *(.data.nosave) |
235 | } :data.init /* switch back to data.init, see PERCPU_VADDR() above */ | 236 | } :data.init2 /* use another section data.init2, see PERCPU_VADDR() above */ |
236 | . = ALIGN(PAGE_SIZE); | 237 | . = ALIGN(PAGE_SIZE); |
237 | __nosave_end = .; | 238 | __nosave_end = .; |
238 | 239 | ||
@@ -256,6 +257,14 @@ SECTIONS | |||
256 | DWARF_DEBUG | 257 | DWARF_DEBUG |
257 | } | 258 | } |
258 | 259 | ||
260 | /* | ||
261 | * Per-cpu symbols which need to be offset from __per_cpu_load | ||
262 | * for the boot processor. | ||
263 | */ | ||
264 | #define INIT_PER_CPU(x) init_per_cpu__##x = per_cpu__##x + __per_cpu_load | ||
265 | INIT_PER_CPU(gdt_page); | ||
266 | INIT_PER_CPU(irq_stack_union); | ||
267 | |||
259 | /* | 268 | /* |
260 | * Build-time check on the image size: | 269 | * Build-time check on the image size: |
261 | */ | 270 | */ |
diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c index a688f3bfaec2..c609205df594 100644 --- a/arch/x86/kernel/vsmp_64.c +++ b/arch/x86/kernel/vsmp_64.c | |||
@@ -37,6 +37,7 @@ static unsigned long vsmp_save_fl(void) | |||
37 | flags &= ~X86_EFLAGS_IF; | 37 | flags &= ~X86_EFLAGS_IF; |
38 | return flags; | 38 | return flags; |
39 | } | 39 | } |
40 | PV_CALLEE_SAVE_REGS_THUNK(vsmp_save_fl); | ||
40 | 41 | ||
41 | static void vsmp_restore_fl(unsigned long flags) | 42 | static void vsmp_restore_fl(unsigned long flags) |
42 | { | 43 | { |
@@ -46,6 +47,7 @@ static void vsmp_restore_fl(unsigned long flags) | |||
46 | flags |= X86_EFLAGS_AC; | 47 | flags |= X86_EFLAGS_AC; |
47 | native_restore_fl(flags); | 48 | native_restore_fl(flags); |
48 | } | 49 | } |
50 | PV_CALLEE_SAVE_REGS_THUNK(vsmp_restore_fl); | ||
49 | 51 | ||
50 | static void vsmp_irq_disable(void) | 52 | static void vsmp_irq_disable(void) |
51 | { | 53 | { |
@@ -53,6 +55,7 @@ static void vsmp_irq_disable(void) | |||
53 | 55 | ||
54 | native_restore_fl((flags & ~X86_EFLAGS_IF) | X86_EFLAGS_AC); | 56 | native_restore_fl((flags & ~X86_EFLAGS_IF) | X86_EFLAGS_AC); |
55 | } | 57 | } |
58 | PV_CALLEE_SAVE_REGS_THUNK(vsmp_irq_disable); | ||
56 | 59 | ||
57 | static void vsmp_irq_enable(void) | 60 | static void vsmp_irq_enable(void) |
58 | { | 61 | { |
@@ -60,6 +63,7 @@ static void vsmp_irq_enable(void) | |||
60 | 63 | ||
61 | native_restore_fl((flags | X86_EFLAGS_IF) & (~X86_EFLAGS_AC)); | 64 | native_restore_fl((flags | X86_EFLAGS_IF) & (~X86_EFLAGS_AC)); |
62 | } | 65 | } |
66 | PV_CALLEE_SAVE_REGS_THUNK(vsmp_irq_enable); | ||
63 | 67 | ||
64 | static unsigned __init_or_module vsmp_patch(u8 type, u16 clobbers, void *ibuf, | 68 | static unsigned __init_or_module vsmp_patch(u8 type, u16 clobbers, void *ibuf, |
65 | unsigned long addr, unsigned len) | 69 | unsigned long addr, unsigned len) |
@@ -90,10 +94,10 @@ static void __init set_vsmp_pv_ops(void) | |||
90 | cap, ctl); | 94 | cap, ctl); |
91 | if (cap & ctl & (1 << 4)) { | 95 | if (cap & ctl & (1 << 4)) { |
92 | /* Setup irq ops and turn on vSMP IRQ fastpath handling */ | 96 | /* Setup irq ops and turn on vSMP IRQ fastpath handling */ |
93 | pv_irq_ops.irq_disable = vsmp_irq_disable; | 97 | pv_irq_ops.irq_disable = PV_CALLEE_SAVE(vsmp_irq_disable); |
94 | pv_irq_ops.irq_enable = vsmp_irq_enable; | 98 | pv_irq_ops.irq_enable = PV_CALLEE_SAVE(vsmp_irq_enable); |
95 | pv_irq_ops.save_fl = vsmp_save_fl; | 99 | pv_irq_ops.save_fl = PV_CALLEE_SAVE(vsmp_save_fl); |
96 | pv_irq_ops.restore_fl = vsmp_restore_fl; | 100 | pv_irq_ops.restore_fl = PV_CALLEE_SAVE(vsmp_restore_fl); |
97 | pv_init_ops.patch = vsmp_patch; | 101 | pv_init_ops.patch = vsmp_patch; |
98 | 102 | ||
99 | ctl &= ~(1 << 4); | 103 | ctl &= ~(1 << 4); |
diff --git a/arch/x86/lguest/boot.c b/arch/x86/lguest/boot.c index 92f1c6f3e19d..da2e314f61b5 100644 --- a/arch/x86/lguest/boot.c +++ b/arch/x86/lguest/boot.c | |||
@@ -173,24 +173,29 @@ static unsigned long save_fl(void) | |||
173 | { | 173 | { |
174 | return lguest_data.irq_enabled; | 174 | return lguest_data.irq_enabled; |
175 | } | 175 | } |
176 | PV_CALLEE_SAVE_REGS_THUNK(save_fl); | ||
176 | 177 | ||
177 | /* restore_flags() just sets the flags back to the value given. */ | 178 | /* restore_flags() just sets the flags back to the value given. */ |
178 | static void restore_fl(unsigned long flags) | 179 | static void restore_fl(unsigned long flags) |
179 | { | 180 | { |
180 | lguest_data.irq_enabled = flags; | 181 | lguest_data.irq_enabled = flags; |
181 | } | 182 | } |
183 | PV_CALLEE_SAVE_REGS_THUNK(restore_fl); | ||
182 | 184 | ||
183 | /* Interrupts go off... */ | 185 | /* Interrupts go off... */ |
184 | static void irq_disable(void) | 186 | static void irq_disable(void) |
185 | { | 187 | { |
186 | lguest_data.irq_enabled = 0; | 188 | lguest_data.irq_enabled = 0; |
187 | } | 189 | } |
190 | PV_CALLEE_SAVE_REGS_THUNK(irq_disable); | ||
188 | 191 | ||
189 | /* Interrupts go on... */ | 192 | /* Interrupts go on... */ |
190 | static void irq_enable(void) | 193 | static void irq_enable(void) |
191 | { | 194 | { |
192 | lguest_data.irq_enabled = X86_EFLAGS_IF; | 195 | lguest_data.irq_enabled = X86_EFLAGS_IF; |
193 | } | 196 | } |
197 | PV_CALLEE_SAVE_REGS_THUNK(irq_enable); | ||
198 | |||
194 | /*:*/ | 199 | /*:*/ |
195 | /*M:003 Note that we don't check for outstanding interrupts when we re-enable | 200 | /*M:003 Note that we don't check for outstanding interrupts when we re-enable |
196 | * them (or when we unmask an interrupt). This seems to work for the moment, | 201 | * them (or when we unmask an interrupt). This seems to work for the moment, |
@@ -278,7 +283,7 @@ static void lguest_load_tls(struct thread_struct *t, unsigned int cpu) | |||
278 | /* There's one problem which normal hardware doesn't have: the Host | 283 | /* There's one problem which normal hardware doesn't have: the Host |
279 | * can't handle us removing entries we're currently using. So we clear | 284 | * can't handle us removing entries we're currently using. So we clear |
280 | * the GS register here: if it's needed it'll be reloaded anyway. */ | 285 | * the GS register here: if it's needed it'll be reloaded anyway. */ |
281 | loadsegment(gs, 0); | 286 | lazy_load_gs(0); |
282 | lazy_hcall(LHCALL_LOAD_TLS, __pa(&t->tls_array), cpu, 0); | 287 | lazy_hcall(LHCALL_LOAD_TLS, __pa(&t->tls_array), cpu, 0); |
283 | } | 288 | } |
284 | 289 | ||
@@ -984,10 +989,10 @@ __init void lguest_init(void) | |||
984 | 989 | ||
985 | /* interrupt-related operations */ | 990 | /* interrupt-related operations */ |
986 | pv_irq_ops.init_IRQ = lguest_init_IRQ; | 991 | pv_irq_ops.init_IRQ = lguest_init_IRQ; |
987 | pv_irq_ops.save_fl = save_fl; | 992 | pv_irq_ops.save_fl = PV_CALLEE_SAVE(save_fl); |
988 | pv_irq_ops.restore_fl = restore_fl; | 993 | pv_irq_ops.restore_fl = PV_CALLEE_SAVE(restore_fl); |
989 | pv_irq_ops.irq_disable = irq_disable; | 994 | pv_irq_ops.irq_disable = PV_CALLEE_SAVE(irq_disable); |
990 | pv_irq_ops.irq_enable = irq_enable; | 995 | pv_irq_ops.irq_enable = PV_CALLEE_SAVE(irq_enable); |
991 | pv_irq_ops.safe_halt = lguest_safe_halt; | 996 | pv_irq_ops.safe_halt = lguest_safe_halt; |
992 | 997 | ||
993 | /* init-time operations */ | 998 | /* init-time operations */ |
diff --git a/arch/x86/mach-default/Makefile b/arch/x86/mach-default/Makefile deleted file mode 100644 index 012fe34459e6..000000000000 --- a/arch/x86/mach-default/Makefile +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | # | ||
2 | # Makefile for the linux kernel. | ||
3 | # | ||
4 | |||
5 | obj-y := setup.o | ||
diff --git a/arch/x86/mach-default/setup.c b/arch/x86/mach-default/setup.c deleted file mode 100644 index a265a7c63190..000000000000 --- a/arch/x86/mach-default/setup.c +++ /dev/null | |||
@@ -1,174 +0,0 @@ | |||
1 | /* | ||
2 | * Machine specific setup for generic | ||
3 | */ | ||
4 | |||
5 | #include <linux/smp.h> | ||
6 | #include <linux/init.h> | ||
7 | #include <linux/interrupt.h> | ||
8 | #include <asm/acpi.h> | ||
9 | #include <asm/arch_hooks.h> | ||
10 | #include <asm/e820.h> | ||
11 | #include <asm/setup.h> | ||
12 | |||
13 | #include <mach_ipi.h> | ||
14 | |||
15 | #ifdef CONFIG_HOTPLUG_CPU | ||
16 | #define DEFAULT_SEND_IPI (1) | ||
17 | #else | ||
18 | #define DEFAULT_SEND_IPI (0) | ||
19 | #endif | ||
20 | |||
21 | int no_broadcast = DEFAULT_SEND_IPI; | ||
22 | |||
23 | /** | ||
24 | * pre_intr_init_hook - initialisation prior to setting up interrupt vectors | ||
25 | * | ||
26 | * Description: | ||
27 | * Perform any necessary interrupt initialisation prior to setting up | ||
28 | * the "ordinary" interrupt call gates. For legacy reasons, the ISA | ||
29 | * interrupts should be initialised here if the machine emulates a PC | ||
30 | * in any way. | ||
31 | **/ | ||
32 | void __init pre_intr_init_hook(void) | ||
33 | { | ||
34 | if (x86_quirks->arch_pre_intr_init) { | ||
35 | if (x86_quirks->arch_pre_intr_init()) | ||
36 | return; | ||
37 | } | ||
38 | init_ISA_irqs(); | ||
39 | } | ||
40 | |||
41 | /* | ||
42 | * IRQ2 is cascade interrupt to second interrupt controller | ||
43 | */ | ||
44 | static struct irqaction irq2 = { | ||
45 | .handler = no_action, | ||
46 | .mask = CPU_MASK_NONE, | ||
47 | .name = "cascade", | ||
48 | }; | ||
49 | |||
50 | /** | ||
51 | * intr_init_hook - post gate setup interrupt initialisation | ||
52 | * | ||
53 | * Description: | ||
54 | * Fill in any interrupts that may have been left out by the general | ||
55 | * init_IRQ() routine. interrupts having to do with the machine rather | ||
56 | * than the devices on the I/O bus (like APIC interrupts in intel MP | ||
57 | * systems) are started here. | ||
58 | **/ | ||
59 | void __init intr_init_hook(void) | ||
60 | { | ||
61 | if (x86_quirks->arch_intr_init) { | ||
62 | if (x86_quirks->arch_intr_init()) | ||
63 | return; | ||
64 | } | ||
65 | if (!acpi_ioapic) | ||
66 | setup_irq(2, &irq2); | ||
67 | |||
68 | } | ||
69 | |||
70 | /** | ||
71 | * pre_setup_arch_hook - hook called prior to any setup_arch() execution | ||
72 | * | ||
73 | * Description: | ||
74 | * generally used to activate any machine specific identification | ||
75 | * routines that may be needed before setup_arch() runs. On Voyager | ||
76 | * this is used to get the board revision and type. | ||
77 | **/ | ||
78 | void __init pre_setup_arch_hook(void) | ||
79 | { | ||
80 | } | ||
81 | |||
82 | /** | ||
83 | * trap_init_hook - initialise system specific traps | ||
84 | * | ||
85 | * Description: | ||
86 | * Called as the final act of trap_init(). Used in VISWS to initialise | ||
87 | * the various board specific APIC traps. | ||
88 | **/ | ||
89 | void __init trap_init_hook(void) | ||
90 | { | ||
91 | if (x86_quirks->arch_trap_init) { | ||
92 | if (x86_quirks->arch_trap_init()) | ||
93 | return; | ||
94 | } | ||
95 | } | ||
96 | |||
97 | static struct irqaction irq0 = { | ||
98 | .handler = timer_interrupt, | ||
99 | .flags = IRQF_DISABLED | IRQF_NOBALANCING | IRQF_IRQPOLL, | ||
100 | .mask = CPU_MASK_NONE, | ||
101 | .name = "timer" | ||
102 | }; | ||
103 | |||
104 | /** | ||
105 | * pre_time_init_hook - do any specific initialisations before. | ||
106 | * | ||
107 | **/ | ||
108 | void __init pre_time_init_hook(void) | ||
109 | { | ||
110 | if (x86_quirks->arch_pre_time_init) | ||
111 | x86_quirks->arch_pre_time_init(); | ||
112 | } | ||
113 | |||
114 | /** | ||
115 | * time_init_hook - do any specific initialisations for the system timer. | ||
116 | * | ||
117 | * Description: | ||
118 | * Must plug the system timer interrupt source at HZ into the IRQ listed | ||
119 | * in irq_vectors.h:TIMER_IRQ | ||
120 | **/ | ||
121 | void __init time_init_hook(void) | ||
122 | { | ||
123 | if (x86_quirks->arch_time_init) { | ||
124 | /* | ||
125 | * A nonzero return code does not mean failure, it means | ||
126 | * that the architecture quirk does not want any | ||
127 | * generic (timer) setup to be performed after this: | ||
128 | */ | ||
129 | if (x86_quirks->arch_time_init()) | ||
130 | return; | ||
131 | } | ||
132 | |||
133 | irq0.mask = cpumask_of_cpu(0); | ||
134 | setup_irq(0, &irq0); | ||
135 | } | ||
136 | |||
137 | #ifdef CONFIG_MCA | ||
138 | /** | ||
139 | * mca_nmi_hook - hook into MCA specific NMI chain | ||
140 | * | ||
141 | * Description: | ||
142 | * The MCA (Microchannel Architecture) has an NMI chain for NMI sources | ||
143 | * along the MCA bus. Use this to hook into that chain if you will need | ||
144 | * it. | ||
145 | **/ | ||
146 | void mca_nmi_hook(void) | ||
147 | { | ||
148 | /* | ||
149 | * If I recall correctly, there's a whole bunch of other things that | ||
150 | * we can do to check for NMI problems, but that's all I know about | ||
151 | * at the moment. | ||
152 | */ | ||
153 | pr_warning("NMI generated from unknown source!\n"); | ||
154 | } | ||
155 | #endif | ||
156 | |||
157 | static __init int no_ipi_broadcast(char *str) | ||
158 | { | ||
159 | get_option(&str, &no_broadcast); | ||
160 | pr_info("Using %s mode\n", | ||
161 | no_broadcast ? "No IPI Broadcast" : "IPI Broadcast"); | ||
162 | return 1; | ||
163 | } | ||
164 | __setup("no_ipi_broadcast=", no_ipi_broadcast); | ||
165 | |||
166 | static int __init print_ipi_mode(void) | ||
167 | { | ||
168 | pr_info("Using IPI %s mode\n", | ||
169 | no_broadcast ? "No-Shortcut" : "Shortcut"); | ||
170 | return 0; | ||
171 | } | ||
172 | |||
173 | late_initcall(print_ipi_mode); | ||
174 | |||
diff --git a/arch/x86/mach-generic/Makefile b/arch/x86/mach-generic/Makefile deleted file mode 100644 index 6730f4e7c744..000000000000 --- a/arch/x86/mach-generic/Makefile +++ /dev/null | |||
@@ -1,11 +0,0 @@ | |||
1 | # | ||
2 | # Makefile for the generic architecture | ||
3 | # | ||
4 | |||
5 | EXTRA_CFLAGS := -Iarch/x86/kernel | ||
6 | |||
7 | obj-y := probe.o default.o | ||
8 | obj-$(CONFIG_X86_NUMAQ) += numaq.o | ||
9 | obj-$(CONFIG_X86_SUMMIT) += summit.o | ||
10 | obj-$(CONFIG_X86_BIGSMP) += bigsmp.o | ||
11 | obj-$(CONFIG_X86_ES7000) += es7000.o | ||
diff --git a/arch/x86/mach-generic/bigsmp.c b/arch/x86/mach-generic/bigsmp.c deleted file mode 100644 index bc4c7840b2a8..000000000000 --- a/arch/x86/mach-generic/bigsmp.c +++ /dev/null | |||
@@ -1,60 +0,0 @@ | |||
1 | /* | ||
2 | * APIC driver for "bigsmp" XAPIC machines with more than 8 virtual CPUs. | ||
3 | * Drives the local APIC in "clustered mode". | ||
4 | */ | ||
5 | #define APIC_DEFINITION 1 | ||
6 | #include <linux/threads.h> | ||
7 | #include <linux/cpumask.h> | ||
8 | #include <asm/mpspec.h> | ||
9 | #include <asm/genapic.h> | ||
10 | #include <asm/fixmap.h> | ||
11 | #include <asm/apicdef.h> | ||
12 | #include <linux/kernel.h> | ||
13 | #include <linux/init.h> | ||
14 | #include <linux/dmi.h> | ||
15 | #include <asm/bigsmp/apicdef.h> | ||
16 | #include <linux/smp.h> | ||
17 | #include <asm/bigsmp/apic.h> | ||
18 | #include <asm/bigsmp/ipi.h> | ||
19 | #include <asm/mach-default/mach_mpparse.h> | ||
20 | #include <asm/mach-default/mach_wakecpu.h> | ||
21 | |||
22 | static int dmi_bigsmp; /* can be set by dmi scanners */ | ||
23 | |||
24 | static int hp_ht_bigsmp(const struct dmi_system_id *d) | ||
25 | { | ||
26 | printk(KERN_NOTICE "%s detected: force use of apic=bigsmp\n", d->ident); | ||
27 | dmi_bigsmp = 1; | ||
28 | return 0; | ||
29 | } | ||
30 | |||
31 | |||
32 | static const struct dmi_system_id bigsmp_dmi_table[] = { | ||
33 | { hp_ht_bigsmp, "HP ProLiant DL760 G2", | ||
34 | { DMI_MATCH(DMI_BIOS_VENDOR, "HP"), | ||
35 | DMI_MATCH(DMI_BIOS_VERSION, "P44-"),} | ||
36 | }, | ||
37 | |||
38 | { hp_ht_bigsmp, "HP ProLiant DL740", | ||
39 | { DMI_MATCH(DMI_BIOS_VENDOR, "HP"), | ||
40 | DMI_MATCH(DMI_BIOS_VERSION, "P47-"),} | ||
41 | }, | ||
42 | { } | ||
43 | }; | ||
44 | |||
45 | static void vector_allocation_domain(int cpu, cpumask_t *retmask) | ||
46 | { | ||
47 | cpus_clear(*retmask); | ||
48 | cpu_set(cpu, *retmask); | ||
49 | } | ||
50 | |||
51 | static int probe_bigsmp(void) | ||
52 | { | ||
53 | if (def_to_bigsmp) | ||
54 | dmi_bigsmp = 1; | ||
55 | else | ||
56 | dmi_check_system(bigsmp_dmi_table); | ||
57 | return dmi_bigsmp; | ||
58 | } | ||
59 | |||
60 | struct genapic apic_bigsmp = APIC_INIT("bigsmp", probe_bigsmp); | ||
diff --git a/arch/x86/mach-generic/default.c b/arch/x86/mach-generic/default.c deleted file mode 100644 index e63a4a76d8cd..000000000000 --- a/arch/x86/mach-generic/default.c +++ /dev/null | |||
@@ -1,27 +0,0 @@ | |||
1 | /* | ||
2 | * Default generic APIC driver. This handles up to 8 CPUs. | ||
3 | */ | ||
4 | #define APIC_DEFINITION 1 | ||
5 | #include <linux/threads.h> | ||
6 | #include <linux/cpumask.h> | ||
7 | #include <asm/mpspec.h> | ||
8 | #include <asm/mach-default/mach_apicdef.h> | ||
9 | #include <asm/genapic.h> | ||
10 | #include <asm/fixmap.h> | ||
11 | #include <asm/apicdef.h> | ||
12 | #include <linux/kernel.h> | ||
13 | #include <linux/string.h> | ||
14 | #include <linux/smp.h> | ||
15 | #include <linux/init.h> | ||
16 | #include <asm/mach-default/mach_apic.h> | ||
17 | #include <asm/mach-default/mach_ipi.h> | ||
18 | #include <asm/mach-default/mach_mpparse.h> | ||
19 | #include <asm/mach-default/mach_wakecpu.h> | ||
20 | |||
21 | /* should be called last. */ | ||
22 | static int probe_default(void) | ||
23 | { | ||
24 | return 1; | ||
25 | } | ||
26 | |||
27 | struct genapic apic_default = APIC_INIT("default", probe_default); | ||
diff --git a/arch/x86/mach-generic/es7000.c b/arch/x86/mach-generic/es7000.c deleted file mode 100644 index c2ded1448024..000000000000 --- a/arch/x86/mach-generic/es7000.c +++ /dev/null | |||
@@ -1,103 +0,0 @@ | |||
1 | /* | ||
2 | * APIC driver for the Unisys ES7000 chipset. | ||
3 | */ | ||
4 | #define APIC_DEFINITION 1 | ||
5 | #include <linux/threads.h> | ||
6 | #include <linux/cpumask.h> | ||
7 | #include <asm/mpspec.h> | ||
8 | #include <asm/genapic.h> | ||
9 | #include <asm/fixmap.h> | ||
10 | #include <asm/apicdef.h> | ||
11 | #include <linux/kernel.h> | ||
12 | #include <linux/string.h> | ||
13 | #include <linux/init.h> | ||
14 | #include <asm/es7000/apicdef.h> | ||
15 | #include <linux/smp.h> | ||
16 | #include <asm/es7000/apic.h> | ||
17 | #include <asm/es7000/ipi.h> | ||
18 | #include <asm/es7000/mpparse.h> | ||
19 | #include <asm/mach-default/mach_wakecpu.h> | ||
20 | |||
21 | void __init es7000_update_genapic_to_cluster(void) | ||
22 | { | ||
23 | genapic->target_cpus = target_cpus_cluster; | ||
24 | genapic->int_delivery_mode = INT_DELIVERY_MODE_CLUSTER; | ||
25 | genapic->int_dest_mode = INT_DEST_MODE_CLUSTER; | ||
26 | genapic->no_balance_irq = NO_BALANCE_IRQ_CLUSTER; | ||
27 | |||
28 | genapic->init_apic_ldr = init_apic_ldr_cluster; | ||
29 | |||
30 | genapic->cpu_mask_to_apicid = cpu_mask_to_apicid_cluster; | ||
31 | } | ||
32 | |||
33 | static int probe_es7000(void) | ||
34 | { | ||
35 | /* probed later in mptable/ACPI hooks */ | ||
36 | return 0; | ||
37 | } | ||
38 | |||
39 | extern void es7000_sw_apic(void); | ||
40 | static void __init enable_apic_mode(void) | ||
41 | { | ||
42 | es7000_sw_apic(); | ||
43 | return; | ||
44 | } | ||
45 | |||
46 | static __init int | ||
47 | mps_oem_check(struct mpc_table *mpc, char *oem, char *productid) | ||
48 | { | ||
49 | if (mpc->oemptr) { | ||
50 | struct mpc_oemtable *oem_table = | ||
51 | (struct mpc_oemtable *)mpc->oemptr; | ||
52 | if (!strncmp(oem, "UNISYS", 6)) | ||
53 | return parse_unisys_oem((char *)oem_table); | ||
54 | } | ||
55 | return 0; | ||
56 | } | ||
57 | |||
58 | #ifdef CONFIG_ACPI | ||
59 | /* Hook from generic ACPI tables.c */ | ||
60 | static int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id) | ||
61 | { | ||
62 | unsigned long oem_addr = 0; | ||
63 | int check_dsdt; | ||
64 | int ret = 0; | ||
65 | |||
66 | /* check dsdt at first to avoid clear fix_map for oem_addr */ | ||
67 | check_dsdt = es7000_check_dsdt(); | ||
68 | |||
69 | if (!find_unisys_acpi_oem_table(&oem_addr)) { | ||
70 | if (check_dsdt) | ||
71 | ret = parse_unisys_oem((char *)oem_addr); | ||
72 | else { | ||
73 | setup_unisys(); | ||
74 | ret = 1; | ||
75 | } | ||
76 | /* | ||
77 | * we need to unmap it | ||
78 | */ | ||
79 | unmap_unisys_acpi_oem_table(oem_addr); | ||
80 | } | ||
81 | return ret; | ||
82 | } | ||
83 | #else | ||
84 | static int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id) | ||
85 | { | ||
86 | return 0; | ||
87 | } | ||
88 | #endif | ||
89 | |||
90 | static void vector_allocation_domain(int cpu, cpumask_t *retmask) | ||
91 | { | ||
92 | /* Careful. Some cpus do not strictly honor the set of cpus | ||
93 | * specified in the interrupt destination when using lowest | ||
94 | * priority interrupt delivery mode. | ||
95 | * | ||
96 | * In particular there was a hyperthreading cpu observed to | ||
97 | * deliver interrupts to the wrong hyperthread when only one | ||
98 | * hyperthread was specified in the interrupt desitination. | ||
99 | */ | ||
100 | *retmask = (cpumask_t){ { [0] = APIC_ALL_CPUS, } }; | ||
101 | } | ||
102 | |||
103 | struct genapic __initdata_refok apic_es7000 = APIC_INIT("es7000", probe_es7000); | ||
diff --git a/arch/x86/mach-generic/numaq.c b/arch/x86/mach-generic/numaq.c deleted file mode 100644 index 3679e2255645..000000000000 --- a/arch/x86/mach-generic/numaq.c +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | /* | ||
2 | * APIC driver for the IBM NUMAQ chipset. | ||
3 | */ | ||
4 | #define APIC_DEFINITION 1 | ||
5 | #include <linux/threads.h> | ||
6 | #include <linux/cpumask.h> | ||
7 | #include <asm/mpspec.h> | ||
8 | #include <asm/genapic.h> | ||
9 | #include <asm/fixmap.h> | ||
10 | #include <asm/apicdef.h> | ||
11 | #include <linux/kernel.h> | ||
12 | #include <linux/string.h> | ||
13 | #include <linux/init.h> | ||
14 | #include <asm/numaq/apicdef.h> | ||
15 | #include <linux/smp.h> | ||
16 | #include <asm/numaq/apic.h> | ||
17 | #include <asm/numaq/ipi.h> | ||
18 | #include <asm/numaq/mpparse.h> | ||
19 | #include <asm/numaq/wakecpu.h> | ||
20 | #include <asm/numaq.h> | ||
21 | |||
22 | static int mps_oem_check(struct mpc_table *mpc, char *oem, char *productid) | ||
23 | { | ||
24 | numaq_mps_oem_check(mpc, oem, productid); | ||
25 | return found_numaq; | ||
26 | } | ||
27 | |||
28 | static int probe_numaq(void) | ||
29 | { | ||
30 | /* already know from get_memcfg_numaq() */ | ||
31 | return found_numaq; | ||
32 | } | ||
33 | |||
34 | /* Hook from generic ACPI tables.c */ | ||
35 | static int acpi_madt_oem_check(char *oem_id, char *oem_table_id) | ||
36 | { | ||
37 | return 0; | ||
38 | } | ||
39 | |||
40 | static void vector_allocation_domain(int cpu, cpumask_t *retmask) | ||
41 | { | ||
42 | /* Careful. Some cpus do not strictly honor the set of cpus | ||
43 | * specified in the interrupt destination when using lowest | ||
44 | * priority interrupt delivery mode. | ||
45 | * | ||
46 | * In particular there was a hyperthreading cpu observed to | ||
47 | * deliver interrupts to the wrong hyperthread when only one | ||
48 | * hyperthread was specified in the interrupt desitination. | ||
49 | */ | ||
50 | *retmask = (cpumask_t){ { [0] = APIC_ALL_CPUS, } }; | ||
51 | } | ||
52 | |||
53 | struct genapic apic_numaq = APIC_INIT("NUMAQ", probe_numaq); | ||
diff --git a/arch/x86/mach-generic/probe.c b/arch/x86/mach-generic/probe.c deleted file mode 100644 index 15a38daef1a8..000000000000 --- a/arch/x86/mach-generic/probe.c +++ /dev/null | |||
@@ -1,152 +0,0 @@ | |||
1 | /* | ||
2 | * Copyright 2003 Andi Kleen, SuSE Labs. | ||
3 | * Subject to the GNU Public License, v.2 | ||
4 | * | ||
5 | * Generic x86 APIC driver probe layer. | ||
6 | */ | ||
7 | #include <linux/threads.h> | ||
8 | #include <linux/cpumask.h> | ||
9 | #include <linux/string.h> | ||
10 | #include <linux/kernel.h> | ||
11 | #include <linux/ctype.h> | ||
12 | #include <linux/init.h> | ||
13 | #include <linux/errno.h> | ||
14 | #include <asm/fixmap.h> | ||
15 | #include <asm/mpspec.h> | ||
16 | #include <asm/apicdef.h> | ||
17 | #include <asm/genapic.h> | ||
18 | #include <asm/setup.h> | ||
19 | |||
20 | extern struct genapic apic_numaq; | ||
21 | extern struct genapic apic_summit; | ||
22 | extern struct genapic apic_bigsmp; | ||
23 | extern struct genapic apic_es7000; | ||
24 | extern struct genapic apic_default; | ||
25 | |||
26 | struct genapic *genapic = &apic_default; | ||
27 | |||
28 | static struct genapic *apic_probe[] __initdata = { | ||
29 | #ifdef CONFIG_X86_NUMAQ | ||
30 | &apic_numaq, | ||
31 | #endif | ||
32 | #ifdef CONFIG_X86_SUMMIT | ||
33 | &apic_summit, | ||
34 | #endif | ||
35 | #ifdef CONFIG_X86_BIGSMP | ||
36 | &apic_bigsmp, | ||
37 | #endif | ||
38 | #ifdef CONFIG_X86_ES7000 | ||
39 | &apic_es7000, | ||
40 | #endif | ||
41 | &apic_default, /* must be last */ | ||
42 | NULL, | ||
43 | }; | ||
44 | |||
45 | static int cmdline_apic __initdata; | ||
46 | static int __init parse_apic(char *arg) | ||
47 | { | ||
48 | int i; | ||
49 | |||
50 | if (!arg) | ||
51 | return -EINVAL; | ||
52 | |||
53 | for (i = 0; apic_probe[i]; i++) { | ||
54 | if (!strcmp(apic_probe[i]->name, arg)) { | ||
55 | genapic = apic_probe[i]; | ||
56 | cmdline_apic = 1; | ||
57 | return 0; | ||
58 | } | ||
59 | } | ||
60 | |||
61 | if (x86_quirks->update_genapic) | ||
62 | x86_quirks->update_genapic(); | ||
63 | |||
64 | /* Parsed again by __setup for debug/verbose */ | ||
65 | return 0; | ||
66 | } | ||
67 | early_param("apic", parse_apic); | ||
68 | |||
69 | void __init generic_bigsmp_probe(void) | ||
70 | { | ||
71 | #ifdef CONFIG_X86_BIGSMP | ||
72 | /* | ||
73 | * This routine is used to switch to bigsmp mode when | ||
74 | * - There is no apic= option specified by the user | ||
75 | * - generic_apic_probe() has chosen apic_default as the sub_arch | ||
76 | * - we find more than 8 CPUs in acpi LAPIC listing with xAPIC support | ||
77 | */ | ||
78 | |||
79 | if (!cmdline_apic && genapic == &apic_default) { | ||
80 | if (apic_bigsmp.probe()) { | ||
81 | genapic = &apic_bigsmp; | ||
82 | if (x86_quirks->update_genapic) | ||
83 | x86_quirks->update_genapic(); | ||
84 | printk(KERN_INFO "Overriding APIC driver with %s\n", | ||
85 | genapic->name); | ||
86 | } | ||
87 | } | ||
88 | #endif | ||
89 | } | ||
90 | |||
91 | void __init generic_apic_probe(void) | ||
92 | { | ||
93 | if (!cmdline_apic) { | ||
94 | int i; | ||
95 | for (i = 0; apic_probe[i]; i++) { | ||
96 | if (apic_probe[i]->probe()) { | ||
97 | genapic = apic_probe[i]; | ||
98 | break; | ||
99 | } | ||
100 | } | ||
101 | /* Not visible without early console */ | ||
102 | if (!apic_probe[i]) | ||
103 | panic("Didn't find an APIC driver"); | ||
104 | |||
105 | if (x86_quirks->update_genapic) | ||
106 | x86_quirks->update_genapic(); | ||
107 | } | ||
108 | printk(KERN_INFO "Using APIC driver %s\n", genapic->name); | ||
109 | } | ||
110 | |||
111 | /* These functions can switch the APIC even after the initial ->probe() */ | ||
112 | |||
113 | int __init mps_oem_check(struct mpc_table *mpc, char *oem, char *productid) | ||
114 | { | ||
115 | int i; | ||
116 | for (i = 0; apic_probe[i]; ++i) { | ||
117 | if (apic_probe[i]->mps_oem_check(mpc, oem, productid)) { | ||
118 | if (!cmdline_apic) { | ||
119 | genapic = apic_probe[i]; | ||
120 | if (x86_quirks->update_genapic) | ||
121 | x86_quirks->update_genapic(); | ||
122 | printk(KERN_INFO "Switched to APIC driver `%s'.\n", | ||
123 | genapic->name); | ||
124 | } | ||
125 | return 1; | ||
126 | } | ||
127 | } | ||
128 | return 0; | ||
129 | } | ||
130 | |||
131 | int __init acpi_madt_oem_check(char *oem_id, char *oem_table_id) | ||
132 | { | ||
133 | int i; | ||
134 | for (i = 0; apic_probe[i]; ++i) { | ||
135 | if (apic_probe[i]->acpi_madt_oem_check(oem_id, oem_table_id)) { | ||
136 | if (!cmdline_apic) { | ||
137 | genapic = apic_probe[i]; | ||
138 | if (x86_quirks->update_genapic) | ||
139 | x86_quirks->update_genapic(); | ||
140 | printk(KERN_INFO "Switched to APIC driver `%s'.\n", | ||
141 | genapic->name); | ||
142 | } | ||
143 | return 1; | ||
144 | } | ||
145 | } | ||
146 | return 0; | ||
147 | } | ||
148 | |||
149 | int hard_smp_processor_id(void) | ||
150 | { | ||
151 | return genapic->get_apic_id(*(unsigned long *)(APIC_BASE+APIC_ID)); | ||
152 | } | ||
diff --git a/arch/x86/mach-generic/summit.c b/arch/x86/mach-generic/summit.c deleted file mode 100644 index 2821ffc188b5..000000000000 --- a/arch/x86/mach-generic/summit.c +++ /dev/null | |||
@@ -1,40 +0,0 @@ | |||
1 | /* | ||
2 | * APIC driver for the IBM "Summit" chipset. | ||
3 | */ | ||
4 | #define APIC_DEFINITION 1 | ||
5 | #include <linux/threads.h> | ||
6 | #include <linux/cpumask.h> | ||
7 | #include <asm/mpspec.h> | ||
8 | #include <asm/genapic.h> | ||
9 | #include <asm/fixmap.h> | ||
10 | #include <asm/apicdef.h> | ||
11 | #include <linux/kernel.h> | ||
12 | #include <linux/string.h> | ||
13 | #include <linux/init.h> | ||
14 | #include <asm/summit/apicdef.h> | ||
15 | #include <linux/smp.h> | ||
16 | #include <asm/summit/apic.h> | ||
17 | #include <asm/summit/ipi.h> | ||
18 | #include <asm/summit/mpparse.h> | ||
19 | #include <asm/mach-default/mach_wakecpu.h> | ||
20 | |||
21 | static int probe_summit(void) | ||
22 | { | ||
23 | /* probed later in mptable/ACPI hooks */ | ||
24 | return 0; | ||
25 | } | ||
26 | |||
27 | static void vector_allocation_domain(int cpu, cpumask_t *retmask) | ||
28 | { | ||
29 | /* Careful. Some cpus do not strictly honor the set of cpus | ||
30 | * specified in the interrupt destination when using lowest | ||
31 | * priority interrupt delivery mode. | ||
32 | * | ||
33 | * In particular there was a hyperthreading cpu observed to | ||
34 | * deliver interrupts to the wrong hyperthread when only one | ||
35 | * hyperthread was specified in the interrupt desitination. | ||
36 | */ | ||
37 | *retmask = (cpumask_t){ { [0] = APIC_ALL_CPUS, } }; | ||
38 | } | ||
39 | |||
40 | struct genapic apic_summit = APIC_INIT("summit", probe_summit); | ||
diff --git a/arch/x86/mach-rdc321x/Makefile b/arch/x86/mach-rdc321x/Makefile deleted file mode 100644 index 8325b4ca431c..000000000000 --- a/arch/x86/mach-rdc321x/Makefile +++ /dev/null | |||
@@ -1,5 +0,0 @@ | |||
1 | # | ||
2 | # Makefile for the RDC321x specific parts of the kernel | ||
3 | # | ||
4 | obj-$(CONFIG_X86_RDC321X) := gpio.o platform.o | ||
5 | |||
diff --git a/arch/x86/mach-rdc321x/gpio.c b/arch/x86/mach-rdc321x/gpio.c deleted file mode 100644 index 247f33d3a407..000000000000 --- a/arch/x86/mach-rdc321x/gpio.c +++ /dev/null | |||
@@ -1,194 +0,0 @@ | |||
1 | /* | ||
2 | * GPIO support for RDC SoC R3210/R8610 | ||
3 | * | ||
4 | * Copyright (C) 2007, Florian Fainelli <florian@openwrt.org> | ||
5 | * Copyright (C) 2008, Volker Weiss <dev@tintuc.de> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation; either version 2 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
15 | * GNU General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with this program; if not, write to the Free Software | ||
19 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. | ||
20 | * | ||
21 | */ | ||
22 | |||
23 | |||
24 | #include <linux/spinlock.h> | ||
25 | #include <linux/io.h> | ||
26 | #include <linux/types.h> | ||
27 | #include <linux/module.h> | ||
28 | |||
29 | #include <asm/gpio.h> | ||
30 | #include <asm/mach-rdc321x/rdc321x_defs.h> | ||
31 | |||
32 | |||
33 | /* spin lock to protect our private copy of GPIO data register plus | ||
34 | the access to PCI conf registers. */ | ||
35 | static DEFINE_SPINLOCK(gpio_lock); | ||
36 | |||
37 | /* copy of GPIO data registers */ | ||
38 | static u32 gpio_data_reg1; | ||
39 | static u32 gpio_data_reg2; | ||
40 | |||
41 | static u32 gpio_request_data[2]; | ||
42 | |||
43 | |||
44 | static inline void rdc321x_conf_write(unsigned addr, u32 value) | ||
45 | { | ||
46 | outl((1 << 31) | (7 << 11) | addr, RDC3210_CFGREG_ADDR); | ||
47 | outl(value, RDC3210_CFGREG_DATA); | ||
48 | } | ||
49 | |||
50 | static inline void rdc321x_conf_or(unsigned addr, u32 value) | ||
51 | { | ||
52 | outl((1 << 31) | (7 << 11) | addr, RDC3210_CFGREG_ADDR); | ||
53 | value |= inl(RDC3210_CFGREG_DATA); | ||
54 | outl(value, RDC3210_CFGREG_DATA); | ||
55 | } | ||
56 | |||
57 | static inline u32 rdc321x_conf_read(unsigned addr) | ||
58 | { | ||
59 | outl((1 << 31) | (7 << 11) | addr, RDC3210_CFGREG_ADDR); | ||
60 | |||
61 | return inl(RDC3210_CFGREG_DATA); | ||
62 | } | ||
63 | |||
64 | /* configure pin as GPIO */ | ||
65 | static void rdc321x_configure_gpio(unsigned gpio) | ||
66 | { | ||
67 | unsigned long flags; | ||
68 | |||
69 | spin_lock_irqsave(&gpio_lock, flags); | ||
70 | rdc321x_conf_or(gpio < 32 | ||
71 | ? RDC321X_GPIO_CTRL_REG1 : RDC321X_GPIO_CTRL_REG2, | ||
72 | 1 << (gpio & 0x1f)); | ||
73 | spin_unlock_irqrestore(&gpio_lock, flags); | ||
74 | } | ||
75 | |||
76 | /* initially setup the 2 copies of the gpio data registers. | ||
77 | This function must be called by the platform setup code. */ | ||
78 | void __init rdc321x_gpio_setup() | ||
79 | { | ||
80 | /* this might not be, what others (BIOS, bootloader, etc.) | ||
81 | wrote to these registers before, but it's a good guess. Still | ||
82 | better than just using 0xffffffff. */ | ||
83 | |||
84 | gpio_data_reg1 = rdc321x_conf_read(RDC321X_GPIO_DATA_REG1); | ||
85 | gpio_data_reg2 = rdc321x_conf_read(RDC321X_GPIO_DATA_REG2); | ||
86 | } | ||
87 | |||
88 | /* determine, if gpio number is valid */ | ||
89 | static inline int rdc321x_is_gpio(unsigned gpio) | ||
90 | { | ||
91 | return gpio <= RDC321X_MAX_GPIO; | ||
92 | } | ||
93 | |||
94 | /* request GPIO */ | ||
95 | int rdc_gpio_request(unsigned gpio, const char *label) | ||
96 | { | ||
97 | unsigned long flags; | ||
98 | |||
99 | if (!rdc321x_is_gpio(gpio)) | ||
100 | return -EINVAL; | ||
101 | |||
102 | spin_lock_irqsave(&gpio_lock, flags); | ||
103 | if (gpio_request_data[(gpio & 0x20) ? 1 : 0] & (1 << (gpio & 0x1f))) | ||
104 | goto inuse; | ||
105 | gpio_request_data[(gpio & 0x20) ? 1 : 0] |= (1 << (gpio & 0x1f)); | ||
106 | spin_unlock_irqrestore(&gpio_lock, flags); | ||
107 | |||
108 | return 0; | ||
109 | inuse: | ||
110 | spin_unlock_irqrestore(&gpio_lock, flags); | ||
111 | return -EINVAL; | ||
112 | } | ||
113 | EXPORT_SYMBOL(rdc_gpio_request); | ||
114 | |||
115 | /* release previously-claimed GPIO */ | ||
116 | void rdc_gpio_free(unsigned gpio) | ||
117 | { | ||
118 | unsigned long flags; | ||
119 | |||
120 | if (!rdc321x_is_gpio(gpio)) | ||
121 | return; | ||
122 | |||
123 | spin_lock_irqsave(&gpio_lock, flags); | ||
124 | gpio_request_data[(gpio & 0x20) ? 1 : 0] &= ~(1 << (gpio & 0x1f)); | ||
125 | spin_unlock_irqrestore(&gpio_lock, flags); | ||
126 | } | ||
127 | EXPORT_SYMBOL(rdc_gpio_free); | ||
128 | |||
129 | /* read GPIO pin */ | ||
130 | int rdc_gpio_get_value(unsigned gpio) | ||
131 | { | ||
132 | u32 reg; | ||
133 | unsigned long flags; | ||
134 | |||
135 | spin_lock_irqsave(&gpio_lock, flags); | ||
136 | reg = rdc321x_conf_read(gpio < 32 | ||
137 | ? RDC321X_GPIO_DATA_REG1 : RDC321X_GPIO_DATA_REG2); | ||
138 | spin_unlock_irqrestore(&gpio_lock, flags); | ||
139 | |||
140 | return (1 << (gpio & 0x1f)) & reg ? 1 : 0; | ||
141 | } | ||
142 | EXPORT_SYMBOL(rdc_gpio_get_value); | ||
143 | |||
144 | /* set GPIO pin to value */ | ||
145 | void rdc_gpio_set_value(unsigned gpio, int value) | ||
146 | { | ||
147 | unsigned long flags; | ||
148 | u32 reg; | ||
149 | |||
150 | reg = 1 << (gpio & 0x1f); | ||
151 | if (gpio < 32) { | ||
152 | spin_lock_irqsave(&gpio_lock, flags); | ||
153 | if (value) | ||
154 | gpio_data_reg1 |= reg; | ||
155 | else | ||
156 | gpio_data_reg1 &= ~reg; | ||
157 | rdc321x_conf_write(RDC321X_GPIO_DATA_REG1, gpio_data_reg1); | ||
158 | spin_unlock_irqrestore(&gpio_lock, flags); | ||
159 | } else { | ||
160 | spin_lock_irqsave(&gpio_lock, flags); | ||
161 | if (value) | ||
162 | gpio_data_reg2 |= reg; | ||
163 | else | ||
164 | gpio_data_reg2 &= ~reg; | ||
165 | rdc321x_conf_write(RDC321X_GPIO_DATA_REG2, gpio_data_reg2); | ||
166 | spin_unlock_irqrestore(&gpio_lock, flags); | ||
167 | } | ||
168 | } | ||
169 | EXPORT_SYMBOL(rdc_gpio_set_value); | ||
170 | |||
171 | /* configure GPIO pin as input */ | ||
172 | int rdc_gpio_direction_input(unsigned gpio) | ||
173 | { | ||
174 | if (!rdc321x_is_gpio(gpio)) | ||
175 | return -EINVAL; | ||
176 | |||
177 | rdc321x_configure_gpio(gpio); | ||
178 | |||
179 | return 0; | ||
180 | } | ||
181 | EXPORT_SYMBOL(rdc_gpio_direction_input); | ||
182 | |||
183 | /* configure GPIO pin as output and set value */ | ||
184 | int rdc_gpio_direction_output(unsigned gpio, int value) | ||
185 | { | ||
186 | if (!rdc321x_is_gpio(gpio)) | ||
187 | return -EINVAL; | ||
188 | |||
189 | gpio_set_value(gpio, value); | ||
190 | rdc321x_configure_gpio(gpio); | ||
191 | |||
192 | return 0; | ||
193 | } | ||
194 | EXPORT_SYMBOL(rdc_gpio_direction_output); | ||
diff --git a/arch/x86/mach-rdc321x/platform.c b/arch/x86/mach-rdc321x/platform.c deleted file mode 100644 index 4f4e50c3ad3b..000000000000 --- a/arch/x86/mach-rdc321x/platform.c +++ /dev/null | |||
@@ -1,69 +0,0 @@ | |||
1 | /* | ||
2 | * Generic RDC321x platform devices | ||
3 | * | ||
4 | * Copyright (C) 2007 Florian Fainelli <florian@openwrt.org> | ||
5 | * | ||
6 | * This program is free software; you can redistribute it and/or | ||
7 | * modify it under the terms of the GNU General Public License | ||
8 | * as published by the Free Software Foundation; either version 2 | ||
9 | * of the License, or (at your option) any later version. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License | ||
17 | * along with this program; if not, write to the | ||
18 | * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
19 | * Boston, MA 02110-1301, USA. | ||
20 | * | ||
21 | */ | ||
22 | |||
23 | #include <linux/init.h> | ||
24 | #include <linux/kernel.h> | ||
25 | #include <linux/list.h> | ||
26 | #include <linux/device.h> | ||
27 | #include <linux/platform_device.h> | ||
28 | #include <linux/leds.h> | ||
29 | |||
30 | #include <asm/gpio.h> | ||
31 | |||
32 | /* LEDS */ | ||
33 | static struct gpio_led default_leds[] = { | ||
34 | { .name = "rdc:dmz", .gpio = 1, }, | ||
35 | }; | ||
36 | |||
37 | static struct gpio_led_platform_data rdc321x_led_data = { | ||
38 | .num_leds = ARRAY_SIZE(default_leds), | ||
39 | .leds = default_leds, | ||
40 | }; | ||
41 | |||
42 | static struct platform_device rdc321x_leds = { | ||
43 | .name = "leds-gpio", | ||
44 | .id = -1, | ||
45 | .dev = { | ||
46 | .platform_data = &rdc321x_led_data, | ||
47 | } | ||
48 | }; | ||
49 | |||
50 | /* Watchdog */ | ||
51 | static struct platform_device rdc321x_wdt = { | ||
52 | .name = "rdc321x-wdt", | ||
53 | .id = -1, | ||
54 | .num_resources = 0, | ||
55 | }; | ||
56 | |||
57 | static struct platform_device *rdc321x_devs[] = { | ||
58 | &rdc321x_leds, | ||
59 | &rdc321x_wdt | ||
60 | }; | ||
61 | |||
62 | static int __init rdc_board_setup(void) | ||
63 | { | ||
64 | rdc321x_gpio_setup(); | ||
65 | |||
66 | return platform_add_devices(rdc321x_devs, ARRAY_SIZE(rdc321x_devs)); | ||
67 | } | ||
68 | |||
69 | arch_initcall(rdc_board_setup); | ||
diff --git a/arch/x86/mach-voyager/voyager_smp.c b/arch/x86/mach-voyager/voyager_smp.c index 2c74aec4efc1..6f5a38c7f900 100644 --- a/arch/x86/mach-voyager/voyager_smp.c +++ b/arch/x86/mach-voyager/voyager_smp.c | |||
@@ -528,8 +528,6 @@ static void __init do_boot_cpu(__u8 cpu) | |||
528 | /* init_tasks (in sched.c) is indexed logically */ | 528 | /* init_tasks (in sched.c) is indexed logically */ |
529 | stack_start.sp = (void *)idle->thread.sp; | 529 | stack_start.sp = (void *)idle->thread.sp; |
530 | 530 | ||
531 | init_gdt(cpu); | ||
532 | per_cpu(this_cpu_off, cpu) = __per_cpu_offset[cpu]; | ||
533 | per_cpu(current_task, cpu) = idle; | 531 | per_cpu(current_task, cpu) = idle; |
534 | early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu); | 532 | early_gdt_descr.address = (unsigned long)get_cpu_gdt_table(cpu); |
535 | irq_ctx_init(cpu); | 533 | irq_ctx_init(cpu); |
@@ -1746,15 +1744,13 @@ static void __init voyager_smp_prepare_cpus(unsigned int max_cpus) | |||
1746 | 1744 | ||
1747 | static void __cpuinit voyager_smp_prepare_boot_cpu(void) | 1745 | static void __cpuinit voyager_smp_prepare_boot_cpu(void) |
1748 | { | 1746 | { |
1749 | init_gdt(smp_processor_id()); | 1747 | int cpu = smp_processor_id(); |
1750 | per_cpu(this_cpu_off, cpu) = __per_cpu_offset[cpu]; | 1748 | switch_to_new_gdt(cpu); |
1751 | switch_to_new_gdt(); | ||
1752 | 1749 | ||
1753 | cpu_online_map = cpumask_of_cpu(smp_processor_id()); | 1750 | cpu_online_map = cpumask_of_cpu(smp_processor_id()); |
1754 | cpu_callout_map = cpumask_of_cpu(smp_processor_id()); | 1751 | cpu_callout_map = cpumask_of_cpu(smp_processor_id()); |
1755 | cpu_callin_map = CPU_MASK_NONE; | 1752 | cpu_callin_map = CPU_MASK_NONE; |
1756 | cpu_present_map = cpumask_of_cpu(smp_processor_id()); | 1753 | cpu_present_map = cpumask_of_cpu(smp_processor_id()); |
1757 | |||
1758 | } | 1754 | } |
1759 | 1755 | ||
1760 | static int __cpuinit voyager_cpu_up(unsigned int cpu) | 1756 | static int __cpuinit voyager_cpu_up(unsigned int cpu) |
@@ -1781,7 +1777,6 @@ static void __init voyager_smp_cpus_done(unsigned int max_cpus) | |||
1781 | void __init smp_setup_processor_id(void) | 1777 | void __init smp_setup_processor_id(void) |
1782 | { | 1778 | { |
1783 | current_thread_info()->cpu = hard_smp_processor_id(); | 1779 | current_thread_info()->cpu = hard_smp_processor_id(); |
1784 | percpu_write(cpu_number, hard_smp_processor_id()); | ||
1785 | } | 1780 | } |
1786 | 1781 | ||
1787 | static void voyager_send_call_func(const struct cpumask *callmask) | 1782 | static void voyager_send_call_func(const struct cpumask *callmask) |
diff --git a/arch/x86/math-emu/get_address.c b/arch/x86/math-emu/get_address.c index 420b3b6e3915..6ef5e99380f9 100644 --- a/arch/x86/math-emu/get_address.c +++ b/arch/x86/math-emu/get_address.c | |||
@@ -150,11 +150,9 @@ static long pm_address(u_char FPU_modrm, u_char segment, | |||
150 | #endif /* PARANOID */ | 150 | #endif /* PARANOID */ |
151 | 151 | ||
152 | switch (segment) { | 152 | switch (segment) { |
153 | /* gs isn't used by the kernel, so it still has its | ||
154 | user-space value. */ | ||
155 | case PREFIX_GS_ - 1: | 153 | case PREFIX_GS_ - 1: |
156 | /* N.B. - movl %seg, mem is a 2 byte write regardless of prefix */ | 154 | /* user gs handling can be lazy, use special accessors */ |
157 | savesegment(gs, addr->selector); | 155 | addr->selector = get_user_gs(FPU_info->regs); |
158 | break; | 156 | break; |
159 | default: | 157 | default: |
160 | addr->selector = PM_REG_(segment); | 158 | addr->selector = PM_REG_(segment); |
diff --git a/arch/x86/mm/Makefile b/arch/x86/mm/Makefile index 9f05157220f5..2b938a384910 100644 --- a/arch/x86/mm/Makefile +++ b/arch/x86/mm/Makefile | |||
@@ -1,7 +1,7 @@ | |||
1 | obj-y := init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \ | 1 | obj-y := init_$(BITS).o fault.o ioremap.o extable.o pageattr.o mmap.o \ |
2 | pat.o pgtable.o gup.o | 2 | pat.o pgtable.o gup.o |
3 | 3 | ||
4 | obj-$(CONFIG_X86_SMP) += tlb.o | 4 | obj-$(CONFIG_SMP) += tlb.o |
5 | 5 | ||
6 | obj-$(CONFIG_X86_32) += pgtable_32.o iomap_32.o | 6 | obj-$(CONFIG_X86_32) += pgtable_32.o iomap_32.o |
7 | 7 | ||
diff --git a/arch/x86/mm/extable.c b/arch/x86/mm/extable.c index 7e8db53528a7..61b41ca3b5a2 100644 --- a/arch/x86/mm/extable.c +++ b/arch/x86/mm/extable.c | |||
@@ -23,6 +23,12 @@ int fixup_exception(struct pt_regs *regs) | |||
23 | 23 | ||
24 | fixup = search_exception_tables(regs->ip); | 24 | fixup = search_exception_tables(regs->ip); |
25 | if (fixup) { | 25 | if (fixup) { |
26 | /* If fixup is less than 16, it means uaccess error */ | ||
27 | if (fixup->fixup < 16) { | ||
28 | current_thread_info()->uaccess_err = -EFAULT; | ||
29 | regs->ip += fixup->fixup; | ||
30 | return 1; | ||
31 | } | ||
26 | regs->ip = fixup->fixup; | 32 | regs->ip = fixup->fixup; |
27 | return 1; | 33 | return 1; |
28 | } | 34 | } |
diff --git a/arch/x86/mm/fault.c b/arch/x86/mm/fault.c index 8c3f3113a6ec..94c4e7262197 100644 --- a/arch/x86/mm/fault.c +++ b/arch/x86/mm/fault.c | |||
@@ -420,7 +420,6 @@ static noinline void pgtable_bad(struct pt_regs *regs, | |||
420 | printk(KERN_ALERT "%s: Corrupted page table at address %lx\n", | 420 | printk(KERN_ALERT "%s: Corrupted page table at address %lx\n", |
421 | tsk->comm, address); | 421 | tsk->comm, address); |
422 | dump_pagetable(address); | 422 | dump_pagetable(address); |
423 | tsk = current; | ||
424 | tsk->thread.cr2 = address; | 423 | tsk->thread.cr2 = address; |
425 | tsk->thread.trap_no = 14; | 424 | tsk->thread.trap_no = 14; |
426 | tsk->thread.error_code = error_code; | 425 | tsk->thread.error_code = error_code; |
@@ -783,6 +782,15 @@ static inline int access_error(unsigned long error_code, int write, | |||
783 | return 0; | 782 | return 0; |
784 | } | 783 | } |
785 | 784 | ||
785 | static int fault_in_kernel_space(unsigned long address) | ||
786 | { | ||
787 | #ifdef CONFIG_X86_32 | ||
788 | return address >= TASK_SIZE; | ||
789 | #else /* !CONFIG_X86_32 */ | ||
790 | return address >= TASK_SIZE64; | ||
791 | #endif /* CONFIG_X86_32 */ | ||
792 | } | ||
793 | |||
786 | /* | 794 | /* |
787 | * This routine handles page faults. It determines the address, | 795 | * This routine handles page faults. It determines the address, |
788 | * and the problem, and then passes it off to one of the appropriate | 796 | * and the problem, and then passes it off to one of the appropriate |
@@ -823,11 +831,7 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code) | |||
823 | * (error_code & 4) == 0, and that the fault was not a | 831 | * (error_code & 4) == 0, and that the fault was not a |
824 | * protection error (error_code & 9) == 0. | 832 | * protection error (error_code & 9) == 0. |
825 | */ | 833 | */ |
826 | #ifdef CONFIG_X86_32 | 834 | if (unlikely(fault_in_kernel_space(address))) { |
827 | if (unlikely(address >= TASK_SIZE)) { | ||
828 | #else | ||
829 | if (unlikely(address >= TASK_SIZE64)) { | ||
830 | #endif | ||
831 | if (!(error_code & (PF_RSVD|PF_USER|PF_PROT)) && | 835 | if (!(error_code & (PF_RSVD|PF_USER|PF_PROT)) && |
832 | vmalloc_fault(address) >= 0) | 836 | vmalloc_fault(address) >= 0) |
833 | return; | 837 | return; |
@@ -899,6 +903,12 @@ void __kprobes do_page_fault(struct pt_regs *regs, unsigned long error_code) | |||
899 | return; | 903 | return; |
900 | } | 904 | } |
901 | down_read(&mm->mmap_sem); | 905 | down_read(&mm->mmap_sem); |
906 | } else { | ||
907 | /* | ||
908 | * The above down_read_trylock() might have succeeded in which | ||
909 | * case we'll have missed the might_sleep() from down_read(). | ||
910 | */ | ||
911 | might_sleep(); | ||
902 | } | 912 | } |
903 | 913 | ||
904 | vma = find_vma(mm, address); | 914 | vma = find_vma(mm, address); |
diff --git a/arch/x86/mm/init_32.c b/arch/x86/mm/init_32.c index 00263bf07a88..06708ee94aa4 100644 --- a/arch/x86/mm/init_32.c +++ b/arch/x86/mm/init_32.c | |||
@@ -674,75 +674,97 @@ static int __init parse_highmem(char *arg) | |||
674 | } | 674 | } |
675 | early_param("highmem", parse_highmem); | 675 | early_param("highmem", parse_highmem); |
676 | 676 | ||
677 | #define MSG_HIGHMEM_TOO_BIG \ | ||
678 | "highmem size (%luMB) is bigger than pages available (%luMB)!\n" | ||
679 | |||
680 | #define MSG_LOWMEM_TOO_SMALL \ | ||
681 | "highmem size (%luMB) results in <64MB lowmem, ignoring it!\n" | ||
677 | /* | 682 | /* |
678 | * Determine low and high memory ranges: | 683 | * All of RAM fits into lowmem - but if user wants highmem |
684 | * artificially via the highmem=x boot parameter then create | ||
685 | * it: | ||
679 | */ | 686 | */ |
680 | void __init find_low_pfn_range(void) | 687 | void __init lowmem_pfn_init(void) |
681 | { | 688 | { |
682 | /* it could update max_pfn */ | ||
683 | |||
684 | /* max_low_pfn is 0, we already have early_res support */ | 689 | /* max_low_pfn is 0, we already have early_res support */ |
685 | |||
686 | max_low_pfn = max_pfn; | 690 | max_low_pfn = max_pfn; |
687 | if (max_low_pfn > MAXMEM_PFN) { | 691 | |
688 | if (highmem_pages == -1) | 692 | if (highmem_pages == -1) |
689 | highmem_pages = max_pfn - MAXMEM_PFN; | 693 | highmem_pages = 0; |
690 | if (highmem_pages + MAXMEM_PFN < max_pfn) | 694 | #ifdef CONFIG_HIGHMEM |
691 | max_pfn = MAXMEM_PFN + highmem_pages; | 695 | if (highmem_pages >= max_pfn) { |
692 | if (highmem_pages + MAXMEM_PFN > max_pfn) { | 696 | printk(KERN_ERR MSG_HIGHMEM_TOO_BIG, |
693 | printk(KERN_WARNING "only %luMB highmem pages " | 697 | pages_to_mb(highmem_pages), pages_to_mb(max_pfn)); |
694 | "available, ignoring highmem size of %uMB.\n", | 698 | highmem_pages = 0; |
695 | pages_to_mb(max_pfn - MAXMEM_PFN), | 699 | } |
700 | if (highmem_pages) { | ||
701 | if (max_low_pfn - highmem_pages < 64*1024*1024/PAGE_SIZE) { | ||
702 | printk(KERN_ERR MSG_LOWMEM_TOO_SMALL, | ||
696 | pages_to_mb(highmem_pages)); | 703 | pages_to_mb(highmem_pages)); |
697 | highmem_pages = 0; | 704 | highmem_pages = 0; |
698 | } | 705 | } |
699 | max_low_pfn = MAXMEM_PFN; | 706 | max_low_pfn -= highmem_pages; |
707 | } | ||
708 | #else | ||
709 | if (highmem_pages) | ||
710 | printk(KERN_ERR "ignoring highmem size on non-highmem kernel!\n"); | ||
711 | #endif | ||
712 | } | ||
713 | |||
714 | #define MSG_HIGHMEM_TOO_SMALL \ | ||
715 | "only %luMB highmem pages available, ignoring highmem size of %luMB!\n" | ||
716 | |||
717 | #define MSG_HIGHMEM_TRIMMED \ | ||
718 | "Warning: only 4GB will be used. Use a HIGHMEM64G enabled kernel!\n" | ||
719 | /* | ||
720 | * We have more RAM than fits into lowmem - we try to put it into | ||
721 | * highmem, also taking the highmem=x boot parameter into account: | ||
722 | */ | ||
723 | void __init highmem_pfn_init(void) | ||
724 | { | ||
725 | max_low_pfn = MAXMEM_PFN; | ||
726 | |||
727 | if (highmem_pages == -1) | ||
728 | highmem_pages = max_pfn - MAXMEM_PFN; | ||
729 | |||
730 | if (highmem_pages + MAXMEM_PFN < max_pfn) | ||
731 | max_pfn = MAXMEM_PFN + highmem_pages; | ||
732 | |||
733 | if (highmem_pages + MAXMEM_PFN > max_pfn) { | ||
734 | printk(KERN_WARNING MSG_HIGHMEM_TOO_SMALL, | ||
735 | pages_to_mb(max_pfn - MAXMEM_PFN), | ||
736 | pages_to_mb(highmem_pages)); | ||
737 | highmem_pages = 0; | ||
738 | } | ||
700 | #ifndef CONFIG_HIGHMEM | 739 | #ifndef CONFIG_HIGHMEM |
701 | /* Maximum memory usable is what is directly addressable */ | 740 | /* Maximum memory usable is what is directly addressable */ |
702 | printk(KERN_WARNING "Warning only %ldMB will be used.\n", | 741 | printk(KERN_WARNING "Warning only %ldMB will be used.\n", MAXMEM>>20); |
703 | MAXMEM>>20); | 742 | if (max_pfn > MAX_NONPAE_PFN) |
704 | if (max_pfn > MAX_NONPAE_PFN) | 743 | printk(KERN_WARNING "Use a HIGHMEM64G enabled kernel.\n"); |
705 | printk(KERN_WARNING | 744 | else |
706 | "Use a HIGHMEM64G enabled kernel.\n"); | 745 | printk(KERN_WARNING "Use a HIGHMEM enabled kernel.\n"); |
707 | else | 746 | max_pfn = MAXMEM_PFN; |
708 | printk(KERN_WARNING "Use a HIGHMEM enabled kernel.\n"); | ||
709 | max_pfn = MAXMEM_PFN; | ||
710 | #else /* !CONFIG_HIGHMEM */ | 747 | #else /* !CONFIG_HIGHMEM */ |
711 | #ifndef CONFIG_HIGHMEM64G | 748 | #ifndef CONFIG_HIGHMEM64G |
712 | if (max_pfn > MAX_NONPAE_PFN) { | 749 | if (max_pfn > MAX_NONPAE_PFN) { |
713 | max_pfn = MAX_NONPAE_PFN; | 750 | max_pfn = MAX_NONPAE_PFN; |
714 | printk(KERN_WARNING "Warning only 4GB will be used." | 751 | printk(KERN_WARNING MSG_HIGHMEM_TRIMMED); |
715 | "Use a HIGHMEM64G enabled kernel.\n"); | 752 | } |
716 | } | ||
717 | #endif /* !CONFIG_HIGHMEM64G */ | 753 | #endif /* !CONFIG_HIGHMEM64G */ |
718 | #endif /* !CONFIG_HIGHMEM */ | 754 | #endif /* !CONFIG_HIGHMEM */ |
719 | } else { | 755 | } |
720 | if (highmem_pages == -1) | 756 | |
721 | highmem_pages = 0; | 757 | /* |
722 | #ifdef CONFIG_HIGHMEM | 758 | * Determine low and high memory ranges: |
723 | if (highmem_pages >= max_pfn) { | 759 | */ |
724 | printk(KERN_ERR "highmem size specified (%uMB) is " | 760 | void __init find_low_pfn_range(void) |
725 | "bigger than pages available (%luMB)!.\n", | 761 | { |
726 | pages_to_mb(highmem_pages), | 762 | /* it could update max_pfn */ |
727 | pages_to_mb(max_pfn)); | 763 | |
728 | highmem_pages = 0; | 764 | if (max_pfn <= MAXMEM_PFN) |
729 | } | 765 | lowmem_pfn_init(); |
730 | if (highmem_pages) { | 766 | else |
731 | if (max_low_pfn - highmem_pages < | 767 | highmem_pfn_init(); |
732 | 64*1024*1024/PAGE_SIZE){ | ||
733 | printk(KERN_ERR "highmem size %uMB results in " | ||
734 | "smaller than 64MB lowmem, ignoring it.\n" | ||
735 | , pages_to_mb(highmem_pages)); | ||
736 | highmem_pages = 0; | ||
737 | } | ||
738 | max_low_pfn -= highmem_pages; | ||
739 | } | ||
740 | #else | ||
741 | if (highmem_pages) | ||
742 | printk(KERN_ERR "ignoring highmem size on non-highmem" | ||
743 | " kernel!\n"); | ||
744 | #endif | ||
745 | } | ||
746 | } | 768 | } |
747 | 769 | ||
748 | #ifndef CONFIG_NEED_MULTIPLE_NODES | 770 | #ifndef CONFIG_NEED_MULTIPLE_NODES |
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index af750ab973b6..433f7bd4648a 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c | |||
@@ -134,25 +134,6 @@ int page_is_ram(unsigned long pagenr) | |||
134 | return 0; | 134 | return 0; |
135 | } | 135 | } |
136 | 136 | ||
137 | int pagerange_is_ram(unsigned long start, unsigned long end) | ||
138 | { | ||
139 | int ram_page = 0, not_rampage = 0; | ||
140 | unsigned long page_nr; | ||
141 | |||
142 | for (page_nr = (start >> PAGE_SHIFT); page_nr < (end >> PAGE_SHIFT); | ||
143 | ++page_nr) { | ||
144 | if (page_is_ram(page_nr)) | ||
145 | ram_page = 1; | ||
146 | else | ||
147 | not_rampage = 1; | ||
148 | |||
149 | if (ram_page == not_rampage) | ||
150 | return -1; | ||
151 | } | ||
152 | |||
153 | return ram_page; | ||
154 | } | ||
155 | |||
156 | /* | 137 | /* |
157 | * Fix up the linear direct mapping of the kernel to avoid cache attribute | 138 | * Fix up the linear direct mapping of the kernel to avoid cache attribute |
158 | * conflicts. | 139 | * conflicts. |
@@ -367,7 +348,7 @@ EXPORT_SYMBOL(ioremap_nocache); | |||
367 | * | 348 | * |
368 | * Must be freed with iounmap. | 349 | * Must be freed with iounmap. |
369 | */ | 350 | */ |
370 | void __iomem *ioremap_wc(unsigned long phys_addr, unsigned long size) | 351 | void __iomem *ioremap_wc(resource_size_t phys_addr, unsigned long size) |
371 | { | 352 | { |
372 | if (pat_enabled) | 353 | if (pat_enabled) |
373 | return __ioremap_caller(phys_addr, size, _PAGE_CACHE_WC, | 354 | return __ioremap_caller(phys_addr, size, _PAGE_CACHE_WC, |
diff --git a/arch/x86/mm/mmap.c b/arch/x86/mm/mmap.c index 56fe7124fbec..165829600566 100644 --- a/arch/x86/mm/mmap.c +++ b/arch/x86/mm/mmap.c | |||
@@ -4,7 +4,7 @@ | |||
4 | * Based on code by Ingo Molnar and Andi Kleen, copyrighted | 4 | * Based on code by Ingo Molnar and Andi Kleen, copyrighted |
5 | * as follows: | 5 | * as follows: |
6 | * | 6 | * |
7 | * Copyright 2003-2004 Red Hat Inc., Durham, North Carolina. | 7 | * Copyright 2003-2009 Red Hat Inc. |
8 | * All Rights Reserved. | 8 | * All Rights Reserved. |
9 | * Copyright 2005 Andi Kleen, SUSE Labs. | 9 | * Copyright 2005 Andi Kleen, SUSE Labs. |
10 | * Copyright 2007 Jiri Kosina, SUSE Labs. | 10 | * Copyright 2007 Jiri Kosina, SUSE Labs. |
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c index 71a14f89f89e..deb1c1ab7868 100644 --- a/arch/x86/mm/numa_64.c +++ b/arch/x86/mm/numa_64.c | |||
@@ -20,6 +20,12 @@ | |||
20 | #include <asm/acpi.h> | 20 | #include <asm/acpi.h> |
21 | #include <asm/k8.h> | 21 | #include <asm/k8.h> |
22 | 22 | ||
23 | #ifdef CONFIG_DEBUG_PER_CPU_MAPS | ||
24 | # define DBG(x...) printk(KERN_DEBUG x) | ||
25 | #else | ||
26 | # define DBG(x...) | ||
27 | #endif | ||
28 | |||
23 | struct pglist_data *node_data[MAX_NUMNODES] __read_mostly; | 29 | struct pglist_data *node_data[MAX_NUMNODES] __read_mostly; |
24 | EXPORT_SYMBOL(node_data); | 30 | EXPORT_SYMBOL(node_data); |
25 | 31 | ||
@@ -33,6 +39,21 @@ int numa_off __initdata; | |||
33 | static unsigned long __initdata nodemap_addr; | 39 | static unsigned long __initdata nodemap_addr; |
34 | static unsigned long __initdata nodemap_size; | 40 | static unsigned long __initdata nodemap_size; |
35 | 41 | ||
42 | DEFINE_PER_CPU(int, node_number) = 0; | ||
43 | EXPORT_PER_CPU_SYMBOL(node_number); | ||
44 | |||
45 | /* | ||
46 | * Map cpu index to node index | ||
47 | */ | ||
48 | DEFINE_EARLY_PER_CPU(int, x86_cpu_to_node_map, NUMA_NO_NODE); | ||
49 | EXPORT_EARLY_PER_CPU_SYMBOL(x86_cpu_to_node_map); | ||
50 | |||
51 | /* | ||
52 | * Which logical CPUs are on which nodes | ||
53 | */ | ||
54 | cpumask_t *node_to_cpumask_map; | ||
55 | EXPORT_SYMBOL(node_to_cpumask_map); | ||
56 | |||
36 | /* | 57 | /* |
37 | * Given a shift value, try to populate memnodemap[] | 58 | * Given a shift value, try to populate memnodemap[] |
38 | * Returns : | 59 | * Returns : |
@@ -640,3 +661,199 @@ void __init init_cpu_to_node(void) | |||
640 | #endif | 661 | #endif |
641 | 662 | ||
642 | 663 | ||
664 | /* | ||
665 | * Allocate node_to_cpumask_map based on number of available nodes | ||
666 | * Requires node_possible_map to be valid. | ||
667 | * | ||
668 | * Note: node_to_cpumask() is not valid until after this is done. | ||
669 | * (Use CONFIG_DEBUG_PER_CPU_MAPS to check this.) | ||
670 | */ | ||
671 | void __init setup_node_to_cpumask_map(void) | ||
672 | { | ||
673 | unsigned int node, num = 0; | ||
674 | cpumask_t *map; | ||
675 | |||
676 | /* setup nr_node_ids if not done yet */ | ||
677 | if (nr_node_ids == MAX_NUMNODES) { | ||
678 | for_each_node_mask(node, node_possible_map) | ||
679 | num = node; | ||
680 | nr_node_ids = num + 1; | ||
681 | } | ||
682 | |||
683 | /* allocate the map */ | ||
684 | map = alloc_bootmem_low(nr_node_ids * sizeof(cpumask_t)); | ||
685 | DBG("node_to_cpumask_map at %p for %d nodes\n", map, nr_node_ids); | ||
686 | |||
687 | pr_debug("Node to cpumask map at %p for %d nodes\n", | ||
688 | map, nr_node_ids); | ||
689 | |||
690 | /* node_to_cpumask() will now work */ | ||
691 | node_to_cpumask_map = map; | ||
692 | } | ||
693 | |||
694 | void __cpuinit numa_set_node(int cpu, int node) | ||
695 | { | ||
696 | int *cpu_to_node_map = early_per_cpu_ptr(x86_cpu_to_node_map); | ||
697 | |||
698 | /* early setting, no percpu area yet */ | ||
699 | if (cpu_to_node_map) { | ||
700 | cpu_to_node_map[cpu] = node; | ||
701 | return; | ||
702 | } | ||
703 | |||
704 | #ifdef CONFIG_DEBUG_PER_CPU_MAPS | ||
705 | if (cpu >= nr_cpu_ids || !cpu_possible(cpu)) { | ||
706 | printk(KERN_ERR "numa_set_node: invalid cpu# (%d)\n", cpu); | ||
707 | dump_stack(); | ||
708 | return; | ||
709 | } | ||
710 | #endif | ||
711 | per_cpu(x86_cpu_to_node_map, cpu) = node; | ||
712 | |||
713 | if (node != NUMA_NO_NODE) | ||
714 | per_cpu(node_number, cpu) = node; | ||
715 | } | ||
716 | |||
717 | void __cpuinit numa_clear_node(int cpu) | ||
718 | { | ||
719 | numa_set_node(cpu, NUMA_NO_NODE); | ||
720 | } | ||
721 | |||
722 | #ifndef CONFIG_DEBUG_PER_CPU_MAPS | ||
723 | |||
724 | void __cpuinit numa_add_cpu(int cpu) | ||
725 | { | ||
726 | cpu_set(cpu, node_to_cpumask_map[early_cpu_to_node(cpu)]); | ||
727 | } | ||
728 | |||
729 | void __cpuinit numa_remove_cpu(int cpu) | ||
730 | { | ||
731 | cpu_clear(cpu, node_to_cpumask_map[early_cpu_to_node(cpu)]); | ||
732 | } | ||
733 | |||
734 | #else /* CONFIG_DEBUG_PER_CPU_MAPS */ | ||
735 | |||
736 | /* | ||
737 | * --------- debug versions of the numa functions --------- | ||
738 | */ | ||
739 | static void __cpuinit numa_set_cpumask(int cpu, int enable) | ||
740 | { | ||
741 | int node = early_cpu_to_node(cpu); | ||
742 | cpumask_t *mask; | ||
743 | char buf[64]; | ||
744 | |||
745 | if (node_to_cpumask_map == NULL) { | ||
746 | printk(KERN_ERR "node_to_cpumask_map NULL\n"); | ||
747 | dump_stack(); | ||
748 | return; | ||
749 | } | ||
750 | |||
751 | mask = &node_to_cpumask_map[node]; | ||
752 | if (enable) | ||
753 | cpu_set(cpu, *mask); | ||
754 | else | ||
755 | cpu_clear(cpu, *mask); | ||
756 | |||
757 | cpulist_scnprintf(buf, sizeof(buf), mask); | ||
758 | printk(KERN_DEBUG "%s cpu %d node %d: mask now %s\n", | ||
759 | enable ? "numa_add_cpu" : "numa_remove_cpu", cpu, node, buf); | ||
760 | } | ||
761 | |||
762 | void __cpuinit numa_add_cpu(int cpu) | ||
763 | { | ||
764 | numa_set_cpumask(cpu, 1); | ||
765 | } | ||
766 | |||
767 | void __cpuinit numa_remove_cpu(int cpu) | ||
768 | { | ||
769 | numa_set_cpumask(cpu, 0); | ||
770 | } | ||
771 | |||
772 | int cpu_to_node(int cpu) | ||
773 | { | ||
774 | if (early_per_cpu_ptr(x86_cpu_to_node_map)) { | ||
775 | printk(KERN_WARNING | ||
776 | "cpu_to_node(%d): usage too early!\n", cpu); | ||
777 | dump_stack(); | ||
778 | return early_per_cpu_ptr(x86_cpu_to_node_map)[cpu]; | ||
779 | } | ||
780 | return per_cpu(x86_cpu_to_node_map, cpu); | ||
781 | } | ||
782 | EXPORT_SYMBOL(cpu_to_node); | ||
783 | |||
784 | /* | ||
785 | * Same function as cpu_to_node() but used if called before the | ||
786 | * per_cpu areas are setup. | ||
787 | */ | ||
788 | int early_cpu_to_node(int cpu) | ||
789 | { | ||
790 | if (early_per_cpu_ptr(x86_cpu_to_node_map)) | ||
791 | return early_per_cpu_ptr(x86_cpu_to_node_map)[cpu]; | ||
792 | |||
793 | if (!cpu_possible(cpu)) { | ||
794 | printk(KERN_WARNING | ||
795 | "early_cpu_to_node(%d): no per_cpu area!\n", cpu); | ||
796 | dump_stack(); | ||
797 | return NUMA_NO_NODE; | ||
798 | } | ||
799 | return per_cpu(x86_cpu_to_node_map, cpu); | ||
800 | } | ||
801 | |||
802 | |||
803 | /* empty cpumask */ | ||
804 | static const cpumask_t cpu_mask_none; | ||
805 | |||
806 | /* | ||
807 | * Returns a pointer to the bitmask of CPUs on Node 'node'. | ||
808 | */ | ||
809 | const cpumask_t *cpumask_of_node(int node) | ||
810 | { | ||
811 | if (node_to_cpumask_map == NULL) { | ||
812 | printk(KERN_WARNING | ||
813 | "cpumask_of_node(%d): no node_to_cpumask_map!\n", | ||
814 | node); | ||
815 | dump_stack(); | ||
816 | return (const cpumask_t *)&cpu_online_map; | ||
817 | } | ||
818 | if (node >= nr_node_ids) { | ||
819 | printk(KERN_WARNING | ||
820 | "cpumask_of_node(%d): node > nr_node_ids(%d)\n", | ||
821 | node, nr_node_ids); | ||
822 | dump_stack(); | ||
823 | return &cpu_mask_none; | ||
824 | } | ||
825 | return &node_to_cpumask_map[node]; | ||
826 | } | ||
827 | EXPORT_SYMBOL(cpumask_of_node); | ||
828 | |||
829 | /* | ||
830 | * Returns a bitmask of CPUs on Node 'node'. | ||
831 | * | ||
832 | * Side note: this function creates the returned cpumask on the stack | ||
833 | * so with a high NR_CPUS count, excessive stack space is used. The | ||
834 | * node_to_cpumask_ptr function should be used whenever possible. | ||
835 | */ | ||
836 | cpumask_t node_to_cpumask(int node) | ||
837 | { | ||
838 | if (node_to_cpumask_map == NULL) { | ||
839 | printk(KERN_WARNING | ||
840 | "node_to_cpumask(%d): no node_to_cpumask_map!\n", node); | ||
841 | dump_stack(); | ||
842 | return cpu_online_map; | ||
843 | } | ||
844 | if (node >= nr_node_ids) { | ||
845 | printk(KERN_WARNING | ||
846 | "node_to_cpumask(%d): node > nr_node_ids(%d)\n", | ||
847 | node, nr_node_ids); | ||
848 | dump_stack(); | ||
849 | return cpu_mask_none; | ||
850 | } | ||
851 | return node_to_cpumask_map[node]; | ||
852 | } | ||
853 | EXPORT_SYMBOL(node_to_cpumask); | ||
854 | |||
855 | /* | ||
856 | * --------- end of debug versions of the numa functions --------- | ||
857 | */ | ||
858 | |||
859 | #endif /* CONFIG_DEBUG_PER_CPU_MAPS */ | ||
diff --git a/arch/x86/mm/pageattr.c b/arch/x86/mm/pageattr.c index 84ba74820ad6..8ca0d8566fc8 100644 --- a/arch/x86/mm/pageattr.c +++ b/arch/x86/mm/pageattr.c | |||
@@ -575,7 +575,6 @@ static int __change_page_attr(struct cpa_data *cpa, int primary) | |||
575 | address = cpa->vaddr[cpa->curpage]; | 575 | address = cpa->vaddr[cpa->curpage]; |
576 | else | 576 | else |
577 | address = *cpa->vaddr; | 577 | address = *cpa->vaddr; |
578 | |||
579 | repeat: | 578 | repeat: |
580 | kpte = lookup_address(address, &level); | 579 | kpte = lookup_address(address, &level); |
581 | if (!kpte) | 580 | if (!kpte) |
@@ -812,6 +811,13 @@ static int change_page_attr_set_clr(unsigned long *addr, int numpages, | |||
812 | 811 | ||
813 | vm_unmap_aliases(); | 812 | vm_unmap_aliases(); |
814 | 813 | ||
814 | /* | ||
815 | * If we're called with lazy mmu updates enabled, the | ||
816 | * in-memory pte state may be stale. Flush pending updates to | ||
817 | * bring them up to date. | ||
818 | */ | ||
819 | arch_flush_lazy_mmu_mode(); | ||
820 | |||
815 | cpa.vaddr = addr; | 821 | cpa.vaddr = addr; |
816 | cpa.numpages = numpages; | 822 | cpa.numpages = numpages; |
817 | cpa.mask_set = mask_set; | 823 | cpa.mask_set = mask_set; |
@@ -854,6 +860,13 @@ static int change_page_attr_set_clr(unsigned long *addr, int numpages, | |||
854 | } else | 860 | } else |
855 | cpa_flush_all(cache); | 861 | cpa_flush_all(cache); |
856 | 862 | ||
863 | /* | ||
864 | * If we've been called with lazy mmu updates enabled, then | ||
865 | * make sure that everything gets flushed out before we | ||
866 | * return. | ||
867 | */ | ||
868 | arch_flush_lazy_mmu_mode(); | ||
869 | |||
857 | out: | 870 | out: |
858 | return ret; | 871 | return ret; |
859 | } | 872 | } |
diff --git a/arch/x86/mm/pat.c b/arch/x86/mm/pat.c index 7b61036427df..05f9aef6818a 100644 --- a/arch/x86/mm/pat.c +++ b/arch/x86/mm/pat.c | |||
@@ -30,7 +30,7 @@ | |||
30 | #ifdef CONFIG_X86_PAT | 30 | #ifdef CONFIG_X86_PAT |
31 | int __read_mostly pat_enabled = 1; | 31 | int __read_mostly pat_enabled = 1; |
32 | 32 | ||
33 | void __cpuinit pat_disable(char *reason) | 33 | void __cpuinit pat_disable(const char *reason) |
34 | { | 34 | { |
35 | pat_enabled = 0; | 35 | pat_enabled = 0; |
36 | printk(KERN_INFO "%s\n", reason); | 36 | printk(KERN_INFO "%s\n", reason); |
@@ -42,6 +42,11 @@ static int __init nopat(char *str) | |||
42 | return 0; | 42 | return 0; |
43 | } | 43 | } |
44 | early_param("nopat", nopat); | 44 | early_param("nopat", nopat); |
45 | #else | ||
46 | static inline void pat_disable(const char *reason) | ||
47 | { | ||
48 | (void)reason; | ||
49 | } | ||
45 | #endif | 50 | #endif |
46 | 51 | ||
47 | 52 | ||
@@ -78,16 +83,20 @@ void pat_init(void) | |||
78 | if (!pat_enabled) | 83 | if (!pat_enabled) |
79 | return; | 84 | return; |
80 | 85 | ||
81 | /* Paranoia check. */ | 86 | if (!cpu_has_pat) { |
82 | if (!cpu_has_pat && boot_pat_state) { | 87 | if (!boot_pat_state) { |
83 | /* | 88 | pat_disable("PAT not supported by CPU."); |
84 | * If this happens we are on a secondary CPU, but | 89 | return; |
85 | * switched to PAT on the boot CPU. We have no way to | 90 | } else { |
86 | * undo PAT. | 91 | /* |
87 | */ | 92 | * If this happens we are on a secondary CPU, but |
88 | printk(KERN_ERR "PAT enabled, " | 93 | * switched to PAT on the boot CPU. We have no way to |
89 | "but not supported by secondary CPU\n"); | 94 | * undo PAT. |
90 | BUG(); | 95 | */ |
96 | printk(KERN_ERR "PAT enabled, " | ||
97 | "but not supported by secondary CPU\n"); | ||
98 | BUG(); | ||
99 | } | ||
91 | } | 100 | } |
92 | 101 | ||
93 | /* Set PWT to Write-Combining. All other bits stay the same */ | 102 | /* Set PWT to Write-Combining. All other bits stay the same */ |
@@ -211,6 +220,33 @@ chk_conflict(struct memtype *new, struct memtype *entry, unsigned long *type) | |||
211 | static struct memtype *cached_entry; | 220 | static struct memtype *cached_entry; |
212 | static u64 cached_start; | 221 | static u64 cached_start; |
213 | 222 | ||
223 | static int pat_pagerange_is_ram(unsigned long start, unsigned long end) | ||
224 | { | ||
225 | int ram_page = 0, not_rampage = 0; | ||
226 | unsigned long page_nr; | ||
227 | |||
228 | for (page_nr = (start >> PAGE_SHIFT); page_nr < (end >> PAGE_SHIFT); | ||
229 | ++page_nr) { | ||
230 | /* | ||
231 | * For legacy reasons, physical address range in the legacy ISA | ||
232 | * region is tracked as non-RAM. This will allow users of | ||
233 | * /dev/mem to map portions of legacy ISA region, even when | ||
234 | * some of those portions are listed(or not even listed) with | ||
235 | * different e820 types(RAM/reserved/..) | ||
236 | */ | ||
237 | if (page_nr >= (ISA_END_ADDRESS >> PAGE_SHIFT) && | ||
238 | page_is_ram(page_nr)) | ||
239 | ram_page = 1; | ||
240 | else | ||
241 | not_rampage = 1; | ||
242 | |||
243 | if (ram_page == not_rampage) | ||
244 | return -1; | ||
245 | } | ||
246 | |||
247 | return ram_page; | ||
248 | } | ||
249 | |||
214 | /* | 250 | /* |
215 | * For RAM pages, mark the pages as non WB memory type using | 251 | * For RAM pages, mark the pages as non WB memory type using |
216 | * PageNonWB (PG_arch_1). We allow only one set_memory_uc() or | 252 | * PageNonWB (PG_arch_1). We allow only one set_memory_uc() or |
@@ -336,20 +372,12 @@ int reserve_memtype(u64 start, u64 end, unsigned long req_type, | |||
336 | if (new_type) | 372 | if (new_type) |
337 | *new_type = actual_type; | 373 | *new_type = actual_type; |
338 | 374 | ||
339 | /* | 375 | is_range_ram = pat_pagerange_is_ram(start, end); |
340 | * For legacy reasons, some parts of the physical address range in the | 376 | if (is_range_ram == 1) |
341 | * legacy 1MB region is treated as non-RAM (even when listed as RAM in | 377 | return reserve_ram_pages_type(start, end, req_type, |
342 | * the e820 tables). So we will track the memory attributes of this | 378 | new_type); |
343 | * legacy 1MB region using the linear memtype_list always. | 379 | else if (is_range_ram < 0) |
344 | */ | 380 | return -EINVAL; |
345 | if (end >= ISA_END_ADDRESS) { | ||
346 | is_range_ram = pagerange_is_ram(start, end); | ||
347 | if (is_range_ram == 1) | ||
348 | return reserve_ram_pages_type(start, end, req_type, | ||
349 | new_type); | ||
350 | else if (is_range_ram < 0) | ||
351 | return -EINVAL; | ||
352 | } | ||
353 | 381 | ||
354 | new = kmalloc(sizeof(struct memtype), GFP_KERNEL); | 382 | new = kmalloc(sizeof(struct memtype), GFP_KERNEL); |
355 | if (!new) | 383 | if (!new) |
@@ -446,19 +474,11 @@ int free_memtype(u64 start, u64 end) | |||
446 | if (is_ISA_range(start, end - 1)) | 474 | if (is_ISA_range(start, end - 1)) |
447 | return 0; | 475 | return 0; |
448 | 476 | ||
449 | /* | 477 | is_range_ram = pat_pagerange_is_ram(start, end); |
450 | * For legacy reasons, some parts of the physical address range in the | 478 | if (is_range_ram == 1) |
451 | * legacy 1MB region is treated as non-RAM (even when listed as RAM in | 479 | return free_ram_pages_type(start, end); |
452 | * the e820 tables). So we will track the memory attributes of this | 480 | else if (is_range_ram < 0) |
453 | * legacy 1MB region using the linear memtype_list always. | 481 | return -EINVAL; |
454 | */ | ||
455 | if (end >= ISA_END_ADDRESS) { | ||
456 | is_range_ram = pagerange_is_ram(start, end); | ||
457 | if (is_range_ram == 1) | ||
458 | return free_ram_pages_type(start, end); | ||
459 | else if (is_range_ram < 0) | ||
460 | return -EINVAL; | ||
461 | } | ||
462 | 482 | ||
463 | spin_lock(&memtype_lock); | 483 | spin_lock(&memtype_lock); |
464 | list_for_each_entry(entry, &memtype_list, nd) { | 484 | list_for_each_entry(entry, &memtype_list, nd) { |
@@ -626,17 +646,13 @@ static int reserve_pfn_range(u64 paddr, unsigned long size, pgprot_t *vma_prot, | |||
626 | unsigned long flags; | 646 | unsigned long flags; |
627 | unsigned long want_flags = (pgprot_val(*vma_prot) & _PAGE_CACHE_MASK); | 647 | unsigned long want_flags = (pgprot_val(*vma_prot) & _PAGE_CACHE_MASK); |
628 | 648 | ||
629 | is_ram = pagerange_is_ram(paddr, paddr + size); | 649 | is_ram = pat_pagerange_is_ram(paddr, paddr + size); |
630 | 650 | ||
631 | if (is_ram != 0) { | 651 | /* |
632 | /* | 652 | * reserve_pfn_range() doesn't support RAM pages. |
633 | * For mapping RAM pages, drivers need to call | 653 | */ |
634 | * set_memory_[uc|wc|wb] directly, for reserve and free, before | 654 | if (is_ram != 0) |
635 | * setting up the PTE. | 655 | return -EINVAL; |
636 | */ | ||
637 | WARN_ON_ONCE(1); | ||
638 | return 0; | ||
639 | } | ||
640 | 656 | ||
641 | ret = reserve_memtype(paddr, paddr + size, want_flags, &flags); | 657 | ret = reserve_memtype(paddr, paddr + size, want_flags, &flags); |
642 | if (ret) | 658 | if (ret) |
@@ -693,7 +709,7 @@ static void free_pfn_range(u64 paddr, unsigned long size) | |||
693 | { | 709 | { |
694 | int is_ram; | 710 | int is_ram; |
695 | 711 | ||
696 | is_ram = pagerange_is_ram(paddr, paddr + size); | 712 | is_ram = pat_pagerange_is_ram(paddr, paddr + size); |
697 | if (is_ram == 0) | 713 | if (is_ram == 0) |
698 | free_memtype(paddr, paddr + size); | 714 | free_memtype(paddr, paddr + size); |
699 | } | 715 | } |
diff --git a/arch/x86/mm/tlb.c b/arch/x86/mm/tlb.c index 72a6d4ebe34d..14c5af4d11e6 100644 --- a/arch/x86/mm/tlb.c +++ b/arch/x86/mm/tlb.c | |||
@@ -14,7 +14,7 @@ | |||
14 | DEFINE_PER_CPU_SHARED_ALIGNED(struct tlb_state, cpu_tlbstate) | 14 | DEFINE_PER_CPU_SHARED_ALIGNED(struct tlb_state, cpu_tlbstate) |
15 | = { &init_mm, 0, }; | 15 | = { &init_mm, 0, }; |
16 | 16 | ||
17 | #include <mach_ipi.h> | 17 | #include <asm/genapic.h> |
18 | /* | 18 | /* |
19 | * Smarter SMP flushing macros. | 19 | * Smarter SMP flushing macros. |
20 | * c/o Linus Torvalds. | 20 | * c/o Linus Torvalds. |
@@ -196,7 +196,7 @@ static void flush_tlb_others_ipi(const struct cpumask *cpumask, | |||
196 | * We have to send the IPI only to | 196 | * We have to send the IPI only to |
197 | * CPUs affected. | 197 | * CPUs affected. |
198 | */ | 198 | */ |
199 | send_IPI_mask(to_cpumask(f->flush_cpumask), | 199 | apic->send_IPI_mask(to_cpumask(f->flush_cpumask), |
200 | INVALIDATE_TLB_VECTOR_START + sender); | 200 | INVALIDATE_TLB_VECTOR_START + sender); |
201 | 201 | ||
202 | while (!cpumask_empty(to_cpumask(f->flush_cpumask))) | 202 | while (!cpumask_empty(to_cpumask(f->flush_cpumask))) |
diff --git a/arch/x86/pci/numaq_32.c b/arch/x86/pci/numaq_32.c index 2089354968a2..5601e829c387 100644 --- a/arch/x86/pci/numaq_32.c +++ b/arch/x86/pci/numaq_32.c | |||
@@ -5,7 +5,7 @@ | |||
5 | #include <linux/pci.h> | 5 | #include <linux/pci.h> |
6 | #include <linux/init.h> | 6 | #include <linux/init.h> |
7 | #include <linux/nodemask.h> | 7 | #include <linux/nodemask.h> |
8 | #include <mach_apic.h> | 8 | #include <asm/genapic.h> |
9 | #include <asm/mpspec.h> | 9 | #include <asm/mpspec.h> |
10 | #include <asm/pci_x86.h> | 10 | #include <asm/pci_x86.h> |
11 | 11 | ||
@@ -18,10 +18,6 @@ | |||
18 | 18 | ||
19 | #define QUADLOCAL2BUS(quad,local) (quad_local_to_mp_bus_id[quad][local]) | 19 | #define QUADLOCAL2BUS(quad,local) (quad_local_to_mp_bus_id[quad][local]) |
20 | 20 | ||
21 | /* Where the IO area was mapped on multiquad, always 0 otherwise */ | ||
22 | void *xquad_portio; | ||
23 | EXPORT_SYMBOL(xquad_portio); | ||
24 | |||
25 | #define XQUAD_PORT_ADDR(port, quad) (xquad_portio + (XQUAD_PORTIO_QUAD*quad) + port) | 21 | #define XQUAD_PORT_ADDR(port, quad) (xquad_portio + (XQUAD_PORTIO_QUAD*quad) + port) |
26 | 22 | ||
27 | #define PCI_CONF1_MQ_ADDRESS(bus, devfn, reg) \ | 23 | #define PCI_CONF1_MQ_ADDRESS(bus, devfn, reg) \ |
diff --git a/arch/x86/pci/pcbios.c b/arch/x86/pci/pcbios.c index b82cae970dfd..1c975cc9839e 100644 --- a/arch/x86/pci/pcbios.c +++ b/arch/x86/pci/pcbios.c | |||
@@ -7,7 +7,7 @@ | |||
7 | #include <linux/module.h> | 7 | #include <linux/module.h> |
8 | #include <linux/uaccess.h> | 8 | #include <linux/uaccess.h> |
9 | #include <asm/pci_x86.h> | 9 | #include <asm/pci_x86.h> |
10 | #include <asm/mach-default/pci-functions.h> | 10 | #include <asm/pci-functions.h> |
11 | 11 | ||
12 | /* BIOS32 signature: "_32_" */ | 12 | /* BIOS32 signature: "_32_" */ |
13 | #define BIOS32_SIGNATURE (('_' << 0) + ('3' << 8) + ('2' << 16) + ('_' << 24)) | 13 | #define BIOS32_SIGNATURE (('_' << 0) + ('3' << 8) + ('2' << 16) + ('_' << 24)) |
diff --git a/arch/x86/vdso/Makefile b/arch/x86/vdso/Makefile index 4d6ef0a336d6..16a9020c8f11 100644 --- a/arch/x86/vdso/Makefile +++ b/arch/x86/vdso/Makefile | |||
@@ -38,7 +38,7 @@ $(obj)/%.so: $(obj)/%.so.dbg FORCE | |||
38 | $(call if_changed,objcopy) | 38 | $(call if_changed,objcopy) |
39 | 39 | ||
40 | CFL := $(PROFILING) -mcmodel=small -fPIC -O2 -fasynchronous-unwind-tables -m64 \ | 40 | CFL := $(PROFILING) -mcmodel=small -fPIC -O2 -fasynchronous-unwind-tables -m64 \ |
41 | $(filter -g%,$(KBUILD_CFLAGS)) | 41 | $(filter -g%,$(KBUILD_CFLAGS)) $(call cc-option, -fno-stack-protector) |
42 | 42 | ||
43 | $(vobjs): KBUILD_CFLAGS += $(CFL) | 43 | $(vobjs): KBUILD_CFLAGS += $(CFL) |
44 | 44 | ||
diff --git a/arch/x86/xen/Makefile b/arch/x86/xen/Makefile index 6dcefba7836f..3b767d03fd6a 100644 --- a/arch/x86/xen/Makefile +++ b/arch/x86/xen/Makefile | |||
@@ -6,7 +6,8 @@ CFLAGS_REMOVE_irq.o = -pg | |||
6 | endif | 6 | endif |
7 | 7 | ||
8 | obj-y := enlighten.o setup.o multicalls.o mmu.o irq.o \ | 8 | obj-y := enlighten.o setup.o multicalls.o mmu.o irq.o \ |
9 | time.o xen-asm_$(BITS).o grant-table.o suspend.o | 9 | time.o xen-asm.o xen-asm_$(BITS).o \ |
10 | grant-table.o suspend.o | ||
10 | 11 | ||
11 | obj-$(CONFIG_SMP) += smp.o spinlock.o | 12 | obj-$(CONFIG_SMP) += smp.o spinlock.o |
12 | obj-$(CONFIG_XEN_DEBUG_FS) += debugfs.o \ No newline at end of file | 13 | obj-$(CONFIG_XEN_DEBUG_FS) += debugfs.o \ No newline at end of file |
diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index bef941f61451..95ff6a0e942a 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c | |||
@@ -61,40 +61,13 @@ DEFINE_PER_CPU(struct vcpu_info, xen_vcpu_info); | |||
61 | enum xen_domain_type xen_domain_type = XEN_NATIVE; | 61 | enum xen_domain_type xen_domain_type = XEN_NATIVE; |
62 | EXPORT_SYMBOL_GPL(xen_domain_type); | 62 | EXPORT_SYMBOL_GPL(xen_domain_type); |
63 | 63 | ||
64 | /* | ||
65 | * Identity map, in addition to plain kernel map. This needs to be | ||
66 | * large enough to allocate page table pages to allocate the rest. | ||
67 | * Each page can map 2MB. | ||
68 | */ | ||
69 | static pte_t level1_ident_pgt[PTRS_PER_PTE * 4] __page_aligned_bss; | ||
70 | |||
71 | #ifdef CONFIG_X86_64 | ||
72 | /* l3 pud for userspace vsyscall mapping */ | ||
73 | static pud_t level3_user_vsyscall[PTRS_PER_PUD] __page_aligned_bss; | ||
74 | #endif /* CONFIG_X86_64 */ | ||
75 | |||
76 | /* | ||
77 | * Note about cr3 (pagetable base) values: | ||
78 | * | ||
79 | * xen_cr3 contains the current logical cr3 value; it contains the | ||
80 | * last set cr3. This may not be the current effective cr3, because | ||
81 | * its update may be being lazily deferred. However, a vcpu looking | ||
82 | * at its own cr3 can use this value knowing that it everything will | ||
83 | * be self-consistent. | ||
84 | * | ||
85 | * xen_current_cr3 contains the actual vcpu cr3; it is set once the | ||
86 | * hypercall to set the vcpu cr3 is complete (so it may be a little | ||
87 | * out of date, but it will never be set early). If one vcpu is | ||
88 | * looking at another vcpu's cr3 value, it should use this variable. | ||
89 | */ | ||
90 | DEFINE_PER_CPU(unsigned long, xen_cr3); /* cr3 stored as physaddr */ | ||
91 | DEFINE_PER_CPU(unsigned long, xen_current_cr3); /* actual vcpu cr3 */ | ||
92 | |||
93 | struct start_info *xen_start_info; | 64 | struct start_info *xen_start_info; |
94 | EXPORT_SYMBOL_GPL(xen_start_info); | 65 | EXPORT_SYMBOL_GPL(xen_start_info); |
95 | 66 | ||
96 | struct shared_info xen_dummy_shared_info; | 67 | struct shared_info xen_dummy_shared_info; |
97 | 68 | ||
69 | void *xen_initial_gdt; | ||
70 | |||
98 | /* | 71 | /* |
99 | * Point at some empty memory to start with. We map the real shared_info | 72 | * Point at some empty memory to start with. We map the real shared_info |
100 | * page as soon as fixmap is up and running. | 73 | * page as soon as fixmap is up and running. |
@@ -114,14 +87,7 @@ struct shared_info *HYPERVISOR_shared_info = (void *)&xen_dummy_shared_info; | |||
114 | * | 87 | * |
115 | * 0: not available, 1: available | 88 | * 0: not available, 1: available |
116 | */ | 89 | */ |
117 | static int have_vcpu_info_placement = | 90 | static int have_vcpu_info_placement = 1; |
118 | #ifdef CONFIG_X86_32 | ||
119 | 1 | ||
120 | #else | ||
121 | 0 | ||
122 | #endif | ||
123 | ; | ||
124 | |||
125 | 91 | ||
126 | static void xen_vcpu_setup(int cpu) | 92 | static void xen_vcpu_setup(int cpu) |
127 | { | 93 | { |
@@ -237,7 +203,7 @@ static unsigned long xen_get_debugreg(int reg) | |||
237 | return HYPERVISOR_get_debugreg(reg); | 203 | return HYPERVISOR_get_debugreg(reg); |
238 | } | 204 | } |
239 | 205 | ||
240 | static void xen_leave_lazy(void) | 206 | void xen_leave_lazy(void) |
241 | { | 207 | { |
242 | paravirt_leave_lazy(paravirt_get_lazy_mode()); | 208 | paravirt_leave_lazy(paravirt_get_lazy_mode()); |
243 | xen_mc_flush(); | 209 | xen_mc_flush(); |
@@ -357,13 +323,14 @@ static void load_TLS_descriptor(struct thread_struct *t, | |||
357 | static void xen_load_tls(struct thread_struct *t, unsigned int cpu) | 323 | static void xen_load_tls(struct thread_struct *t, unsigned int cpu) |
358 | { | 324 | { |
359 | /* | 325 | /* |
360 | * XXX sleazy hack: If we're being called in a lazy-cpu zone, | 326 | * XXX sleazy hack: If we're being called in a lazy-cpu zone |
361 | * it means we're in a context switch, and %gs has just been | 327 | * and lazy gs handling is enabled, it means we're in a |
362 | * saved. This means we can zero it out to prevent faults on | 328 | * context switch, and %gs has just been saved. This means we |
363 | * exit from the hypervisor if the next process has no %gs. | 329 | * can zero it out to prevent faults on exit from the |
364 | * Either way, it has been saved, and the new value will get | 330 | * hypervisor if the next process has no %gs. Either way, it |
365 | * loaded properly. This will go away as soon as Xen has been | 331 | * has been saved, and the new value will get loaded properly. |
366 | * modified to not save/restore %gs for normal hypercalls. | 332 | * This will go away as soon as Xen has been modified to not |
333 | * save/restore %gs for normal hypercalls. | ||
367 | * | 334 | * |
368 | * On x86_64, this hack is not used for %gs, because gs points | 335 | * On x86_64, this hack is not used for %gs, because gs points |
369 | * to KERNEL_GS_BASE (and uses it for PDA references), so we | 336 | * to KERNEL_GS_BASE (and uses it for PDA references), so we |
@@ -375,7 +342,7 @@ static void xen_load_tls(struct thread_struct *t, unsigned int cpu) | |||
375 | */ | 342 | */ |
376 | if (paravirt_get_lazy_mode() == PARAVIRT_LAZY_CPU) { | 343 | if (paravirt_get_lazy_mode() == PARAVIRT_LAZY_CPU) { |
377 | #ifdef CONFIG_X86_32 | 344 | #ifdef CONFIG_X86_32 |
378 | loadsegment(gs, 0); | 345 | lazy_load_gs(0); |
379 | #else | 346 | #else |
380 | loadsegment(fs, 0); | 347 | loadsegment(fs, 0); |
381 | #endif | 348 | #endif |
@@ -598,76 +565,6 @@ static struct apic_ops xen_basic_apic_ops = { | |||
598 | 565 | ||
599 | #endif | 566 | #endif |
600 | 567 | ||
601 | static void xen_flush_tlb(void) | ||
602 | { | ||
603 | struct mmuext_op *op; | ||
604 | struct multicall_space mcs; | ||
605 | |||
606 | preempt_disable(); | ||
607 | |||
608 | mcs = xen_mc_entry(sizeof(*op)); | ||
609 | |||
610 | op = mcs.args; | ||
611 | op->cmd = MMUEXT_TLB_FLUSH_LOCAL; | ||
612 | MULTI_mmuext_op(mcs.mc, op, 1, NULL, DOMID_SELF); | ||
613 | |||
614 | xen_mc_issue(PARAVIRT_LAZY_MMU); | ||
615 | |||
616 | preempt_enable(); | ||
617 | } | ||
618 | |||
619 | static void xen_flush_tlb_single(unsigned long addr) | ||
620 | { | ||
621 | struct mmuext_op *op; | ||
622 | struct multicall_space mcs; | ||
623 | |||
624 | preempt_disable(); | ||
625 | |||
626 | mcs = xen_mc_entry(sizeof(*op)); | ||
627 | op = mcs.args; | ||
628 | op->cmd = MMUEXT_INVLPG_LOCAL; | ||
629 | op->arg1.linear_addr = addr & PAGE_MASK; | ||
630 | MULTI_mmuext_op(mcs.mc, op, 1, NULL, DOMID_SELF); | ||
631 | |||
632 | xen_mc_issue(PARAVIRT_LAZY_MMU); | ||
633 | |||
634 | preempt_enable(); | ||
635 | } | ||
636 | |||
637 | static void xen_flush_tlb_others(const struct cpumask *cpus, | ||
638 | struct mm_struct *mm, unsigned long va) | ||
639 | { | ||
640 | struct { | ||
641 | struct mmuext_op op; | ||
642 | DECLARE_BITMAP(mask, NR_CPUS); | ||
643 | } *args; | ||
644 | struct multicall_space mcs; | ||
645 | |||
646 | BUG_ON(cpumask_empty(cpus)); | ||
647 | BUG_ON(!mm); | ||
648 | |||
649 | mcs = xen_mc_entry(sizeof(*args)); | ||
650 | args = mcs.args; | ||
651 | args->op.arg2.vcpumask = to_cpumask(args->mask); | ||
652 | |||
653 | /* Remove us, and any offline CPUS. */ | ||
654 | cpumask_and(to_cpumask(args->mask), cpus, cpu_online_mask); | ||
655 | cpumask_clear_cpu(smp_processor_id(), to_cpumask(args->mask)); | ||
656 | if (unlikely(cpumask_empty(to_cpumask(args->mask)))) | ||
657 | goto issue; | ||
658 | |||
659 | if (va == TLB_FLUSH_ALL) { | ||
660 | args->op.cmd = MMUEXT_TLB_FLUSH_MULTI; | ||
661 | } else { | ||
662 | args->op.cmd = MMUEXT_INVLPG_MULTI; | ||
663 | args->op.arg1.linear_addr = va; | ||
664 | } | ||
665 | |||
666 | MULTI_mmuext_op(mcs.mc, &args->op, 1, NULL, DOMID_SELF); | ||
667 | |||
668 | issue: | ||
669 | xen_mc_issue(PARAVIRT_LAZY_MMU); | ||
670 | } | ||
671 | 568 | ||
672 | static void xen_clts(void) | 569 | static void xen_clts(void) |
673 | { | 570 | { |
@@ -693,21 +590,6 @@ static void xen_write_cr0(unsigned long cr0) | |||
693 | xen_mc_issue(PARAVIRT_LAZY_CPU); | 590 | xen_mc_issue(PARAVIRT_LAZY_CPU); |
694 | } | 591 | } |
695 | 592 | ||
696 | static void xen_write_cr2(unsigned long cr2) | ||
697 | { | ||
698 | percpu_read(xen_vcpu)->arch.cr2 = cr2; | ||
699 | } | ||
700 | |||
701 | static unsigned long xen_read_cr2(void) | ||
702 | { | ||
703 | return percpu_read(xen_vcpu)->arch.cr2; | ||
704 | } | ||
705 | |||
706 | static unsigned long xen_read_cr2_direct(void) | ||
707 | { | ||
708 | return percpu_read(xen_vcpu_info.arch.cr2); | ||
709 | } | ||
710 | |||
711 | static void xen_write_cr4(unsigned long cr4) | 593 | static void xen_write_cr4(unsigned long cr4) |
712 | { | 594 | { |
713 | cr4 &= ~X86_CR4_PGE; | 595 | cr4 &= ~X86_CR4_PGE; |
@@ -716,71 +598,6 @@ static void xen_write_cr4(unsigned long cr4) | |||
716 | native_write_cr4(cr4); | 598 | native_write_cr4(cr4); |
717 | } | 599 | } |
718 | 600 | ||
719 | static unsigned long xen_read_cr3(void) | ||
720 | { | ||
721 | return percpu_read(xen_cr3); | ||
722 | } | ||
723 | |||
724 | static void set_current_cr3(void *v) | ||
725 | { | ||
726 | percpu_write(xen_current_cr3, (unsigned long)v); | ||
727 | } | ||
728 | |||
729 | static void __xen_write_cr3(bool kernel, unsigned long cr3) | ||
730 | { | ||
731 | struct mmuext_op *op; | ||
732 | struct multicall_space mcs; | ||
733 | unsigned long mfn; | ||
734 | |||
735 | if (cr3) | ||
736 | mfn = pfn_to_mfn(PFN_DOWN(cr3)); | ||
737 | else | ||
738 | mfn = 0; | ||
739 | |||
740 | WARN_ON(mfn == 0 && kernel); | ||
741 | |||
742 | mcs = __xen_mc_entry(sizeof(*op)); | ||
743 | |||
744 | op = mcs.args; | ||
745 | op->cmd = kernel ? MMUEXT_NEW_BASEPTR : MMUEXT_NEW_USER_BASEPTR; | ||
746 | op->arg1.mfn = mfn; | ||
747 | |||
748 | MULTI_mmuext_op(mcs.mc, op, 1, NULL, DOMID_SELF); | ||
749 | |||
750 | if (kernel) { | ||
751 | percpu_write(xen_cr3, cr3); | ||
752 | |||
753 | /* Update xen_current_cr3 once the batch has actually | ||
754 | been submitted. */ | ||
755 | xen_mc_callback(set_current_cr3, (void *)cr3); | ||
756 | } | ||
757 | } | ||
758 | |||
759 | static void xen_write_cr3(unsigned long cr3) | ||
760 | { | ||
761 | BUG_ON(preemptible()); | ||
762 | |||
763 | xen_mc_batch(); /* disables interrupts */ | ||
764 | |||
765 | /* Update while interrupts are disabled, so its atomic with | ||
766 | respect to ipis */ | ||
767 | percpu_write(xen_cr3, cr3); | ||
768 | |||
769 | __xen_write_cr3(true, cr3); | ||
770 | |||
771 | #ifdef CONFIG_X86_64 | ||
772 | { | ||
773 | pgd_t *user_pgd = xen_get_user_pgd(__va(cr3)); | ||
774 | if (user_pgd) | ||
775 | __xen_write_cr3(false, __pa(user_pgd)); | ||
776 | else | ||
777 | __xen_write_cr3(false, 0); | ||
778 | } | ||
779 | #endif | ||
780 | |||
781 | xen_mc_issue(PARAVIRT_LAZY_CPU); /* interrupts restored */ | ||
782 | } | ||
783 | |||
784 | static int xen_write_msr_safe(unsigned int msr, unsigned low, unsigned high) | 601 | static int xen_write_msr_safe(unsigned int msr, unsigned low, unsigned high) |
785 | { | 602 | { |
786 | int ret; | 603 | int ret; |
@@ -822,185 +639,6 @@ static int xen_write_msr_safe(unsigned int msr, unsigned low, unsigned high) | |||
822 | return ret; | 639 | return ret; |
823 | } | 640 | } |
824 | 641 | ||
825 | /* Early in boot, while setting up the initial pagetable, assume | ||
826 | everything is pinned. */ | ||
827 | static __init void xen_alloc_pte_init(struct mm_struct *mm, unsigned long pfn) | ||
828 | { | ||
829 | #ifdef CONFIG_FLATMEM | ||
830 | BUG_ON(mem_map); /* should only be used early */ | ||
831 | #endif | ||
832 | make_lowmem_page_readonly(__va(PFN_PHYS(pfn))); | ||
833 | } | ||
834 | |||
835 | /* Early release_pte assumes that all pts are pinned, since there's | ||
836 | only init_mm and anything attached to that is pinned. */ | ||
837 | static void xen_release_pte_init(unsigned long pfn) | ||
838 | { | ||
839 | make_lowmem_page_readwrite(__va(PFN_PHYS(pfn))); | ||
840 | } | ||
841 | |||
842 | static void pin_pagetable_pfn(unsigned cmd, unsigned long pfn) | ||
843 | { | ||
844 | struct mmuext_op op; | ||
845 | op.cmd = cmd; | ||
846 | op.arg1.mfn = pfn_to_mfn(pfn); | ||
847 | if (HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF)) | ||
848 | BUG(); | ||
849 | } | ||
850 | |||
851 | /* This needs to make sure the new pte page is pinned iff its being | ||
852 | attached to a pinned pagetable. */ | ||
853 | static void xen_alloc_ptpage(struct mm_struct *mm, unsigned long pfn, unsigned level) | ||
854 | { | ||
855 | struct page *page = pfn_to_page(pfn); | ||
856 | |||
857 | if (PagePinned(virt_to_page(mm->pgd))) { | ||
858 | SetPagePinned(page); | ||
859 | |||
860 | vm_unmap_aliases(); | ||
861 | if (!PageHighMem(page)) { | ||
862 | make_lowmem_page_readonly(__va(PFN_PHYS((unsigned long)pfn))); | ||
863 | if (level == PT_PTE && USE_SPLIT_PTLOCKS) | ||
864 | pin_pagetable_pfn(MMUEXT_PIN_L1_TABLE, pfn); | ||
865 | } else { | ||
866 | /* make sure there are no stray mappings of | ||
867 | this page */ | ||
868 | kmap_flush_unused(); | ||
869 | } | ||
870 | } | ||
871 | } | ||
872 | |||
873 | static void xen_alloc_pte(struct mm_struct *mm, unsigned long pfn) | ||
874 | { | ||
875 | xen_alloc_ptpage(mm, pfn, PT_PTE); | ||
876 | } | ||
877 | |||
878 | static void xen_alloc_pmd(struct mm_struct *mm, unsigned long pfn) | ||
879 | { | ||
880 | xen_alloc_ptpage(mm, pfn, PT_PMD); | ||
881 | } | ||
882 | |||
883 | static int xen_pgd_alloc(struct mm_struct *mm) | ||
884 | { | ||
885 | pgd_t *pgd = mm->pgd; | ||
886 | int ret = 0; | ||
887 | |||
888 | BUG_ON(PagePinned(virt_to_page(pgd))); | ||
889 | |||
890 | #ifdef CONFIG_X86_64 | ||
891 | { | ||
892 | struct page *page = virt_to_page(pgd); | ||
893 | pgd_t *user_pgd; | ||
894 | |||
895 | BUG_ON(page->private != 0); | ||
896 | |||
897 | ret = -ENOMEM; | ||
898 | |||
899 | user_pgd = (pgd_t *)__get_free_page(GFP_KERNEL | __GFP_ZERO); | ||
900 | page->private = (unsigned long)user_pgd; | ||
901 | |||
902 | if (user_pgd != NULL) { | ||
903 | user_pgd[pgd_index(VSYSCALL_START)] = | ||
904 | __pgd(__pa(level3_user_vsyscall) | _PAGE_TABLE); | ||
905 | ret = 0; | ||
906 | } | ||
907 | |||
908 | BUG_ON(PagePinned(virt_to_page(xen_get_user_pgd(pgd)))); | ||
909 | } | ||
910 | #endif | ||
911 | |||
912 | return ret; | ||
913 | } | ||
914 | |||
915 | static void xen_pgd_free(struct mm_struct *mm, pgd_t *pgd) | ||
916 | { | ||
917 | #ifdef CONFIG_X86_64 | ||
918 | pgd_t *user_pgd = xen_get_user_pgd(pgd); | ||
919 | |||
920 | if (user_pgd) | ||
921 | free_page((unsigned long)user_pgd); | ||
922 | #endif | ||
923 | } | ||
924 | |||
925 | /* This should never happen until we're OK to use struct page */ | ||
926 | static void xen_release_ptpage(unsigned long pfn, unsigned level) | ||
927 | { | ||
928 | struct page *page = pfn_to_page(pfn); | ||
929 | |||
930 | if (PagePinned(page)) { | ||
931 | if (!PageHighMem(page)) { | ||
932 | if (level == PT_PTE && USE_SPLIT_PTLOCKS) | ||
933 | pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, pfn); | ||
934 | make_lowmem_page_readwrite(__va(PFN_PHYS(pfn))); | ||
935 | } | ||
936 | ClearPagePinned(page); | ||
937 | } | ||
938 | } | ||
939 | |||
940 | static void xen_release_pte(unsigned long pfn) | ||
941 | { | ||
942 | xen_release_ptpage(pfn, PT_PTE); | ||
943 | } | ||
944 | |||
945 | static void xen_release_pmd(unsigned long pfn) | ||
946 | { | ||
947 | xen_release_ptpage(pfn, PT_PMD); | ||
948 | } | ||
949 | |||
950 | #if PAGETABLE_LEVELS == 4 | ||
951 | static void xen_alloc_pud(struct mm_struct *mm, unsigned long pfn) | ||
952 | { | ||
953 | xen_alloc_ptpage(mm, pfn, PT_PUD); | ||
954 | } | ||
955 | |||
956 | static void xen_release_pud(unsigned long pfn) | ||
957 | { | ||
958 | xen_release_ptpage(pfn, PT_PUD); | ||
959 | } | ||
960 | #endif | ||
961 | |||
962 | #ifdef CONFIG_HIGHPTE | ||
963 | static void *xen_kmap_atomic_pte(struct page *page, enum km_type type) | ||
964 | { | ||
965 | pgprot_t prot = PAGE_KERNEL; | ||
966 | |||
967 | if (PagePinned(page)) | ||
968 | prot = PAGE_KERNEL_RO; | ||
969 | |||
970 | if (0 && PageHighMem(page)) | ||
971 | printk("mapping highpte %lx type %d prot %s\n", | ||
972 | page_to_pfn(page), type, | ||
973 | (unsigned long)pgprot_val(prot) & _PAGE_RW ? "WRITE" : "READ"); | ||
974 | |||
975 | return kmap_atomic_prot(page, type, prot); | ||
976 | } | ||
977 | #endif | ||
978 | |||
979 | #ifdef CONFIG_X86_32 | ||
980 | static __init pte_t mask_rw_pte(pte_t *ptep, pte_t pte) | ||
981 | { | ||
982 | /* If there's an existing pte, then don't allow _PAGE_RW to be set */ | ||
983 | if (pte_val_ma(*ptep) & _PAGE_PRESENT) | ||
984 | pte = __pte_ma(((pte_val_ma(*ptep) & _PAGE_RW) | ~_PAGE_RW) & | ||
985 | pte_val_ma(pte)); | ||
986 | |||
987 | return pte; | ||
988 | } | ||
989 | |||
990 | /* Init-time set_pte while constructing initial pagetables, which | ||
991 | doesn't allow RO pagetable pages to be remapped RW */ | ||
992 | static __init void xen_set_pte_init(pte_t *ptep, pte_t pte) | ||
993 | { | ||
994 | pte = mask_rw_pte(ptep, pte); | ||
995 | |||
996 | xen_set_pte(ptep, pte); | ||
997 | } | ||
998 | #endif | ||
999 | |||
1000 | static __init void xen_pagetable_setup_start(pgd_t *base) | ||
1001 | { | ||
1002 | } | ||
1003 | |||
1004 | void xen_setup_shared_info(void) | 642 | void xen_setup_shared_info(void) |
1005 | { | 643 | { |
1006 | if (!xen_feature(XENFEAT_auto_translated_physmap)) { | 644 | if (!xen_feature(XENFEAT_auto_translated_physmap)) { |
@@ -1021,37 +659,6 @@ void xen_setup_shared_info(void) | |||
1021 | xen_setup_mfn_list_list(); | 659 | xen_setup_mfn_list_list(); |
1022 | } | 660 | } |
1023 | 661 | ||
1024 | static __init void xen_pagetable_setup_done(pgd_t *base) | ||
1025 | { | ||
1026 | xen_setup_shared_info(); | ||
1027 | } | ||
1028 | |||
1029 | static __init void xen_post_allocator_init(void) | ||
1030 | { | ||
1031 | pv_mmu_ops.set_pte = xen_set_pte; | ||
1032 | pv_mmu_ops.set_pmd = xen_set_pmd; | ||
1033 | pv_mmu_ops.set_pud = xen_set_pud; | ||
1034 | #if PAGETABLE_LEVELS == 4 | ||
1035 | pv_mmu_ops.set_pgd = xen_set_pgd; | ||
1036 | #endif | ||
1037 | |||
1038 | /* This will work as long as patching hasn't happened yet | ||
1039 | (which it hasn't) */ | ||
1040 | pv_mmu_ops.alloc_pte = xen_alloc_pte; | ||
1041 | pv_mmu_ops.alloc_pmd = xen_alloc_pmd; | ||
1042 | pv_mmu_ops.release_pte = xen_release_pte; | ||
1043 | pv_mmu_ops.release_pmd = xen_release_pmd; | ||
1044 | #if PAGETABLE_LEVELS == 4 | ||
1045 | pv_mmu_ops.alloc_pud = xen_alloc_pud; | ||
1046 | pv_mmu_ops.release_pud = xen_release_pud; | ||
1047 | #endif | ||
1048 | |||
1049 | #ifdef CONFIG_X86_64 | ||
1050 | SetPagePinned(virt_to_page(level3_user_vsyscall)); | ||
1051 | #endif | ||
1052 | xen_mark_init_mm_pinned(); | ||
1053 | } | ||
1054 | |||
1055 | /* This is called once we have the cpu_possible_map */ | 662 | /* This is called once we have the cpu_possible_map */ |
1056 | void xen_setup_vcpu_info_placement(void) | 663 | void xen_setup_vcpu_info_placement(void) |
1057 | { | 664 | { |
@@ -1065,10 +672,10 @@ void xen_setup_vcpu_info_placement(void) | |||
1065 | if (have_vcpu_info_placement) { | 672 | if (have_vcpu_info_placement) { |
1066 | printk(KERN_INFO "Xen: using vcpu_info placement\n"); | 673 | printk(KERN_INFO "Xen: using vcpu_info placement\n"); |
1067 | 674 | ||
1068 | pv_irq_ops.save_fl = xen_save_fl_direct; | 675 | pv_irq_ops.save_fl = __PV_IS_CALLEE_SAVE(xen_save_fl_direct); |
1069 | pv_irq_ops.restore_fl = xen_restore_fl_direct; | 676 | pv_irq_ops.restore_fl = __PV_IS_CALLEE_SAVE(xen_restore_fl_direct); |
1070 | pv_irq_ops.irq_disable = xen_irq_disable_direct; | 677 | pv_irq_ops.irq_disable = __PV_IS_CALLEE_SAVE(xen_irq_disable_direct); |
1071 | pv_irq_ops.irq_enable = xen_irq_enable_direct; | 678 | pv_irq_ops.irq_enable = __PV_IS_CALLEE_SAVE(xen_irq_enable_direct); |
1072 | pv_mmu_ops.read_cr2 = xen_read_cr2_direct; | 679 | pv_mmu_ops.read_cr2 = xen_read_cr2_direct; |
1073 | } | 680 | } |
1074 | } | 681 | } |
@@ -1126,49 +733,6 @@ static unsigned xen_patch(u8 type, u16 clobbers, void *insnbuf, | |||
1126 | return ret; | 733 | return ret; |
1127 | } | 734 | } |
1128 | 735 | ||
1129 | static void xen_set_fixmap(unsigned idx, unsigned long phys, pgprot_t prot) | ||
1130 | { | ||
1131 | pte_t pte; | ||
1132 | |||
1133 | phys >>= PAGE_SHIFT; | ||
1134 | |||
1135 | switch (idx) { | ||
1136 | case FIX_BTMAP_END ... FIX_BTMAP_BEGIN: | ||
1137 | #ifdef CONFIG_X86_F00F_BUG | ||
1138 | case FIX_F00F_IDT: | ||
1139 | #endif | ||
1140 | #ifdef CONFIG_X86_32 | ||
1141 | case FIX_WP_TEST: | ||
1142 | case FIX_VDSO: | ||
1143 | # ifdef CONFIG_HIGHMEM | ||
1144 | case FIX_KMAP_BEGIN ... FIX_KMAP_END: | ||
1145 | # endif | ||
1146 | #else | ||
1147 | case VSYSCALL_LAST_PAGE ... VSYSCALL_FIRST_PAGE: | ||
1148 | #endif | ||
1149 | #ifdef CONFIG_X86_LOCAL_APIC | ||
1150 | case FIX_APIC_BASE: /* maps dummy local APIC */ | ||
1151 | #endif | ||
1152 | pte = pfn_pte(phys, prot); | ||
1153 | break; | ||
1154 | |||
1155 | default: | ||
1156 | pte = mfn_pte(phys, prot); | ||
1157 | break; | ||
1158 | } | ||
1159 | |||
1160 | __native_set_fixmap(idx, pte); | ||
1161 | |||
1162 | #ifdef CONFIG_X86_64 | ||
1163 | /* Replicate changes to map the vsyscall page into the user | ||
1164 | pagetable vsyscall mapping. */ | ||
1165 | if (idx >= VSYSCALL_LAST_PAGE && idx <= VSYSCALL_FIRST_PAGE) { | ||
1166 | unsigned long vaddr = __fix_to_virt(idx); | ||
1167 | set_pte_vaddr_pud(level3_user_vsyscall, vaddr, pte); | ||
1168 | } | ||
1169 | #endif | ||
1170 | } | ||
1171 | |||
1172 | static const struct pv_info xen_info __initdata = { | 736 | static const struct pv_info xen_info __initdata = { |
1173 | .paravirt_enabled = 1, | 737 | .paravirt_enabled = 1, |
1174 | .shared_kernel_pmd = 0, | 738 | .shared_kernel_pmd = 0, |
@@ -1264,87 +828,6 @@ static const struct pv_apic_ops xen_apic_ops __initdata = { | |||
1264 | #endif | 828 | #endif |
1265 | }; | 829 | }; |
1266 | 830 | ||
1267 | static const struct pv_mmu_ops xen_mmu_ops __initdata = { | ||
1268 | .pagetable_setup_start = xen_pagetable_setup_start, | ||
1269 | .pagetable_setup_done = xen_pagetable_setup_done, | ||
1270 | |||
1271 | .read_cr2 = xen_read_cr2, | ||
1272 | .write_cr2 = xen_write_cr2, | ||
1273 | |||
1274 | .read_cr3 = xen_read_cr3, | ||
1275 | .write_cr3 = xen_write_cr3, | ||
1276 | |||
1277 | .flush_tlb_user = xen_flush_tlb, | ||
1278 | .flush_tlb_kernel = xen_flush_tlb, | ||
1279 | .flush_tlb_single = xen_flush_tlb_single, | ||
1280 | .flush_tlb_others = xen_flush_tlb_others, | ||
1281 | |||
1282 | .pte_update = paravirt_nop, | ||
1283 | .pte_update_defer = paravirt_nop, | ||
1284 | |||
1285 | .pgd_alloc = xen_pgd_alloc, | ||
1286 | .pgd_free = xen_pgd_free, | ||
1287 | |||
1288 | .alloc_pte = xen_alloc_pte_init, | ||
1289 | .release_pte = xen_release_pte_init, | ||
1290 | .alloc_pmd = xen_alloc_pte_init, | ||
1291 | .alloc_pmd_clone = paravirt_nop, | ||
1292 | .release_pmd = xen_release_pte_init, | ||
1293 | |||
1294 | #ifdef CONFIG_HIGHPTE | ||
1295 | .kmap_atomic_pte = xen_kmap_atomic_pte, | ||
1296 | #endif | ||
1297 | |||
1298 | #ifdef CONFIG_X86_64 | ||
1299 | .set_pte = xen_set_pte, | ||
1300 | #else | ||
1301 | .set_pte = xen_set_pte_init, | ||
1302 | #endif | ||
1303 | .set_pte_at = xen_set_pte_at, | ||
1304 | .set_pmd = xen_set_pmd_hyper, | ||
1305 | |||
1306 | .ptep_modify_prot_start = __ptep_modify_prot_start, | ||
1307 | .ptep_modify_prot_commit = __ptep_modify_prot_commit, | ||
1308 | |||
1309 | .pte_val = xen_pte_val, | ||
1310 | .pte_flags = native_pte_flags, | ||
1311 | .pgd_val = xen_pgd_val, | ||
1312 | |||
1313 | .make_pte = xen_make_pte, | ||
1314 | .make_pgd = xen_make_pgd, | ||
1315 | |||
1316 | #ifdef CONFIG_X86_PAE | ||
1317 | .set_pte_atomic = xen_set_pte_atomic, | ||
1318 | .set_pte_present = xen_set_pte_at, | ||
1319 | .pte_clear = xen_pte_clear, | ||
1320 | .pmd_clear = xen_pmd_clear, | ||
1321 | #endif /* CONFIG_X86_PAE */ | ||
1322 | .set_pud = xen_set_pud_hyper, | ||
1323 | |||
1324 | .make_pmd = xen_make_pmd, | ||
1325 | .pmd_val = xen_pmd_val, | ||
1326 | |||
1327 | #if PAGETABLE_LEVELS == 4 | ||
1328 | .pud_val = xen_pud_val, | ||
1329 | .make_pud = xen_make_pud, | ||
1330 | .set_pgd = xen_set_pgd_hyper, | ||
1331 | |||
1332 | .alloc_pud = xen_alloc_pte_init, | ||
1333 | .release_pud = xen_release_pte_init, | ||
1334 | #endif /* PAGETABLE_LEVELS == 4 */ | ||
1335 | |||
1336 | .activate_mm = xen_activate_mm, | ||
1337 | .dup_mmap = xen_dup_mmap, | ||
1338 | .exit_mmap = xen_exit_mmap, | ||
1339 | |||
1340 | .lazy_mode = { | ||
1341 | .enter = paravirt_enter_lazy_mmu, | ||
1342 | .leave = xen_leave_lazy, | ||
1343 | }, | ||
1344 | |||
1345 | .set_fixmap = xen_set_fixmap, | ||
1346 | }; | ||
1347 | |||
1348 | static void xen_reboot(int reason) | 831 | static void xen_reboot(int reason) |
1349 | { | 832 | { |
1350 | struct sched_shutdown r = { .reason = reason }; | 833 | struct sched_shutdown r = { .reason = reason }; |
@@ -1387,223 +870,6 @@ static const struct machine_ops __initdata xen_machine_ops = { | |||
1387 | }; | 870 | }; |
1388 | 871 | ||
1389 | 872 | ||
1390 | static void __init xen_reserve_top(void) | ||
1391 | { | ||
1392 | #ifdef CONFIG_X86_32 | ||
1393 | unsigned long top = HYPERVISOR_VIRT_START; | ||
1394 | struct xen_platform_parameters pp; | ||
1395 | |||
1396 | if (HYPERVISOR_xen_version(XENVER_platform_parameters, &pp) == 0) | ||
1397 | top = pp.virt_start; | ||
1398 | |||
1399 | reserve_top_address(-top); | ||
1400 | #endif /* CONFIG_X86_32 */ | ||
1401 | } | ||
1402 | |||
1403 | /* | ||
1404 | * Like __va(), but returns address in the kernel mapping (which is | ||
1405 | * all we have until the physical memory mapping has been set up. | ||
1406 | */ | ||
1407 | static void *__ka(phys_addr_t paddr) | ||
1408 | { | ||
1409 | #ifdef CONFIG_X86_64 | ||
1410 | return (void *)(paddr + __START_KERNEL_map); | ||
1411 | #else | ||
1412 | return __va(paddr); | ||
1413 | #endif | ||
1414 | } | ||
1415 | |||
1416 | /* Convert a machine address to physical address */ | ||
1417 | static unsigned long m2p(phys_addr_t maddr) | ||
1418 | { | ||
1419 | phys_addr_t paddr; | ||
1420 | |||
1421 | maddr &= PTE_PFN_MASK; | ||
1422 | paddr = mfn_to_pfn(maddr >> PAGE_SHIFT) << PAGE_SHIFT; | ||
1423 | |||
1424 | return paddr; | ||
1425 | } | ||
1426 | |||
1427 | /* Convert a machine address to kernel virtual */ | ||
1428 | static void *m2v(phys_addr_t maddr) | ||
1429 | { | ||
1430 | return __ka(m2p(maddr)); | ||
1431 | } | ||
1432 | |||
1433 | static void set_page_prot(void *addr, pgprot_t prot) | ||
1434 | { | ||
1435 | unsigned long pfn = __pa(addr) >> PAGE_SHIFT; | ||
1436 | pte_t pte = pfn_pte(pfn, prot); | ||
1437 | |||
1438 | if (HYPERVISOR_update_va_mapping((unsigned long)addr, pte, 0)) | ||
1439 | BUG(); | ||
1440 | } | ||
1441 | |||
1442 | static __init void xen_map_identity_early(pmd_t *pmd, unsigned long max_pfn) | ||
1443 | { | ||
1444 | unsigned pmdidx, pteidx; | ||
1445 | unsigned ident_pte; | ||
1446 | unsigned long pfn; | ||
1447 | |||
1448 | ident_pte = 0; | ||
1449 | pfn = 0; | ||
1450 | for (pmdidx = 0; pmdidx < PTRS_PER_PMD && pfn < max_pfn; pmdidx++) { | ||
1451 | pte_t *pte_page; | ||
1452 | |||
1453 | /* Reuse or allocate a page of ptes */ | ||
1454 | if (pmd_present(pmd[pmdidx])) | ||
1455 | pte_page = m2v(pmd[pmdidx].pmd); | ||
1456 | else { | ||
1457 | /* Check for free pte pages */ | ||
1458 | if (ident_pte == ARRAY_SIZE(level1_ident_pgt)) | ||
1459 | break; | ||
1460 | |||
1461 | pte_page = &level1_ident_pgt[ident_pte]; | ||
1462 | ident_pte += PTRS_PER_PTE; | ||
1463 | |||
1464 | pmd[pmdidx] = __pmd(__pa(pte_page) | _PAGE_TABLE); | ||
1465 | } | ||
1466 | |||
1467 | /* Install mappings */ | ||
1468 | for (pteidx = 0; pteidx < PTRS_PER_PTE; pteidx++, pfn++) { | ||
1469 | pte_t pte; | ||
1470 | |||
1471 | if (pfn > max_pfn_mapped) | ||
1472 | max_pfn_mapped = pfn; | ||
1473 | |||
1474 | if (!pte_none(pte_page[pteidx])) | ||
1475 | continue; | ||
1476 | |||
1477 | pte = pfn_pte(pfn, PAGE_KERNEL_EXEC); | ||
1478 | pte_page[pteidx] = pte; | ||
1479 | } | ||
1480 | } | ||
1481 | |||
1482 | for (pteidx = 0; pteidx < ident_pte; pteidx += PTRS_PER_PTE) | ||
1483 | set_page_prot(&level1_ident_pgt[pteidx], PAGE_KERNEL_RO); | ||
1484 | |||
1485 | set_page_prot(pmd, PAGE_KERNEL_RO); | ||
1486 | } | ||
1487 | |||
1488 | #ifdef CONFIG_X86_64 | ||
1489 | static void convert_pfn_mfn(void *v) | ||
1490 | { | ||
1491 | pte_t *pte = v; | ||
1492 | int i; | ||
1493 | |||
1494 | /* All levels are converted the same way, so just treat them | ||
1495 | as ptes. */ | ||
1496 | for (i = 0; i < PTRS_PER_PTE; i++) | ||
1497 | pte[i] = xen_make_pte(pte[i].pte); | ||
1498 | } | ||
1499 | |||
1500 | /* | ||
1501 | * Set up the inital kernel pagetable. | ||
1502 | * | ||
1503 | * We can construct this by grafting the Xen provided pagetable into | ||
1504 | * head_64.S's preconstructed pagetables. We copy the Xen L2's into | ||
1505 | * level2_ident_pgt, level2_kernel_pgt and level2_fixmap_pgt. This | ||
1506 | * means that only the kernel has a physical mapping to start with - | ||
1507 | * but that's enough to get __va working. We need to fill in the rest | ||
1508 | * of the physical mapping once some sort of allocator has been set | ||
1509 | * up. | ||
1510 | */ | ||
1511 | static __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd, | ||
1512 | unsigned long max_pfn) | ||
1513 | { | ||
1514 | pud_t *l3; | ||
1515 | pmd_t *l2; | ||
1516 | |||
1517 | /* Zap identity mapping */ | ||
1518 | init_level4_pgt[0] = __pgd(0); | ||
1519 | |||
1520 | /* Pre-constructed entries are in pfn, so convert to mfn */ | ||
1521 | convert_pfn_mfn(init_level4_pgt); | ||
1522 | convert_pfn_mfn(level3_ident_pgt); | ||
1523 | convert_pfn_mfn(level3_kernel_pgt); | ||
1524 | |||
1525 | l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd); | ||
1526 | l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud); | ||
1527 | |||
1528 | memcpy(level2_ident_pgt, l2, sizeof(pmd_t) * PTRS_PER_PMD); | ||
1529 | memcpy(level2_kernel_pgt, l2, sizeof(pmd_t) * PTRS_PER_PMD); | ||
1530 | |||
1531 | l3 = m2v(pgd[pgd_index(__START_KERNEL_map + PMD_SIZE)].pgd); | ||
1532 | l2 = m2v(l3[pud_index(__START_KERNEL_map + PMD_SIZE)].pud); | ||
1533 | memcpy(level2_fixmap_pgt, l2, sizeof(pmd_t) * PTRS_PER_PMD); | ||
1534 | |||
1535 | /* Set up identity map */ | ||
1536 | xen_map_identity_early(level2_ident_pgt, max_pfn); | ||
1537 | |||
1538 | /* Make pagetable pieces RO */ | ||
1539 | set_page_prot(init_level4_pgt, PAGE_KERNEL_RO); | ||
1540 | set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO); | ||
1541 | set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO); | ||
1542 | set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO); | ||
1543 | set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); | ||
1544 | set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); | ||
1545 | |||
1546 | /* Pin down new L4 */ | ||
1547 | pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE, | ||
1548 | PFN_DOWN(__pa_symbol(init_level4_pgt))); | ||
1549 | |||
1550 | /* Unpin Xen-provided one */ | ||
1551 | pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, PFN_DOWN(__pa(pgd))); | ||
1552 | |||
1553 | /* Switch over */ | ||
1554 | pgd = init_level4_pgt; | ||
1555 | |||
1556 | /* | ||
1557 | * At this stage there can be no user pgd, and no page | ||
1558 | * structure to attach it to, so make sure we just set kernel | ||
1559 | * pgd. | ||
1560 | */ | ||
1561 | xen_mc_batch(); | ||
1562 | __xen_write_cr3(true, __pa(pgd)); | ||
1563 | xen_mc_issue(PARAVIRT_LAZY_CPU); | ||
1564 | |||
1565 | reserve_early(__pa(xen_start_info->pt_base), | ||
1566 | __pa(xen_start_info->pt_base + | ||
1567 | xen_start_info->nr_pt_frames * PAGE_SIZE), | ||
1568 | "XEN PAGETABLES"); | ||
1569 | |||
1570 | return pgd; | ||
1571 | } | ||
1572 | #else /* !CONFIG_X86_64 */ | ||
1573 | static pmd_t level2_kernel_pgt[PTRS_PER_PMD] __page_aligned_bss; | ||
1574 | |||
1575 | static __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd, | ||
1576 | unsigned long max_pfn) | ||
1577 | { | ||
1578 | pmd_t *kernel_pmd; | ||
1579 | |||
1580 | init_pg_tables_start = __pa(pgd); | ||
1581 | init_pg_tables_end = __pa(pgd) + xen_start_info->nr_pt_frames*PAGE_SIZE; | ||
1582 | max_pfn_mapped = PFN_DOWN(init_pg_tables_end + 512*1024); | ||
1583 | |||
1584 | kernel_pmd = m2v(pgd[KERNEL_PGD_BOUNDARY].pgd); | ||
1585 | memcpy(level2_kernel_pgt, kernel_pmd, sizeof(pmd_t) * PTRS_PER_PMD); | ||
1586 | |||
1587 | xen_map_identity_early(level2_kernel_pgt, max_pfn); | ||
1588 | |||
1589 | memcpy(swapper_pg_dir, pgd, sizeof(pgd_t) * PTRS_PER_PGD); | ||
1590 | set_pgd(&swapper_pg_dir[KERNEL_PGD_BOUNDARY], | ||
1591 | __pgd(__pa(level2_kernel_pgt) | _PAGE_PRESENT)); | ||
1592 | |||
1593 | set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); | ||
1594 | set_page_prot(swapper_pg_dir, PAGE_KERNEL_RO); | ||
1595 | set_page_prot(empty_zero_page, PAGE_KERNEL_RO); | ||
1596 | |||
1597 | pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, PFN_DOWN(__pa(pgd))); | ||
1598 | |||
1599 | xen_write_cr3(__pa(swapper_pg_dir)); | ||
1600 | |||
1601 | pin_pagetable_pfn(MMUEXT_PIN_L3_TABLE, PFN_DOWN(__pa(swapper_pg_dir))); | ||
1602 | |||
1603 | return swapper_pg_dir; | ||
1604 | } | ||
1605 | #endif /* CONFIG_X86_64 */ | ||
1606 | |||
1607 | /* First C function to be called on Xen boot */ | 873 | /* First C function to be called on Xen boot */ |
1608 | asmlinkage void __init xen_start_kernel(void) | 874 | asmlinkage void __init xen_start_kernel(void) |
1609 | { | 875 | { |
@@ -1643,9 +909,18 @@ asmlinkage void __init xen_start_kernel(void) | |||
1643 | machine_ops = xen_machine_ops; | 909 | machine_ops = xen_machine_ops; |
1644 | 910 | ||
1645 | #ifdef CONFIG_X86_64 | 911 | #ifdef CONFIG_X86_64 |
1646 | /* Disable until direct per-cpu data access. */ | 912 | /* |
1647 | have_vcpu_info_placement = 0; | 913 | * Setup percpu state. We only need to do this for 64-bit |
914 | * because 32-bit already has %fs set properly. | ||
915 | */ | ||
916 | load_percpu_segment(0); | ||
1648 | #endif | 917 | #endif |
918 | /* | ||
919 | * The only reliable way to retain the initial address of the | ||
920 | * percpu gdt_page is to remember it here, so we can go and | ||
921 | * mark it RW later, when the initial percpu area is freed. | ||
922 | */ | ||
923 | xen_initial_gdt = &per_cpu(gdt_page, 0); | ||
1649 | 924 | ||
1650 | xen_smp_init(); | 925 | xen_smp_init(); |
1651 | 926 | ||
diff --git a/arch/x86/xen/irq.c b/arch/x86/xen/irq.c index 2e8271431e1a..cfd17799bd6d 100644 --- a/arch/x86/xen/irq.c +++ b/arch/x86/xen/irq.c | |||
@@ -19,21 +19,6 @@ void xen_force_evtchn_callback(void) | |||
19 | (void)HYPERVISOR_xen_version(0, NULL); | 19 | (void)HYPERVISOR_xen_version(0, NULL); |
20 | } | 20 | } |
21 | 21 | ||
22 | static void __init __xen_init_IRQ(void) | ||
23 | { | ||
24 | int i; | ||
25 | |||
26 | /* Create identity vector->irq map */ | ||
27 | for(i = 0; i < NR_VECTORS; i++) { | ||
28 | int cpu; | ||
29 | |||
30 | for_each_possible_cpu(cpu) | ||
31 | per_cpu(vector_irq, cpu)[i] = i; | ||
32 | } | ||
33 | |||
34 | xen_init_IRQ(); | ||
35 | } | ||
36 | |||
37 | static unsigned long xen_save_fl(void) | 22 | static unsigned long xen_save_fl(void) |
38 | { | 23 | { |
39 | struct vcpu_info *vcpu; | 24 | struct vcpu_info *vcpu; |
@@ -50,6 +35,7 @@ static unsigned long xen_save_fl(void) | |||
50 | */ | 35 | */ |
51 | return (-flags) & X86_EFLAGS_IF; | 36 | return (-flags) & X86_EFLAGS_IF; |
52 | } | 37 | } |
38 | PV_CALLEE_SAVE_REGS_THUNK(xen_save_fl); | ||
53 | 39 | ||
54 | static void xen_restore_fl(unsigned long flags) | 40 | static void xen_restore_fl(unsigned long flags) |
55 | { | 41 | { |
@@ -76,6 +62,7 @@ static void xen_restore_fl(unsigned long flags) | |||
76 | xen_force_evtchn_callback(); | 62 | xen_force_evtchn_callback(); |
77 | } | 63 | } |
78 | } | 64 | } |
65 | PV_CALLEE_SAVE_REGS_THUNK(xen_restore_fl); | ||
79 | 66 | ||
80 | static void xen_irq_disable(void) | 67 | static void xen_irq_disable(void) |
81 | { | 68 | { |
@@ -86,6 +73,7 @@ static void xen_irq_disable(void) | |||
86 | percpu_read(xen_vcpu)->evtchn_upcall_mask = 1; | 73 | percpu_read(xen_vcpu)->evtchn_upcall_mask = 1; |
87 | preempt_enable_no_resched(); | 74 | preempt_enable_no_resched(); |
88 | } | 75 | } |
76 | PV_CALLEE_SAVE_REGS_THUNK(xen_irq_disable); | ||
89 | 77 | ||
90 | static void xen_irq_enable(void) | 78 | static void xen_irq_enable(void) |
91 | { | 79 | { |
@@ -106,6 +94,7 @@ static void xen_irq_enable(void) | |||
106 | if (unlikely(vcpu->evtchn_upcall_pending)) | 94 | if (unlikely(vcpu->evtchn_upcall_pending)) |
107 | xen_force_evtchn_callback(); | 95 | xen_force_evtchn_callback(); |
108 | } | 96 | } |
97 | PV_CALLEE_SAVE_REGS_THUNK(xen_irq_enable); | ||
109 | 98 | ||
110 | static void xen_safe_halt(void) | 99 | static void xen_safe_halt(void) |
111 | { | 100 | { |
@@ -123,11 +112,13 @@ static void xen_halt(void) | |||
123 | } | 112 | } |
124 | 113 | ||
125 | static const struct pv_irq_ops xen_irq_ops __initdata = { | 114 | static const struct pv_irq_ops xen_irq_ops __initdata = { |
126 | .init_IRQ = __xen_init_IRQ, | 115 | .init_IRQ = xen_init_IRQ, |
127 | .save_fl = xen_save_fl, | 116 | |
128 | .restore_fl = xen_restore_fl, | 117 | .save_fl = PV_CALLEE_SAVE(xen_save_fl), |
129 | .irq_disable = xen_irq_disable, | 118 | .restore_fl = PV_CALLEE_SAVE(xen_restore_fl), |
130 | .irq_enable = xen_irq_enable, | 119 | .irq_disable = PV_CALLEE_SAVE(xen_irq_disable), |
120 | .irq_enable = PV_CALLEE_SAVE(xen_irq_enable), | ||
121 | |||
131 | .safe_halt = xen_safe_halt, | 122 | .safe_halt = xen_safe_halt, |
132 | .halt = xen_halt, | 123 | .halt = xen_halt, |
133 | #ifdef CONFIG_X86_64 | 124 | #ifdef CONFIG_X86_64 |
diff --git a/arch/x86/xen/mmu.c b/arch/x86/xen/mmu.c index 98cb9869eb24..d2e8ed1aff3d 100644 --- a/arch/x86/xen/mmu.c +++ b/arch/x86/xen/mmu.c | |||
@@ -47,6 +47,7 @@ | |||
47 | #include <asm/tlbflush.h> | 47 | #include <asm/tlbflush.h> |
48 | #include <asm/fixmap.h> | 48 | #include <asm/fixmap.h> |
49 | #include <asm/mmu_context.h> | 49 | #include <asm/mmu_context.h> |
50 | #include <asm/setup.h> | ||
50 | #include <asm/paravirt.h> | 51 | #include <asm/paravirt.h> |
51 | #include <asm/linkage.h> | 52 | #include <asm/linkage.h> |
52 | 53 | ||
@@ -55,6 +56,8 @@ | |||
55 | 56 | ||
56 | #include <xen/page.h> | 57 | #include <xen/page.h> |
57 | #include <xen/interface/xen.h> | 58 | #include <xen/interface/xen.h> |
59 | #include <xen/interface/version.h> | ||
60 | #include <xen/hvc-console.h> | ||
58 | 61 | ||
59 | #include "multicalls.h" | 62 | #include "multicalls.h" |
60 | #include "mmu.h" | 63 | #include "mmu.h" |
@@ -114,6 +117,37 @@ static inline void check_zero(void) | |||
114 | 117 | ||
115 | #endif /* CONFIG_XEN_DEBUG_FS */ | 118 | #endif /* CONFIG_XEN_DEBUG_FS */ |
116 | 119 | ||
120 | |||
121 | /* | ||
122 | * Identity map, in addition to plain kernel map. This needs to be | ||
123 | * large enough to allocate page table pages to allocate the rest. | ||
124 | * Each page can map 2MB. | ||
125 | */ | ||
126 | static pte_t level1_ident_pgt[PTRS_PER_PTE * 4] __page_aligned_bss; | ||
127 | |||
128 | #ifdef CONFIG_X86_64 | ||
129 | /* l3 pud for userspace vsyscall mapping */ | ||
130 | static pud_t level3_user_vsyscall[PTRS_PER_PUD] __page_aligned_bss; | ||
131 | #endif /* CONFIG_X86_64 */ | ||
132 | |||
133 | /* | ||
134 | * Note about cr3 (pagetable base) values: | ||
135 | * | ||
136 | * xen_cr3 contains the current logical cr3 value; it contains the | ||
137 | * last set cr3. This may not be the current effective cr3, because | ||
138 | * its update may be being lazily deferred. However, a vcpu looking | ||
139 | * at its own cr3 can use this value knowing that it everything will | ||
140 | * be self-consistent. | ||
141 | * | ||
142 | * xen_current_cr3 contains the actual vcpu cr3; it is set once the | ||
143 | * hypercall to set the vcpu cr3 is complete (so it may be a little | ||
144 | * out of date, but it will never be set early). If one vcpu is | ||
145 | * looking at another vcpu's cr3 value, it should use this variable. | ||
146 | */ | ||
147 | DEFINE_PER_CPU(unsigned long, xen_cr3); /* cr3 stored as physaddr */ | ||
148 | DEFINE_PER_CPU(unsigned long, xen_current_cr3); /* actual vcpu cr3 */ | ||
149 | |||
150 | |||
117 | /* | 151 | /* |
118 | * Just beyond the highest usermode address. STACK_TOP_MAX has a | 152 | * Just beyond the highest usermode address. STACK_TOP_MAX has a |
119 | * redzone above it, so round it up to a PGD boundary. | 153 | * redzone above it, so round it up to a PGD boundary. |
@@ -458,28 +492,33 @@ pteval_t xen_pte_val(pte_t pte) | |||
458 | { | 492 | { |
459 | return pte_mfn_to_pfn(pte.pte); | 493 | return pte_mfn_to_pfn(pte.pte); |
460 | } | 494 | } |
495 | PV_CALLEE_SAVE_REGS_THUNK(xen_pte_val); | ||
461 | 496 | ||
462 | pgdval_t xen_pgd_val(pgd_t pgd) | 497 | pgdval_t xen_pgd_val(pgd_t pgd) |
463 | { | 498 | { |
464 | return pte_mfn_to_pfn(pgd.pgd); | 499 | return pte_mfn_to_pfn(pgd.pgd); |
465 | } | 500 | } |
501 | PV_CALLEE_SAVE_REGS_THUNK(xen_pgd_val); | ||
466 | 502 | ||
467 | pte_t xen_make_pte(pteval_t pte) | 503 | pte_t xen_make_pte(pteval_t pte) |
468 | { | 504 | { |
469 | pte = pte_pfn_to_mfn(pte); | 505 | pte = pte_pfn_to_mfn(pte); |
470 | return native_make_pte(pte); | 506 | return native_make_pte(pte); |
471 | } | 507 | } |
508 | PV_CALLEE_SAVE_REGS_THUNK(xen_make_pte); | ||
472 | 509 | ||
473 | pgd_t xen_make_pgd(pgdval_t pgd) | 510 | pgd_t xen_make_pgd(pgdval_t pgd) |
474 | { | 511 | { |
475 | pgd = pte_pfn_to_mfn(pgd); | 512 | pgd = pte_pfn_to_mfn(pgd); |
476 | return native_make_pgd(pgd); | 513 | return native_make_pgd(pgd); |
477 | } | 514 | } |
515 | PV_CALLEE_SAVE_REGS_THUNK(xen_make_pgd); | ||
478 | 516 | ||
479 | pmdval_t xen_pmd_val(pmd_t pmd) | 517 | pmdval_t xen_pmd_val(pmd_t pmd) |
480 | { | 518 | { |
481 | return pte_mfn_to_pfn(pmd.pmd); | 519 | return pte_mfn_to_pfn(pmd.pmd); |
482 | } | 520 | } |
521 | PV_CALLEE_SAVE_REGS_THUNK(xen_pmd_val); | ||
483 | 522 | ||
484 | void xen_set_pud_hyper(pud_t *ptr, pud_t val) | 523 | void xen_set_pud_hyper(pud_t *ptr, pud_t val) |
485 | { | 524 | { |
@@ -556,12 +595,14 @@ pmd_t xen_make_pmd(pmdval_t pmd) | |||
556 | pmd = pte_pfn_to_mfn(pmd); | 595 | pmd = pte_pfn_to_mfn(pmd); |
557 | return native_make_pmd(pmd); | 596 | return native_make_pmd(pmd); |
558 | } | 597 | } |
598 | PV_CALLEE_SAVE_REGS_THUNK(xen_make_pmd); | ||
559 | 599 | ||
560 | #if PAGETABLE_LEVELS == 4 | 600 | #if PAGETABLE_LEVELS == 4 |
561 | pudval_t xen_pud_val(pud_t pud) | 601 | pudval_t xen_pud_val(pud_t pud) |
562 | { | 602 | { |
563 | return pte_mfn_to_pfn(pud.pud); | 603 | return pte_mfn_to_pfn(pud.pud); |
564 | } | 604 | } |
605 | PV_CALLEE_SAVE_REGS_THUNK(xen_pud_val); | ||
565 | 606 | ||
566 | pud_t xen_make_pud(pudval_t pud) | 607 | pud_t xen_make_pud(pudval_t pud) |
567 | { | 608 | { |
@@ -569,6 +610,7 @@ pud_t xen_make_pud(pudval_t pud) | |||
569 | 610 | ||
570 | return native_make_pud(pud); | 611 | return native_make_pud(pud); |
571 | } | 612 | } |
613 | PV_CALLEE_SAVE_REGS_THUNK(xen_make_pud); | ||
572 | 614 | ||
573 | pgd_t *xen_get_user_pgd(pgd_t *pgd) | 615 | pgd_t *xen_get_user_pgd(pgd_t *pgd) |
574 | { | 616 | { |
@@ -1152,6 +1194,709 @@ void xen_exit_mmap(struct mm_struct *mm) | |||
1152 | spin_unlock(&mm->page_table_lock); | 1194 | spin_unlock(&mm->page_table_lock); |
1153 | } | 1195 | } |
1154 | 1196 | ||
1197 | static __init void xen_pagetable_setup_start(pgd_t *base) | ||
1198 | { | ||
1199 | } | ||
1200 | |||
1201 | static __init void xen_pagetable_setup_done(pgd_t *base) | ||
1202 | { | ||
1203 | xen_setup_shared_info(); | ||
1204 | } | ||
1205 | |||
1206 | static void xen_write_cr2(unsigned long cr2) | ||
1207 | { | ||
1208 | percpu_read(xen_vcpu)->arch.cr2 = cr2; | ||
1209 | } | ||
1210 | |||
1211 | static unsigned long xen_read_cr2(void) | ||
1212 | { | ||
1213 | return percpu_read(xen_vcpu)->arch.cr2; | ||
1214 | } | ||
1215 | |||
1216 | unsigned long xen_read_cr2_direct(void) | ||
1217 | { | ||
1218 | return percpu_read(xen_vcpu_info.arch.cr2); | ||
1219 | } | ||
1220 | |||
1221 | static void xen_flush_tlb(void) | ||
1222 | { | ||
1223 | struct mmuext_op *op; | ||
1224 | struct multicall_space mcs; | ||
1225 | |||
1226 | preempt_disable(); | ||
1227 | |||
1228 | mcs = xen_mc_entry(sizeof(*op)); | ||
1229 | |||
1230 | op = mcs.args; | ||
1231 | op->cmd = MMUEXT_TLB_FLUSH_LOCAL; | ||
1232 | MULTI_mmuext_op(mcs.mc, op, 1, NULL, DOMID_SELF); | ||
1233 | |||
1234 | xen_mc_issue(PARAVIRT_LAZY_MMU); | ||
1235 | |||
1236 | preempt_enable(); | ||
1237 | } | ||
1238 | |||
1239 | static void xen_flush_tlb_single(unsigned long addr) | ||
1240 | { | ||
1241 | struct mmuext_op *op; | ||
1242 | struct multicall_space mcs; | ||
1243 | |||
1244 | preempt_disable(); | ||
1245 | |||
1246 | mcs = xen_mc_entry(sizeof(*op)); | ||
1247 | op = mcs.args; | ||
1248 | op->cmd = MMUEXT_INVLPG_LOCAL; | ||
1249 | op->arg1.linear_addr = addr & PAGE_MASK; | ||
1250 | MULTI_mmuext_op(mcs.mc, op, 1, NULL, DOMID_SELF); | ||
1251 | |||
1252 | xen_mc_issue(PARAVIRT_LAZY_MMU); | ||
1253 | |||
1254 | preempt_enable(); | ||
1255 | } | ||
1256 | |||
1257 | static void xen_flush_tlb_others(const struct cpumask *cpus, | ||
1258 | struct mm_struct *mm, unsigned long va) | ||
1259 | { | ||
1260 | struct { | ||
1261 | struct mmuext_op op; | ||
1262 | DECLARE_BITMAP(mask, NR_CPUS); | ||
1263 | } *args; | ||
1264 | struct multicall_space mcs; | ||
1265 | |||
1266 | BUG_ON(cpumask_empty(cpus)); | ||
1267 | BUG_ON(!mm); | ||
1268 | |||
1269 | mcs = xen_mc_entry(sizeof(*args)); | ||
1270 | args = mcs.args; | ||
1271 | args->op.arg2.vcpumask = to_cpumask(args->mask); | ||
1272 | |||
1273 | /* Remove us, and any offline CPUS. */ | ||
1274 | cpumask_and(to_cpumask(args->mask), cpus, cpu_online_mask); | ||
1275 | cpumask_clear_cpu(smp_processor_id(), to_cpumask(args->mask)); | ||
1276 | if (unlikely(cpumask_empty(to_cpumask(args->mask)))) | ||
1277 | goto issue; | ||
1278 | |||
1279 | if (va == TLB_FLUSH_ALL) { | ||
1280 | args->op.cmd = MMUEXT_TLB_FLUSH_MULTI; | ||
1281 | } else { | ||
1282 | args->op.cmd = MMUEXT_INVLPG_MULTI; | ||
1283 | args->op.arg1.linear_addr = va; | ||
1284 | } | ||
1285 | |||
1286 | MULTI_mmuext_op(mcs.mc, &args->op, 1, NULL, DOMID_SELF); | ||
1287 | |||
1288 | issue: | ||
1289 | xen_mc_issue(PARAVIRT_LAZY_MMU); | ||
1290 | } | ||
1291 | |||
1292 | static unsigned long xen_read_cr3(void) | ||
1293 | { | ||
1294 | return percpu_read(xen_cr3); | ||
1295 | } | ||
1296 | |||
1297 | static void set_current_cr3(void *v) | ||
1298 | { | ||
1299 | percpu_write(xen_current_cr3, (unsigned long)v); | ||
1300 | } | ||
1301 | |||
1302 | static void __xen_write_cr3(bool kernel, unsigned long cr3) | ||
1303 | { | ||
1304 | struct mmuext_op *op; | ||
1305 | struct multicall_space mcs; | ||
1306 | unsigned long mfn; | ||
1307 | |||
1308 | if (cr3) | ||
1309 | mfn = pfn_to_mfn(PFN_DOWN(cr3)); | ||
1310 | else | ||
1311 | mfn = 0; | ||
1312 | |||
1313 | WARN_ON(mfn == 0 && kernel); | ||
1314 | |||
1315 | mcs = __xen_mc_entry(sizeof(*op)); | ||
1316 | |||
1317 | op = mcs.args; | ||
1318 | op->cmd = kernel ? MMUEXT_NEW_BASEPTR : MMUEXT_NEW_USER_BASEPTR; | ||
1319 | op->arg1.mfn = mfn; | ||
1320 | |||
1321 | MULTI_mmuext_op(mcs.mc, op, 1, NULL, DOMID_SELF); | ||
1322 | |||
1323 | if (kernel) { | ||
1324 | percpu_write(xen_cr3, cr3); | ||
1325 | |||
1326 | /* Update xen_current_cr3 once the batch has actually | ||
1327 | been submitted. */ | ||
1328 | xen_mc_callback(set_current_cr3, (void *)cr3); | ||
1329 | } | ||
1330 | } | ||
1331 | |||
1332 | static void xen_write_cr3(unsigned long cr3) | ||
1333 | { | ||
1334 | BUG_ON(preemptible()); | ||
1335 | |||
1336 | xen_mc_batch(); /* disables interrupts */ | ||
1337 | |||
1338 | /* Update while interrupts are disabled, so its atomic with | ||
1339 | respect to ipis */ | ||
1340 | percpu_write(xen_cr3, cr3); | ||
1341 | |||
1342 | __xen_write_cr3(true, cr3); | ||
1343 | |||
1344 | #ifdef CONFIG_X86_64 | ||
1345 | { | ||
1346 | pgd_t *user_pgd = xen_get_user_pgd(__va(cr3)); | ||
1347 | if (user_pgd) | ||
1348 | __xen_write_cr3(false, __pa(user_pgd)); | ||
1349 | else | ||
1350 | __xen_write_cr3(false, 0); | ||
1351 | } | ||
1352 | #endif | ||
1353 | |||
1354 | xen_mc_issue(PARAVIRT_LAZY_CPU); /* interrupts restored */ | ||
1355 | } | ||
1356 | |||
1357 | static int xen_pgd_alloc(struct mm_struct *mm) | ||
1358 | { | ||
1359 | pgd_t *pgd = mm->pgd; | ||
1360 | int ret = 0; | ||
1361 | |||
1362 | BUG_ON(PagePinned(virt_to_page(pgd))); | ||
1363 | |||
1364 | #ifdef CONFIG_X86_64 | ||
1365 | { | ||
1366 | struct page *page = virt_to_page(pgd); | ||
1367 | pgd_t *user_pgd; | ||
1368 | |||
1369 | BUG_ON(page->private != 0); | ||
1370 | |||
1371 | ret = -ENOMEM; | ||
1372 | |||
1373 | user_pgd = (pgd_t *)__get_free_page(GFP_KERNEL | __GFP_ZERO); | ||
1374 | page->private = (unsigned long)user_pgd; | ||
1375 | |||
1376 | if (user_pgd != NULL) { | ||
1377 | user_pgd[pgd_index(VSYSCALL_START)] = | ||
1378 | __pgd(__pa(level3_user_vsyscall) | _PAGE_TABLE); | ||
1379 | ret = 0; | ||
1380 | } | ||
1381 | |||
1382 | BUG_ON(PagePinned(virt_to_page(xen_get_user_pgd(pgd)))); | ||
1383 | } | ||
1384 | #endif | ||
1385 | |||
1386 | return ret; | ||
1387 | } | ||
1388 | |||
1389 | static void xen_pgd_free(struct mm_struct *mm, pgd_t *pgd) | ||
1390 | { | ||
1391 | #ifdef CONFIG_X86_64 | ||
1392 | pgd_t *user_pgd = xen_get_user_pgd(pgd); | ||
1393 | |||
1394 | if (user_pgd) | ||
1395 | free_page((unsigned long)user_pgd); | ||
1396 | #endif | ||
1397 | } | ||
1398 | |||
1399 | #ifdef CONFIG_HIGHPTE | ||
1400 | static void *xen_kmap_atomic_pte(struct page *page, enum km_type type) | ||
1401 | { | ||
1402 | pgprot_t prot = PAGE_KERNEL; | ||
1403 | |||
1404 | if (PagePinned(page)) | ||
1405 | prot = PAGE_KERNEL_RO; | ||
1406 | |||
1407 | if (0 && PageHighMem(page)) | ||
1408 | printk("mapping highpte %lx type %d prot %s\n", | ||
1409 | page_to_pfn(page), type, | ||
1410 | (unsigned long)pgprot_val(prot) & _PAGE_RW ? "WRITE" : "READ"); | ||
1411 | |||
1412 | return kmap_atomic_prot(page, type, prot); | ||
1413 | } | ||
1414 | #endif | ||
1415 | |||
1416 | #ifdef CONFIG_X86_32 | ||
1417 | static __init pte_t mask_rw_pte(pte_t *ptep, pte_t pte) | ||
1418 | { | ||
1419 | /* If there's an existing pte, then don't allow _PAGE_RW to be set */ | ||
1420 | if (pte_val_ma(*ptep) & _PAGE_PRESENT) | ||
1421 | pte = __pte_ma(((pte_val_ma(*ptep) & _PAGE_RW) | ~_PAGE_RW) & | ||
1422 | pte_val_ma(pte)); | ||
1423 | |||
1424 | return pte; | ||
1425 | } | ||
1426 | |||
1427 | /* Init-time set_pte while constructing initial pagetables, which | ||
1428 | doesn't allow RO pagetable pages to be remapped RW */ | ||
1429 | static __init void xen_set_pte_init(pte_t *ptep, pte_t pte) | ||
1430 | { | ||
1431 | pte = mask_rw_pte(ptep, pte); | ||
1432 | |||
1433 | xen_set_pte(ptep, pte); | ||
1434 | } | ||
1435 | #endif | ||
1436 | |||
1437 | /* Early in boot, while setting up the initial pagetable, assume | ||
1438 | everything is pinned. */ | ||
1439 | static __init void xen_alloc_pte_init(struct mm_struct *mm, unsigned long pfn) | ||
1440 | { | ||
1441 | #ifdef CONFIG_FLATMEM | ||
1442 | BUG_ON(mem_map); /* should only be used early */ | ||
1443 | #endif | ||
1444 | make_lowmem_page_readonly(__va(PFN_PHYS(pfn))); | ||
1445 | } | ||
1446 | |||
1447 | /* Early release_pte assumes that all pts are pinned, since there's | ||
1448 | only init_mm and anything attached to that is pinned. */ | ||
1449 | static void xen_release_pte_init(unsigned long pfn) | ||
1450 | { | ||
1451 | make_lowmem_page_readwrite(__va(PFN_PHYS(pfn))); | ||
1452 | } | ||
1453 | |||
1454 | static void pin_pagetable_pfn(unsigned cmd, unsigned long pfn) | ||
1455 | { | ||
1456 | struct mmuext_op op; | ||
1457 | op.cmd = cmd; | ||
1458 | op.arg1.mfn = pfn_to_mfn(pfn); | ||
1459 | if (HYPERVISOR_mmuext_op(&op, 1, NULL, DOMID_SELF)) | ||
1460 | BUG(); | ||
1461 | } | ||
1462 | |||
1463 | /* This needs to make sure the new pte page is pinned iff its being | ||
1464 | attached to a pinned pagetable. */ | ||
1465 | static void xen_alloc_ptpage(struct mm_struct *mm, unsigned long pfn, unsigned level) | ||
1466 | { | ||
1467 | struct page *page = pfn_to_page(pfn); | ||
1468 | |||
1469 | if (PagePinned(virt_to_page(mm->pgd))) { | ||
1470 | SetPagePinned(page); | ||
1471 | |||
1472 | vm_unmap_aliases(); | ||
1473 | if (!PageHighMem(page)) { | ||
1474 | make_lowmem_page_readonly(__va(PFN_PHYS((unsigned long)pfn))); | ||
1475 | if (level == PT_PTE && USE_SPLIT_PTLOCKS) | ||
1476 | pin_pagetable_pfn(MMUEXT_PIN_L1_TABLE, pfn); | ||
1477 | } else { | ||
1478 | /* make sure there are no stray mappings of | ||
1479 | this page */ | ||
1480 | kmap_flush_unused(); | ||
1481 | } | ||
1482 | } | ||
1483 | } | ||
1484 | |||
1485 | static void xen_alloc_pte(struct mm_struct *mm, unsigned long pfn) | ||
1486 | { | ||
1487 | xen_alloc_ptpage(mm, pfn, PT_PTE); | ||
1488 | } | ||
1489 | |||
1490 | static void xen_alloc_pmd(struct mm_struct *mm, unsigned long pfn) | ||
1491 | { | ||
1492 | xen_alloc_ptpage(mm, pfn, PT_PMD); | ||
1493 | } | ||
1494 | |||
1495 | /* This should never happen until we're OK to use struct page */ | ||
1496 | static void xen_release_ptpage(unsigned long pfn, unsigned level) | ||
1497 | { | ||
1498 | struct page *page = pfn_to_page(pfn); | ||
1499 | |||
1500 | if (PagePinned(page)) { | ||
1501 | if (!PageHighMem(page)) { | ||
1502 | if (level == PT_PTE && USE_SPLIT_PTLOCKS) | ||
1503 | pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, pfn); | ||
1504 | make_lowmem_page_readwrite(__va(PFN_PHYS(pfn))); | ||
1505 | } | ||
1506 | ClearPagePinned(page); | ||
1507 | } | ||
1508 | } | ||
1509 | |||
1510 | static void xen_release_pte(unsigned long pfn) | ||
1511 | { | ||
1512 | xen_release_ptpage(pfn, PT_PTE); | ||
1513 | } | ||
1514 | |||
1515 | static void xen_release_pmd(unsigned long pfn) | ||
1516 | { | ||
1517 | xen_release_ptpage(pfn, PT_PMD); | ||
1518 | } | ||
1519 | |||
1520 | #if PAGETABLE_LEVELS == 4 | ||
1521 | static void xen_alloc_pud(struct mm_struct *mm, unsigned long pfn) | ||
1522 | { | ||
1523 | xen_alloc_ptpage(mm, pfn, PT_PUD); | ||
1524 | } | ||
1525 | |||
1526 | static void xen_release_pud(unsigned long pfn) | ||
1527 | { | ||
1528 | xen_release_ptpage(pfn, PT_PUD); | ||
1529 | } | ||
1530 | #endif | ||
1531 | |||
1532 | void __init xen_reserve_top(void) | ||
1533 | { | ||
1534 | #ifdef CONFIG_X86_32 | ||
1535 | unsigned long top = HYPERVISOR_VIRT_START; | ||
1536 | struct xen_platform_parameters pp; | ||
1537 | |||
1538 | if (HYPERVISOR_xen_version(XENVER_platform_parameters, &pp) == 0) | ||
1539 | top = pp.virt_start; | ||
1540 | |||
1541 | reserve_top_address(-top); | ||
1542 | #endif /* CONFIG_X86_32 */ | ||
1543 | } | ||
1544 | |||
1545 | /* | ||
1546 | * Like __va(), but returns address in the kernel mapping (which is | ||
1547 | * all we have until the physical memory mapping has been set up. | ||
1548 | */ | ||
1549 | static void *__ka(phys_addr_t paddr) | ||
1550 | { | ||
1551 | #ifdef CONFIG_X86_64 | ||
1552 | return (void *)(paddr + __START_KERNEL_map); | ||
1553 | #else | ||
1554 | return __va(paddr); | ||
1555 | #endif | ||
1556 | } | ||
1557 | |||
1558 | /* Convert a machine address to physical address */ | ||
1559 | static unsigned long m2p(phys_addr_t maddr) | ||
1560 | { | ||
1561 | phys_addr_t paddr; | ||
1562 | |||
1563 | maddr &= PTE_PFN_MASK; | ||
1564 | paddr = mfn_to_pfn(maddr >> PAGE_SHIFT) << PAGE_SHIFT; | ||
1565 | |||
1566 | return paddr; | ||
1567 | } | ||
1568 | |||
1569 | /* Convert a machine address to kernel virtual */ | ||
1570 | static void *m2v(phys_addr_t maddr) | ||
1571 | { | ||
1572 | return __ka(m2p(maddr)); | ||
1573 | } | ||
1574 | |||
1575 | static void set_page_prot(void *addr, pgprot_t prot) | ||
1576 | { | ||
1577 | unsigned long pfn = __pa(addr) >> PAGE_SHIFT; | ||
1578 | pte_t pte = pfn_pte(pfn, prot); | ||
1579 | |||
1580 | if (HYPERVISOR_update_va_mapping((unsigned long)addr, pte, 0)) | ||
1581 | BUG(); | ||
1582 | } | ||
1583 | |||
1584 | static __init void xen_map_identity_early(pmd_t *pmd, unsigned long max_pfn) | ||
1585 | { | ||
1586 | unsigned pmdidx, pteidx; | ||
1587 | unsigned ident_pte; | ||
1588 | unsigned long pfn; | ||
1589 | |||
1590 | ident_pte = 0; | ||
1591 | pfn = 0; | ||
1592 | for (pmdidx = 0; pmdidx < PTRS_PER_PMD && pfn < max_pfn; pmdidx++) { | ||
1593 | pte_t *pte_page; | ||
1594 | |||
1595 | /* Reuse or allocate a page of ptes */ | ||
1596 | if (pmd_present(pmd[pmdidx])) | ||
1597 | pte_page = m2v(pmd[pmdidx].pmd); | ||
1598 | else { | ||
1599 | /* Check for free pte pages */ | ||
1600 | if (ident_pte == ARRAY_SIZE(level1_ident_pgt)) | ||
1601 | break; | ||
1602 | |||
1603 | pte_page = &level1_ident_pgt[ident_pte]; | ||
1604 | ident_pte += PTRS_PER_PTE; | ||
1605 | |||
1606 | pmd[pmdidx] = __pmd(__pa(pte_page) | _PAGE_TABLE); | ||
1607 | } | ||
1608 | |||
1609 | /* Install mappings */ | ||
1610 | for (pteidx = 0; pteidx < PTRS_PER_PTE; pteidx++, pfn++) { | ||
1611 | pte_t pte; | ||
1612 | |||
1613 | if (pfn > max_pfn_mapped) | ||
1614 | max_pfn_mapped = pfn; | ||
1615 | |||
1616 | if (!pte_none(pte_page[pteidx])) | ||
1617 | continue; | ||
1618 | |||
1619 | pte = pfn_pte(pfn, PAGE_KERNEL_EXEC); | ||
1620 | pte_page[pteidx] = pte; | ||
1621 | } | ||
1622 | } | ||
1623 | |||
1624 | for (pteidx = 0; pteidx < ident_pte; pteidx += PTRS_PER_PTE) | ||
1625 | set_page_prot(&level1_ident_pgt[pteidx], PAGE_KERNEL_RO); | ||
1626 | |||
1627 | set_page_prot(pmd, PAGE_KERNEL_RO); | ||
1628 | } | ||
1629 | |||
1630 | #ifdef CONFIG_X86_64 | ||
1631 | static void convert_pfn_mfn(void *v) | ||
1632 | { | ||
1633 | pte_t *pte = v; | ||
1634 | int i; | ||
1635 | |||
1636 | /* All levels are converted the same way, so just treat them | ||
1637 | as ptes. */ | ||
1638 | for (i = 0; i < PTRS_PER_PTE; i++) | ||
1639 | pte[i] = xen_make_pte(pte[i].pte); | ||
1640 | } | ||
1641 | |||
1642 | /* | ||
1643 | * Set up the inital kernel pagetable. | ||
1644 | * | ||
1645 | * We can construct this by grafting the Xen provided pagetable into | ||
1646 | * head_64.S's preconstructed pagetables. We copy the Xen L2's into | ||
1647 | * level2_ident_pgt, level2_kernel_pgt and level2_fixmap_pgt. This | ||
1648 | * means that only the kernel has a physical mapping to start with - | ||
1649 | * but that's enough to get __va working. We need to fill in the rest | ||
1650 | * of the physical mapping once some sort of allocator has been set | ||
1651 | * up. | ||
1652 | */ | ||
1653 | __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd, | ||
1654 | unsigned long max_pfn) | ||
1655 | { | ||
1656 | pud_t *l3; | ||
1657 | pmd_t *l2; | ||
1658 | |||
1659 | /* Zap identity mapping */ | ||
1660 | init_level4_pgt[0] = __pgd(0); | ||
1661 | |||
1662 | /* Pre-constructed entries are in pfn, so convert to mfn */ | ||
1663 | convert_pfn_mfn(init_level4_pgt); | ||
1664 | convert_pfn_mfn(level3_ident_pgt); | ||
1665 | convert_pfn_mfn(level3_kernel_pgt); | ||
1666 | |||
1667 | l3 = m2v(pgd[pgd_index(__START_KERNEL_map)].pgd); | ||
1668 | l2 = m2v(l3[pud_index(__START_KERNEL_map)].pud); | ||
1669 | |||
1670 | memcpy(level2_ident_pgt, l2, sizeof(pmd_t) * PTRS_PER_PMD); | ||
1671 | memcpy(level2_kernel_pgt, l2, sizeof(pmd_t) * PTRS_PER_PMD); | ||
1672 | |||
1673 | l3 = m2v(pgd[pgd_index(__START_KERNEL_map + PMD_SIZE)].pgd); | ||
1674 | l2 = m2v(l3[pud_index(__START_KERNEL_map + PMD_SIZE)].pud); | ||
1675 | memcpy(level2_fixmap_pgt, l2, sizeof(pmd_t) * PTRS_PER_PMD); | ||
1676 | |||
1677 | /* Set up identity map */ | ||
1678 | xen_map_identity_early(level2_ident_pgt, max_pfn); | ||
1679 | |||
1680 | /* Make pagetable pieces RO */ | ||
1681 | set_page_prot(init_level4_pgt, PAGE_KERNEL_RO); | ||
1682 | set_page_prot(level3_ident_pgt, PAGE_KERNEL_RO); | ||
1683 | set_page_prot(level3_kernel_pgt, PAGE_KERNEL_RO); | ||
1684 | set_page_prot(level3_user_vsyscall, PAGE_KERNEL_RO); | ||
1685 | set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); | ||
1686 | set_page_prot(level2_fixmap_pgt, PAGE_KERNEL_RO); | ||
1687 | |||
1688 | /* Pin down new L4 */ | ||
1689 | pin_pagetable_pfn(MMUEXT_PIN_L4_TABLE, | ||
1690 | PFN_DOWN(__pa_symbol(init_level4_pgt))); | ||
1691 | |||
1692 | /* Unpin Xen-provided one */ | ||
1693 | pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, PFN_DOWN(__pa(pgd))); | ||
1694 | |||
1695 | /* Switch over */ | ||
1696 | pgd = init_level4_pgt; | ||
1697 | |||
1698 | /* | ||
1699 | * At this stage there can be no user pgd, and no page | ||
1700 | * structure to attach it to, so make sure we just set kernel | ||
1701 | * pgd. | ||
1702 | */ | ||
1703 | xen_mc_batch(); | ||
1704 | __xen_write_cr3(true, __pa(pgd)); | ||
1705 | xen_mc_issue(PARAVIRT_LAZY_CPU); | ||
1706 | |||
1707 | reserve_early(__pa(xen_start_info->pt_base), | ||
1708 | __pa(xen_start_info->pt_base + | ||
1709 | xen_start_info->nr_pt_frames * PAGE_SIZE), | ||
1710 | "XEN PAGETABLES"); | ||
1711 | |||
1712 | return pgd; | ||
1713 | } | ||
1714 | #else /* !CONFIG_X86_64 */ | ||
1715 | static pmd_t level2_kernel_pgt[PTRS_PER_PMD] __page_aligned_bss; | ||
1716 | |||
1717 | __init pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd, | ||
1718 | unsigned long max_pfn) | ||
1719 | { | ||
1720 | pmd_t *kernel_pmd; | ||
1721 | |||
1722 | init_pg_tables_start = __pa(pgd); | ||
1723 | init_pg_tables_end = __pa(pgd) + xen_start_info->nr_pt_frames*PAGE_SIZE; | ||
1724 | max_pfn_mapped = PFN_DOWN(init_pg_tables_end + 512*1024); | ||
1725 | |||
1726 | kernel_pmd = m2v(pgd[KERNEL_PGD_BOUNDARY].pgd); | ||
1727 | memcpy(level2_kernel_pgt, kernel_pmd, sizeof(pmd_t) * PTRS_PER_PMD); | ||
1728 | |||
1729 | xen_map_identity_early(level2_kernel_pgt, max_pfn); | ||
1730 | |||
1731 | memcpy(swapper_pg_dir, pgd, sizeof(pgd_t) * PTRS_PER_PGD); | ||
1732 | set_pgd(&swapper_pg_dir[KERNEL_PGD_BOUNDARY], | ||
1733 | __pgd(__pa(level2_kernel_pgt) | _PAGE_PRESENT)); | ||
1734 | |||
1735 | set_page_prot(level2_kernel_pgt, PAGE_KERNEL_RO); | ||
1736 | set_page_prot(swapper_pg_dir, PAGE_KERNEL_RO); | ||
1737 | set_page_prot(empty_zero_page, PAGE_KERNEL_RO); | ||
1738 | |||
1739 | pin_pagetable_pfn(MMUEXT_UNPIN_TABLE, PFN_DOWN(__pa(pgd))); | ||
1740 | |||
1741 | xen_write_cr3(__pa(swapper_pg_dir)); | ||
1742 | |||
1743 | pin_pagetable_pfn(MMUEXT_PIN_L3_TABLE, PFN_DOWN(__pa(swapper_pg_dir))); | ||
1744 | |||
1745 | return swapper_pg_dir; | ||
1746 | } | ||
1747 | #endif /* CONFIG_X86_64 */ | ||
1748 | |||
1749 | static void xen_set_fixmap(unsigned idx, unsigned long phys, pgprot_t prot) | ||
1750 | { | ||
1751 | pte_t pte; | ||
1752 | |||
1753 | phys >>= PAGE_SHIFT; | ||
1754 | |||
1755 | switch (idx) { | ||
1756 | case FIX_BTMAP_END ... FIX_BTMAP_BEGIN: | ||
1757 | #ifdef CONFIG_X86_F00F_BUG | ||
1758 | case FIX_F00F_IDT: | ||
1759 | #endif | ||
1760 | #ifdef CONFIG_X86_32 | ||
1761 | case FIX_WP_TEST: | ||
1762 | case FIX_VDSO: | ||
1763 | # ifdef CONFIG_HIGHMEM | ||
1764 | case FIX_KMAP_BEGIN ... FIX_KMAP_END: | ||
1765 | # endif | ||
1766 | #else | ||
1767 | case VSYSCALL_LAST_PAGE ... VSYSCALL_FIRST_PAGE: | ||
1768 | #endif | ||
1769 | #ifdef CONFIG_X86_LOCAL_APIC | ||
1770 | case FIX_APIC_BASE: /* maps dummy local APIC */ | ||
1771 | #endif | ||
1772 | pte = pfn_pte(phys, prot); | ||
1773 | break; | ||
1774 | |||
1775 | default: | ||
1776 | pte = mfn_pte(phys, prot); | ||
1777 | break; | ||
1778 | } | ||
1779 | |||
1780 | __native_set_fixmap(idx, pte); | ||
1781 | |||
1782 | #ifdef CONFIG_X86_64 | ||
1783 | /* Replicate changes to map the vsyscall page into the user | ||
1784 | pagetable vsyscall mapping. */ | ||
1785 | if (idx >= VSYSCALL_LAST_PAGE && idx <= VSYSCALL_FIRST_PAGE) { | ||
1786 | unsigned long vaddr = __fix_to_virt(idx); | ||
1787 | set_pte_vaddr_pud(level3_user_vsyscall, vaddr, pte); | ||
1788 | } | ||
1789 | #endif | ||
1790 | } | ||
1791 | |||
1792 | __init void xen_post_allocator_init(void) | ||
1793 | { | ||
1794 | pv_mmu_ops.set_pte = xen_set_pte; | ||
1795 | pv_mmu_ops.set_pmd = xen_set_pmd; | ||
1796 | pv_mmu_ops.set_pud = xen_set_pud; | ||
1797 | #if PAGETABLE_LEVELS == 4 | ||
1798 | pv_mmu_ops.set_pgd = xen_set_pgd; | ||
1799 | #endif | ||
1800 | |||
1801 | /* This will work as long as patching hasn't happened yet | ||
1802 | (which it hasn't) */ | ||
1803 | pv_mmu_ops.alloc_pte = xen_alloc_pte; | ||
1804 | pv_mmu_ops.alloc_pmd = xen_alloc_pmd; | ||
1805 | pv_mmu_ops.release_pte = xen_release_pte; | ||
1806 | pv_mmu_ops.release_pmd = xen_release_pmd; | ||
1807 | #if PAGETABLE_LEVELS == 4 | ||
1808 | pv_mmu_ops.alloc_pud = xen_alloc_pud; | ||
1809 | pv_mmu_ops.release_pud = xen_release_pud; | ||
1810 | #endif | ||
1811 | |||
1812 | #ifdef CONFIG_X86_64 | ||
1813 | SetPagePinned(virt_to_page(level3_user_vsyscall)); | ||
1814 | #endif | ||
1815 | xen_mark_init_mm_pinned(); | ||
1816 | } | ||
1817 | |||
1818 | |||
1819 | const struct pv_mmu_ops xen_mmu_ops __initdata = { | ||
1820 | .pagetable_setup_start = xen_pagetable_setup_start, | ||
1821 | .pagetable_setup_done = xen_pagetable_setup_done, | ||
1822 | |||
1823 | .read_cr2 = xen_read_cr2, | ||
1824 | .write_cr2 = xen_write_cr2, | ||
1825 | |||
1826 | .read_cr3 = xen_read_cr3, | ||
1827 | .write_cr3 = xen_write_cr3, | ||
1828 | |||
1829 | .flush_tlb_user = xen_flush_tlb, | ||
1830 | .flush_tlb_kernel = xen_flush_tlb, | ||
1831 | .flush_tlb_single = xen_flush_tlb_single, | ||
1832 | .flush_tlb_others = xen_flush_tlb_others, | ||
1833 | |||
1834 | .pte_update = paravirt_nop, | ||
1835 | .pte_update_defer = paravirt_nop, | ||
1836 | |||
1837 | .pgd_alloc = xen_pgd_alloc, | ||
1838 | .pgd_free = xen_pgd_free, | ||
1839 | |||
1840 | .alloc_pte = xen_alloc_pte_init, | ||
1841 | .release_pte = xen_release_pte_init, | ||
1842 | .alloc_pmd = xen_alloc_pte_init, | ||
1843 | .alloc_pmd_clone = paravirt_nop, | ||
1844 | .release_pmd = xen_release_pte_init, | ||
1845 | |||
1846 | #ifdef CONFIG_HIGHPTE | ||
1847 | .kmap_atomic_pte = xen_kmap_atomic_pte, | ||
1848 | #endif | ||
1849 | |||
1850 | #ifdef CONFIG_X86_64 | ||
1851 | .set_pte = xen_set_pte, | ||
1852 | #else | ||
1853 | .set_pte = xen_set_pte_init, | ||
1854 | #endif | ||
1855 | .set_pte_at = xen_set_pte_at, | ||
1856 | .set_pmd = xen_set_pmd_hyper, | ||
1857 | |||
1858 | .ptep_modify_prot_start = __ptep_modify_prot_start, | ||
1859 | .ptep_modify_prot_commit = __ptep_modify_prot_commit, | ||
1860 | |||
1861 | .pte_val = PV_CALLEE_SAVE(xen_pte_val), | ||
1862 | .pgd_val = PV_CALLEE_SAVE(xen_pgd_val), | ||
1863 | |||
1864 | .make_pte = PV_CALLEE_SAVE(xen_make_pte), | ||
1865 | .make_pgd = PV_CALLEE_SAVE(xen_make_pgd), | ||
1866 | |||
1867 | #ifdef CONFIG_X86_PAE | ||
1868 | .set_pte_atomic = xen_set_pte_atomic, | ||
1869 | .set_pte_present = xen_set_pte_at, | ||
1870 | .pte_clear = xen_pte_clear, | ||
1871 | .pmd_clear = xen_pmd_clear, | ||
1872 | #endif /* CONFIG_X86_PAE */ | ||
1873 | .set_pud = xen_set_pud_hyper, | ||
1874 | |||
1875 | .make_pmd = PV_CALLEE_SAVE(xen_make_pmd), | ||
1876 | .pmd_val = PV_CALLEE_SAVE(xen_pmd_val), | ||
1877 | |||
1878 | #if PAGETABLE_LEVELS == 4 | ||
1879 | .pud_val = PV_CALLEE_SAVE(xen_pud_val), | ||
1880 | .make_pud = PV_CALLEE_SAVE(xen_make_pud), | ||
1881 | .set_pgd = xen_set_pgd_hyper, | ||
1882 | |||
1883 | .alloc_pud = xen_alloc_pte_init, | ||
1884 | .release_pud = xen_release_pte_init, | ||
1885 | #endif /* PAGETABLE_LEVELS == 4 */ | ||
1886 | |||
1887 | .activate_mm = xen_activate_mm, | ||
1888 | .dup_mmap = xen_dup_mmap, | ||
1889 | .exit_mmap = xen_exit_mmap, | ||
1890 | |||
1891 | .lazy_mode = { | ||
1892 | .enter = paravirt_enter_lazy_mmu, | ||
1893 | .leave = xen_leave_lazy, | ||
1894 | }, | ||
1895 | |||
1896 | .set_fixmap = xen_set_fixmap, | ||
1897 | }; | ||
1898 | |||
1899 | |||
1155 | #ifdef CONFIG_XEN_DEBUG_FS | 1900 | #ifdef CONFIG_XEN_DEBUG_FS |
1156 | 1901 | ||
1157 | static struct dentry *d_mmu_debug; | 1902 | static struct dentry *d_mmu_debug; |
diff --git a/arch/x86/xen/mmu.h b/arch/x86/xen/mmu.h index 98d71659da5a..24d1b44a337d 100644 --- a/arch/x86/xen/mmu.h +++ b/arch/x86/xen/mmu.h | |||
@@ -54,4 +54,7 @@ pte_t xen_ptep_modify_prot_start(struct mm_struct *mm, unsigned long addr, pte_t | |||
54 | void xen_ptep_modify_prot_commit(struct mm_struct *mm, unsigned long addr, | 54 | void xen_ptep_modify_prot_commit(struct mm_struct *mm, unsigned long addr, |
55 | pte_t *ptep, pte_t pte); | 55 | pte_t *ptep, pte_t pte); |
56 | 56 | ||
57 | unsigned long xen_read_cr2_direct(void); | ||
58 | |||
59 | extern const struct pv_mmu_ops xen_mmu_ops; | ||
57 | #endif /* _XEN_MMU_H */ | 60 | #endif /* _XEN_MMU_H */ |
diff --git a/arch/x86/xen/smp.c b/arch/x86/xen/smp.c index 72c2eb9b64cd..035582ae815d 100644 --- a/arch/x86/xen/smp.c +++ b/arch/x86/xen/smp.c | |||
@@ -170,7 +170,7 @@ static void __init xen_smp_prepare_boot_cpu(void) | |||
170 | 170 | ||
171 | /* We've switched to the "real" per-cpu gdt, so make sure the | 171 | /* We've switched to the "real" per-cpu gdt, so make sure the |
172 | old memory can be recycled */ | 172 | old memory can be recycled */ |
173 | make_lowmem_page_readwrite(&per_cpu_var(gdt_page)); | 173 | make_lowmem_page_readwrite(xen_initial_gdt); |
174 | 174 | ||
175 | xen_setup_vcpu_info_placement(); | 175 | xen_setup_vcpu_info_placement(); |
176 | } | 176 | } |
@@ -235,6 +235,8 @@ cpu_initialize_context(unsigned int cpu, struct task_struct *idle) | |||
235 | ctxt->user_regs.ss = __KERNEL_DS; | 235 | ctxt->user_regs.ss = __KERNEL_DS; |
236 | #ifdef CONFIG_X86_32 | 236 | #ifdef CONFIG_X86_32 |
237 | ctxt->user_regs.fs = __KERNEL_PERCPU; | 237 | ctxt->user_regs.fs = __KERNEL_PERCPU; |
238 | #else | ||
239 | ctxt->gs_base_kernel = per_cpu_offset(cpu); | ||
238 | #endif | 240 | #endif |
239 | ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle; | 241 | ctxt->user_regs.eip = (unsigned long)cpu_bringup_and_idle; |
240 | ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */ | 242 | ctxt->user_regs.eflags = 0x1000; /* IOPL_RING1 */ |
@@ -281,10 +283,12 @@ static int __cpuinit xen_cpu_up(unsigned int cpu) | |||
281 | 283 | ||
282 | per_cpu(current_task, cpu) = idle; | 284 | per_cpu(current_task, cpu) = idle; |
283 | #ifdef CONFIG_X86_32 | 285 | #ifdef CONFIG_X86_32 |
284 | init_gdt(cpu); | ||
285 | irq_ctx_init(cpu); | 286 | irq_ctx_init(cpu); |
286 | #else | 287 | #else |
287 | clear_tsk_thread_flag(idle, TIF_FORK); | 288 | clear_tsk_thread_flag(idle, TIF_FORK); |
289 | per_cpu(kernel_stack, cpu) = | ||
290 | (unsigned long)task_stack_page(idle) - | ||
291 | KERNEL_STACK_OFFSET + THREAD_SIZE; | ||
288 | #endif | 292 | #endif |
289 | xen_setup_timer(cpu); | 293 | xen_setup_timer(cpu); |
290 | xen_init_lock_cpu(cpu); | 294 | xen_init_lock_cpu(cpu); |
diff --git a/arch/x86/xen/xen-asm.S b/arch/x86/xen/xen-asm.S new file mode 100644 index 000000000000..79d7362ad6d1 --- /dev/null +++ b/arch/x86/xen/xen-asm.S | |||
@@ -0,0 +1,142 @@ | |||
1 | /* | ||
2 | * Asm versions of Xen pv-ops, suitable for either direct use or | ||
3 | * inlining. The inline versions are the same as the direct-use | ||
4 | * versions, with the pre- and post-amble chopped off. | ||
5 | * | ||
6 | * This code is encoded for size rather than absolute efficiency, with | ||
7 | * a view to being able to inline as much as possible. | ||
8 | * | ||
9 | * We only bother with direct forms (ie, vcpu in percpu data) of the | ||
10 | * operations here; the indirect forms are better handled in C, since | ||
11 | * they're generally too large to inline anyway. | ||
12 | */ | ||
13 | |||
14 | #include <asm/asm-offsets.h> | ||
15 | #include <asm/percpu.h> | ||
16 | #include <asm/processor-flags.h> | ||
17 | |||
18 | #include "xen-asm.h" | ||
19 | |||
20 | /* | ||
21 | * Enable events. This clears the event mask and tests the pending | ||
22 | * event status with one and operation. If there are pending events, | ||
23 | * then enter the hypervisor to get them handled. | ||
24 | */ | ||
25 | ENTRY(xen_irq_enable_direct) | ||
26 | /* Unmask events */ | ||
27 | movb $0, PER_CPU_VAR(xen_vcpu_info) + XEN_vcpu_info_mask | ||
28 | |||
29 | /* | ||
30 | * Preempt here doesn't matter because that will deal with any | ||
31 | * pending interrupts. The pending check may end up being run | ||
32 | * on the wrong CPU, but that doesn't hurt. | ||
33 | */ | ||
34 | |||
35 | /* Test for pending */ | ||
36 | testb $0xff, PER_CPU_VAR(xen_vcpu_info) + XEN_vcpu_info_pending | ||
37 | jz 1f | ||
38 | |||
39 | 2: call check_events | ||
40 | 1: | ||
41 | ENDPATCH(xen_irq_enable_direct) | ||
42 | ret | ||
43 | ENDPROC(xen_irq_enable_direct) | ||
44 | RELOC(xen_irq_enable_direct, 2b+1) | ||
45 | |||
46 | |||
47 | /* | ||
48 | * Disabling events is simply a matter of making the event mask | ||
49 | * non-zero. | ||
50 | */ | ||
51 | ENTRY(xen_irq_disable_direct) | ||
52 | movb $1, PER_CPU_VAR(xen_vcpu_info) + XEN_vcpu_info_mask | ||
53 | ENDPATCH(xen_irq_disable_direct) | ||
54 | ret | ||
55 | ENDPROC(xen_irq_disable_direct) | ||
56 | RELOC(xen_irq_disable_direct, 0) | ||
57 | |||
58 | /* | ||
59 | * (xen_)save_fl is used to get the current interrupt enable status. | ||
60 | * Callers expect the status to be in X86_EFLAGS_IF, and other bits | ||
61 | * may be set in the return value. We take advantage of this by | ||
62 | * making sure that X86_EFLAGS_IF has the right value (and other bits | ||
63 | * in that byte are 0), but other bits in the return value are | ||
64 | * undefined. We need to toggle the state of the bit, because Xen and | ||
65 | * x86 use opposite senses (mask vs enable). | ||
66 | */ | ||
67 | ENTRY(xen_save_fl_direct) | ||
68 | testb $0xff, PER_CPU_VAR(xen_vcpu_info) + XEN_vcpu_info_mask | ||
69 | setz %ah | ||
70 | addb %ah, %ah | ||
71 | ENDPATCH(xen_save_fl_direct) | ||
72 | ret | ||
73 | ENDPROC(xen_save_fl_direct) | ||
74 | RELOC(xen_save_fl_direct, 0) | ||
75 | |||
76 | |||
77 | /* | ||
78 | * In principle the caller should be passing us a value return from | ||
79 | * xen_save_fl_direct, but for robustness sake we test only the | ||
80 | * X86_EFLAGS_IF flag rather than the whole byte. After setting the | ||
81 | * interrupt mask state, it checks for unmasked pending events and | ||
82 | * enters the hypervisor to get them delivered if so. | ||
83 | */ | ||
84 | ENTRY(xen_restore_fl_direct) | ||
85 | #ifdef CONFIG_X86_64 | ||
86 | testw $X86_EFLAGS_IF, %di | ||
87 | #else | ||
88 | testb $X86_EFLAGS_IF>>8, %ah | ||
89 | #endif | ||
90 | setz PER_CPU_VAR(xen_vcpu_info) + XEN_vcpu_info_mask | ||
91 | /* | ||
92 | * Preempt here doesn't matter because that will deal with any | ||
93 | * pending interrupts. The pending check may end up being run | ||
94 | * on the wrong CPU, but that doesn't hurt. | ||
95 | */ | ||
96 | |||
97 | /* check for unmasked and pending */ | ||
98 | cmpw $0x0001, PER_CPU_VAR(xen_vcpu_info) + XEN_vcpu_info_pending | ||
99 | jz 1f | ||
100 | 2: call check_events | ||
101 | 1: | ||
102 | ENDPATCH(xen_restore_fl_direct) | ||
103 | ret | ||
104 | ENDPROC(xen_restore_fl_direct) | ||
105 | RELOC(xen_restore_fl_direct, 2b+1) | ||
106 | |||
107 | |||
108 | /* | ||
109 | * Force an event check by making a hypercall, but preserve regs | ||
110 | * before making the call. | ||
111 | */ | ||
112 | check_events: | ||
113 | #ifdef CONFIG_X86_32 | ||
114 | push %eax | ||
115 | push %ecx | ||
116 | push %edx | ||
117 | call xen_force_evtchn_callback | ||
118 | pop %edx | ||
119 | pop %ecx | ||
120 | pop %eax | ||
121 | #else | ||
122 | push %rax | ||
123 | push %rcx | ||
124 | push %rdx | ||
125 | push %rsi | ||
126 | push %rdi | ||
127 | push %r8 | ||
128 | push %r9 | ||
129 | push %r10 | ||
130 | push %r11 | ||
131 | call xen_force_evtchn_callback | ||
132 | pop %r11 | ||
133 | pop %r10 | ||
134 | pop %r9 | ||
135 | pop %r8 | ||
136 | pop %rdi | ||
137 | pop %rsi | ||
138 | pop %rdx | ||
139 | pop %rcx | ||
140 | pop %rax | ||
141 | #endif | ||
142 | ret | ||
diff --git a/arch/x86/xen/xen-asm.h b/arch/x86/xen/xen-asm.h new file mode 100644 index 000000000000..465276467a47 --- /dev/null +++ b/arch/x86/xen/xen-asm.h | |||
@@ -0,0 +1,12 @@ | |||
1 | #ifndef _XEN_XEN_ASM_H | ||
2 | #define _XEN_XEN_ASM_H | ||
3 | |||
4 | #include <linux/linkage.h> | ||
5 | |||
6 | #define RELOC(x, v) .globl x##_reloc; x##_reloc=v | ||
7 | #define ENDPATCH(x) .globl x##_end; x##_end=. | ||
8 | |||
9 | /* Pseudo-flag used for virtual NMI, which we don't implement yet */ | ||
10 | #define XEN_EFLAGS_NMI 0x80000000 | ||
11 | |||
12 | #endif | ||
diff --git a/arch/x86/xen/xen-asm_32.S b/arch/x86/xen/xen-asm_32.S index 42786f59d9c0..88e15deb8b82 100644 --- a/arch/x86/xen/xen-asm_32.S +++ b/arch/x86/xen/xen-asm_32.S | |||
@@ -1,117 +1,43 @@ | |||
1 | /* | 1 | /* |
2 | Asm versions of Xen pv-ops, suitable for either direct use or inlining. | 2 | * Asm versions of Xen pv-ops, suitable for either direct use or |
3 | The inline versions are the same as the direct-use versions, with the | 3 | * inlining. The inline versions are the same as the direct-use |
4 | pre- and post-amble chopped off. | 4 | * versions, with the pre- and post-amble chopped off. |
5 | 5 | * | |
6 | This code is encoded for size rather than absolute efficiency, | 6 | * This code is encoded for size rather than absolute efficiency, with |
7 | with a view to being able to inline as much as possible. | 7 | * a view to being able to inline as much as possible. |
8 | 8 | * | |
9 | We only bother with direct forms (ie, vcpu in pda) of the operations | 9 | * We only bother with direct forms (ie, vcpu in pda) of the |
10 | here; the indirect forms are better handled in C, since they're | 10 | * operations here; the indirect forms are better handled in C, since |
11 | generally too large to inline anyway. | 11 | * they're generally too large to inline anyway. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <linux/linkage.h> | ||
15 | |||
16 | #include <asm/asm-offsets.h> | ||
17 | #include <asm/thread_info.h> | 14 | #include <asm/thread_info.h> |
18 | #include <asm/percpu.h> | ||
19 | #include <asm/processor-flags.h> | 15 | #include <asm/processor-flags.h> |
20 | #include <asm/segment.h> | 16 | #include <asm/segment.h> |
21 | 17 | ||
22 | #include <xen/interface/xen.h> | 18 | #include <xen/interface/xen.h> |
23 | 19 | ||
24 | #define RELOC(x, v) .globl x##_reloc; x##_reloc=v | 20 | #include "xen-asm.h" |
25 | #define ENDPATCH(x) .globl x##_end; x##_end=. | ||
26 | |||
27 | /* Pseudo-flag used for virtual NMI, which we don't implement yet */ | ||
28 | #define XEN_EFLAGS_NMI 0x80000000 | ||
29 | |||
30 | /* | ||
31 | Enable events. This clears the event mask and tests the pending | ||
32 | event status with one and operation. If there are pending | ||
33 | events, then enter the hypervisor to get them handled. | ||
34 | */ | ||
35 | ENTRY(xen_irq_enable_direct) | ||
36 | /* Unmask events */ | ||
37 | movb $0, PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_mask | ||
38 | |||
39 | /* Preempt here doesn't matter because that will deal with | ||
40 | any pending interrupts. The pending check may end up being | ||
41 | run on the wrong CPU, but that doesn't hurt. */ | ||
42 | |||
43 | /* Test for pending */ | ||
44 | testb $0xff, PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_pending | ||
45 | jz 1f | ||
46 | |||
47 | 2: call check_events | ||
48 | 1: | ||
49 | ENDPATCH(xen_irq_enable_direct) | ||
50 | ret | ||
51 | ENDPROC(xen_irq_enable_direct) | ||
52 | RELOC(xen_irq_enable_direct, 2b+1) | ||
53 | |||
54 | |||
55 | /* | ||
56 | Disabling events is simply a matter of making the event mask | ||
57 | non-zero. | ||
58 | */ | ||
59 | ENTRY(xen_irq_disable_direct) | ||
60 | movb $1, PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_mask | ||
61 | ENDPATCH(xen_irq_disable_direct) | ||
62 | ret | ||
63 | ENDPROC(xen_irq_disable_direct) | ||
64 | RELOC(xen_irq_disable_direct, 0) | ||
65 | 21 | ||
66 | /* | 22 | /* |
67 | (xen_)save_fl is used to get the current interrupt enable status. | 23 | * Force an event check by making a hypercall, but preserve regs |
68 | Callers expect the status to be in X86_EFLAGS_IF, and other bits | 24 | * before making the call. |
69 | may be set in the return value. We take advantage of this by | ||
70 | making sure that X86_EFLAGS_IF has the right value (and other bits | ||
71 | in that byte are 0), but other bits in the return value are | ||
72 | undefined. We need to toggle the state of the bit, because | ||
73 | Xen and x86 use opposite senses (mask vs enable). | ||
74 | */ | 25 | */ |
75 | ENTRY(xen_save_fl_direct) | 26 | check_events: |
76 | testb $0xff, PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_mask | 27 | push %eax |
77 | setz %ah | 28 | push %ecx |
78 | addb %ah,%ah | 29 | push %edx |
79 | ENDPATCH(xen_save_fl_direct) | 30 | call xen_force_evtchn_callback |
80 | ret | 31 | pop %edx |
81 | ENDPROC(xen_save_fl_direct) | 32 | pop %ecx |
82 | RELOC(xen_save_fl_direct, 0) | 33 | pop %eax |
83 | |||
84 | |||
85 | /* | ||
86 | In principle the caller should be passing us a value return | ||
87 | from xen_save_fl_direct, but for robustness sake we test only | ||
88 | the X86_EFLAGS_IF flag rather than the whole byte. After | ||
89 | setting the interrupt mask state, it checks for unmasked | ||
90 | pending events and enters the hypervisor to get them delivered | ||
91 | if so. | ||
92 | */ | ||
93 | ENTRY(xen_restore_fl_direct) | ||
94 | testb $X86_EFLAGS_IF>>8, %ah | ||
95 | setz PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_mask | ||
96 | /* Preempt here doesn't matter because that will deal with | ||
97 | any pending interrupts. The pending check may end up being | ||
98 | run on the wrong CPU, but that doesn't hurt. */ | ||
99 | |||
100 | /* check for unmasked and pending */ | ||
101 | cmpw $0x0001, PER_CPU_VAR(xen_vcpu_info)+XEN_vcpu_info_pending | ||
102 | jz 1f | ||
103 | 2: call check_events | ||
104 | 1: | ||
105 | ENDPATCH(xen_restore_fl_direct) | ||
106 | ret | 34 | ret |
107 | ENDPROC(xen_restore_fl_direct) | ||
108 | RELOC(xen_restore_fl_direct, 2b+1) | ||
109 | 35 | ||
110 | /* | 36 | /* |
111 | We can't use sysexit directly, because we're not running in ring0. | 37 | * We can't use sysexit directly, because we're not running in ring0. |
112 | But we can easily fake it up using iret. Assuming xen_sysexit | 38 | * But we can easily fake it up using iret. Assuming xen_sysexit is |
113 | is jumped to with a standard stack frame, we can just strip it | 39 | * jumped to with a standard stack frame, we can just strip it back to |
114 | back to a standard iret frame and use iret. | 40 | * a standard iret frame and use iret. |
115 | */ | 41 | */ |
116 | ENTRY(xen_sysexit) | 42 | ENTRY(xen_sysexit) |
117 | movl PT_EAX(%esp), %eax /* Shouldn't be necessary? */ | 43 | movl PT_EAX(%esp), %eax /* Shouldn't be necessary? */ |
@@ -122,33 +48,31 @@ ENTRY(xen_sysexit) | |||
122 | ENDPROC(xen_sysexit) | 48 | ENDPROC(xen_sysexit) |
123 | 49 | ||
124 | /* | 50 | /* |
125 | This is run where a normal iret would be run, with the same stack setup: | 51 | * This is run where a normal iret would be run, with the same stack setup: |
126 | 8: eflags | 52 | * 8: eflags |
127 | 4: cs | 53 | * 4: cs |
128 | esp-> 0: eip | 54 | * esp-> 0: eip |
129 | 55 | * | |
130 | This attempts to make sure that any pending events are dealt | 56 | * This attempts to make sure that any pending events are dealt with |
131 | with on return to usermode, but there is a small window in | 57 | * on return to usermode, but there is a small window in which an |
132 | which an event can happen just before entering usermode. If | 58 | * event can happen just before entering usermode. If the nested |
133 | the nested interrupt ends up setting one of the TIF_WORK_MASK | 59 | * interrupt ends up setting one of the TIF_WORK_MASK pending work |
134 | pending work flags, they will not be tested again before | 60 | * flags, they will not be tested again before returning to |
135 | returning to usermode. This means that a process can end up | 61 | * usermode. This means that a process can end up with pending work, |
136 | with pending work, which will be unprocessed until the process | 62 | * which will be unprocessed until the process enters and leaves the |
137 | enters and leaves the kernel again, which could be an | 63 | * kernel again, which could be an unbounded amount of time. This |
138 | unbounded amount of time. This means that a pending signal or | 64 | * means that a pending signal or reschedule event could be |
139 | reschedule event could be indefinitely delayed. | 65 | * indefinitely delayed. |
140 | 66 | * | |
141 | The fix is to notice a nested interrupt in the critical | 67 | * The fix is to notice a nested interrupt in the critical window, and |
142 | window, and if one occurs, then fold the nested interrupt into | 68 | * if one occurs, then fold the nested interrupt into the current |
143 | the current interrupt stack frame, and re-process it | 69 | * interrupt stack frame, and re-process it iteratively rather than |
144 | iteratively rather than recursively. This means that it will | 70 | * recursively. This means that it will exit via the normal path, and |
145 | exit via the normal path, and all pending work will be dealt | 71 | * all pending work will be dealt with appropriately. |
146 | with appropriately. | 72 | * |
147 | 73 | * Because the nested interrupt handler needs to deal with the current | |
148 | Because the nested interrupt handler needs to deal with the | 74 | * stack state in whatever form its in, we keep things simple by only |
149 | current stack state in whatever form its in, we keep things | 75 | * using a single register which is pushed/popped on the stack. |
150 | simple by only using a single register which is pushed/popped | ||
151 | on the stack. | ||
152 | */ | 76 | */ |
153 | ENTRY(xen_iret) | 77 | ENTRY(xen_iret) |
154 | /* test eflags for special cases */ | 78 | /* test eflags for special cases */ |
@@ -158,13 +82,15 @@ ENTRY(xen_iret) | |||
158 | push %eax | 82 | push %eax |
159 | ESP_OFFSET=4 # bytes pushed onto stack | 83 | ESP_OFFSET=4 # bytes pushed onto stack |
160 | 84 | ||
161 | /* Store vcpu_info pointer for easy access. Do it this | 85 | /* |
162 | way to avoid having to reload %fs */ | 86 | * Store vcpu_info pointer for easy access. Do it this way to |
87 | * avoid having to reload %fs | ||
88 | */ | ||
163 | #ifdef CONFIG_SMP | 89 | #ifdef CONFIG_SMP |
164 | GET_THREAD_INFO(%eax) | 90 | GET_THREAD_INFO(%eax) |
165 | movl TI_cpu(%eax),%eax | 91 | movl TI_cpu(%eax), %eax |
166 | movl __per_cpu_offset(,%eax,4),%eax | 92 | movl __per_cpu_offset(,%eax,4), %eax |
167 | mov per_cpu__xen_vcpu(%eax),%eax | 93 | mov per_cpu__xen_vcpu(%eax), %eax |
168 | #else | 94 | #else |
169 | movl per_cpu__xen_vcpu, %eax | 95 | movl per_cpu__xen_vcpu, %eax |
170 | #endif | 96 | #endif |
@@ -172,37 +98,46 @@ ENTRY(xen_iret) | |||
172 | /* check IF state we're restoring */ | 98 | /* check IF state we're restoring */ |
173 | testb $X86_EFLAGS_IF>>8, 8+1+ESP_OFFSET(%esp) | 99 | testb $X86_EFLAGS_IF>>8, 8+1+ESP_OFFSET(%esp) |
174 | 100 | ||
175 | /* Maybe enable events. Once this happens we could get a | 101 | /* |
176 | recursive event, so the critical region starts immediately | 102 | * Maybe enable events. Once this happens we could get a |
177 | afterwards. However, if that happens we don't end up | 103 | * recursive event, so the critical region starts immediately |
178 | resuming the code, so we don't have to be worried about | 104 | * afterwards. However, if that happens we don't end up |
179 | being preempted to another CPU. */ | 105 | * resuming the code, so we don't have to be worried about |
106 | * being preempted to another CPU. | ||
107 | */ | ||
180 | setz XEN_vcpu_info_mask(%eax) | 108 | setz XEN_vcpu_info_mask(%eax) |
181 | xen_iret_start_crit: | 109 | xen_iret_start_crit: |
182 | 110 | ||
183 | /* check for unmasked and pending */ | 111 | /* check for unmasked and pending */ |
184 | cmpw $0x0001, XEN_vcpu_info_pending(%eax) | 112 | cmpw $0x0001, XEN_vcpu_info_pending(%eax) |
185 | 113 | ||
186 | /* If there's something pending, mask events again so we | 114 | /* |
187 | can jump back into xen_hypervisor_callback */ | 115 | * If there's something pending, mask events again so we can |
116 | * jump back into xen_hypervisor_callback | ||
117 | */ | ||
188 | sete XEN_vcpu_info_mask(%eax) | 118 | sete XEN_vcpu_info_mask(%eax) |
189 | 119 | ||
190 | popl %eax | 120 | popl %eax |
191 | 121 | ||
192 | /* From this point on the registers are restored and the stack | 122 | /* |
193 | updated, so we don't need to worry about it if we're preempted */ | 123 | * From this point on the registers are restored and the stack |
124 | * updated, so we don't need to worry about it if we're | ||
125 | * preempted | ||
126 | */ | ||
194 | iret_restore_end: | 127 | iret_restore_end: |
195 | 128 | ||
196 | /* Jump to hypervisor_callback after fixing up the stack. | 129 | /* |
197 | Events are masked, so jumping out of the critical | 130 | * Jump to hypervisor_callback after fixing up the stack. |
198 | region is OK. */ | 131 | * Events are masked, so jumping out of the critical region is |
132 | * OK. | ||
133 | */ | ||
199 | je xen_hypervisor_callback | 134 | je xen_hypervisor_callback |
200 | 135 | ||
201 | 1: iret | 136 | 1: iret |
202 | xen_iret_end_crit: | 137 | xen_iret_end_crit: |
203 | .section __ex_table,"a" | 138 | .section __ex_table, "a" |
204 | .align 4 | 139 | .align 4 |
205 | .long 1b,iret_exc | 140 | .long 1b, iret_exc |
206 | .previous | 141 | .previous |
207 | 142 | ||
208 | hyper_iret: | 143 | hyper_iret: |
@@ -212,55 +147,55 @@ hyper_iret: | |||
212 | .globl xen_iret_start_crit, xen_iret_end_crit | 147 | .globl xen_iret_start_crit, xen_iret_end_crit |
213 | 148 | ||
214 | /* | 149 | /* |
215 | This is called by xen_hypervisor_callback in entry.S when it sees | 150 | * This is called by xen_hypervisor_callback in entry.S when it sees |
216 | that the EIP at the time of interrupt was between xen_iret_start_crit | 151 | * that the EIP at the time of interrupt was between |
217 | and xen_iret_end_crit. We're passed the EIP in %eax so we can do | 152 | * xen_iret_start_crit and xen_iret_end_crit. We're passed the EIP in |
218 | a more refined determination of what to do. | 153 | * %eax so we can do a more refined determination of what to do. |
219 | 154 | * | |
220 | The stack format at this point is: | 155 | * The stack format at this point is: |
221 | ---------------- | 156 | * ---------------- |
222 | ss : (ss/esp may be present if we came from usermode) | 157 | * ss : (ss/esp may be present if we came from usermode) |
223 | esp : | 158 | * esp : |
224 | eflags } outer exception info | 159 | * eflags } outer exception info |
225 | cs } | 160 | * cs } |
226 | eip } | 161 | * eip } |
227 | ---------------- <- edi (copy dest) | 162 | * ---------------- <- edi (copy dest) |
228 | eax : outer eax if it hasn't been restored | 163 | * eax : outer eax if it hasn't been restored |
229 | ---------------- | 164 | * ---------------- |
230 | eflags } nested exception info | 165 | * eflags } nested exception info |
231 | cs } (no ss/esp because we're nested | 166 | * cs } (no ss/esp because we're nested |
232 | eip } from the same ring) | 167 | * eip } from the same ring) |
233 | orig_eax }<- esi (copy src) | 168 | * orig_eax }<- esi (copy src) |
234 | - - - - - - - - | 169 | * - - - - - - - - |
235 | fs } | 170 | * fs } |
236 | es } | 171 | * es } |
237 | ds } SAVE_ALL state | 172 | * ds } SAVE_ALL state |
238 | eax } | 173 | * eax } |
239 | : : | 174 | * : : |
240 | ebx }<- esp | 175 | * ebx }<- esp |
241 | ---------------- | 176 | * ---------------- |
242 | 177 | * | |
243 | In order to deliver the nested exception properly, we need to shift | 178 | * In order to deliver the nested exception properly, we need to shift |
244 | everything from the return addr up to the error code so it | 179 | * everything from the return addr up to the error code so it sits |
245 | sits just under the outer exception info. This means that when we | 180 | * just under the outer exception info. This means that when we |
246 | handle the exception, we do it in the context of the outer exception | 181 | * handle the exception, we do it in the context of the outer |
247 | rather than starting a new one. | 182 | * exception rather than starting a new one. |
248 | 183 | * | |
249 | The only caveat is that if the outer eax hasn't been | 184 | * The only caveat is that if the outer eax hasn't been restored yet |
250 | restored yet (ie, it's still on stack), we need to insert | 185 | * (ie, it's still on stack), we need to insert its value into the |
251 | its value into the SAVE_ALL state before going on, since | 186 | * SAVE_ALL state before going on, since it's usermode state which we |
252 | it's usermode state which we eventually need to restore. | 187 | * eventually need to restore. |
253 | */ | 188 | */ |
254 | ENTRY(xen_iret_crit_fixup) | 189 | ENTRY(xen_iret_crit_fixup) |
255 | /* | 190 | /* |
256 | Paranoia: Make sure we're really coming from kernel space. | 191 | * Paranoia: Make sure we're really coming from kernel space. |
257 | One could imagine a case where userspace jumps into the | 192 | * One could imagine a case where userspace jumps into the |
258 | critical range address, but just before the CPU delivers a GP, | 193 | * critical range address, but just before the CPU delivers a |
259 | it decides to deliver an interrupt instead. Unlikely? | 194 | * GP, it decides to deliver an interrupt instead. Unlikely? |
260 | Definitely. Easy to avoid? Yes. The Intel documents | 195 | * Definitely. Easy to avoid? Yes. The Intel documents |
261 | explicitly say that the reported EIP for a bad jump is the | 196 | * explicitly say that the reported EIP for a bad jump is the |
262 | jump instruction itself, not the destination, but some virtual | 197 | * jump instruction itself, not the destination, but some |
263 | environments get this wrong. | 198 | * virtual environments get this wrong. |
264 | */ | 199 | */ |
265 | movl PT_CS(%esp), %ecx | 200 | movl PT_CS(%esp), %ecx |
266 | andl $SEGMENT_RPL_MASK, %ecx | 201 | andl $SEGMENT_RPL_MASK, %ecx |
@@ -270,15 +205,17 @@ ENTRY(xen_iret_crit_fixup) | |||
270 | lea PT_ORIG_EAX(%esp), %esi | 205 | lea PT_ORIG_EAX(%esp), %esi |
271 | lea PT_EFLAGS(%esp), %edi | 206 | lea PT_EFLAGS(%esp), %edi |
272 | 207 | ||
273 | /* If eip is before iret_restore_end then stack | 208 | /* |
274 | hasn't been restored yet. */ | 209 | * If eip is before iret_restore_end then stack |
210 | * hasn't been restored yet. | ||
211 | */ | ||
275 | cmp $iret_restore_end, %eax | 212 | cmp $iret_restore_end, %eax |
276 | jae 1f | 213 | jae 1f |
277 | 214 | ||
278 | movl 0+4(%edi),%eax /* copy EAX (just above top of frame) */ | 215 | movl 0+4(%edi), %eax /* copy EAX (just above top of frame) */ |
279 | movl %eax, PT_EAX(%esp) | 216 | movl %eax, PT_EAX(%esp) |
280 | 217 | ||
281 | lea ESP_OFFSET(%edi),%edi /* move dest up over saved regs */ | 218 | lea ESP_OFFSET(%edi), %edi /* move dest up over saved regs */ |
282 | 219 | ||
283 | /* set up the copy */ | 220 | /* set up the copy */ |
284 | 1: std | 221 | 1: std |
@@ -286,20 +223,6 @@ ENTRY(xen_iret_crit_fixup) | |||
286 | rep movsl | 223 | rep movsl |
287 | cld | 224 | cld |
288 | 225 | ||
289 | lea 4(%edi),%esp /* point esp to new frame */ | 226 | lea 4(%edi), %esp /* point esp to new frame */ |
290 | 2: jmp xen_do_upcall | 227 | 2: jmp xen_do_upcall |
291 | 228 | ||
292 | |||
293 | /* | ||
294 | Force an event check by making a hypercall, | ||
295 | but preserve regs before making the call. | ||
296 | */ | ||
297 | check_events: | ||
298 | push %eax | ||
299 | push %ecx | ||
300 | push %edx | ||
301 | call xen_force_evtchn_callback | ||
302 | pop %edx | ||
303 | pop %ecx | ||
304 | pop %eax | ||
305 | ret | ||
diff --git a/arch/x86/xen/xen-asm_64.S b/arch/x86/xen/xen-asm_64.S index d6fc51f4ce85..02f496a8dbaa 100644 --- a/arch/x86/xen/xen-asm_64.S +++ b/arch/x86/xen/xen-asm_64.S | |||
@@ -1,173 +1,45 @@ | |||
1 | /* | 1 | /* |
2 | Asm versions of Xen pv-ops, suitable for either direct use or inlining. | 2 | * Asm versions of Xen pv-ops, suitable for either direct use or |
3 | The inline versions are the same as the direct-use versions, with the | 3 | * inlining. The inline versions are the same as the direct-use |
4 | pre- and post-amble chopped off. | 4 | * versions, with the pre- and post-amble chopped off. |
5 | 5 | * | |
6 | This code is encoded for size rather than absolute efficiency, | 6 | * This code is encoded for size rather than absolute efficiency, with |
7 | with a view to being able to inline as much as possible. | 7 | * a view to being able to inline as much as possible. |
8 | 8 | * | |
9 | We only bother with direct forms (ie, vcpu in pda) of the operations | 9 | * We only bother with direct forms (ie, vcpu in pda) of the |
10 | here; the indirect forms are better handled in C, since they're | 10 | * operations here; the indirect forms are better handled in C, since |
11 | generally too large to inline anyway. | 11 | * they're generally too large to inline anyway. |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #include <linux/linkage.h> | ||
15 | |||
16 | #include <asm/asm-offsets.h> | ||
17 | #include <asm/processor-flags.h> | ||
18 | #include <asm/errno.h> | 14 | #include <asm/errno.h> |
19 | #include <asm/segment.h> | ||
20 | #include <asm/percpu.h> | 15 | #include <asm/percpu.h> |
16 | #include <asm/processor-flags.h> | ||
17 | #include <asm/segment.h> | ||
21 | 18 | ||
22 | #include <xen/interface/xen.h> | 19 | #include <xen/interface/xen.h> |
23 | 20 | ||
24 | #define RELOC(x, v) .globl x##_reloc; x##_reloc=v | 21 | #include "xen-asm.h" |
25 | #define ENDPATCH(x) .globl x##_end; x##_end=. | ||
26 | |||
27 | /* Pseudo-flag used for virtual NMI, which we don't implement yet */ | ||
28 | #define XEN_EFLAGS_NMI 0x80000000 | ||
29 | |||
30 | #if 1 | ||
31 | /* | ||
32 | FIXME: x86_64 now can support direct access to percpu variables | ||
33 | via a segment override. Update xen accordingly. | ||
34 | */ | ||
35 | #define BUG ud2a | ||
36 | #endif | ||
37 | |||
38 | /* | ||
39 | Enable events. This clears the event mask and tests the pending | ||
40 | event status with one and operation. If there are pending | ||
41 | events, then enter the hypervisor to get them handled. | ||
42 | */ | ||
43 | ENTRY(xen_irq_enable_direct) | ||
44 | BUG | ||
45 | |||
46 | /* Unmask events */ | ||
47 | movb $0, PER_CPU_VAR(xen_vcpu_info) + XEN_vcpu_info_mask | ||
48 | |||
49 | /* Preempt here doesn't matter because that will deal with | ||
50 | any pending interrupts. The pending check may end up being | ||
51 | run on the wrong CPU, but that doesn't hurt. */ | ||
52 | |||
53 | /* Test for pending */ | ||
54 | testb $0xff, PER_CPU_VAR(xen_vcpu_info) + XEN_vcpu_info_pending | ||
55 | jz 1f | ||
56 | |||
57 | 2: call check_events | ||
58 | 1: | ||
59 | ENDPATCH(xen_irq_enable_direct) | ||
60 | ret | ||
61 | ENDPROC(xen_irq_enable_direct) | ||
62 | RELOC(xen_irq_enable_direct, 2b+1) | ||
63 | |||
64 | /* | ||
65 | Disabling events is simply a matter of making the event mask | ||
66 | non-zero. | ||
67 | */ | ||
68 | ENTRY(xen_irq_disable_direct) | ||
69 | BUG | ||
70 | |||
71 | movb $1, PER_CPU_VAR(xen_vcpu_info) + XEN_vcpu_info_mask | ||
72 | ENDPATCH(xen_irq_disable_direct) | ||
73 | ret | ||
74 | ENDPROC(xen_irq_disable_direct) | ||
75 | RELOC(xen_irq_disable_direct, 0) | ||
76 | |||
77 | /* | ||
78 | (xen_)save_fl is used to get the current interrupt enable status. | ||
79 | Callers expect the status to be in X86_EFLAGS_IF, and other bits | ||
80 | may be set in the return value. We take advantage of this by | ||
81 | making sure that X86_EFLAGS_IF has the right value (and other bits | ||
82 | in that byte are 0), but other bits in the return value are | ||
83 | undefined. We need to toggle the state of the bit, because | ||
84 | Xen and x86 use opposite senses (mask vs enable). | ||
85 | */ | ||
86 | ENTRY(xen_save_fl_direct) | ||
87 | BUG | ||
88 | |||
89 | testb $0xff, PER_CPU_VAR(xen_vcpu_info) + XEN_vcpu_info_mask | ||
90 | setz %ah | ||
91 | addb %ah,%ah | ||
92 | ENDPATCH(xen_save_fl_direct) | ||
93 | ret | ||
94 | ENDPROC(xen_save_fl_direct) | ||
95 | RELOC(xen_save_fl_direct, 0) | ||
96 | |||
97 | /* | ||
98 | In principle the caller should be passing us a value return | ||
99 | from xen_save_fl_direct, but for robustness sake we test only | ||
100 | the X86_EFLAGS_IF flag rather than the whole byte. After | ||
101 | setting the interrupt mask state, it checks for unmasked | ||
102 | pending events and enters the hypervisor to get them delivered | ||
103 | if so. | ||
104 | */ | ||
105 | ENTRY(xen_restore_fl_direct) | ||
106 | BUG | ||
107 | |||
108 | testb $X86_EFLAGS_IF>>8, %ah | ||
109 | setz PER_CPU_VAR(xen_vcpu_info) + XEN_vcpu_info_mask | ||
110 | /* Preempt here doesn't matter because that will deal with | ||
111 | any pending interrupts. The pending check may end up being | ||
112 | run on the wrong CPU, but that doesn't hurt. */ | ||
113 | |||
114 | /* check for unmasked and pending */ | ||
115 | cmpw $0x0001, PER_CPU_VAR(xen_vcpu_info) + XEN_vcpu_info_pending | ||
116 | jz 1f | ||
117 | 2: call check_events | ||
118 | 1: | ||
119 | ENDPATCH(xen_restore_fl_direct) | ||
120 | ret | ||
121 | ENDPROC(xen_restore_fl_direct) | ||
122 | RELOC(xen_restore_fl_direct, 2b+1) | ||
123 | |||
124 | |||
125 | /* | ||
126 | Force an event check by making a hypercall, | ||
127 | but preserve regs before making the call. | ||
128 | */ | ||
129 | check_events: | ||
130 | push %rax | ||
131 | push %rcx | ||
132 | push %rdx | ||
133 | push %rsi | ||
134 | push %rdi | ||
135 | push %r8 | ||
136 | push %r9 | ||
137 | push %r10 | ||
138 | push %r11 | ||
139 | call xen_force_evtchn_callback | ||
140 | pop %r11 | ||
141 | pop %r10 | ||
142 | pop %r9 | ||
143 | pop %r8 | ||
144 | pop %rdi | ||
145 | pop %rsi | ||
146 | pop %rdx | ||
147 | pop %rcx | ||
148 | pop %rax | ||
149 | ret | ||
150 | 22 | ||
151 | ENTRY(xen_adjust_exception_frame) | 23 | ENTRY(xen_adjust_exception_frame) |
152 | mov 8+0(%rsp),%rcx | 24 | mov 8+0(%rsp), %rcx |
153 | mov 8+8(%rsp),%r11 | 25 | mov 8+8(%rsp), %r11 |
154 | ret $16 | 26 | ret $16 |
155 | 27 | ||
156 | hypercall_iret = hypercall_page + __HYPERVISOR_iret * 32 | 28 | hypercall_iret = hypercall_page + __HYPERVISOR_iret * 32 |
157 | /* | 29 | /* |
158 | Xen64 iret frame: | 30 | * Xen64 iret frame: |
159 | 31 | * | |
160 | ss | 32 | * ss |
161 | rsp | 33 | * rsp |
162 | rflags | 34 | * rflags |
163 | cs | 35 | * cs |
164 | rip <-- standard iret frame | 36 | * rip <-- standard iret frame |
165 | 37 | * | |
166 | flags | 38 | * flags |
167 | 39 | * | |
168 | rcx } | 40 | * rcx } |
169 | r11 }<-- pushed by hypercall page | 41 | * r11 }<-- pushed by hypercall page |
170 | rsp -> rax } | 42 | * rsp->rax } |
171 | */ | 43 | */ |
172 | ENTRY(xen_iret) | 44 | ENTRY(xen_iret) |
173 | pushq $0 | 45 | pushq $0 |
@@ -176,8 +48,8 @@ ENDPATCH(xen_iret) | |||
176 | RELOC(xen_iret, 1b+1) | 48 | RELOC(xen_iret, 1b+1) |
177 | 49 | ||
178 | /* | 50 | /* |
179 | sysexit is not used for 64-bit processes, so it's | 51 | * sysexit is not used for 64-bit processes, so it's only ever used to |
180 | only ever used to return to 32-bit compat userspace. | 52 | * return to 32-bit compat userspace. |
181 | */ | 53 | */ |
182 | ENTRY(xen_sysexit) | 54 | ENTRY(xen_sysexit) |
183 | pushq $__USER32_DS | 55 | pushq $__USER32_DS |
@@ -192,10 +64,12 @@ ENDPATCH(xen_sysexit) | |||
192 | RELOC(xen_sysexit, 1b+1) | 64 | RELOC(xen_sysexit, 1b+1) |
193 | 65 | ||
194 | ENTRY(xen_sysret64) | 66 | ENTRY(xen_sysret64) |
195 | /* We're already on the usermode stack at this point, but still | 67 | /* |
196 | with the kernel gs, so we can easily switch back */ | 68 | * We're already on the usermode stack at this point, but |
69 | * still with the kernel gs, so we can easily switch back | ||
70 | */ | ||
197 | movq %rsp, PER_CPU_VAR(old_rsp) | 71 | movq %rsp, PER_CPU_VAR(old_rsp) |
198 | movq PER_CPU_VAR(kernel_stack),%rsp | 72 | movq PER_CPU_VAR(kernel_stack), %rsp |
199 | 73 | ||
200 | pushq $__USER_DS | 74 | pushq $__USER_DS |
201 | pushq PER_CPU_VAR(old_rsp) | 75 | pushq PER_CPU_VAR(old_rsp) |
@@ -209,8 +83,10 @@ ENDPATCH(xen_sysret64) | |||
209 | RELOC(xen_sysret64, 1b+1) | 83 | RELOC(xen_sysret64, 1b+1) |
210 | 84 | ||
211 | ENTRY(xen_sysret32) | 85 | ENTRY(xen_sysret32) |
212 | /* We're already on the usermode stack at this point, but still | 86 | /* |
213 | with the kernel gs, so we can easily switch back */ | 87 | * We're already on the usermode stack at this point, but |
88 | * still with the kernel gs, so we can easily switch back | ||
89 | */ | ||
214 | movq %rsp, PER_CPU_VAR(old_rsp) | 90 | movq %rsp, PER_CPU_VAR(old_rsp) |
215 | movq PER_CPU_VAR(kernel_stack), %rsp | 91 | movq PER_CPU_VAR(kernel_stack), %rsp |
216 | 92 | ||
@@ -226,28 +102,27 @@ ENDPATCH(xen_sysret32) | |||
226 | RELOC(xen_sysret32, 1b+1) | 102 | RELOC(xen_sysret32, 1b+1) |
227 | 103 | ||
228 | /* | 104 | /* |
229 | Xen handles syscall callbacks much like ordinary exceptions, | 105 | * Xen handles syscall callbacks much like ordinary exceptions, which |
230 | which means we have: | 106 | * means we have: |
231 | - kernel gs | 107 | * - kernel gs |
232 | - kernel rsp | 108 | * - kernel rsp |
233 | - an iret-like stack frame on the stack (including rcx and r11): | 109 | * - an iret-like stack frame on the stack (including rcx and r11): |
234 | ss | 110 | * ss |
235 | rsp | 111 | * rsp |
236 | rflags | 112 | * rflags |
237 | cs | 113 | * cs |
238 | rip | 114 | * rip |
239 | r11 | 115 | * r11 |
240 | rsp-> rcx | 116 | * rsp->rcx |
241 | 117 | * | |
242 | In all the entrypoints, we undo all that to make it look | 118 | * In all the entrypoints, we undo all that to make it look like a |
243 | like a CPU-generated syscall/sysenter and jump to the normal | 119 | * CPU-generated syscall/sysenter and jump to the normal entrypoint. |
244 | entrypoint. | ||
245 | */ | 120 | */ |
246 | 121 | ||
247 | .macro undo_xen_syscall | 122 | .macro undo_xen_syscall |
248 | mov 0*8(%rsp),%rcx | 123 | mov 0*8(%rsp), %rcx |
249 | mov 1*8(%rsp),%r11 | 124 | mov 1*8(%rsp), %r11 |
250 | mov 5*8(%rsp),%rsp | 125 | mov 5*8(%rsp), %rsp |
251 | .endm | 126 | .endm |
252 | 127 | ||
253 | /* Normal 64-bit system call target */ | 128 | /* Normal 64-bit system call target */ |
@@ -274,7 +149,7 @@ ENDPROC(xen_sysenter_target) | |||
274 | 149 | ||
275 | ENTRY(xen_syscall32_target) | 150 | ENTRY(xen_syscall32_target) |
276 | ENTRY(xen_sysenter_target) | 151 | ENTRY(xen_sysenter_target) |
277 | lea 16(%rsp), %rsp /* strip %rcx,%r11 */ | 152 | lea 16(%rsp), %rsp /* strip %rcx, %r11 */ |
278 | mov $-ENOSYS, %rax | 153 | mov $-ENOSYS, %rax |
279 | pushq $VGCF_in_syscall | 154 | pushq $VGCF_in_syscall |
280 | jmp hypercall_iret | 155 | jmp hypercall_iret |
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index c1f8faf0a2c5..2f5ef2632ea2 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h | |||
@@ -10,9 +10,12 @@ | |||
10 | extern const char xen_hypervisor_callback[]; | 10 | extern const char xen_hypervisor_callback[]; |
11 | extern const char xen_failsafe_callback[]; | 11 | extern const char xen_failsafe_callback[]; |
12 | 12 | ||
13 | extern void *xen_initial_gdt; | ||
14 | |||
13 | struct trap_info; | 15 | struct trap_info; |
14 | void xen_copy_trap_info(struct trap_info *traps); | 16 | void xen_copy_trap_info(struct trap_info *traps); |
15 | 17 | ||
18 | DECLARE_PER_CPU(struct vcpu_info, xen_vcpu_info); | ||
16 | DECLARE_PER_CPU(unsigned long, xen_cr3); | 19 | DECLARE_PER_CPU(unsigned long, xen_cr3); |
17 | DECLARE_PER_CPU(unsigned long, xen_current_cr3); | 20 | DECLARE_PER_CPU(unsigned long, xen_current_cr3); |
18 | 21 | ||
@@ -22,6 +25,13 @@ extern struct shared_info *HYPERVISOR_shared_info; | |||
22 | 25 | ||
23 | void xen_setup_mfn_list_list(void); | 26 | void xen_setup_mfn_list_list(void); |
24 | void xen_setup_shared_info(void); | 27 | void xen_setup_shared_info(void); |
28 | void xen_setup_machphys_mapping(void); | ||
29 | pgd_t *xen_setup_kernel_pagetable(pgd_t *pgd, unsigned long max_pfn); | ||
30 | void xen_ident_map_ISA(void); | ||
31 | void xen_reserve_top(void); | ||
32 | |||
33 | void xen_leave_lazy(void); | ||
34 | void xen_post_allocator_init(void); | ||
25 | 35 | ||
26 | char * __init xen_memory_setup(void); | 36 | char * __init xen_memory_setup(void); |
27 | void __init xen_arch_setup(void); | 37 | void __init xen_arch_setup(void); |