intel-iommu: Kill DMAR_BROKEN_GFX_WA option.

[safe/jmp/linux-2.6] / arch / x86 / Kconfig

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index bd720a6..22a0fd1 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -28,18 +28,32 @@ config X86
        select HAVE_KPROBES
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARCH_WANT_FRAME_POINTERS
        select HAVE_KPROBES
        select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARCH_WANT_FRAME_POINTERS

+       select HAVE_DMA_ATTRS

        select HAVE_KRETPROBES
        select HAVE_FTRACE_MCOUNT_RECORD
        select HAVE_DYNAMIC_FTRACE
        select HAVE_FUNCTION_TRACER
        select HAVE_FUNCTION_GRAPH_TRACER
        select HAVE_KRETPROBES
        select HAVE_FTRACE_MCOUNT_RECORD
        select HAVE_DYNAMIC_FTRACE
        select HAVE_FUNCTION_TRACER
        select HAVE_FUNCTION_GRAPH_TRACER

+       select HAVE_FUNCTION_GRAPH_FP_TEST

        select HAVE_FUNCTION_TRACE_MCOUNT_TEST
        select HAVE_FUNCTION_TRACE_MCOUNT_TEST

+       select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
+       select HAVE_FTRACE_SYSCALLS

        select HAVE_KVM
        select HAVE_ARCH_KGDB
        select HAVE_ARCH_TRACEHOOK
        select HAVE_GENERIC_DMA_COHERENT if X86_32
        select HAVE_EFFICIENT_UNALIGNED_ACCESS
        select USER_STACKTRACE_SUPPORT
        select HAVE_KVM
        select HAVE_ARCH_KGDB
        select HAVE_ARCH_TRACEHOOK
        select HAVE_GENERIC_DMA_COHERENT if X86_32
        select HAVE_EFFICIENT_UNALIGNED_ACCESS
        select USER_STACKTRACE_SUPPORT

+       select HAVE_DMA_API_DEBUG
+       select HAVE_KERNEL_GZIP
+       select HAVE_KERNEL_BZIP2
+       select HAVE_KERNEL_LZMA
+       select HAVE_ARCH_KMEMCHECK
+
+config OUTPUT_FORMAT
+       string
+       default "elf32-i386" if X86_32
+       default "elf64-x86-64" if X86_64

 
 config ARCH_DEFCONFIG
        string
 
 config ARCH_DEFCONFIG
        string


@@ -135,6 +149,9 @@ config ARCH_HAS_CACHE_LINE_SIZE
 config HAVE_SETUP_PER_CPU_AREA
        def_bool y
 
 config HAVE_SETUP_PER_CPU_AREA
        def_bool y
 

+config HAVE_DYNAMIC_PER_CPU_AREA
+       def_bool y
+

 config HAVE_CPUMASK_OF_CPU_MAP
        def_bool X86_64_SMP
 
 config HAVE_CPUMASK_OF_CPU_MAP
        def_bool X86_64_SMP
 


@@ -158,11 +175,17 @@ config AUDIT_ARCH
 config ARCH_SUPPORTS_OPTIMIZED_INLINING
        def_bool y
 
 config ARCH_SUPPORTS_OPTIMIZED_INLINING
        def_bool y
 

+config ARCH_SUPPORTS_DEBUG_PAGEALLOC
+       def_bool y
+

 # Use the generic interrupt handling code in kernel/irq/:
 config GENERIC_HARDIRQS
        bool
        default y
 
 # Use the generic interrupt handling code in kernel/irq/:
 config GENERIC_HARDIRQS
        bool
        default y
 

+config GENERIC_HARDIRQS_NO__DO_IRQ
+       def_bool y
+

 config GENERIC_IRQ_PROBE
        bool
        default y
 config GENERIC_IRQ_PROBE
        bool
        default y


@@ -237,16 +260,13 @@ config SMP
 
 config X86_X2APIC
        bool "Support x2apic"
 
 config X86_X2APIC
        bool "Support x2apic"

-       depends on X86_LOCAL_APIC && X86_64
+       depends on X86_LOCAL_APIC && X86_64 && INTR_REMAP

        ---help---
          This enables x2apic support on CPUs that have this feature.
 
          This allows 32-bit apic IDs (so it can support very large systems),
          and accesses the local apic via MSRs not via mmio.
 
        ---help---
          This enables x2apic support on CPUs that have this feature.
 
          This allows 32-bit apic IDs (so it can support very large systems),
          and accesses the local apic via MSRs not via mmio.
 

