iommu/arm-smmu: Add adreno-smmu implementation and bindings
Subsystems (6)
v18 cover iommu/arm-smmu: Add adreno-smmu implementation and bindings
This short series adds support for the adreno-smmu implementation of the arm-smmu driver and the device-tree bindings to turn on the implementation for the sm845 and sc7180 GPUs. These changes are the last ones needed to enable per-instance pagetables in the drm/msm driver.
No deltas in this patchset since the last go-around for 5.10 [1].
[1] https://patchwork.freedesktop.org/series/81393/
Jordan Crouse (3):
iommu/arm-smmu-qcom: Add implementation for the adreno GPU SMMU
dt-bindings: arm-smmu: Add compatible string for Adreno GPU SMMU
arm: dts: qcom: sm845: Set the compatible string for the GPU SMMU
Rob Clark (1):
iommu/arm-smmu: Add a way for implementations to influence SCTLR
.../devicetree/bindings/iommu/arm,smmu.yaml | 9 +- arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 9 + arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +- drivers/iommu/arm/arm-smmu/arm-smmu-impl.c | 3 + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 157 +++++++++++++++++- drivers/iommu/arm/arm-smmu/arm-smmu.c | 3 + drivers/iommu/arm/arm-smmu/arm-smmu.h | 4 + 7 files changed, 182 insertions(+), 5 deletions(-)
Signature · 1 line
2.25.1
PATCH v18 1/4 iommu/arm-smmu-qcom: Add implementation for the adreno GPU SMMU
Add a special implementation for the SMMU attached to most Adreno GPU target triggered from the qcom,adreno-smmu compatible string.
The new Adreno SMMU implementation will enable split pagetables (TTBR1) for the domain attached to the GPU device (SID 0) and hard code it context bank 0 so the GPU hardware can implement per-instance pagetables.
---
drivers/iommu/arm/arm-smmu/arm-smmu-impl.c | 3 + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 151 ++++++++++++++++++++- drivers/iommu/arm/arm-smmu/arm-smmu.h | 1 + 3 files changed, 153 insertions(+), 2 deletions(-)
drivers/iommu/arm/arm-smmu/arm-smmu-impl.c +3 -0
@@ -223,6 +223,9 @@ struct arm_smmu_device *arm_smmu_impl_init(struct arm_smmu_device *smmu) of_device_is_compatible(np, "qcom,sm8250-smmu-500"))return qcom_smmu_impl_init (smmu); +if (of_device_is_compatible (smmu->dev->of_node,"qcom,adreno-smmu" )) +return qcom_adreno_smmu_impl_init (smmu); +if (of_device_is_compatible (np,"marvell,ap806-smmu-500" )) smmu->impl = &mrvl_mmu500_impl;
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +149 -2
176 lines not on this page · raw message
drivers/iommu/arm/arm-smmu/arm-smmu.h +1 -0
@@ -520,6 +520,7 @@ static inline void arm_smmu_writeq(struct arm_smmu_device *smmu, int page,struct arm_smmu_device *arm_smmu_impl_init (struct arm_smmu_device *smmu);struct arm_smmu_device *nvidia_smmu_impl_init (struct arm_smmu_device *smmu);struct arm_smmu_device *qcom_smmu_impl_init (struct arm_smmu_device *smmu); +struct arm_smmu_device *qcom_adreno_smmu_impl_init (struct arm_smmu_device *smmu);void arm_smmu_write_context_bank (struct arm_smmu_device *smmu,int idx);int arm_mmu500_reset (struct arm_smmu_device *smmu);
Signature · 1 line
2.25.1
PATCH v18 2/4 iommu/arm-smmu: Add a way for implementations to influence SCTLR
In reply to Jordan CrouseFrom: Rob Clark <[email protected]>
For the Adreno GPU's SMMU, we want SCTLR.HUPCF set to ensure that pending translations are not terminated on iova fault. Otherwise a terminated CP read could hang the GPU by returning invalid command-stream data.
---
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 6 ++++++ drivers/iommu/arm/arm-smmu/arm-smmu.c | 3 +++ drivers/iommu/arm/arm-smmu/arm-smmu.h | 3 +++ 3 files changed, 12 insertions(+)
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +6 -0
@@ -129,6 +129,12 @@ static int qcom_adreno_smmu_init_context(struct arm_smmu_domain *smmu_domain, (smmu_domain->cfg.fmt == ARM_SMMU_CTX_FMT_AARCH64)) pgtbl_cfg->quirks |= IO_PGTABLE_QUIRK_ARM_TTBR1; +/* +* On the GPU device we want to process subsequent transactions after a +* fault to keep the GPU from hanging +*/ + smmu_domain->cfg.sctlr_set |=ARM_SMMU_SCTLR_HUPCF ; +/* * Initialize private interface with GPU: */
drivers/iommu/arm/arm-smmu/arm-smmu.c +3 -0
@@ -617,6 +617,9 @@ void arm_smmu_write_context_bank(struct arm_smmu_device *smmu, int idx)if (IS_ENABLED (CONFIG_CPU_BIG_ENDIAN )) reg |=ARM_SMMU_SCTLR_E ; + reg |= cfg->sctlr_set; + reg &= ~cfg->sctlr_clr; +arm_smmu_cb_write (smmu, idx,ARM_SMMU_CB_SCTLR , reg); }
drivers/iommu/arm/arm-smmu/arm-smmu.h +3 -0
@@ -144,6 +144,7 @@ enum arm_smmu_cbar_type {#define ARM_SMMU_CB_SCTLR 0x0#define ARM_SMMU_SCTLR_S1_ASIDPNE BIT(12)#define ARM_SMMU_SCTLR_CFCFG BIT(7) +#define ARM_SMMU_SCTLR_HUPCF BIT(8)#define ARM_SMMU_SCTLR_CFIE BIT(6)#define ARM_SMMU_SCTLR_CFRE BIT(5)#define ARM_SMMU_SCTLR_E BIT(4)
@@ -341,6 +342,8 @@ struct arm_smmu_cfg {u16 asid;u16 vmid; }; +u32 sctlr_set;/* extra bits to set in SCTLR */ +u32 sctlr_clr;/* bits to mask in SCTLR */ enum arm_smmu_cbar_type cbar;enum arm_smmu_context_fmt fmt; };
Signature · 1 line
2.25.1
PATCH v18 3/4 dt-bindings: arm-smmu: Add compatible string for Adreno GPU SMMU
In reply to Jordan CrouseEvery Qcom Adreno GPU has an embedded SMMU for its own use. These devices depend on unique features such as split pagetables, different stall/halt requirements and other settings. Identify them with a compatible string so that they can be identified in the arm-smmu implementation specific code.
---
Documentation/devicetree/bindings/iommu/arm,smmu.yaml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
Documentation/devicetree/bindings/iommu/arm,smmu.yaml +7 -2
@@ -28,8 +28,6 @@ properties: - enum: - qcom,msm8996-smmu-v2 - qcom,msm8998-smmu-v2 - - qcom,sc7180-smmu-v2 - - qcom,sdm845-smmu-v2 - const: qcom,smmu-v2 - description: Qcom SoCs implementing "arm,mmu-500"
@@ -40,6 +38,13 @@ properties: - qcom,sm8150-smmu-500 - qcom,sm8250-smmu-500 - const: arm,mmu-500 + - description: Qcom Adreno GPUs implementing "arm,smmu-v2" + items: + - enum: + - qcom,sc7180-smmu-v2 + - qcom,sdm845-smmu-v2 + - const: qcom,adreno-smmu + - const: qcom,smmu-v2 - description: Marvell SoCs implementing "arm,mmu-500" items: - const: marvell,ap806-smmu-500
Signature · 6 lines
2.25.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
PATCH v18 4/4 arm: dts: qcom: sm845: Set the compatible string for the GPU SMMU
In reply to Jordan CrouseSet the qcom,adreno-smmu compatible string for the GPU SMMU to enable split pagetables and per-instance pagetables for drm/msm.
---
arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 9 +++++++++ arch/arm64/boot/dts/qcom/sdm845.dtsi | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi +9 -0
@@ -633,6 +633,15 @@ &mdss_mdp { status = "okay"; }; +/* + * Cheza fw does not properly program the GPU aperture to allow the + * GPU to update the SMMU pagetables for context switches. Work + * around this by dropping the "qcom,adreno-smmu" compat string. + */ +&adreno_smmu { + compatible = "qcom,sdm845-smmu-v2", "qcom,smmu-v2"; +}; + &mss_pil { iommus = <&apps_smmu 0x781 0x0>, <&apps_smmu 0x724 0x3>;
arch/arm64/boot/dts/qcom/sdm845.dtsi +1 -1
@@ -4103,7 +4103,7 @@ opp-257000000 { }; adreno_smmu: iommu@5040000 { - compatible = "qcom,sdm845-smmu-v2", "qcom,smmu-v2"; + compatible = "qcom,sdm845-smmu-v2", "qcom,adreno-smmu", "qcom,smmu-v2"; reg = <0 0x5040000 0 0x10000>; #iommu-cells = <1>; #global-interrupts = <2>;
Signature · 1 line
2.25.1
Will Deacon
maintainerQuoted 9 lines · Jordan Crouse
This short series adds support for the adreno-smmu implementation of the arm-smmu driver and the device-tree bindings to turn on the implementation for the sm845 and sc7180 GPUs. These changes are the last ones needed to enable per-instance pagetables in the drm/msm driver.
No deltas in this patchset since the last go-around for 5.10 [1].
Quoted 7 lines
Jordan Crouse (3):
iommu/arm-smmu-qcom: Add implementation for the adreno GPU SMMU
dt-bindings: arm-smmu: Add compatible string for Adreno GPU SMMU
arm: dts: qcom: sm845: Set the compatible string for the GPU SMMURob Clark (1):
iommu/arm-smmu: Add a way for implementations to influence SCTLR
FYI: this patch (patch 4/4) doesn't seem to have made it anywhere (I don't have it, and neither does the archive).
Will
Quoted 15 lines · Will Deacon
Quoted 14 lines · Jordan Crouse
This short series adds support for the adreno-smmu implementation of the arm-smmu driver and the device-tree bindings to turn on the implementation for the sm845 and sc7180 GPUs. These changes are the last ones needed to enable per-instance pagetables in the drm/msm driver.
No deltas in this patchset since the last go-around for 5.10 [1].
[1] https://patchwork.freedesktop.org/series/81393/
Jordan Crouse (3):
iommu/arm-smmu-qcom: Add implementation for the adreno GPU SMMU
dt-bindings: arm-smmu: Add compatible string for Adreno GPU SMMU
arm: dts: qcom: sm845: Set the compatible string for the GPU SMMU
Quoted 7 lines
Quoted 2 lines
Rob Clark (1):
iommu/arm-smmu: Add a way for implementations to influence SCTLRFYI: this patch (patch 4/4) doesn't seem to have made it anywhere (I don't have it, and neither does the archive).
Will
Patch 4/4 was the bindings for sdm845 and I didn't explicitly add IOMMU to the CC list and so patman did what patman does.
I'll resend.
Jordan
Signature · 2 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project
Quoted 22 lines · Jordan Crouse
Quoted 21 lines · Will Deacon
Quoted 9 lines · Jordan Crouse
This short series adds support for the adreno-smmu implementation of the arm-smmu driver and the device-tree bindings to turn on the implementation for the sm845 and sc7180 GPUs. These changes are the last ones needed to enable per-instance pagetables in the drm/msm driver.
No deltas in this patchset since the last go-around for 5.10 [1].
Quoted 7 lines
Jordan Crouse (3):
iommu/arm-smmu-qcom: Add implementation for the adreno GPU SMMU
dt-bindings: arm-smmu: Add compatible string for Adreno GPU SMMU
arm: dts: qcom: sm845: Set the compatible string for the GPU SMMURob Clark (1):
iommu/arm-smmu: Add a way for implementations to influence SCTLRFYI: this patch (patch 4/4) doesn't seem to have made it anywhere (I don't have it, and neither does the archive).
Quoted 6 lines
Quoted 1 line
Will
Patch 4/4 was the bindings for sdm845 and I didn't explicitly add IOMMU to the CC list and so patman did what patman does.
I'll resend.
Stack re-sent with you and Robin and the list on the CC for the bindings. I expect that Bjorn can pick up the bindings patches once the adreno-smmu patch is accepted but it is good for everybody to get the full picture.
Jordan
Signature · 6 lines
The Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, a Linux Foundation Collaborative Project _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu