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

Commit 269b0123 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu: (89 commits)
  AMD IOMMU: remove now unnecessary #ifdefs
  AMD IOMMU: prealloc_protection_domains should be static
  kvm/iommu: fix compile warning
  AMD IOMMU: add statistics about total number of map requests
  AMD IOMMU: add statistics about allocated io memory
  AMD IOMMU: add stats counter for domain tlb flushes
  AMD IOMMU: add stats counter for single iommu domain tlb flushes
  AMD IOMMU: add stats counter for cross-page request
  AMD IOMMU: add stats counter for free_coherent requests
  AMD IOMMU: add stats counter for alloc_coherent requests
  AMD IOMMU: add stats counter for unmap_sg requests
  AMD IOMMU: add stats counter for map_sg requests
  AMD IOMMU: add stats counter for unmap_single requests
  AMD IOMMU: add stats counter for map_single requests
  AMD IOMMU: add stats counter for completion wait events
  AMD IOMMU: add init code for statistic collection
  AMD IOMMU: add necessary header defines for stats counting
  AMD IOMMU: add Kconfig entry for statistic collection code
  AMD IOMMU: use dev_name in iommu_enable function
  AMD IOMMU: use calc_devid in prealloc_protection_domains
  ...
parents f60a0a79 065a6d68

arch/ia64/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -687,3 +687,6 @@ config IRQ_PER_CPU 


config IOMMU_HELPER

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



config IOMMU_API

	def_bool (DMAR)

arch/ia64/include/asm/kvm_host.h

+1 −1
Original line number Diff line number Diff line
@@ -467,7 +467,7 @@ struct kvm_arch { 
	struct kvm_sal_data rdv_sal_data;



	struct list_head assigned_dev_head;

	struct dmar_domain *intel_iommu_domain;

	struct iommu_domain *iommu_domain;

	struct hlist_head irq_ack_notifier_list;



	unsigned long irq_sources_bitmap;

arch/ia64/kvm/Makefile

+2 −2
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ EXTRA_AFLAGS += -Ivirt/kvm -Iarch/ia64/kvm/ 
common-objs = $(addprefix ../../../virt/kvm/, kvm_main.o ioapic.o \

		coalesced_mmio.o irq_comm.o)



ifeq ($(CONFIG_DMAR),y)

common-objs += $(addprefix ../../../virt/kvm/, vtd.o)

ifeq ($(CONFIG_IOMMU_API),y)

common-objs += $(addprefix ../../../virt/kvm/, iommu.o)

endif



kvm-objs := $(common-objs) kvm-ia64.o kvm_fw.o

arch/ia64/kvm/kvm-ia64.c

+2 −1
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <linux/bitops.h>

#include <linux/hrtimer.h>

#include <linux/uaccess.h>

#include <linux/iommu.h>

#include <linux/intel-iommu.h>



#include <asm/pgtable.h>
@@ -188,7 +189,7 @@ int kvm_dev_ioctl_check_extension(long ext) 
		r = KVM_COALESCED_MMIO_PAGE_OFFSET;

		break;

	case KVM_CAP_IOMMU:

		r = intel_iommu_found();

		r = iommu_found();

		break;

	default:

		r = 0;

arch/x86/Kconfig

+13 −0
Original line number Diff line number Diff line
@@ -586,6 +586,16 @@ config AMD_IOMMU 
	  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
@@ -599,6 +609,9 @@ 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 "Configure Maximum number of SMP Processors and NUMA Nodes"

	depends on X86_64 && SMP && DEBUG_KERNEL && EXPERIMENTAL