-         ( On certain CPU models you may need to enable INTR_REMAP too,
-           to get functional x2apic mode. )
-

          If you don't know what to do here, say N.
 
 config SPARSE_IRQ
          If you don't know what to do here, say N.
 
 config SPARSE_IRQ


@@ -262,14 +282,9 @@ config SPARSE_IRQ
 
          If you don't know what to do here, say N.
 
 
          If you don't know what to do here, say N.
 

-config NUMA_MIGRATE_IRQ_DESC
-       bool "Move irq desc when changing irq smp_affinity"
+config NUMA_IRQ_DESC
+       def_bool y

        depends on SPARSE_IRQ && NUMA
        depends on SPARSE_IRQ && NUMA

-       default n
-       ---help---
-         This enables moving irq_desc to cpu/node that irq will use handled.
-
-         If you don't know what to do here, say N.

 
 config X86_MPPARSE
        bool "Enable MPS table" if ACPI
 
 config X86_MPPARSE
        bool "Enable MPS table" if ACPI


@@ -341,7 +356,8 @@ config X86_UV
        bool "SGI Ultraviolet"
        depends on X86_64
        depends on X86_EXTENDED_PLATFORM
        bool "SGI Ultraviolet"
        depends on X86_64
        depends on X86_EXTENDED_PLATFORM

-       select X86_X2APIC
+       depends on NUMA
+       depends on X86_X2APIC

        ---help---
          This option is needed in order to support SGI Ultraviolet systems.
          If you don't have one of these, you should say N here.
        ---help---
          This option is needed in order to support SGI Ultraviolet systems.
          If you don't have one of these, you should say N here.


@@ -484,6 +500,19 @@ config PARAVIRT
          over full virtualization.  However, when run without a hypervisor
          the kernel is theoretically slower and slightly larger.
 
          over full virtualization.  However, when run without a hypervisor
          the kernel is theoretically slower and slightly larger.
 

+config PARAVIRT_SPINLOCKS
+       bool "Paravirtualization layer for spinlocks"
+       depends on PARAVIRT && SMP && EXPERIMENTAL
+       ---help---
+         Paravirtualized spinlocks allow a pvops backend to replace the
+         spinlock implementation with something virtualization-friendly
+         (for example, block the virtual CPU rather than spinning).
+
+         Unfortunately the downside is an up to 5% performance hit on
+         native kernels, with various workloads.
+
+         If you are unsure how to answer this question, answer N.
+

 config PARAVIRT_CLOCK
        bool
        default n
 config PARAVIRT_CLOCK
        bool
        default n


@@ -651,6 +680,7 @@ config MAXSMP
 
 config NR_CPUS
        int "Maximum number of CPUs" if SMP && !MAXSMP
 
 config NR_CPUS
        int "Maximum number of CPUs" if SMP && !MAXSMP

+       range 2 8 if SMP && X86_32 && !X86_BIGSMP

        range 2 512 if SMP && !MAXSMP
        default "1" if !SMP
        default "4096" if MAXSMP
        range 2 512 if SMP && !MAXSMP
        default "1" if !SMP
        default "4096" if MAXSMP


@@ -712,6 +742,7 @@ config X86_UP_IOAPIC
 config X86_LOCAL_APIC
        def_bool y
        depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC
 config X86_LOCAL_APIC
        def_bool y
        depends on X86_64 || SMP || X86_32_NON_STANDARD || X86_UP_APIC

+       select HAVE_PERF_COUNTERS if (!M386 && !M486)

 
 config X86_IO_APIC
        def_bool y
 
 config X86_IO_APIC
        def_bool y


@@ -761,10 +792,26 @@ config X86_MCE
          to disable it.  MCE support simply ignores non-MCE processors like
          the 386 and 486, so nearly everyone can say Y here.
 
          to disable it.  MCE support simply ignores non-MCE processors like
          the 386 and 486, so nearly everyone can say Y here.
 

+config X86_OLD_MCE
+       depends on X86_32 && X86_MCE
+       bool "Use legacy machine check code (will go away)"
+       default n
+       select X86_ANCIENT_MCE
+       ---help---
+         Use the old i386 machine check code. This is merely intended for
+         testing in a transition period. Try this if you run into any machine
+         check related software problems, but report the problem to
+         linux-kernel.  When in doubt say no.
+
+config X86_NEW_MCE
+       depends on X86_MCE
+       bool
+       default y if (!X86_OLD_MCE && X86_32) || X86_64
+

 config X86_MCE_INTEL
        def_bool y
        prompt "Intel MCE features"
 config X86_MCE_INTEL
        def_bool y
        prompt "Intel MCE features"

