From: Will Deacon <will@kernel.org>
Date: Tue, 8 Dec 2020 15:21:49 +0000 (+0000)
Subject: Merge branch 'for-next/iommu/fixes' into for-next/iommu/core
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c74009f5290d6679ecb865b5d795508df7ad599f;p=linux.git

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

c74009f5290d6679ecb865b5d795508df7ad599f
diff --cc drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
index add1859b28996,702fbaa6c9ada..5dff7ffbef119
--- a/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;
  
+ 	/* Check to make sure qcom_scm has finished probing */
+ 	if (!qcom_scm_is_available())
+ 		return ERR_PTR(-EPROBE_DEFER);
+ 
 -	qsmmu = devm_kzalloc(smmu->dev, sizeof(*qsmmu), GFP_KERNEL);
 +	qsmmu = devm_krealloc(smmu->dev, smmu, sizeof(*qsmmu), GFP_KERNEL);
  	if (!qsmmu)
  		return ERR_PTR(-ENOMEM);