Commit ab65ba57 authored by Jerry Snitselaar's avatar Jerry Snitselaar Committed by Joerg Roedel
Browse files

iommu/vt-d: Move Kconfig and Makefile bits down into intel directory 



Move Intel Kconfig and Makefile bits down into intel directory
with the rest of the Intel specific files.

Signed-off-by: default avatarJerry Snitselaar <jsnitsel@redhat.com>
Reviewed-by: default avatarLu Baolu <baolu.lu@linux.intel.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Lu Baolu <baolu.lu@linux.intel.com>
Link: https://lore.kernel.org/r/20200630200636.48600-2-jsnitsel@redhat.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent f34ce7a7

drivers/iommu/Kconfig

+1 −85
Original line number Diff line number Diff line
@@ -172,91 +172,7 @@ config AMD_IOMMU_DEBUGFS 
	  This option is -NOT- intended for production environments, and should

	  not generally be enabled.



# Intel IOMMU support

config DMAR_TABLE

	bool



config INTEL_IOMMU

	bool "Support for Intel IOMMU using DMA Remapping Devices"

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

	select IOMMU_API

	select IOMMU_IOVA

	select NEED_DMA_MAP_STATE

	select DMAR_TABLE

	select SWIOTLB

	select IOASID

	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 INTEL_IOMMU_DEBUGFS

	bool "Export Intel IOMMU internals in Debugfs"

	depends on INTEL_IOMMU && IOMMU_DEBUGFS

	help

	  !!!WARNING!!!



	  DO NOT ENABLE THIS OPTION UNLESS YOU REALLY KNOW WHAT YOU ARE DOING!!!



	  Expose Intel IOMMU internals in Debugfs.



	  This option is -NOT- intended for production environments, and should

	  only be enabled for debugging Intel IOMMU.



config INTEL_IOMMU_SVM

	bool "Support for Shared Virtual Memory with Intel IOMMU"

	depends on INTEL_IOMMU && X86_64

	select PCI_PASID

	select PCI_PRI

	select MMU_NOTIFIER

	select IOASID

	help

	  Shared Virtual Memory (SVM) provides a facility for devices

	  to access DMA resources through process address space by

	  means of a Process Address Space ID (PASID).



config INTEL_IOMMU_DEFAULT_ON

	def_bool y

	prompt "Enable Intel DMA Remapping Devices by default"

	depends on INTEL_IOMMU

	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 INTEL_IOMMU_BROKEN_GFX_WA

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

	depends on INTEL_IOMMU && 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 INTEL_IOMMU_FLOPPY_WA

	def_bool y

	depends on INTEL_IOMMU && 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 INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON

	bool "Enable Intel IOMMU scalable mode by default"

	depends on INTEL_IOMMU

	help

	  Selecting this option will enable by default the scalable mode if

	  hardware presents the capability. The scalable mode is defined in

	  VT-d 3.0. The scalable mode capability could be checked by reading

	  /sys/devices/virtual/iommu/dmar*/intel-iommu/ecap. If this option

	  is not selected, scalable mode support could also be enabled by

	  passing intel_iommu=sm_on to the kernel. If not sure, please use

	  the default value.

source "drivers/iommu/intel/Kconfig"



config IRQ_REMAP

	bool "Support for Interrupt Remapping"

drivers/iommu/Makefile

+2 −6
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-y += intel/

obj-$(CONFIG_IOMMU_API) += iommu.o

obj-$(CONFIG_IOMMU_API) += iommu-traces.o

obj-$(CONFIG_IOMMU_API) += iommu-sysfs.o
@@ -17,13 +18,8 @@ obj-$(CONFIG_AMD_IOMMU_V2) += amd/iommu_v2.o 
obj-$(CONFIG_ARM_SMMU) += arm_smmu.o

arm_smmu-objs += arm-smmu.o arm-smmu-impl.o arm-smmu-qcom.o

