From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Fri, 19 Mar 2021 16:56:04 +0000 (-0700)
Subject: Merge tag 'iommu-fixes-v5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~1518
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=65a103747104368cb1ba6f097dcc3f85b1dcf86b;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'iommu-fixes-v5.12-rc3' of git://git./linux/kernel/git/joro/iommu

Pull iommu fixes from Joerg Roedel:

 - Three AMD IOMMU patches to fix a boot crash on AMD Stoney systems and
   every other AMD IOMMU system booted with 'amd_iommu=off'.

   This is a v5.11 regression.

 - A Fix for the Tegra IOMMU driver to make sure it detects all IOMMUs

* tag 'iommu-fixes-v5.12-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/tegra-smmu: Make tegra_smmu_probe_device() to handle all IOMMU phandles
  iommu/amd: Keep track of amd_iommu_irq_remap state
  iommu/amd: Don't call early_amd_iommu_init() when AMD IOMMU is disabled
  iommu/amd: Move Stoney Ridge check to detect_ivrs()
---

65a103747104368cb1ba6f097dcc3f85b1dcf86b