-       depends on X86_64 && X86_MCE && X86_LOCAL_APIC
+       depends on X86_NEW_MCE && X86_LOCAL_APIC

        ---help---
           Additional support for intel specific MCE features such as
           the thermal monitor.
        ---help---
           Additional support for intel specific MCE features such as
           the thermal monitor.


@@ -772,19 +819,36 @@ config X86_MCE_INTEL
 config X86_MCE_AMD
        def_bool y
        prompt "AMD MCE features"
 config X86_MCE_AMD
        def_bool y
        prompt "AMD MCE features"

-       depends on X86_64 && X86_MCE && X86_LOCAL_APIC
+       depends on X86_NEW_MCE && X86_LOCAL_APIC

        ---help---
           Additional support for AMD specific MCE features such as
           the DRAM Error Threshold.
 
        ---help---
           Additional support for AMD specific MCE features such as
           the DRAM Error Threshold.
 

+config X86_ANCIENT_MCE
+       def_bool n
+       depends on X86_32
+       prompt "Support for old Pentium 5 / WinChip machine checks"
+       ---help---
+         Include support for machine check handling on old Pentium 5 or WinChip
+         systems. These typically need to be enabled explicitely on the command
+         line.
+

 config X86_MCE_THRESHOLD
        depends on X86_MCE_AMD || X86_MCE_INTEL
        bool
        default y
 
 config X86_MCE_THRESHOLD
        depends on X86_MCE_AMD || X86_MCE_INTEL
        bool
        default y
 

+config X86_MCE_INJECT
+       depends on X86_NEW_MCE
+       tristate "Machine check injector support"
+       ---help---
+         Provide support for injecting machine checks for testing purposes.
+         If you don't know what a machine check is and you don't do kernel
+         QA it is safe to say n.
+

 config X86_MCE_NONFATAL
        tristate "Check for non-fatal errors on AMD Athlon/Duron / Intel Pentium 4"
 config X86_MCE_NONFATAL
        tristate "Check for non-fatal errors on AMD Athlon/Duron / Intel Pentium 4"

-       depends on X86_32 && X86_MCE
+       depends on X86_OLD_MCE

        ---help---
          Enabling this feature starts a timer that triggers every 5 seconds which
          will look at the machine check registers to see if anything happened.
        ---help---
          Enabling this feature starts a timer that triggers every 5 seconds which
          will look at the machine check registers to see if anything happened.


@@ -797,11 +861,15 @@ config X86_MCE_NONFATAL
 
 config X86_MCE_P4THERMAL
        bool "check for P4 thermal throttling interrupt."
 
 config X86_MCE_P4THERMAL
        bool "check for P4 thermal throttling interrupt."

-       depends on X86_32 && X86_MCE && (X86_UP_APIC || SMP)
+       depends on X86_OLD_MCE && X86_MCE && (X86_UP_APIC || SMP)

        ---help---
          Enabling this feature will cause a message to be printed when the P4
          enters thermal throttling.
 
        ---help---
          Enabling this feature will cause a message to be printed when the P4
          enters thermal throttling.
 

+config X86_THERMAL_VECTOR
+       def_bool y
+       depends on X86_MCE_P4THERMAL || X86_MCE_INTEL
+

 config VM86
        bool "Enable VM86 support" if EMBEDDED
        default y
 config VM86
        bool "Enable VM86 support" if EMBEDDED
        default y


@@ -925,6 +993,12 @@ config X86_CPUID
          with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
          /dev/cpu/31/cpuid.
 
          with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
          /dev/cpu/31/cpuid.
 

+config X86_CPU_DEBUG
+       tristate "/sys/kernel/debug/x86/cpu/* - CPU Debug support"
+       ---help---
+         If you select this option, this will provide various x86 CPUs
+         information through debugfs.
+

 choice
        prompt "High Memory Support"
        default HIGHMEM4G if !X86_NUMAQ
 choice
        prompt "High Memory Support"
        default HIGHMEM4G if !X86_NUMAQ


@@ -1117,7 +1191,7 @@ config NUMA_EMU
 
 config NODES_SHIFT
        int "Maximum NUMA Nodes (as a power of 2)" if !MAXSMP
 
 config NODES_SHIFT
        int "Maximum NUMA Nodes (as a power of 2)" if !MAXSMP

-       range 1 9   if X86_64
+       range 1 9

        default "9" if MAXSMP
        default "6" if X86_64
        default "4" if X86_NUMAQ
        default "9" if MAXSMP
        default "6" if X86_64
        default "4" if X86_NUMAQ


