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

Commit fe393164 authored by Tony Luck's avatar Tony Luck
Browse files

Pull vtd-iommu into release branch 

Conflicts:
	arch/ia64/kernel/acpi.c
parents 22ca532a 62fdd767

arch/ia64/Kconfig

+17 −0
Original line number Diff line number Diff line
@@ -145,6 +145,7 @@ config IA64_GENERIC 
	select NUMA

	select ACPI_NUMA

	select SWIOTLB

	select PCI_MSI

	help

	  This selects the system type of your hardware.  A "generic" kernel

	  will run on any supported IA-64 system.  However, if you configure
@@ -152,6 +153,7 @@ config IA64_GENERIC 


	  generic		For any supported IA-64 system

	  DIG-compliant		For DIG ("Developer's Interface Guide") compliant systems

	  DIG+Intel+IOMMU	For DIG systems with Intel IOMMU

	  HP-zx1/sx1000		For HP systems

	  HP-zx1/sx1000+swiotlb	For HP systems with (broken) DMA-constrained devices.

	  SGI-SN2		For SGI Altix systems
@@ -165,6 +167,11 @@ config IA64_DIG 
	bool "DIG-compliant"

	select SWIOTLB



config IA64_DIG_VTD

	bool "DIG+Intel+IOMMU"

	select DMAR

	select PCI_MSI



config IA64_HP_ZX1

	bool "HP-zx1/sx1000"

	help
@@ -614,6 +621,16 @@ 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.



endmenu



endif

arch/ia64/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ libs-y += arch/ia64/lib/ 
core-y				+= arch/ia64/kernel/ arch/ia64/mm/

core-$(CONFIG_IA32_SUPPORT)	+= arch/ia64/ia32/

core-$(CONFIG_IA64_DIG) 	+= arch/ia64/dig/

core-$(CONFIG_IA64_DIG_VTD) 	+= arch/ia64/dig/

core-$(CONFIG_IA64_GENERIC) 	+= arch/ia64/dig/

core-$(CONFIG_IA64_HP_ZX1)	+= arch/ia64/dig/

core-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += arch/ia64/dig/

arch/ia64/configs/generic_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -233,6 +233,8 @@ CONFIG_DMIID=y 
CONFIG_BINFMT_ELF=y

CONFIG_BINFMT_MISC=m



# CONFIG_DMAR is not set



#

# Power management and ACPI

#

arch/ia64/configs/tiger_defconfig

+2 −0
Original line number Diff line number Diff line
@@ -172,6 +172,8 @@ CONFIG_DMIID=y 
CONFIG_BINFMT_ELF=y

CONFIG_BINFMT_MISC=m



# CONFIG_DMAR is not set



#

# Power management and ACPI

#

arch/ia64/dig/Makefile

+5 −0
Original line number Diff line number Diff line
@@ -6,4 +6,9 @@ 
#



obj-y := setup.o

ifeq ($(CONFIG_DMAR), y)

obj-$(CONFIG_IA64_GENERIC) += machvec.o machvec_vtd.o dig_vtd_iommu.o

else

obj-$(CONFIG_IA64_GENERIC) += machvec.o

endif

obj-$(CONFIG_IA64_DIG_VTD) += dig_vtd_iommu.o