From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 May 2017 22:15:47 +0000 (-0700)
Subject: Merge tag 'iommu-updates-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~11332
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=28b47809b2171a6cfbab839936b24280639c9f85;p=platform%2Fkernel%2Flinux-starfive.git

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

Pull IOMMU updates from Joerg Roedel:

 - code optimizations for the Intel VT-d driver

 - ability to switch off a previously enabled Intel IOMMU

 - support for 'struct iommu_device' for OMAP, Rockchip and Mediatek
   IOMMUs

 - header optimizations for IOMMU core code headers and a few fixes that
   became necessary in other parts of the kernel because of that

 - ACPI/IORT updates and fixes

 - Exynos IOMMU optimizations

 - updates for the IOMMU dma-api code to bring it closer to use per-cpu
   iova caches

 - new command-line option to set default domain type allocated by the
   iommu core code

 - another command line option to allow the Intel IOMMU switched off in
   a tboot environment

 - ARM/SMMU: TLB sync optimisations for SMMUv2, Support for using an
   IDENTITY domain in conjunction with DMA ops, Support for SMR masking,
   Support for 16-bit ASIDs (was previously broken)

 - various other small fixes and improvements

* tag 'iommu-updates-v4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu: (63 commits)
  soc/qbman: Move dma-mapping.h include to qman_priv.h
  soc/qbman: Fix implicit header dependency now causing build fails
  iommu: Remove trace-events include from iommu.h
  iommu: Remove pci.h include from trace/events/iommu.h
  arm: dma-mapping: Don't override dma_ops in arch_setup_dma_ops()
  ACPI/IORT: Fix CONFIG_IOMMU_API dependency
  iommu/vt-d: Don't print the failure message when booting non-kdump kernel
  iommu: Move report_iommu_fault() to iommu.c
  iommu: Include device.h in iommu.h
  x86, iommu/vt-d: Add an option to disable Intel IOMMU force on
  iommu/arm-smmu: Return IOVA in iova_to_phys when SMMU is bypassed
  iommu/arm-smmu: Correct sid to mask
  iommu/amd: Fix incorrect error handling in amd_iommu_bind_pasid()
  iommu: Make iommu_bus_notifier return NOTIFY_DONE rather than error code
  omap3isp: Remove iommu_group related code
  iommu/omap: Add iommu-group support
  iommu/omap: Make use of 'struct iommu_device'
  iommu/omap: Store iommu_dev pointer in arch_data
  iommu/omap: Move data structures to omap-iommu.h
  iommu/omap: Drop legacy-style device support
  ...
---

28b47809b2171a6cfbab839936b24280639c9f85
diff --cc drivers/acpi/arm64/iort.c
index 22e08d2,a629e83..c5fecf9
--- a/drivers/acpi/arm64/iort.c
+++ b/drivers/acpi/arm64/iort.c
@@@ -707,10 -670,11 +765,12 @@@ const struct iommu_ops *iort_iommu_conf
  
  		while (parent) {
  			ops = iort_iommu_xlate(dev, parent, streamid);
+ 			if (IS_ERR_OR_NULL(ops))
+ 				return ops;
  
 -			parent = iort_node_get_id(node, &streamid,
 -						  IORT_IOMMU_TYPE, i++);
 +			parent = iort_node_map_platform_id(node, &streamid,
 +							   IORT_IOMMU_TYPE,
 +							   i++);
  		}
  	}