@@ -1125,9 +1199,9 @@ config NODES_SHIFT
        depends on NEED_MULTIPLE_NODES
        ---help---
          Specify the maximum number of NUMA Nodes available on the target
        depends on NEED_MULTIPLE_NODES
        ---help---
          Specify the maximum number of NUMA Nodes available on the target

-         system.  Increases memory reserved to accomodate various tables.
+         system.  Increases memory reserved to accommodate various tables.

 
 

-config HAVE_ARCH_BOOTMEM_NODE
+config HAVE_ARCH_BOOTMEM

        def_bool y
        depends on X86_32 && NUMA
 
        def_bool y
        depends on X86_32 && NUMA
 


@@ -1303,7 +1377,7 @@ config MTRR_SANITIZER
          add writeback entries.
 
          Can be disabled with disable_mtrr_cleanup on the kernel command line.
          add writeback entries.
 
          Can be disabled with disable_mtrr_cleanup on the kernel command line.

-         The largest mtrr entry size for a continous block can be set with
+         The largest mtrr entry size for a continuous block can be set with

          mtrr_chunk_size.
 
          If unsure, say Y.
          mtrr_chunk_size.
 
          If unsure, say Y.


@@ -1425,16 +1499,14 @@ config CRASH_DUMP
 config KEXEC_JUMP
        bool "kexec jump (EXPERIMENTAL)"
        depends on EXPERIMENTAL
 config KEXEC_JUMP
        bool "kexec jump (EXPERIMENTAL)"
        depends on EXPERIMENTAL

-       depends on KEXEC && HIBERNATION && X86_32
+       depends on KEXEC && HIBERNATION

        ---help---
          Jump between original kernel and kexeced kernel and invoke
          code in physical address mode via KEXEC
 
 config PHYSICAL_START
        hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
        ---help---
          Jump between original kernel and kexeced kernel and invoke
          code in physical address mode via KEXEC
 
 config PHYSICAL_START
        hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)

-       default "0x1000000" if X86_NUMAQ
-       default "0x200000" if X86_64
-       default "0x100000"
+       default "0x1000000"

        ---help---
          This gives the physical address where the kernel is loaded.
 
        ---help---
          This gives the physical address where the kernel is loaded.
 


@@ -1453,15 +1525,15 @@ config PHYSICAL_START
          to be specifically compiled to run from a specific memory area
          (normally a reserved region) and this option comes handy.
 
          to be specifically compiled to run from a specific memory area
          (normally a reserved region) and this option comes handy.
 

-         So if you are using bzImage for capturing the crash dump, leave
-         the value here unchanged to 0x100000 and set CONFIG_RELOCATABLE=y.
-         Otherwise if you plan to use vmlinux for capturing the crash dump
-         change this value to start of the reserved region (Typically 16MB
-         0x1000000). In other words, it can be set based on the "X" value as
-         specified in the "crashkernel=YM@XM" command line boot parameter
-         passed to the panic-ed kernel. Typically this parameter is set as
-         crashkernel=64M@16M. Please take a look at
-         Documentation/kdump/kdump.txt for more details about crash dumps.
+         So if you are using bzImage for capturing the crash dump,
+         leave the value here unchanged to 0x1000000 and set
+         CONFIG_RELOCATABLE=y.  Otherwise if you plan to use vmlinux
+         for capturing the crash dump change this value to start of
+         the reserved region.  In other words, it can be set based on
+         the "X" value as specified in the "crashkernel=YM@XM"
+         command line boot parameter passed to the panic-ed
+         kernel. Please take a look at Documentation/kdump/kdump.txt
+         for more details about crash dumps.

 
          Usage of bzImage for capturing the crash dump is recommended as
          one does not have to build two kernels. Same kernel can be used
 
          Usage of bzImage for capturing the crash dump is recommended as
          one does not have to build two kernels. Same kernel can be used


@@ -1474,8 +1546,8 @@ config PHYSICAL_START
          Don't change this unless you know what you are doing.
 
 config RELOCATABLE
          Don't change this unless you know what you are doing.
 
 config RELOCATABLE

-       bool "Build a relocatable kernel (EXPERIMENTAL)"
-       depends on EXPERIMENTAL
+       bool "Build a relocatable kernel"
+       default y

        ---help---
          This builds a kernel image that retains relocation information
          so it can be loaded someplace besides the default 1MB.
        ---help---
          This builds a kernel image that retains relocation information
          so it can be loaded someplace besides the default 1MB.


@@ -1490,12 +1562,16 @@ config RELOCATABLE
          it has been loaded at and the compile time physical address
          (CONFIG_PHYSICAL_START) is ignored.
 
          it has been loaded at and the compile time physical address
          (CONFIG_PHYSICAL_START) is ignored.
 

