iommu/arm-smmu-qcom: Add SC7280 support

PATCH Superseded Sai Prakash Ranjan 3 participants 8 messages Apr 20, 2021 – Jun 8, 2021

Subsystems (4)

Arm Qualcomm mailing list IOMMU Arm SMMU drivers Qualcomm IOMMU

lore

Share & tools

lore

Sai Prakash Ranjan

author

2021-04-20 06:05 UTC #0 lore raw

v3 cover iommu/arm-smmu-qcom: Add SC7280 support

Patch 1 adds the sc7280 smmu compatible.
Patch 2 moves the adreno smmu check before apss smmu to enable adreno smmu specific implementation.

Note that dt-binding for sc7280 is already merged.

Changes in v3:
* Collect acks and reviews
* Rebase on top of for-joerg/arm-smmu/updates

Changes in v2:
* Add a comment to make sure this order is not changed in future (Jordan)

Sai Prakash Ranjan (2):
iommu/arm-smmu-qcom: Add SC7280 SMMU compatible iommu/arm-smmu-qcom: Move the adreno smmu specific impl earlier

 drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

Signature · 7 lines

QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation

_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu

Sai Prakash Ranjan

author

2021-04-20 06:05 UTC #1 lore raw

PATCH v3 1/2 iommu/arm-smmu-qcom: Add SC7280 SMMU compatible

Add compatible for SC7280 SMMU to use the Qualcomm Technologies, Inc. specific implementation.

Signed-off-by Sai Prakash Ranjan <[email protected]>

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

drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +2 -0

