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 e25b635..22a0fd1 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -28,11 +28,13 @@ 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_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
        select HAVE_FTRACE_SYSCALLS
        select HAVE_FUNCTION_TRACE_MCOUNT_TEST
        select HAVE_FTRACE_NMI_ENTER if DYNAMIC_FTRACE
        select HAVE_FTRACE_SYSCALLS


@@ -46,6 +48,12 @@ config X86
        select HAVE_KERNEL_GZIP
        select HAVE_KERNEL_BZIP2
        select HAVE_KERNEL_LZMA
        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


@@ -274,15 +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

-       depends on BROKEN
-       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


@@ -355,7 +357,7 @@ config X86_UV
        depends on X86_64
        depends on X86_EXTENDED_PLATFORM
        depends on NUMA
        depends on X86_64
        depends on X86_EXTENDED_PLATFORM
        depends on NUMA

-       select X86_X2APIC
+       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.


@@ -740,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


@@ -822,13 +825,13 @@ config X86_MCE_AMD
           the DRAM Error Threshold.
 
 config X86_ANCIENT_MCE
           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.
+       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
 
 config X86_MCE_THRESHOLD
        depends on X86_MCE_AMD || X86_MCE_INTEL


@@ -1503,9 +1506,7 @@ config KEXEC_JUMP
 
 config PHYSICAL_START
        hex "Physical address where the kernel is loaded" if (EMBEDDED || CRASH_DUMP)
 
 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.
 


@@ -1524,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


@@ -1545,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.


@@ -1561,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


@@ -1908,25 +1913,26 @@ 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)"
 
 config INTR_REMAP
        bool "Support for Interrupt Remapping (EXPERIMENTAL)"