+# Relocation on x86-32 needs some additional build support
+config X86_NEED_RELOCS
+       def_bool y
+       depends on X86_32 && RELOCATABLE
+

 config PHYSICAL_ALIGN
        hex
        prompt "Alignment value to which kernel should be aligned" if X86_32
 config PHYSICAL_ALIGN
        hex
        prompt "Alignment value to which kernel should be aligned" if X86_32

-       default "0x100000" if X86_32
-       default "0x200000" if X86_64
-       range 0x2000 0x400000
+       default "0x1000000"
+       range 0x2000 0x1000000

        ---help---
          This value puts the alignment restrictions on physical address
          where kernel is loaded and run from. Kernel is compiled for an
        ---help---
          This value puts the alignment restrictions on physical address
          where kernel is loaded and run from. Kernel is compiled for an


@@ -1818,8 +1894,8 @@ config PCI_MMCONFIG
 
 config DMAR
        bool "Support for DMA Remapping Devices (EXPERIMENTAL)"
 
 config DMAR
        bool "Support for DMA Remapping Devices (EXPERIMENTAL)"

-       depends on X86_64 && PCI_MSI && ACPI && EXPERIMENTAL
-       ---help---
+       depends on PCI_MSI && ACPI && EXPERIMENTAL
+       help

          DMA remapping (DMAR) devices support enables independent address
          translations for Direct Memory Access (DMA) from devices.
          These DMA remapping devices are reported via ACPI tables
          DMA remapping (DMAR) devices support enables independent address
          translations for Direct Memory Access (DMA) from devices.
          These DMA remapping devices are reported via ACPI tables


@@ -1827,7 +1903,7 @@ config DMAR
          remapping devices.
 
 config DMAR_DEFAULT_ON
          remapping devices.
 
 config DMAR_DEFAULT_ON

-       def_bool n
+       def_bool y

        prompt "Enable DMA Remapping Devices by default"
        depends on DMAR
        help
        prompt "Enable DMA Remapping Devices by default"
        depends on DMAR
        help


@@ -1837,30 +1913,30 @@ config DMAR_DEFAULT_ON
          recommended you say N here while the DMAR code remains
          experimental.
 
          recommended you say N here while the DMAR code remains
          experimental.
 

-config DMAR_GFX_WA
-       def_bool y
-       prompt "Support for Graphics workaround"
-       depends on DMAR
+config DMAR_BROKEN_GFX_WA
+       def_bool n
+       prompt "Workaround broken graphics drivers (going away soon)"
+       depends on DMAR && BROKEN

        ---help---
          Current Graphics drivers tend to use physical address
          for DMA and avoid using DMA APIs. Setting this config
          option permits the IOMMU driver to set a unity map for
          all the OS-visible memory. Hence the driver can continue
        ---help---
          Current Graphics drivers tend to use physical address
          for DMA and avoid using DMA APIs. Setting this config
          option permits the IOMMU driver to set a unity map for
          all the OS-visible memory. Hence the driver can continue

-         to use physical addresses for DMA.
+         to use physical addresses for DMA, at least until this
+         option is removed in the 2.6.32 kernel.

 
 config DMAR_FLOPPY_WA
        def_bool y
        depends on DMAR
        ---help---
 
 config DMAR_FLOPPY_WA
        def_bool y
        depends on DMAR
        ---help---

-         Floppy disk drivers are know to bypass DMA API calls
+         Floppy disk drivers are known to bypass DMA API calls

          thereby failing to work when IOMMU is enabled. This
          workaround will setup a 1:1 mapping for the first
          thereby failing to work when IOMMU is enabled. This
          workaround will setup a 1:1 mapping for the first

-         16M to make floppy (an ISA device) work.
+         16MiB to make floppy (an ISA device) work.

 
 config INTR_REMAP
        bool "Support for Interrupt Remapping (EXPERIMENTAL)"
        depends on X86_64 && X86_IO_APIC && PCI_MSI && ACPI && EXPERIMENTAL
 
 config INTR_REMAP
        bool "Support for Interrupt Remapping (EXPERIMENTAL)"
        depends on X86_64 && X86_IO_APIC && PCI_MSI && ACPI && EXPERIMENTAL

-       select X86_X2APIC

        ---help---
          Supports Interrupt remapping for IO-APIC and MSI devices.
          To use x2apic mode in the CPU's which support x2APIC enhancements or
        ---help---
          Supports Interrupt remapping for IO-APIC and MSI devices.
          To use x2apic mode in the CPU's which support x2APIC enhancements or