Commit 98265300 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'core-iommu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86, ioapic: Consolidate the explicit EOI code
  x86, ioapic: Restore the mask bit correctly in eoi_ioapic_irq()
  x86, kdump, ioapic: Reset remote-IRR in clear_IO_APIC
  iommu: Rename the DMAR and INTR_REMAP config options
  x86, ioapic: Define irq_remap_modify_chip_defaults()
  x86, msi, intr-remap: Use the ioapic set affinity routine
  iommu: Cleanup ifdefs in detect_intel_iommu()
  iommu: No need to set dmar_disabled in check_zero_address()
  iommu: Move IOMMU specific code to intel-iommu.c
  intr_remap: Call dmar_dev_scope_init() explicitly
  x86, x2apic: Enable the bios request for x2apic optout
parents 37d96c28 c0205701

Documentation/kernel-parameters.txt

+2 −1
Original line number Diff line number Diff line
@@ -1020,10 +1020,11 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			has the capability. With this option, super page will

			not be supported.

	intremap=	[X86-64, Intel-IOMMU]

			Format: { on (default) | off | nosid }

			on	enable Interrupt Remapping (default)

			off	disable Interrupt Remapping

			nosid	disable Source ID checking

			no_x2apic_optout

				BIOS x2APIC opt-out request will be ignored



	inttest=	[IA-64]

arch/ia64/configs/generic_defconfig

+1 −1
Original line number Diff line number Diff line
@@ -234,4 +234,4 @@ CONFIG_CRYPTO_MD5=y 
# CONFIG_CRYPTO_ANSI_CPRNG is not set

CONFIG_CRC_T10DIF=y

CONFIG_MISC_DEVICES=y

CONFIG_DMAR=y
 
CONFIG_INTEL_IOMMU=y

arch/ia64/dig/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
#



obj-y := setup.o

ifeq ($(CONFIG_DMAR), y)

ifeq ($(CONFIG_INTEL_IOMMU), y)

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

else

obj-$(CONFIG_IA64_GENERIC) += machvec.o

arch/ia64/include/asm/device.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ struct dev_archdata { 
#ifdef CONFIG_ACPI

	void	*acpi_handle;

#endif

#ifdef CONFIG_DMAR

#ifdef CONFIG_INTEL_IOMMU

	void *iommu; /* hook for IOMMU specific extension */

#endif

};

arch/ia64/include/asm/iommu.h

+4 −2
Original line number Diff line number Diff line
@@ -7,12 +7,14 @@ 


extern void pci_iommu_shutdown(void);

extern void no_iommu_init(void);

#ifdef	CONFIG_INTEL_IOMMU

extern int force_iommu, no_iommu;

extern int iommu_detected;

#ifdef	CONFIG_DMAR

extern int iommu_pass_through;

extern int iommu_detected;

#else

#define iommu_pass_through	(0)

#define no_iommu		(1)

#define iommu_detected		(0)

#endif

extern void iommu_dma_init(void);

extern void machvec_init(const char *name);

CRA Git | Maintained and supported by SUSTech CRA and CCSE