Skip to contentSkip to conversation

iommu: SMMU for SDM670

PATCH Superseded Richard Acayan 2 participants 4 messages Nov 3, 2022 – Nov 4, 2022

Subsystems (4)

v3 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

v3 cover iommu: SMMU for SDM670

Changes since v2:
- rewrite driver patch (2/2)
- rebase on (1/2):
https://lore.kernel.org/linux-iommu/[email protected]/
- reset review process (1-2/2)

Changes since v1 (no emails related to this series since last week):
- accumulate tags (both were added because it seems like the discussion ended in agreement to keep adding compatible strings to the driver)

This adds the compatible string for the Qualcomm Snapdragon 670's SMMU. The SMMU is necessary for GENI I2C, included in initial bringup because it doesn't need non-trivial patches except for patches conventionally added before the initial device tree (global clock controller and pinctrl).

Richard Acayan (2):
dt-bindings: iommu: arm-smmu: add sdm670 compatible
iommu: arm-smmu-qcom: add sdm670 compatible

 Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 1 +
 drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c            | 8 ++++++++
 2 files changed, 9 insertions(+)
Signature · 1 line
2.38.1
#1 lore raw

PATCH v3 1/2 dt-bindings: iommu: arm-smmu: add sdm670 compatible

The Snapdragon 670 needs the IOMMU for GENI I2C. Add a compatible string in the documentation to represent its support.

---
 Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 1 +
 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/iommu/arm,smmu.yaml +1 -0
index 796dc7d4dbdd..f77597e8ed39 100644
@@ -39,6 +39,7 @@ properties:
               - qcom,sc7280-smmu-500
               - qcom,sc8180x-smmu-500
               - qcom,sc8280xp-smmu-500
+              - qcom,sdm670-smmu-500
               - qcom,sdm845-smmu-500
               - qcom,sm6350-smmu-500
               - qcom,sm6375-smmu-500
Signature · 1 line
2.38.1
#3 lore raw

PATCH v3 2/2 iommu: arm-smmu-qcom: add sdm670 compatible

In reply to Richard Acayan

The Snapdragon 670 needs the IOMMU for GENI I2C. Even though there is a generic compatible string to support it, it still needs special handling. The Adreno SMMU is separate, like Snapdragon 845, but the lack of PCI on SDM670 makes a reset quirk unnecessary. Add a compatible string to remove both built-in Adreno handling and reset quirk handling in SDM670.

---
 drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 8 ++++++++
 1 file changed, 8 insertions(+)
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +8 -0
index 3be81338a25b..89242aa2f29d 100644
@@ -481,6 +481,13 @@ static const struct qcom_smmu_match_data qcom_smmu_data = {
 	.adreno_impl = &qcom_adreno_smmu_500_impl,
 };
 
+static const struct qcom_smmu_match_data sdm670_smmu_500_data = {
+	/* SDM670 is the same as SDM845 except it doesn't have the reset quirk */
+	.impl = &qcom_smmu_500_impl,
+	/* No adreno impl, on sdm670 it is handled by separete sdm670-smmu-v2. */
+	/* No debug configuration */
+};
+
 static const struct qcom_smmu_match_data sdm845_smmu_500_data = {
 	.impl = &sdm845_smmu_500_impl,
 	/* No adreno impl, on sdm845 it is handled by separete sdm845-smmu-v2. */
@@ -506,6 +513,7 @@ static const struct of_device_id __maybe_unused qcom_smmu_impl_of_match[] = {
 	{ .compatible = "qcom,sc8180x-smmu-500", .data = &qcom_smmu_500_impl0_data },
 	{ .compatible = "qcom,sc8280xp-smmu-500", .data = &qcom_smmu_500_impl0_data },
 	{ .compatible = "qcom,sdm630-smmu-v2", .data = &qcom_smmu_v2_data },
+	{ .compatible = "qcom,sdm670-smmu-500", .data = &sdm670_smmu_500_data },
 	{ .compatible = "qcom,sdm845-smmu-v2", .data = &qcom_smmu_v2_data },
 	{ .compatible = "qcom,sdm845-smmu-500", .data = &sdm845_smmu_500_data },
 	{ .compatible = "qcom,sm6125-smmu-500", .data = &qcom_smmu_500_impl0_data },
Signature · 1 line
2.38.1