From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 11 Oct 2016 19:52:41 +0000 (-0700)
Subject: Merge tag 'iommu-updates-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/joro... 
X-Git-Tag: Ubuntu-5.10.0-12.13~11688
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=56e520c7a0a490b63b042b047ec9659fc08762a4;p=mirror_ubuntu-hirsute-kernel.git

Merge tag 'iommu-updates-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu

Pull IOMMU updates from Joerg Roedel:

 - support for interrupt virtualization in the AMD IOMMU driver. These
   patches were shared with the KVM tree and are already merged through
   that tree.

 - generic DT-binding support for the ARM-SMMU driver. With this the
   driver now makes use of the generic DMA-API code. This also required
   some changes outside of the IOMMU code, but these are acked by the
   respective maintainers.

 - more cleanups and fixes all over the place.

* tag 'iommu-updates-v4.9' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (40 commits)
  iommu/amd: No need to wait iommu completion if no dte irq entry change
  iommu/amd: Free domain id when free a domain of struct dma_ops_domain
  iommu/amd: Use standard bitmap operation to set bitmap
  iommu/amd: Clean up the cmpxchg64 invocation
  iommu/io-pgtable-arm: Check for v7s-incapable systems
  iommu/dma: Avoid PCI host bridge windows
  iommu/dma: Add support for mapping MSIs
  iommu/arm-smmu: Set domain geometry
  iommu/arm-smmu: Wire up generic configuration support
  Docs: dt: document ARM SMMU generic binding usage
  iommu/arm-smmu: Convert to iommu_fwspec
  iommu/arm-smmu: Intelligent SMR allocation
  iommu/arm-smmu: Add a stream map entry iterator
  iommu/arm-smmu: Streamline SMMU data lookups
  iommu/arm-smmu: Refactor mmu-masters handling
  iommu/arm-smmu: Keep track of S2CR state
  iommu/arm-smmu: Consolidate stream map entry state
  iommu/arm-smmu: Handle stream IDs more dynamically
  iommu/arm-smmu: Set PRIVCFG in stage 1 STEs
  iommu/arm-smmu: Support non-PCI devices with SMMUv3
  ...
---

56e520c7a0a490b63b042b047ec9659fc08762a4
diff --cc drivers/irqchip/irq-gic-v3-its.c
index 35c851c14e49,98ff669d5962..003495d91f9c
--- a/drivers/irqchip/irq-gic-v3-its.c
+++ b/drivers/irqchip/irq-gic-v3-its.c
@@@ -19,9 -18,8 +19,10 @@@
  #include <linux/bitmap.h>
  #include <linux/cpu.h>
  #include <linux/delay.h>
+ #include <linux/dma-iommu.h>
  #include <linux/interrupt.h>
 +#include <linux/irqdomain.h>
 +#include <linux/acpi_iort.h>
  #include <linux/log2.h>
  #include <linux/mm.h>
  #include <linux/msi.h>