obj-$(CONFIG_ARM_SMMU_V3) += arm-smmu-v3.o

obj-$(CONFIG_DMAR_TABLE) += intel/dmar.o

obj-$(CONFIG_INTEL_IOMMU) += intel/iommu.o intel/pasid.o

obj-$(CONFIG_INTEL_IOMMU) += intel/trace.o

obj-$(CONFIG_INTEL_IOMMU_DEBUGFS) += intel/debugfs.o

obj-$(CONFIG_INTEL_IOMMU_SVM) += intel/svm.o

obj-$(CONFIG_IPMMU_VMSA) += ipmmu-vmsa.o

obj-$(CONFIG_IRQ_REMAP) += intel/irq_remapping.o irq_remapping.o

obj-$(CONFIG_IRQ_REMAP) += irq_remapping.o

obj-$(CONFIG_MTK_IOMMU) += mtk_iommu.o

obj-$(CONFIG_MTK_IOMMU_V1) += mtk_iommu_v1.o

obj-$(CONFIG_OMAP_IOMMU) += omap-iommu.o

drivers/iommu/intel/Kconfig

0 → 100644
+86 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

# Intel IOMMU support

config DMAR_TABLE

	bool



config INTEL_IOMMU

	bool "Support for Intel IOMMU using DMA Remapping Devices"

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

	select IOMMU_API

	select IOMMU_IOVA

	select NEED_DMA_MAP_STATE

	select DMAR_TABLE

	select SWIOTLB

	select IOASID

	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 INTEL_IOMMU_DEBUGFS

	bool "Export Intel IOMMU internals in Debugfs"

	depends on INTEL_IOMMU && IOMMU_DEBUGFS

	help

	  !!!WARNING!!!



	  DO NOT ENABLE THIS OPTION UNLESS YOU REALLY KNOW WHAT YOU ARE DOING!!!



	  Expose Intel IOMMU internals in Debugfs.



	  This option is -NOT- intended for production environments, and should

	  only be enabled for debugging Intel IOMMU.



config INTEL_IOMMU_SVM

	bool "Support for Shared Virtual Memory with Intel IOMMU"

	depends on INTEL_IOMMU && X86_64

	select PCI_PASID

	select PCI_PRI

	select MMU_NOTIFIER

	select IOASID

	help

	  Shared Virtual Memory (SVM) provides a facility for devices

	  to access DMA resources through process address space by

	  means of a Process Address Space ID (PASID).



config INTEL_IOMMU_DEFAULT_ON

	def_bool y

	prompt "Enable Intel DMA Remapping Devices by default"

	depends on INTEL_IOMMU

	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 INTEL_IOMMU_BROKEN_GFX_WA

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

	depends on INTEL_IOMMU && 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 INTEL_IOMMU_FLOPPY_WA

	def_bool y

	depends on INTEL_IOMMU && 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 INTEL_IOMMU_SCALABLE_MODE_DEFAULT_ON

	bool "Enable Intel IOMMU scalable mode by default"

	depends on INTEL_IOMMU

	help

	  Selecting this option will enable by default the scalable mode if

	  hardware presents the capability. The scalable mode is defined in

	  VT-d 3.0. The scalable mode capability could be checked by reading

	  /sys/devices/virtual/iommu/dmar*/intel-iommu/ecap. If this option

	  is not selected, scalable mode support could also be enabled by

	  passing intel_iommu=sm_on to the kernel. If not sure, please use

	  the default value.

drivers/iommu/intel/Makefile

0 → 100644
+7 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_DMAR_TABLE) += dmar.o

obj-$(CONFIG_INTEL_IOMMU) += iommu.o pasid.o

obj-$(CONFIG_INTEL_IOMMU) += trace.o

obj-$(CONFIG_INTEL_IOMMU_DEBUGFS) += debugfs.o

obj-$(CONFIG_INTEL_IOMMU_SVM) += svm.o

obj-$(CONFIG_IRQ_REMAP) += irq_remapping.o