From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 1 Jan 2019 23:55:29 +0000 (-0800)
Subject: Merge tag 'iommu-updates-v4.21' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.4-rc1~1896
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8e143b90e4d45cca3dc53760d3cfab988bc74571;p=platform%2Fkernel%2Flinux-rpi.git

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

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
  ...
---

8e143b90e4d45cca3dc53760d3cfab988bc74571
diff --cc drivers/iommu/amd_iommu.c
index 567221c,49a669b..87ba23a
--- a/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;