iommu/arm-smmu-qcom: Add SC7280 support
Subsystems (4)
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.
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 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)
base-commit: 7060377ce06f9cd3ed6274c0f2310463feb5baec
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
PATCH 1/2 iommu/arm-smmu-qcom: Add SC7280 SMMU compatible
Add compatible for SC7280 SMMU to use the Qualcomm Technologies, Inc. specific implementation.
--- 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
@@ -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 · 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
PATCH 2/2 iommu/arm-smmu-qcom: Move the adreno smmu specific impl earlier
In reply to Sai Prakash RanjanAdreno(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.
---
Its either this or we add a new compatible for adreno smmu implementing arm,mmu-500 like "qcom,sc7280-adreno-smmu-500".
--- drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +3 -3
@@ -345,11 +345,11 @@ 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); -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 · 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
Re: [PATCH 2/2] iommu/arm-smmu-qcom: Move the adreno smmu specific impl earlier
Quoted 30 lines · 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.Suggested-by Akhil P Oommen <[email protected]>Signed-off-by Sai Prakash Ranjan <[email protected]>---
Its either this or we add a new compatible for adreno smmu implementing arm,mmu-500 like "qcom,sc7280-adreno-smmu-500".
--- drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +0
-0@@ -345,11 +345,11 @@ struct arm_smmu_device *qcom_smmu_impl_init(struct arm_smmu_device *smmu) {const struct device_node *np = smmu->dev->of_node;
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c struct arm_smmu_device *qcom_smmu_impl_init(struct arm_smmu_device *smmu) · line 353
Quoted 10 lines
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +3
-3-if (of_match_node (qcom_smmu_impl_of_match, np)) -return qcom_smmu_create (smmu, &qcom_smmu_impl); -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); +
It would be good to add a comment here explaining the order here so we don't accidentally reorganize ourselves back into a problem later.
Jordan
Quoted 10 lines
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +0
-0return smmu; }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
_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Re: [PATCH 2/2] iommu/arm-smmu-qcom: Move the adreno smmu specific impl earlier
Quoted 39 lines · Jordan Crouse
Quoted 38 lines · 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.Suggested-by Akhil P Oommen <[email protected]>Signed-off-by Sai Prakash Ranjan <[email protected]>---
Its either this or we add a new compatible for adreno smmu implementing arm,mmu-500 like "qcom,sc7280-adreno-smmu-500".
--- drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +0
-3@@ -345,11 +345,11 @@ 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); -if (of_device_is_compatible (np,"qcom,adreno-smmu" ))return qcom_smmu_create (smmu, &qcom_adreno_smmu_impl);
Quoted 7 lines
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c struct arm_smmu_device *qcom_smmu_impl_init(struct arm_smmu_device *smmu) · line 353
Quoted 3 lines
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +3
-0+if (of_match_node (qcom_smmu_impl_of_match, np)) +return qcom_smmu_create (smmu, &qcom_smmu_impl); +It would be good to add a comment here explaining the order here so we don't accidentally reorganize ourselves back into a problem later.
Sure its better, will add it.
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