index 98b3a1c2a181..bea3ee0dabc2 100644
@@ -166,6 +166,7 @@ static const struct of_device_id qcom_smmu_client_of_match[] __maybe_unused = {
 	{ .compatible = "qcom,mdss" },
 	{ .compatible = "qcom,sc7180-mdss" },
 	{ .compatible = "qcom,sc7180-mss-pil" },
+	{ .compatible = "qcom,sc7280-mdss" },
 	{ .compatible = "qcom,sc8180x-mdss" },
 	{ .compatible = "qcom,sdm845-mdss" },
 	{ .compatible = "qcom,sdm845-mss-pil" },

@@ -330,6 +331,7 @@ 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,sc7280-smmu-500" },
 	{ .compatible = "qcom,sc8180x-smmu-500" },
 	{ .compatible = "qcom,sdm630-smmu-v2" },
 	{ .compatible = "qcom,sdm845-smmu-500" },

Signature · 2 lines

QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation

Bjorn Andersson

Reviewed-by on v3 1/2

2021-05-25 04:03 UTC #2 lore raw

Re: [PATCHv3 1/2] iommu/arm-smmu-qcom: Add SC7280 SMMU compatible

Quoted 3 lines · Sai Prakash Ranjan

Add compatible for SC7280 SMMU to use the Qualcomm Technologies, Inc. specific implementation.

Reviewed-by Bjorn Andersson <[email protected]>

Regards,
Bjorn

Quoted 29 lines

Signed-off-by Sai Prakash Ranjan <[email protected]>

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

drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +2 -0

index 98b3a1c2a181..bea3ee0dabc2 100644
@@ -166,6 +166,7 @@ static const struct of_device_id qcom_smmu_client_of_match[] __maybe_unused = {
 	{ .compatible = "qcom,mdss" },
 	{ .compatible = "qcom,sc7180-mdss" },
 	{ .compatible = "qcom,sc7180-mss-pil" },
+	{ .compatible = "qcom,sc7280-mdss" },
 	{ .compatible = "qcom,sc8180x-mdss" },
 	{ .compatible = "qcom,sdm845-mdss" },
 	{ .compatible = "qcom,sdm845-mss-pil" },

@@ -330,6 +331,7 @@ 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,sc7280-smmu-500" },
 	{ .compatible = "qcom,sc8180x-smmu-500" },
 	{ .compatible = "qcom,sdm630-smmu-v2" },
 	{ .compatible = "qcom,sdm845-smmu-500" },

Signature · 2 lines

QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation

Sai Prakash Ranjan

author

2021-04-20 06:05 UTC #3 lore raw

PATCH v3 2/2 iommu/arm-smmu-qcom: Move the adreno smmu specific impl earlier

In reply to Sai Prakash Ranjan

Adreno(GPU) SMMU and APSS(Application Processor SubSystem) SMMU both implement "arm,mmu-500" in some QTI SoCs and to run through adreno smmu specific implementation such as enabling split pagetables support, we need to match the "qcom,adreno-smmu" compatible first before apss smmu or else we will be running apps smmu implementation for adreno smmu and the additional features for adreno smmu is never set. For ex: we have "qcom,sc7280-smmu-500" compatible for both apps and adreno smmu implementing "arm,mmu-500", so the adreno smmu implementation is never reached because the current sequence checks for apps smmu compatible(qcom,sc7280-smmu-500) first and runs that specific impl and we never reach adreno smmu specific implementation.

Signed-off-by Sai Prakash Ranjan <[email protected]>

Reviewed-by Bjorn Andersson <[email protected]>

Acked-by Jordan Crouse <[email protected]>

---
 drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +9 -3

index bea3ee0dabc2..03f048aebb80 100644
@@ -345,11 +345,17 @@ struct arm_smmu_device *qcom_smmu_impl_init(struct arm_smmu_device *smmu)
 {
 	const struct device_node *np = smmu->dev->of_node;
 
-	if (of_match_node(qcom_smmu_impl_of_match, np))
-		return qcom_smmu_create(smmu, &qcom_smmu_impl);
-
+	/*
+	 * Do not change this order of implementation, i.e., first adreno
+	 * smmu impl and then apss smmu since we can have both implementing
+	 * arm,mmu-500 in which case we will miss setting adreno smmu specific
+	 * features if the order is changed.
+	 */
 	if (of_device_is_compatible(np, "qcom,adreno-smmu"))
 		return qcom_smmu_create(smmu, &qcom_adreno_smmu_impl);
 
+	if (of_match_node(qcom_smmu_impl_of_match, np))
+		return qcom_smmu_create(smmu, &qcom_smmu_impl);
+
 	return smmu;
 }

Signature · 2 lines

QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation

Sai Prakash Ranjan

author

2021-05-24 02:43 UTC #4 lore raw

In reply to Sai Prakash Ranjan

Hi Will,

Quoted 14 lines · Sai Prakash Ranjan

Patch 1 adds the sc7280 smmu compatible.
Patch 2 moves the adreno smmu check before apss smmu to enable adreno smmu specific implementation.
Note that dt-binding for sc7280 is already merged.
Changes in v3:
* Collect acks and reviews
* Rebase on top of for-joerg/arm-smmu/updates
Changes in v2:
* Add a comment to make sure this order is not changed in future
(Jordan)

Quoted 6 lines

Sai Prakash Ranjan (2):
iommu/arm-smmu-qcom: Add SC7280 SMMU compatible iommu/arm-smmu-qcom: Move the adreno smmu specific impl earlier
 drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

Gentle Ping!

Thanks,
Sai

Signature · 6 lines

QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu

Sai Prakash Ranjan

author

2021-06-07 02:55 UTC #5 lore raw

Hi Will,

Quoted 17 lines · Sai Prakash Ranjan

Hi Will,
Quoted 14 lines · Sai Prakash Ranjan
Patch 1 adds the sc7280 smmu compatible.
Patch 2 moves the adreno smmu check before apss smmu to enable adreno smmu specific implementation.
Note that dt-binding for sc7280 is already merged.
Changes in v3:
* Collect acks and reviews
* Rebase on top of for-joerg/arm-smmu/updates
Changes in v2:
* Add a comment to make sure this order is not changed in future
(Jordan)

Quoted 9 lines

Quoted 6 lines
Sai Prakash Ranjan (2):
iommu/arm-smmu-qcom: Add SC7280 SMMU compatible iommu/arm-smmu-qcom: Move the adreno smmu specific impl earlier
 drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)
Gentle Ping!

Is this going to be taken for 5.14 or needs one more release cycle?

Thanks,
Sai

Signature · 2 lines

QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation

Will Deacon

maintainer

2021-06-08 12:01 UTC #6 lore raw

In reply to Sai Prakash Ranjan

Quoted 5 lines · Sai Prakash Ranjan

Patch 1 adds the sc7280 smmu compatible.
Patch 2 moves the adreno smmu check before apss smmu to enable adreno smmu specific implementation.
Note that dt-binding for sc7280 is already merged.

This conflicts with what I've already got queued at [1]. Please can you send an updated version, as I wasn't sure about the initialisation order you need here wrt to the ACPI parts.

Thanks,

Will

[1] https://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git/log/?h=for-joerg/arm-smmu/updates

Sai Prakash Ranjan

author

2021-06-08 12:33 UTC #7 lore raw

Quoted 11 lines · Will Deacon

Quoted 5 lines · Sai Prakash Ranjan
Patch 1 adds the sc7280 smmu compatible.
Patch 2 moves the adreno smmu check before apss smmu to enable adreno smmu specific implementation.
Note that dt-binding for sc7280 is already merged.
This conflicts with what I've already got queued at [1]. Please can you send an updated version, as I wasn't sure about the initialisation order you need here wrt to the ACPI parts.

Quoted 6 lines

Thanks,
Will
[1]
https://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git/log/?h=for-joerg/arm-smmu/updates

Sure, have rebased and sent the updated patch [1] after testing for the order.

Thanks,
Sai

[1] https://lore.kernel.org/lkml/[email protected]/

Signature · 6 lines

QUALCOMM INDIA, on behalf of Qualcomm Innovation Center, Inc. is a member
of Code Aurora Forum, hosted by The Linux Foundation
_______________________________________________
iommu mailing list
[email protected]
https://lists.linuxfoundation.org/mailman/listinfo/iommu