Merge branch 'x86-dma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

Pull x86 dma mapping updates from Ingo Molnar:
 "This tree, by Christoph Hellwig, switches over the x86 architecture to
  the generic dma-direct and swiotlb code, and also unifies more of the
  dma-direct code between architectures. The now unused x86-only
  primitives are removed"

* 'x86-dma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  dma-mapping: Don't clear GFP_ZERO in dma_alloc_attrs
  swiotlb: Make swiotlb_{alloc,free}_buffer depend on CONFIG_DMA_DIRECT_OPS
  dma/swiotlb: Remove swiotlb_{alloc,free}_coherent()
  dma/direct: Handle force decryption for DMA coherent buffers in common code
  dma/direct: Handle the memory encryption bit in common code
  dma/swiotlb: Remove swiotlb_set_mem_attributes()
  set_memory.h: Provide set_memory_{en,de}crypted() stubs
  x86/dma: Remove dma_alloc_coherent_gfp_flags()
  iommu/intel-iommu: Enable CONFIG_DMA_DIRECT_OPS=y and clean up intel_{alloc,free}_coherent()
  iommu/amd_iommu: Use CONFIG_DMA_DIRECT_OPS=y and dma_direct_{alloc,free}()
  x86/dma/amd_gart: Use dma_direct_{alloc,free}()
  x86/dma/amd_gart: Look at dev->coherent_dma_mask instead of GFP_DMA
  x86/dma: Use generic swiotlb_ops
  x86/dma: Use DMA-direct (CONFIG_DMA_DIRECT_OPS=y)
  x86/dma: Remove dma_alloc_coherent_mask()

diff --combined arch/x86/Kconfig
index a0fb8bc346d57ddcc3c6f7a8f757482e8ff10f97,5b4899de076f21df801062a672e9ab48801fca1b..27fede43895957b762274f0205eaefbd5d86c131
--- 1/arch/x86/Kconfig
--- 2/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@@ -54,7 -54,6 +54,6 @@@ config X8
        select ARCH_HAS_FORTIFY_SOURCE
        select ARCH_HAS_GCOV_PROFILE_ALL
        select ARCH_HAS_KCOV                    if X86_64
-       select ARCH_HAS_PHYS_TO_DMA
        select ARCH_HAS_MEMBARRIER_SYNC_CORE
        select ARCH_HAS_PMEM_API                if X86_64
        select ARCH_HAS_REFCOUNT
@@@ -83,6 -82,7 +82,7 @@@
        select CLOCKSOURCE_VALIDATE_LAST_CYCLE
        select CLOCKSOURCE_WATCHDOG
        select DCACHE_WORD_ACCESS
+       select DMA_DIRECT_OPS
        select EDAC_ATOMIC_SCRUB
        select EDAC_SUPPORT
        select GENERIC_CLOCKEVENTS
@@@ -393,6 -393,17 +393,6 @@@ config X86_FEATURE_NAME
  
          If in doubt, say Y.
  
 -config X86_FAST_FEATURE_TESTS
 -      bool "Fast CPU feature tests" if EMBEDDED
 -      default y
 -      ---help---
 -        Some fast-paths in the kernel depend on the capabilities of the CPU.
 -        Say Y here for the kernel to patch in the appropriate code at runtime
 -        based on the capabilities of the CPU. The infrastructure for patching
 -        code at runtime takes up some additional space; space-constrained
 -        embedded systems may wish to say N here to produce smaller, slightly
 -        slower code.
 -
  config X86_X2APIC
        bool "Support x2apic"
        depends on X86_LOCAL_APIC && X86_64 && (IRQ_REMAP || HYPERVISOR_GUEST)
@@@ -680,6 -691,7 +680,7 @@@ config X86_SUPPORTS_MEMORY_FAILUR
  config STA2X11
        bool "STA2X11 Companion Chip Support"
        depends on X86_32_NON_STANDARD && PCI
+       select ARCH_HAS_PHYS_TO_DMA
        select X86_DEV_DMA_OPS
        select X86_DMA_REMAP
        select SWIOTLB
@@@ -1597,6 -1609,10 +1598,6 @@@ config ARCH_HAVE_MEMORY_PRESEN
        def_bool y
        depends on X86_32 && DISCONTIGMEM
  
 -config NEED_NODE_MEMMAP_SIZE
 -      def_bool y
 -      depends on X86_32 && (DISCONTIGMEM || SPARSEMEM)
 -
  config ARCH_FLATMEM_ENABLE
        def_bool y
        depends on X86_32 && !NUMA
@@@ -2626,10 -2642,8 +2627,10 @@@ config PCI_DIREC
        depends on PCI && (X86_64 || (PCI_GODIRECT || PCI_GOANY || PCI_GOOLPC || PCI_GOMMCONFIG))
  
  config PCI_MMCONFIG
 -      def_bool y
 -      depends on X86_32 && PCI && (ACPI || SFI) && (PCI_GOMMCONFIG || PCI_GOANY)
 +      bool "Support mmconfig PCI config space access" if X86_64
 +      default y
 +      depends on PCI && (ACPI || SFI || JAILHOUSE_GUEST)
 +      depends on X86_64 || (PCI_GOANY || PCI_GOMMCONFIG)
  
  config PCI_OLPC
        def_bool y
@@@ -2644,9 -2658,9 +2645,9 @@@ config PCI_DOMAIN
        def_bool y
        depends on PCI
  
 -config PCI_MMCONFIG
 -      bool "Support mmconfig PCI config space access"
 -      depends on X86_64 && PCI && ACPI
 +config MMCONF_FAM10H
 +      def_bool y
 +      depends on X86_64 && PCI_MMCONFIG && ACPI
  
  config PCI_CNB20LE_QUIRK
        bool "Read CNB20LE Host Bridge Windows" if EXPERT

diff --combined arch/x86/kernel/Makefile
index 73ccf80c09a2da6e4d0f1ee9a0bd84334e764424,2e8c8a09ecab8c5aaf81bcfc7ca716f51bb9fea7..02d6f5cf4e70800188994e7e64f52916a9d7d83e
--- 1/arch/x86/kernel/Makefile
--- 2/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@@ -57,7 -57,7 +57,7 @@@ obj-$(CONFIG_X86_ESPFIX64)    += espfix_64
  obj-$(CONFIG_SYSFS)   += ksysfs.o
  obj-y                 += bootflag.o e820.o
  obj-y                 += pci-dma.o quirks.o topology.o kdebugfs.o
- obj-y                 += alternative.o i8253.o pci-nommu.o hw_breakpoint.o
+ obj-y                 += alternative.o i8253.o hw_breakpoint.o
  obj-y                 += tsc.o tsc_msr.o io_delay.o rtc.o
  obj-y                 += pci-iommu_table.o
  obj-y                 += resource.o
@@@ -146,6 -146,6 +146,6 @@@ ifeq ($(CONFIG_X86_64),y
        obj-$(CONFIG_GART_IOMMU)        += amd_gart_64.o aperture_64.o
        obj-$(CONFIG_CALGARY_IOMMU)     += pci-calgary_64.o tce_64.o
  
 -      obj-$(CONFIG_PCI_MMCONFIG)      += mmconf-fam10h_64.o
 +      obj-$(CONFIG_MMCONF_FAM10H)     += mmconf-fam10h_64.o
        obj-y                           += vsmp_64.o
  endif