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

Pull IOMMU updates from Joerg Roedel:

 - Page table code for AMD IOMMU now supports large pages where smaller
   page-sizes were mapped before. VFIO had to work around that in the
   past and I included a patch to remove it (acked by Alex Williamson)

 - Patches to unmodularize a couple of IOMMU drivers that would never
   work as modules anyway.

 - Work to unify the the iommu-related pointers in 'struct device' into
   one pointer. This work is not finished yet, but will probably be in
   the next cycle.

 - NUMA aware allocation in iommu-dma code

 - Support for r8a774a1 and r8a774c0 in the Renesas IOMMU driver

 - Scalable mode support for the Intel VT-d driver

 - PM runtime improvements for the ARM-SMMU driver

 - Support for the QCOM-SMMUv2 IOMMU hardware from Qualcom

 - Various smaller fixes and improvements

* tag 'iommu-updates-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (78 commits)
  iommu: Check for iommu_ops == NULL in iommu_probe_device()
  ACPI/IORT: Don't call iommu_ops->add_device directly
  iommu/of: Don't call iommu_ops->add_device directly
  iommu: Consolitate ->add/remove_device() calls
  iommu/sysfs: Rename iommu_release_device()
  dmaengine: sh: rcar-dmac: Use device_iommu_mapped()
  xhci: Use device_iommu_mapped()
  powerpc/iommu: Use device_iommu_mapped()
  ACPI/IORT: Use device_iommu_mapped()
  iommu/of: Use device_iommu_mapped()
  driver core: Introduce device_iommu_mapped() function
  iommu/tegra: Use helper functions to access dev->iommu_fwspec
  iommu/qcom: Use helper functions to access dev->iommu_fwspec
  iommu/of: Use helper functions to access dev->iommu_fwspec
  iommu/mediatek: Use helper functions to access dev->iommu_fwspec
  iommu/ipmmu-vmsa: Use helper functions to access dev->iommu_fwspec
  iommu/dma: Use helper functions to access dev->iommu_fwspec
  iommu/arm-smmu: Use helper functions to access dev->iommu_fwspec
  ACPI/IORT: Use helper functions to access dev->iommu_fwspec
  iommu: Introduce wrappers around dev->iommu_fwspec
  ...

diff --cc Documentation/admin-guide/kernel-parameters.txt
Simple merge

diff --cc arch/powerpc/kernel/eeh.c
Simple merge

diff --cc arch/powerpc/kernel/iommu.c
Simple merge

diff --cc drivers/acpi/arm64/iort.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem_execbuffer.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_display.c
Simple merge

diff --cc drivers/gpu/drm/vmwgfx/vmwgfx_drv.c
Simple merge

diff --cc drivers/iommu/amd_iommu.c
index 567221cca13c8b8c2389407142c13038d1d70af1,49a669b1ce116082213805d9791957c180097812..87ba23a75b381ff245690a1106ddf190b0b327f7
--- 1/drivers/iommu/amd_iommu.c
--- 2/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@@ -2770,10 -2849,21 +2841,10 @@@ int __init amd_iommu_init_dma_ops(void
        swiotlb        = (iommu_pass_through || sme_me_mask) ? 1 : 0;
        iommu_detected = 1;
  
 -      /*
 -       * In case we don't initialize SWIOTLB (actually the common case
 -       * when AMD IOMMU is enabled and SME is not active), make sure there
 -       * are global dma_ops set as a fall-back for devices not handled by
 -       * this driver (for example non-PCI devices). When SME is active,
 -       * make sure that swiotlb variable remains set so the global dma_ops
 -       * continue to be SWIOTLB.
 -       */
 -      if (!swiotlb)
 -              dma_ops = &dma_direct_ops;
 -
        if (amd_iommu_unmap_flush)
-               pr_info("AMD-Vi: IO/TLB flush on unmap enabled\n");
+               pr_info("IO/TLB flush on unmap enabled\n");
        else
-               pr_info("AMD-Vi: Lazy IO/TLB flushing enabled\n");
+               pr_info("Lazy IO/TLB flushing enabled\n");
  
        return 0;
  

diff --cc drivers/iommu/dma-iommu.c
Simple merge

diff --cc drivers/iommu/dmar.c
Simple merge

diff --cc drivers/iommu/intel-iommu.c
Simple merge

diff --cc drivers/misc/mic/scif/scif_rma.h
Simple merge

diff --cc drivers/usb/host/xhci.c
Simple merge