Merge branch 'for-next/iommu/fixes' into for-next/iommu/core

Merge in IOMMU fixes for 5.10 in order to resolve conflicts against the
queue for 5.11.

* for-next/iommu/fixes:
  iommu/amd: Set DTE[IntTabLen] to represent 512 IRTEs
  iommu/vt-d: Don't read VCCAP register unless it exists
  x86/tboot: Don't disable swiotlb when iommu is forced on
  iommu: Check return of __iommu_attach_device()
  arm-smmu-qcom: Ensure the qcom_scm driver has finished probing
  iommu/amd: Enforce 4k mapping for certain IOMMU data structures
  MAINTAINERS: Temporarily add myself to the IOMMU entry
  iommu/vt-d: Fix compile error with CONFIG_PCI_ATS not set
  iommu/vt-d: Avoid panic if iommu init fails in tboot system
  iommu/vt-d: Cure VF irqdomain hickup
  x86/platform/uv: Fix copied UV5 output archtype
  x86/platform/uv: Drop last traces of uv_flush_tlb_others

diff --cc drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
index add1859,702fbaa..5dff7ff
--- 1/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
--- 2/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
@@@ -309,7 -69,11 +309,11 @@@ static struct arm_smmu_device *qcom_smm
  {
        struct qcom_smmu *qsmmu;
  
 -      qsmmu = devm_kzalloc(smmu->dev, sizeof(*qsmmu), GFP_KERNEL);
+       /* Check to make sure qcom_scm has finished probing */
+       if (!qcom_scm_is_available())
+               return ERR_PTR(-EPROBE_DEFER);
+ 
 +      qsmmu = devm_krealloc(smmu->dev, smmu, sizeof(*qsmmu), GFP_KERNEL);
        if (!qsmmu)
                return ERR_PTR(-ENOMEM);
  

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

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