Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 166e9278 authored by Ohad Ben-Cohen's avatar Ohad Ben-Cohen Committed by Joerg Roedel
Browse files

x86/ia64: intel-iommu: move to drivers/iommu/ 



This should ease finding similarities with different platforms,
with the intention of solving problems once in a generic framework
which everyone can use.

Note: to move intel-iommu.c, the declaration of pci_find_upstream_pcie_bridge()
has to move from drivers/pci/pci.h to include/linux/pci.h. This is handled
in this patch, too.

As suggested, also drop DMAR's EXPERIMENTAL tag while we're at it.

Compile-tested on x86_64.

Signed-off-by: default avatarOhad Ben-Cohen <ohad@wizery.com>
Signed-off-by: default avatarJoerg Roedel <joerg.roedel@amd.com>
parent 29b68415

arch/ia64/Kconfig

+0 −21
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

arch/x86/Kconfig

+0 −50
Original line number Diff line number Diff line
@@ -1912,56 +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

	select IOMMU_API

	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"

drivers/iommu/Kconfig

+49 −0
Original line number Diff line number Diff line
@@ -46,3 +46,52 @@ config AMD_IOMMU_STATS 
	  statistics about whats happening in the driver and exports that

	  information to userspace via debugfs.

	  If unsure, say N.



# Intel IOMMU support

config DMAR

	bool "Support for DMA Remapping Devices"

	depends on PCI_MSI && ACPI && (X86 || IA64_GENERIC)

	select IOMMU_API

	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.



config DMAR_BROKEN_GFX_WA

	bool "Workaround broken graphics drivers (going away soon)"

	depends on DMAR && BROKEN && X86

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

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

drivers/iommu/Makefile

+2 −0
Original line number Diff line number Diff line 
obj-$(CONFIG_IOMMU_API) += iommu.o

obj-$(CONFIG_MSM_IOMMU) += msm_iommu.o msm_iommu_dev.o

obj-$(CONFIG_AMD_IOMMU) += amd_iommu.o

obj-$(CONFIG_DMAR) += dmar.o iova.o intel-iommu.o

obj-$(CONFIG_INTR_REMAP) += dmar.o intr_remapping.o

drivers/pci/dmar.c→drivers/iommu/dmar.c

+0 −0

File moved.

View file