[v2] iommu: arm-smmu-qcom: Add sdm630/msm8998 compatibles for qcom quirks

Commit Message

Konrad Dybcio Jan. 9, 2021, 4:56 p.m. UTC

SDM630 and MSM8998 are among the SoCs that use Qualcomm's implementation
of SMMUv2 which has already proven to be problematic over the years. Add
their compatibles to the lookup list to prevent the platforms from being
shut down by the hypervisor at MMU probe.

Signed-off-by: Konrad Dybcio <[e-mail]>
Signed-off-by: AngeloGioacchino Del Regno <[e-mail]>
---
Changes since v1:
- Sort the compatibles alphabetically

 drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 2 ++
 1 file changed, 2 insertions(+)

Comments

Will Deacon Jan. 12, 2021, 7:03 p.m. UTC | #1

On Sat, 9 Jan 2021 17:56:21 +0100, Konrad Dybcio wrote:
> SDM630 and MSM8998 are among the SoCs that use Qualcomm's implementation
> of SMMUv2 which has already proven to be problematic over the years. Add
> their compatibles to the lookup list to prevent the platforms from being
> shut down by the hypervisor at MMU probe.

Applied to arm64 (for-next/iommu/fixes), thanks!

[1/1] iommu: arm-smmu-qcom: Add sdm630/msm8998 compatibles for qcom quirks
      https://git.kernel.org/arm64/c/b812834b5329

Cheers,

Patch

diff --git a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
index 5dff7ffbef11..a833db93e7ff 100644
--- a/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
+++ b/drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c
@@ -323,7 +323,9 @@  static struct arm_smmu_device *qcom_smmu_create(struct arm_smmu_device *smmu,
 }
 
 static const struct of_device_id __maybe_unused qcom_smmu_impl_of_match[] = {
+	{ .compatible = "qcom,msm8998-smmu-v2" },
 	{ .compatible = "qcom,sc7180-smmu-500" },
+	{ .compatible = "qcom,sdm630-smmu-v2" },
 	{ .compatible = "qcom,sdm845-smmu-500" },
 	{ .compatible = "qcom,sm8150-smmu-500" },
 	{ .compatible = "qcom,sm8250-smmu-500" },