From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 24 Aug 2018 20:10:38 +0000 (-0700)
Subject: Merge tag 'iommu-updates-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v4.19~291
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=18b8bfdfbae5821a7df691bc1e542bbab6c31e9c;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'iommu-updates-v4.19' of git://git./linux/kernel/git/joro/iommu

Pull IOMMU updates from Joerg Roedel:

 - PASID table handling updates for the Intel VT-d driver. It implements
   a global PASID space now so that applications usings multiple devices
   will just have one PASID.

 - A new config option to make iommu passthroug mode the default.

 - New sysfs attribute for iommu groups to export the type of the
   default domain.

 - A debugfs interface (for debug only) usable by IOMMU drivers to
   export internals to user-space.

 - R-Car Gen3 SoCs support for the ipmmu-vmsa driver

 - The ARM-SMMU now aborts transactions from unknown devices and devices
   not attached to any domain.

 - Various cleanups and smaller fixes all over the place.

* tag 'iommu-updates-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (42 commits)
  iommu/omap: Fix cache flushes on L2 table entries
  iommu: Remove the ->map_sg indirection
  iommu/arm-smmu-v3: Abort all transactions if SMMU is enabled in kdump kernel
  iommu/arm-smmu-v3: Prevent any devices access to memory without registration
  iommu/ipmmu-vmsa: Don't register as BUS IOMMU if machine doesn't have IPMMU-VMSA
  iommu/ipmmu-vmsa: Clarify supported platforms
  iommu/ipmmu-vmsa: Fix allocation in atomic context
  iommu: Add config option to set passthrough as default
  iommu: Add sysfs attribyte for domain type
  iommu/arm-smmu-v3: sync the OVACKFLG to PRIQ consumer register
  iommu/arm-smmu: Error out only if not enough context interrupts
  iommu/io-pgtable-arm-v7s: Abort allocation when table address overflows the PTE
  iommu/io-pgtable-arm: Fix pgtable allocation in selftest
  iommu/vt-d: Remove the obsolete per iommu pasid tables
  iommu/vt-d: Apply per pci device pasid table in SVA
  iommu/vt-d: Allocate and free pasid table
  iommu/vt-d: Per PCI device pasid table interfaces
  iommu/vt-d: Add for_each_device_domain() helper
  iommu/vt-d: Move device_domain_info to header
  iommu/vt-d: Apply global PASID in SVA
  ...
---

18b8bfdfbae5821a7df691bc1e542bbab6c31e9c
diff --cc drivers/iommu/intel-svm.c
index 7d65aab,eb30836..4a03e50
--- a/drivers/iommu/intel-svm.c
+++ b/drivers/iommu/intel-svm.c
@@@ -24,9 -24,10 +24,11 @@@
  #include <linux/pci-ats.h>
  #include <linux/dmar.h>
  #include <linux/interrupt.h>
 +#include <linux/mm_types.h>
  #include <asm/page.h>
  
+ #include "intel-pasid.h"
+ 
  #define PASID_ENTRY_P		BIT_ULL(0)
  #define PASID_ENTRY_FLPM_5LP	BIT_ULL(9)
  #define PASID_ENTRY_SRE		BIT_ULL(11)