Commit 6d16d6d9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-iommu-for-linus' of... 

Merge branch 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  iommu/core: Fix build with INTR_REMAP=y && CONFIG_DMAR=n
  iommu/amd: Don't use MSI address range for DMA addresses
  iommu/amd: Move missing parts to drivers/iommu
  iommu: Move iommu Kconfig entries to submenu
  x86/ia64: intel-iommu: move to drivers/iommu/
  x86: amd_iommu: move to drivers/iommu/
  msm: iommu: move to drivers/iommu/
  drivers: iommu: move to a dedicated folder
  x86/amd-iommu: Store device alias as dev_data pointer
  x86/amd-iommu: Search for existind dev_data before allocting a new one
  x86/amd-iommu: Allow dev_data->alias to be NULL
  x86/amd-iommu: Use only dev_data in low-level domain attach/detach functions
  x86/amd-iommu: Use only dev_data for dte and iotlb flushing routines
  x86/amd-iommu: Store ATS state in dev_data
  x86/amd-iommu: Store devid in dev_data
  x86/amd-iommu: Introduce global dev_data_list
  x86/amd-iommu: Remove redundant device_flush_dte() calls
  iommu-api: Add missing header file

Fix up trivial conflicts (independent additions close to each other) in
drivers/Makefile and include/linux/pci.h
parents 431bf99d b395fb36

arch/arm/mach-msm/Kconfig

+0 −19
Original line number Diff line number Diff line
@@ -148,22 +148,6 @@ config MACH_MSM8960_RUMI3 


endmenu



config MSM_IOMMU

	bool "MSM IOMMU Support"

	depends on ARCH_MSM8X60 || ARCH_MSM8960

	select IOMMU_API

	default n

	help

	  Support for the IOMMUs found on certain Qualcomm SOCs.

	  These IOMMUs allow virtualization of the address space used by most

	  cores within the multimedia subsystem.



	  If unsure, say N here.



config IOMMU_PGTABLES_L2

	def_bool y

	depends on MSM_IOMMU && MMU && SMP && CPU_DCACHE_DISABLE=n



config MSM_DEBUG_UART

	int

	default 1 if MSM_DEBUG_UART1
@@ -205,9 +189,6 @@ config MSM_GPIOMUX 
config MSM_V2_TLMM

	bool



config IOMMU_API

	bool



config MSM_SCM

	bool

endif

arch/arm/mach-msm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -3,7 +3,7 @@ obj-y += clock.o 
obj-$(CONFIG_DEBUG_FS) += clock-debug.o



obj-$(CONFIG_MSM_VIC) += irq-vic.o

obj-$(CONFIG_MSM_IOMMU) += iommu.o iommu_dev.o devices-iommu.o

obj-$(CONFIG_MSM_IOMMU) += devices-iommu.o



obj-$(CONFIG_ARCH_MSM7X00A) += dma.o irq.o acpuclock-arm11.o

obj-$(CONFIG_ARCH_MSM7X30) += dma.o

arch/ia64/Kconfig

+0 −24
Original line number Diff line number Diff line
@@ -627,27 +627,6 @@ source "drivers/pci/hotplug/Kconfig" 


source "drivers/pcmcia/Kconfig"



config DMAR

        bool "Support for DMA Remapping Devices (EXPERIMENTAL)"

        depends on IA64_GENERIC && 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

	  and include PCI device scope covered by these DMA

	  remapping devices.



config DMAR_DEFAULT_ON

	def_bool y

	prompt "Enable DMA Remapping Devices by default"

	depends on DMAR

	help

	  Selecting this option will enable a DMAR device at boot time if

	  one is found. If this option is not selected, DMAR support can

	  be enabled by passing intel_iommu=on to the kernel. It is

	  recommended you say N here while the DMAR code remains

	  experimental.



endmenu



endif
@@ -681,6 +660,3 @@ source "lib/Kconfig" 


config IOMMU_HELPER

	def_bool (IA64_HP_ZX1 || IA64_HP_ZX1_SWIOTLB || IA64_GENERIC || SWIOTLB)
 


config IOMMU_API

	def_bool (DMAR)

arch/x86/Kconfig

+0 −79
Original line number Diff line number Diff line
@@ -680,33 +680,6 @@ config CALGARY_IOMMU_ENABLED_BY_DEFAULT 
	  Calgary anyway, pass 'iommu=calgary' on the kernel command line.

	  If unsure, say Y.



config AMD_IOMMU

	bool "AMD IOMMU support"

	select SWIOTLB

	select PCI_MSI

	select PCI_IOV

	depends on X86_64 && PCI && ACPI

	---help---

	  With this option you can enable support for AMD IOMMU hardware in

	  your system. An IOMMU is a hardware component which provides

	  remapping of DMA memory accesses from devices. With an AMD IOMMU you

	  can isolate the the DMA memory of different devices and protect the

	  system from misbehaving device drivers or hardware.



	  You can find out if your system has an AMD IOMMU if you look into

	  your BIOS for an option to enable it or if you have an IVRS ACPI

	  table.



config AMD_IOMMU_STATS

	bool "Export AMD IOMMU statistics to debugfs"

	depends on AMD_IOMMU

	select DEBUG_FS

	---help---

	  This option enables code in the AMD IOMMU driver to collect various

	  statistics about whats happening in the driver and exports that

	  information to userspace via debugfs.

	  If unsure, say N.



# need this always selected by IOMMU for the VIA workaround

config SWIOTLB

	def_bool y if X86_64
@@ -720,9 +693,6 @@ config SWIOTLB 
config IOMMU_HELPER

	def_bool (CALGARY_IOMMU || GART_IOMMU || SWIOTLB || AMD_IOMMU)



config IOMMU_API

	def_bool (AMD_IOMMU || DMAR)



config MAXSMP

	bool "Enable Maximum number of SMP Processors and NUMA Nodes"

	depends on X86_64 && SMP && DEBUG_KERNEL && EXPERIMENTAL
@@ -1942,55 +1912,6 @@ config PCI_CNB20LE_QUIRK 


	  You should say N unless you know you need this.



config DMAR

	bool "Support for DMA Remapping Devices (EXPERIMENTAL)"

	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

	  and include PCI device scope covered by these DMA

	  remapping devices.



config DMAR_DEFAULT_ON

	def_bool y

	prompt "Enable DMA Remapping Devices by default"

	depends on DMAR

	help

	  Selecting this option will enable a DMAR device at boot time if

	  one is found. If this option is not selected, DMAR support can

	  be enabled by passing intel_iommu=on to the kernel. It is

	  recommended you say N here while the DMAR code remains

	  experimental.



config DMAR_BROKEN_GFX_WA

	bool "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

	  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---

	  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

	  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

	---help---

	  Supports Interrupt remapping for IO-APIC and MSI devices.

	  To use x2apic mode in the CPU's which support x2APIC enhancements or

	  to support platforms with CPU's having > 8 bit APIC ID, say Y.



source "drivers/pci/pcie/Kconfig"



source "drivers/pci/Kconfig"

arch/x86/kernel/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -123,7 +123,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_AMD_IOMMU)		+= amd_iommu_init.o amd_iommu.o



	obj-$(CONFIG_PCI_MMCONFIG)	+= mmconf-fam10h_64.o

	obj-y				+= vsmp_64.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE