diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-07-25 05:37:07 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-25 05:37:07 -0400 |
commit | 0e2f65ee30eee2db054f7fd73f462c5da33ec963 (patch) | |
tree | 26c61eb7745da0c0d9135e9d12088f570cb8530d /arch/x86/Kconfig | |
parent | da7878d75b8520c9ae00d27dfbbce546a7bfdfbb (diff) | |
parent | fb2e405fc1fc8b20d9c78eaa1c7fd5a297efde43 (diff) |
Merge branch 'linus' into x86/pebs
Conflicts:
arch/x86/Kconfig.cpu
arch/x86/kernel/cpu/intel.c
arch/x86/kernel/setup_64.c
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 285 |
1 files changed, 179 insertions, 106 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index e0edaaa6920a..b2ddfcf01728 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -21,8 +21,11 @@ config X86 | |||
21 | select HAVE_UNSTABLE_SCHED_CLOCK | 21 | select HAVE_UNSTABLE_SCHED_CLOCK |
22 | select HAVE_IDE | 22 | select HAVE_IDE |
23 | select HAVE_OPROFILE | 23 | select HAVE_OPROFILE |
24 | select HAVE_IOREMAP_PROT | ||
24 | select HAVE_KPROBES | 25 | select HAVE_KPROBES |
25 | select HAVE_KRETPROBES | 26 | select HAVE_KRETPROBES |
27 | select HAVE_DYNAMIC_FTRACE | ||
28 | select HAVE_FTRACE | ||
26 | select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) | 29 | select HAVE_KVM if ((X86_32 && !X86_VOYAGER && !X86_VISWS && !X86_NUMAQ) || X86_64) |
27 | select HAVE_ARCH_KGDB if !X86_VOYAGER | 30 | select HAVE_ARCH_KGDB if !X86_VOYAGER |
28 | 31 | ||
@@ -121,7 +124,7 @@ config ARCH_HAS_CACHE_LINE_SIZE | |||
121 | def_bool y | 124 | def_bool y |
122 | 125 | ||
123 | config HAVE_SETUP_PER_CPU_AREA | 126 | config HAVE_SETUP_PER_CPU_AREA |
124 | def_bool X86_64 || (X86_SMP && !X86_VOYAGER) | 127 | def_bool X86_64_SMP || (X86_SMP && !X86_VOYAGER) |
125 | 128 | ||
126 | config HAVE_CPUMASK_OF_CPU_MAP | 129 | config HAVE_CPUMASK_OF_CPU_MAP |
127 | def_bool X86_64_SMP | 130 | def_bool X86_64_SMP |
@@ -168,6 +171,7 @@ config GENERIC_PENDING_IRQ | |||
168 | config X86_SMP | 171 | config X86_SMP |
169 | bool | 172 | bool |
170 | depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64) | 173 | depends on SMP && ((X86_32 && !X86_VOYAGER) || X86_64) |
174 | select USE_GENERIC_SMP_HELPERS | ||
171 | default y | 175 | default y |
172 | 176 | ||
173 | config X86_32_SMP | 177 | config X86_32_SMP |
@@ -181,12 +185,12 @@ config X86_64_SMP | |||
181 | config X86_HT | 185 | config X86_HT |
182 | bool | 186 | bool |
183 | depends on SMP | 187 | depends on SMP |
184 | depends on (X86_32 && !(X86_VISWS || X86_VOYAGER)) || X86_64 | 188 | depends on (X86_32 && !X86_VOYAGER) || X86_64 |
185 | default y | 189 | default y |
186 | 190 | ||
187 | config X86_BIOS_REBOOT | 191 | config X86_BIOS_REBOOT |
188 | bool | 192 | bool |
189 | depends on !X86_VISWS && !X86_VOYAGER | 193 | depends on !X86_VOYAGER |
190 | default y | 194 | default y |
191 | 195 | ||
192 | config X86_TRAMPOLINE | 196 | config X86_TRAMPOLINE |
@@ -230,6 +234,26 @@ config SMP | |||
230 | 234 | ||
231 | If you don't know what to do here, say N. | 235 | If you don't know what to do here, say N. |
232 | 236 | ||
237 | config X86_FIND_SMP_CONFIG | ||
238 | def_bool y | ||
239 | depends on X86_MPPARSE || X86_VOYAGER | ||
240 | |||
241 | if ACPI | ||
242 | config X86_MPPARSE | ||
243 | def_bool y | ||
244 | bool "Enable MPS table" | ||
245 | depends on X86_LOCAL_APIC | ||
246 | help | ||
247 | For old smp systems that do not have proper acpi support. Newer systems | ||
248 | (esp with 64bit cpus) with acpi support, MADT and DSDT will override it | ||
249 | endif | ||
250 | |||
251 | if !ACPI | ||
252 | config X86_MPPARSE | ||
253 | def_bool y | ||
254 | depends on X86_LOCAL_APIC | ||
255 | endif | ||
256 | |||
233 | choice | 257 | choice |
234 | prompt "Subarchitecture Type" | 258 | prompt "Subarchitecture Type" |
235 | default X86_PC | 259 | default X86_PC |
@@ -251,7 +275,7 @@ config X86_ELAN | |||
251 | 275 | ||
252 | config X86_VOYAGER | 276 | config X86_VOYAGER |
253 | bool "Voyager (NCR)" | 277 | bool "Voyager (NCR)" |
254 | depends on X86_32 && (SMP || BROKEN) | 278 | depends on X86_32 && (SMP || BROKEN) && !PCI |
255 | help | 279 | help |
256 | Voyager is an MCA-based 32-way capable SMP architecture proprietary | 280 | Voyager is an MCA-based 32-way capable SMP architecture proprietary |
257 | to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based. | 281 | to NCR Corp. Machine classes 345x/35xx/4100/51xx are Voyager-based. |
@@ -261,16 +285,27 @@ config X86_VOYAGER | |||
261 | If you do not specifically know you have a Voyager based machine, | 285 | If you do not specifically know you have a Voyager based machine, |
262 | say N here, otherwise the kernel you build will not be bootable. | 286 | say N here, otherwise the kernel you build will not be bootable. |
263 | 287 | ||
288 | config X86_GENERICARCH | ||
289 | bool "Generic architecture" | ||
290 | depends on X86_32 | ||
291 | help | ||
292 | This option compiles in the NUMAQ, Summit, bigsmp, ES7000, default | ||
293 | subarchitectures. It is intended for a generic binary kernel. | ||
294 | if you select them all, kernel will probe it one by one. and will | ||
295 | fallback to default. | ||
296 | |||
297 | if X86_GENERICARCH | ||
298 | |||
264 | config X86_NUMAQ | 299 | config X86_NUMAQ |
265 | bool "NUMAQ (IBM/Sequent)" | 300 | bool "NUMAQ (IBM/Sequent)" |
266 | depends on SMP && X86_32 | 301 | depends on SMP && X86_32 && PCI && X86_MPPARSE |
267 | select NUMA | 302 | select NUMA |
268 | help | 303 | help |
269 | This option is used for getting Linux to run on a (IBM/Sequent) NUMA | 304 | This option is used for getting Linux to run on a NUMAQ (IBM/Sequent) |
270 | multiquad box. This changes the way that processors are bootstrapped, | 305 | NUMA multiquad box. This changes the way that processors are |
271 | and uses Clustered Logical APIC addressing mode instead of Flat Logical. | 306 | bootstrapped, and uses Clustered Logical APIC addressing mode instead |
272 | You will need a new lynxer.elf file to flash your firmware with - send | 307 | of Flat Logical. You will need a new lynxer.elf file to flash your |
273 | email to <Martin.Bligh@us.ibm.com>. | 308 | firmware with - send email to <Martin.Bligh@us.ibm.com>. |
274 | 309 | ||
275 | config X86_SUMMIT | 310 | config X86_SUMMIT |
276 | bool "Summit/EXA (IBM x440)" | 311 | bool "Summit/EXA (IBM x440)" |
@@ -279,46 +314,21 @@ config X86_SUMMIT | |||
279 | This option is needed for IBM systems that use the Summit/EXA chipset. | 314 | This option is needed for IBM systems that use the Summit/EXA chipset. |
280 | In particular, it is needed for the x440. | 315 | In particular, it is needed for the x440. |
281 | 316 | ||
282 | If you don't have one of these computers, you should say N here. | 317 | config X86_ES7000 |
283 | If you want to build a NUMA kernel, you must select ACPI. | 318 | bool "Support for Unisys ES7000 IA32 series" |
319 | depends on X86_32 && SMP | ||
320 | help | ||
321 | Support for Unisys ES7000 systems. Say 'Y' here if this kernel is | ||
322 | supposed to run on an IA32-based Unisys ES7000 system. | ||
284 | 323 | ||
285 | config X86_BIGSMP | 324 | config X86_BIGSMP |
286 | bool "Support for other sub-arch SMP systems with more than 8 CPUs" | 325 | bool "Support for big SMP systems with more than 8 CPUs" |
287 | depends on X86_32 && SMP | 326 | depends on X86_32 && SMP |
288 | help | 327 | help |
289 | This option is needed for the systems that have more than 8 CPUs | 328 | This option is needed for the systems that have more than 8 CPUs |
290 | and if the system is not of any sub-arch type above. | 329 | and if the system is not of any sub-arch type above. |
291 | 330 | ||
292 | If you don't have such a system, you should say N here. | 331 | endif |
293 | |||
294 | config X86_VISWS | ||
295 | bool "SGI 320/540 (Visual Workstation)" | ||
296 | depends on X86_32 | ||
297 | help | ||
298 | The SGI Visual Workstation series is an IA32-based workstation | ||
299 | based on SGI systems chips with some legacy PC hardware attached. | ||
300 | |||
301 | Say Y here to create a kernel to run on the SGI 320 or 540. | ||
302 | |||
303 | A kernel compiled for the Visual Workstation will not run on PCs | ||
304 | and vice versa. See <file:Documentation/sgi-visws.txt> for details. | ||
305 | |||
306 | config X86_GENERICARCH | ||
307 | bool "Generic architecture (Summit, bigsmp, ES7000, default)" | ||
308 | depends on X86_32 | ||
309 | help | ||
310 | This option compiles in the Summit, bigsmp, ES7000, default subarchitectures. | ||
311 | It is intended for a generic binary kernel. | ||
312 | If you want a NUMA kernel, select ACPI. We need SRAT for NUMA. | ||
313 | |||
314 | config X86_ES7000 | ||
315 | bool "Support for Unisys ES7000 IA32 series" | ||
316 | depends on X86_32 && SMP | ||
317 | help | ||
318 | Support for Unisys ES7000 systems. Say 'Y' here if this kernel is | ||
319 | supposed to run on an IA32-based Unisys ES7000 system. | ||
320 | Only choose this option if you have such a system, otherwise you | ||
321 | should say N here. | ||
322 | 332 | ||
323 | config X86_RDC321X | 333 | config X86_RDC321X |
324 | bool "RDC R-321x SoC" | 334 | bool "RDC R-321x SoC" |
@@ -337,7 +347,7 @@ config X86_RDC321X | |||
337 | config X86_VSMP | 347 | config X86_VSMP |
338 | bool "Support for ScaleMP vSMP" | 348 | bool "Support for ScaleMP vSMP" |
339 | select PARAVIRT | 349 | select PARAVIRT |
340 | depends on X86_64 | 350 | depends on X86_64 && PCI |
341 | help | 351 | help |
342 | Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is | 352 | Support for ScaleMP vSMP systems. Say 'Y' here if this kernel is |
343 | supposed to run on these EM64T-based machines. Only choose this option | 353 | supposed to run on these EM64T-based machines. Only choose this option |
@@ -345,6 +355,18 @@ config X86_VSMP | |||
345 | 355 | ||
346 | endchoice | 356 | endchoice |
347 | 357 | ||
358 | config X86_VISWS | ||
359 | bool "SGI 320/540 (Visual Workstation)" | ||
360 | depends on X86_32 && PCI && !X86_VOYAGER && X86_MPPARSE && PCI_GODIRECT | ||
361 | help | ||
362 | The SGI Visual Workstation series is an IA32-based workstation | ||
363 | based on SGI systems chips with some legacy PC hardware attached. | ||
364 | |||
365 | Say Y here to create a kernel to run on the SGI 320 or 540. | ||
366 | |||
367 | A kernel compiled for the Visual Workstation will run on general | ||
368 | PCs as well. See <file:Documentation/sgi-visws.txt> for details. | ||
369 | |||
348 | config SCHED_NO_NO_OMIT_FRAME_POINTER | 370 | config SCHED_NO_NO_OMIT_FRAME_POINTER |
349 | def_bool y | 371 | def_bool y |
350 | prompt "Single-depth WCHAN output" | 372 | prompt "Single-depth WCHAN output" |
@@ -373,7 +395,7 @@ config VMI | |||
373 | bool "VMI Guest support" | 395 | bool "VMI Guest support" |
374 | select PARAVIRT | 396 | select PARAVIRT |
375 | depends on X86_32 | 397 | depends on X86_32 |
376 | depends on !(X86_VISWS || X86_VOYAGER) | 398 | depends on !X86_VOYAGER |
377 | help | 399 | help |
378 | VMI provides a paravirtualized interface to the VMware ESX server | 400 | VMI provides a paravirtualized interface to the VMware ESX server |
379 | (it could be used by other hypervisors in theory too, but is not | 401 | (it could be used by other hypervisors in theory too, but is not |
@@ -384,7 +406,7 @@ config KVM_CLOCK | |||
384 | bool "KVM paravirtualized clock" | 406 | bool "KVM paravirtualized clock" |
385 | select PARAVIRT | 407 | select PARAVIRT |
386 | select PARAVIRT_CLOCK | 408 | select PARAVIRT_CLOCK |
387 | depends on !(X86_VISWS || X86_VOYAGER) | 409 | depends on !X86_VOYAGER |
388 | help | 410 | help |
389 | Turning on this option will allow you to run a paravirtualized clock | 411 | Turning on this option will allow you to run a paravirtualized clock |
390 | when running over the KVM hypervisor. Instead of relying on a PIT | 412 | when running over the KVM hypervisor. Instead of relying on a PIT |
@@ -395,7 +417,7 @@ config KVM_CLOCK | |||
395 | config KVM_GUEST | 417 | config KVM_GUEST |
396 | bool "KVM Guest support" | 418 | bool "KVM Guest support" |
397 | select PARAVIRT | 419 | select PARAVIRT |
398 | depends on !(X86_VISWS || X86_VOYAGER) | 420 | depends on !X86_VOYAGER |
399 | help | 421 | help |
400 | This option enables various optimizations for running under the KVM | 422 | This option enables various optimizations for running under the KVM |
401 | hypervisor. | 423 | hypervisor. |
@@ -404,7 +426,7 @@ source "arch/x86/lguest/Kconfig" | |||
404 | 426 | ||
405 | config PARAVIRT | 427 | config PARAVIRT |
406 | bool "Enable paravirtualization code" | 428 | bool "Enable paravirtualization code" |
407 | depends on !(X86_VISWS || X86_VOYAGER) | 429 | depends on !X86_VOYAGER |
408 | help | 430 | help |
409 | This changes the kernel so it can modify itself when it is run | 431 | This changes the kernel so it can modify itself when it is run |
410 | under a hypervisor, potentially improving performance significantly | 432 | under a hypervisor, potentially improving performance significantly |
@@ -417,51 +439,31 @@ config PARAVIRT_CLOCK | |||
417 | 439 | ||
418 | endif | 440 | endif |
419 | 441 | ||
420 | config MEMTEST_BOOTPARAM | 442 | config PARAVIRT_DEBUG |
421 | bool "Memtest boot parameter" | 443 | bool "paravirt-ops debugging" |
422 | depends on X86_64 | 444 | depends on PARAVIRT && DEBUG_KERNEL |
423 | default y | 445 | help |
424 | help | 446 | Enable to debug paravirt_ops internals. Specifically, BUG if |
425 | This option adds a kernel parameter 'memtest', which allows memtest | 447 | a paravirt_op is missing when it is called. |
426 | to be disabled at boot. If this option is selected, memtest | ||
427 | functionality can be disabled with memtest=0 on the kernel | ||
428 | command line. The purpose of this option is to allow a single | ||
429 | kernel image to be distributed with memtest built in, but not | ||
430 | necessarily enabled. | ||
431 | |||
432 | If you are unsure how to answer this question, answer Y. | ||
433 | 448 | ||
434 | config MEMTEST_BOOTPARAM_VALUE | 449 | config MEMTEST |
435 | int "Memtest boot parameter default value (0-4)" | 450 | bool "Memtest" |
436 | depends on MEMTEST_BOOTPARAM | ||
437 | range 0 4 | ||
438 | default 0 | ||
439 | help | 451 | help |
440 | This option sets the default value for the kernel parameter | 452 | This option adds a kernel parameter 'memtest', which allows memtest |
441 | 'memtest', which allows memtest to be disabled at boot. If this | 453 | to be set. |
442 | option is set to 0 (zero), the memtest kernel parameter will | 454 | memtest=0, mean disabled; -- default |
443 | default to 0, disabling memtest at bootup. If this option is | 455 | memtest=1, mean do 1 test pattern; |
444 | set to 4, the memtest kernel parameter will default to 4, | 456 | ... |
445 | enabling memtest at bootup, and use that as pattern number. | 457 | memtest=4, mean do 4 test patterns. |
446 | 458 | If you are unsure how to answer this question, answer N. | |
447 | If you are unsure how to answer this question, answer 0. | ||
448 | |||
449 | config ACPI_SRAT | ||
450 | def_bool y | ||
451 | depends on X86_32 && ACPI && NUMA && (X86_SUMMIT || X86_GENERICARCH) | ||
452 | select ACPI_NUMA | ||
453 | |||
454 | config HAVE_ARCH_PARSE_SRAT | ||
455 | def_bool y | ||
456 | depends on ACPI_SRAT | ||
457 | 459 | ||
458 | config X86_SUMMIT_NUMA | 460 | config X86_SUMMIT_NUMA |
459 | def_bool y | 461 | def_bool y |
460 | depends on X86_32 && NUMA && (X86_SUMMIT || X86_GENERICARCH) | 462 | depends on X86_32 && NUMA && X86_GENERICARCH |
461 | 463 | ||
462 | config X86_CYCLONE_TIMER | 464 | config X86_CYCLONE_TIMER |
463 | def_bool y | 465 | def_bool y |
464 | depends on X86_32 && X86_SUMMIT || X86_GENERICARCH | 466 | depends on X86_GENERICARCH |
465 | 467 | ||
466 | config ES7000_CLUSTERED_APIC | 468 | config ES7000_CLUSTERED_APIC |
467 | def_bool y | 469 | def_bool y |
@@ -549,6 +551,21 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT | |||
549 | Calgary anyway, pass 'iommu=calgary' on the kernel command line. | 551 | Calgary anyway, pass 'iommu=calgary' on the kernel command line. |
550 | If unsure, say Y. | 552 | If unsure, say Y. |
551 | 553 | ||
554 | config AMD_IOMMU | ||
555 | bool "AMD IOMMU support" | ||
556 | select SWIOTLB | ||
557 | depends on X86_64 && PCI && ACPI | ||
558 | help | ||
559 | With this option you can enable support for AMD IOMMU hardware in | ||
560 | your system. An IOMMU is a hardware component which provides | ||
561 | remapping of DMA memory accesses from devices. With an AMD IOMMU you | ||
562 | can isolate the the DMA memory of different devices and protect the | ||
563 | system from misbehaving device drivers or hardware. | ||
564 | |||
565 | You can find out if your system has an AMD IOMMU if you look into | ||
566 | your BIOS for an option to enable it or if you have an IVRS ACPI | ||
567 | table. | ||
568 | |||
552 | # need this always selected by IOMMU for the VIA workaround | 569 | # need this always selected by IOMMU for the VIA workaround |
553 | config SWIOTLB | 570 | config SWIOTLB |
554 | bool | 571 | bool |
@@ -560,21 +577,36 @@ config SWIOTLB | |||
560 | 3 GB of memory. If unsure, say Y. | 577 | 3 GB of memory. If unsure, say Y. |
561 | 578 | ||
562 | config IOMMU_HELPER | 579 | config IOMMU_HELPER |
563 | def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB) | 580 | def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU) |
581 | config MAXSMP | ||
582 | bool "Configure Maximum number of SMP Processors and NUMA Nodes" | ||
583 | depends on X86_64 && SMP | ||
584 | default n | ||
585 | help | ||
586 | Configure maximum number of CPUS and NUMA Nodes for this architecture. | ||
587 | If unsure, say N. | ||
564 | 588 | ||
589 | if MAXSMP | ||
565 | config NR_CPUS | 590 | config NR_CPUS |
566 | int "Maximum number of CPUs (2-255)" | 591 | int |
567 | range 2 255 | 592 | default "4096" |
593 | endif | ||
594 | |||
595 | if !MAXSMP | ||
596 | config NR_CPUS | ||
597 | int "Maximum number of CPUs (2-4096)" | ||
598 | range 2 4096 | ||
568 | depends on SMP | 599 | depends on SMP |
569 | default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000 | 600 | default "32" if X86_NUMAQ || X86_SUMMIT || X86_BIGSMP || X86_ES7000 |
570 | default "8" | 601 | default "8" |
571 | help | 602 | help |
572 | This allows you to specify the maximum number of CPUs which this | 603 | This allows you to specify the maximum number of CPUs which this |
573 | kernel will support. The maximum supported value is 255 and the | 604 | kernel will support. The maximum supported value is 4096 and the |
574 | minimum value which makes sense is 2. | 605 | minimum value which makes sense is 2. |
575 | 606 | ||
576 | This is purely to save memory - each supported CPU adds | 607 | This is purely to save memory - each supported CPU adds |
577 | approximately eight kilobytes to the kernel image. | 608 | approximately eight kilobytes to the kernel image. |
609 | endif | ||
578 | 610 | ||
579 | config SCHED_SMT | 611 | config SCHED_SMT |
580 | bool "SMT (Hyperthreading) scheduler support" | 612 | bool "SMT (Hyperthreading) scheduler support" |
@@ -598,7 +630,7 @@ source "kernel/Kconfig.preempt" | |||
598 | 630 | ||
599 | config X86_UP_APIC | 631 | config X86_UP_APIC |
600 | bool "Local APIC support on uniprocessors" | 632 | bool "Local APIC support on uniprocessors" |
601 | depends on X86_32 && !SMP && !(X86_VISWS || X86_VOYAGER || X86_GENERICARCH) | 633 | depends on X86_32 && !SMP && !(X86_VOYAGER || X86_GENERICARCH) |
602 | help | 634 | help |
603 | A local APIC (Advanced Programmable Interrupt Controller) is an | 635 | A local APIC (Advanced Programmable Interrupt Controller) is an |
604 | integrated interrupt controller in the CPU. If you have a single-CPU | 636 | integrated interrupt controller in the CPU. If you have a single-CPU |
@@ -623,11 +655,11 @@ config X86_UP_IOAPIC | |||
623 | 655 | ||
624 | config X86_LOCAL_APIC | 656 | config X86_LOCAL_APIC |
625 | def_bool y | 657 | def_bool y |
626 | depends on X86_64 || (X86_32 && (X86_UP_APIC || ((X86_VISWS || SMP) && !X86_VOYAGER) || X86_GENERICARCH)) | 658 | depends on X86_64 || (X86_32 && (X86_UP_APIC || (SMP && !X86_VOYAGER) || X86_GENERICARCH)) |
627 | 659 | ||
628 | config X86_IO_APIC | 660 | config X86_IO_APIC |
629 | def_bool y | 661 | def_bool y |
630 | depends on X86_64 || (X86_32 && (X86_UP_IOAPIC || (SMP && !(X86_VISWS || X86_VOYAGER)) || X86_GENERICARCH)) | 662 | depends on X86_64 || (X86_32 && (X86_UP_IOAPIC || (SMP && !X86_VOYAGER) || X86_GENERICARCH)) |
631 | 663 | ||
632 | config X86_VISWS_APIC | 664 | config X86_VISWS_APIC |
633 | def_bool y | 665 | def_bool y |
@@ -681,7 +713,7 @@ config X86_MCE_NONFATAL | |||
681 | 713 | ||
682 | config X86_MCE_P4THERMAL | 714 | config X86_MCE_P4THERMAL |
683 | bool "check for P4 thermal throttling interrupt." | 715 | bool "check for P4 thermal throttling interrupt." |
684 | depends on X86_32 && X86_MCE && (X86_UP_APIC || SMP) && !X86_VISWS | 716 | depends on X86_32 && X86_MCE && (X86_UP_APIC || SMP) |
685 | help | 717 | help |
686 | Enabling this feature will cause a message to be printed when the P4 | 718 | Enabling this feature will cause a message to be printed when the P4 |
687 | enters thermal throttling. | 719 | enters thermal throttling. |
@@ -911,9 +943,9 @@ config X86_PAE | |||
911 | config NUMA | 943 | config NUMA |
912 | bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)" | 944 | bool "Numa Memory Allocation and Scheduler Support (EXPERIMENTAL)" |
913 | depends on SMP | 945 | depends on SMP |
914 | depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || (X86_SUMMIT || X86_GENERICARCH) && ACPI) && EXPERIMENTAL) | 946 | depends on X86_64 || (X86_32 && HIGHMEM64G && (X86_NUMAQ || X86_BIGSMP || X86_SUMMIT && ACPI) && EXPERIMENTAL) |
915 | default n if X86_PC | 947 | default n if X86_PC |
916 | default y if (X86_NUMAQ || X86_SUMMIT) | 948 | default y if (X86_NUMAQ || X86_SUMMIT || X86_BIGSMP) |
917 | help | 949 | help |
918 | Enable NUMA (Non Uniform Memory Access) support. | 950 | Enable NUMA (Non Uniform Memory Access) support. |
919 | The kernel will try to allocate memory used by a CPU on the | 951 | The kernel will try to allocate memory used by a CPU on the |
@@ -965,13 +997,25 @@ config NUMA_EMU | |||
965 | into virtual nodes when booted with "numa=fake=N", where N is the | 997 | into virtual nodes when booted with "numa=fake=N", where N is the |
966 | number of nodes. This is only useful for debugging. | 998 | number of nodes. This is only useful for debugging. |
967 | 999 | ||
1000 | if MAXSMP | ||
1001 | |||
968 | config NODES_SHIFT | 1002 | config NODES_SHIFT |
969 | int "Max num nodes shift(1-15)" | 1003 | int |
970 | range 1 15 if X86_64 | 1004 | default "9" |
1005 | endif | ||
1006 | |||
1007 | if !MAXSMP | ||
1008 | config NODES_SHIFT | ||
1009 | int "Maximum NUMA Nodes (as a power of 2)" | ||
1010 | range 1 9 if X86_64 | ||
971 | default "6" if X86_64 | 1011 | default "6" if X86_64 |
972 | default "4" if X86_NUMAQ | 1012 | default "4" if X86_NUMAQ |
973 | default "3" | 1013 | default "3" |
974 | depends on NEED_MULTIPLE_NODES | 1014 | depends on NEED_MULTIPLE_NODES |
1015 | help | ||
1016 | Specify the maximum number of NUMA Nodes available on the target | ||
1017 | system. Increases memory reserved to accomodate various tables. | ||
1018 | endif | ||
975 | 1019 | ||
976 | config HAVE_ARCH_BOOTMEM_NODE | 1020 | config HAVE_ARCH_BOOTMEM_NODE |
977 | def_bool y | 1021 | def_bool y |
@@ -1090,6 +1134,37 @@ config MTRR | |||
1090 | 1134 | ||
1091 | See <file:Documentation/mtrr.txt> for more information. | 1135 | See <file:Documentation/mtrr.txt> for more information. |
1092 | 1136 | ||
1137 | config MTRR_SANITIZER | ||
1138 | bool | ||
1139 | prompt "MTRR cleanup support" | ||
1140 | depends on MTRR | ||
1141 | help | ||
1142 | Convert MTRR layout from continuous to discrete, so X drivers can | ||
1143 | add writeback entries. | ||
1144 | |||
1145 | Can be disabled with disable_mtrr_cleanup on the kernel command line. | ||
1146 | The largest mtrr entry size for a continous block can be set with | ||
1147 | mtrr_chunk_size. | ||
1148 | |||
1149 | If unsure, say N. | ||
1150 | |||
1151 | config MTRR_SANITIZER_ENABLE_DEFAULT | ||
1152 | int "MTRR cleanup enable value (0-1)" | ||
1153 | range 0 1 | ||
1154 | default "0" | ||
1155 | depends on MTRR_SANITIZER | ||
1156 | help | ||
1157 | Enable mtrr cleanup default value | ||
1158 | |||
1159 | config MTRR_SANITIZER_SPARE_REG_NR_DEFAULT | ||
1160 | int "MTRR cleanup spare reg num (0-7)" | ||
1161 | range 0 7 | ||
1162 | default "1" | ||
1163 | depends on MTRR_SANITIZER | ||
1164 | help | ||
1165 | mtrr cleanup spare entries default, it can be changed via | ||
1166 | mtrr_spare_reg_nr=N on the kernel command line. | ||
1167 | |||
1093 | config X86_PAT | 1168 | config X86_PAT |
1094 | bool | 1169 | bool |
1095 | prompt "x86 PAT support" | 1170 | prompt "x86 PAT support" |
@@ -1190,7 +1265,6 @@ config KEXEC | |||
1190 | 1265 | ||
1191 | config CRASH_DUMP | 1266 | config CRASH_DUMP |
1192 | bool "kernel crash dumps (EXPERIMENTAL)" | 1267 | bool "kernel crash dumps (EXPERIMENTAL)" |
1193 | depends on EXPERIMENTAL | ||
1194 | depends on X86_64 || (X86_32 && HIGHMEM) | 1268 | depends on X86_64 || (X86_32 && HIGHMEM) |
1195 | help | 1269 | help |
1196 | Generate crash dump after being started by kexec. | 1270 | Generate crash dump after being started by kexec. |
@@ -1339,7 +1413,7 @@ config X86_APM_BOOT | |||
1339 | 1413 | ||
1340 | menuconfig APM | 1414 | menuconfig APM |
1341 | tristate "APM (Advanced Power Management) BIOS support" | 1415 | tristate "APM (Advanced Power Management) BIOS support" |
1342 | depends on X86_32 && PM_SLEEP && !X86_VISWS | 1416 | depends on X86_32 && PM_SLEEP |
1343 | ---help--- | 1417 | ---help--- |
1344 | APM is a BIOS specification for saving power using several different | 1418 | APM is a BIOS specification for saving power using several different |
1345 | techniques. This is mostly useful for battery powered laptops with | 1419 | techniques. This is mostly useful for battery powered laptops with |
@@ -1475,8 +1549,7 @@ endmenu | |||
1475 | menu "Bus options (PCI etc.)" | 1549 | menu "Bus options (PCI etc.)" |
1476 | 1550 | ||
1477 | config PCI | 1551 | config PCI |
1478 | bool "PCI support" if !X86_VISWS && !X86_VSMP | 1552 | bool "PCI support" |
1479 | depends on !X86_VOYAGER | ||
1480 | default y | 1553 | default y |
1481 | select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC) | 1554 | select ARCH_SUPPORTS_MSI if (X86_LOCAL_APIC && X86_IO_APIC) |
1482 | help | 1555 | help |
@@ -1487,7 +1560,7 @@ config PCI | |||
1487 | 1560 | ||
1488 | choice | 1561 | choice |
1489 | prompt "PCI access mode" | 1562 | prompt "PCI access mode" |
1490 | depends on X86_32 && PCI && !X86_VISWS | 1563 | depends on X86_32 && PCI |
1491 | default PCI_GOANY | 1564 | default PCI_GOANY |
1492 | ---help--- | 1565 | ---help--- |
1493 | On PCI systems, the BIOS can be used to detect the PCI devices and | 1566 | On PCI systems, the BIOS can be used to detect the PCI devices and |
@@ -1524,12 +1597,12 @@ endchoice | |||
1524 | 1597 | ||
1525 | config PCI_BIOS | 1598 | config PCI_BIOS |
1526 | def_bool y | 1599 | def_bool y |
1527 | depends on X86_32 && !X86_VISWS && PCI && (PCI_GOBIOS || PCI_GOANY) | 1600 | depends on X86_32 && PCI && (PCI_GOBIOS || PCI_GOANY) |
1528 | 1601 | ||
1529 | # x86-64 doesn't support PCI BIOS access from long mode so always go direct. | 1602 | # x86-64 doesn't support PCI BIOS access from long mode so always go direct. |
1530 | config PCI_DIRECT | 1603 | config PCI_DIRECT |
1531 | def_bool y | 1604 | def_bool y |
1532 | depends on PCI && (X86_64 || (PCI_GODIRECT || PCI_GOANY || PCI_GOOLPC) || X86_VISWS) | 1605 | depends on PCI && (X86_64 || (PCI_GODIRECT || PCI_GOANY || PCI_GOOLPC)) |
1533 | 1606 | ||
1534 | config PCI_MMCONFIG | 1607 | config PCI_MMCONFIG |
1535 | def_bool y | 1608 | def_bool y |
@@ -1589,7 +1662,7 @@ if X86_32 | |||
1589 | 1662 | ||
1590 | config ISA | 1663 | config ISA |
1591 | bool "ISA support" | 1664 | bool "ISA support" |
1592 | depends on !(X86_VOYAGER || X86_VISWS) | 1665 | depends on !X86_VOYAGER |
1593 | help | 1666 | help |
1594 | Find out whether you have ISA slots on your motherboard. ISA is the | 1667 | Find out whether you have ISA slots on your motherboard. ISA is the |
1595 | name of a bus system, i.e. the way the CPU talks to the other stuff | 1668 | name of a bus system, i.e. the way the CPU talks to the other stuff |
@@ -1616,7 +1689,7 @@ config EISA | |||
1616 | source "drivers/eisa/Kconfig" | 1689 | source "drivers/eisa/Kconfig" |
1617 | 1690 | ||
1618 | config MCA | 1691 | config MCA |
1619 | bool "MCA support" if !(X86_VISWS || X86_VOYAGER) | 1692 | bool "MCA support" if !X86_VOYAGER |
1620 | default y if X86_VOYAGER | 1693 | default y if X86_VOYAGER |
1621 | help | 1694 | help |
1622 | MicroChannel Architecture is found in some IBM PS/2 machines and | 1695 | MicroChannel Architecture is found in some IBM PS/2 machines and |