Skip to content
This repository was archived by the owner on Oct 31, 2024. It is now read-only.

Commit c390a26

Browse files
lumaggregkh
authored andcommitted
iommu/arm-smmu-qcom: apply num_context_bank fixes for SDM630 / SDM660
[ Upstream commit 19eb465 ] The Qualcomm SDM630 / SDM660 platform requires the same kind of workaround as MSM8998: some IOMMUs have context banks reserved by firmware / TZ, touching those banks resets the board. Apply the num_context_bank workaround to those two SMMU devices in order to allow them to be used by Linux. Fixes: b812834 ("iommu: arm-smmu-qcom: Add sdm630/msm8998 compatibles for qcom quirks") Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Reviewed-by: Bjorn Andersson <andersson@kernel.org> Link: https://lore.kernel.org/r/20240907-sdm660-wifi-v1-1-e316055142f8@linaro.org Signed-off-by: Will Deacon <will@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 7acaef4 commit c390a26

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c

+13-1
Original file line numberDiff line numberDiff line change
@@ -282,8 +282,15 @@ static int qcom_smmu_cfg_probe(struct arm_smmu_device *smmu)
282282
* MSM8998 LPASS SMMU reports 13 context banks, but accessing
283283
* the last context bank crashes the system.
284284
*/
285-
if (of_device_is_compatible(smmu->dev->of_node, "qcom,msm8998-smmu-v2") && smmu->num_context_banks == 13)
285+
if (of_device_is_compatible(smmu->dev->of_node, "qcom,msm8998-smmu-v2") &&
286+
smmu->num_context_banks == 13) {
286287
smmu->num_context_banks = 12;
288+
} else if (of_device_is_compatible(smmu->dev->of_node, "qcom,sdm630-smmu-v2")) {
289+
if (smmu->num_context_banks == 21) /* SDM630 / SDM660 A2NOC SMMU */
290+
smmu->num_context_banks = 7;
291+
else if (smmu->num_context_banks == 14) /* SDM630 / SDM660 LPASS SMMU */
292+
smmu->num_context_banks = 13;
293+
}
287294

288295
/*
289296
* Some platforms support more than the Arm SMMU architected maximum of
@@ -346,6 +353,11 @@ static int qcom_adreno_smmuv2_cfg_probe(struct arm_smmu_device *smmu)
346353
/* Support for 16K pages is advertised on some SoCs, but it doesn't seem to work */
347354
smmu->features &= ~ARM_SMMU_FEAT_FMT_AARCH64_16K;
348355

356+
/* TZ protects several last context banks, hide them from Linux */
357+
if (of_device_is_compatible(smmu->dev->of_node, "qcom,sdm630-smmu-v2") &&
358+
smmu->num_context_banks == 5)
359+
smmu->num_context_banks = 2;
360+
349361
return 0;
350362
}
351363

0 commit comments

Comments
 (0)