Skip to contentSkip to conversation

iommu/arm-smmu-qcom: Skip the TTBR1 quirk for db820c.

PATCH Applied Eric Anholt 5 participants 14 messages Mar 26, 2021 – Jul 20, 2021

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

PATCH 1/2 iommu/arm-smmu-qcom: Skip the TTBR1 quirk for db820c.

db820c wants to use the qcom smmu path to get HUPCF set (which keeps the GPU from wedging and then sometimes wedging the kernel after a page fault), but it doesn't have separate pagetables support yet in drm/msm so we can't go all the way to the TTBR1 path.

---

We've been seeing a flaky test per day or so in Mesa CI where the kernel gets wedged after an iommu fault turns into CP errors. With this patch, the CI isn't throwing the string of CP errors on the faults in any of the ~10 jobs I've run so far.

 drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +12 -1
index bcda17012aee..51f22193e456 100644
@@ -130,6 +130,16 @@ static int qcom_adreno_smmu_alloc_context_bank(struct arm_smmu_domain *smmu_doma
 	return __arm_smmu_alloc_bitmap(smmu->context_map, start, count);
 }
 
+static bool qcom_adreno_can_do_ttbr1(struct arm_smmu_device *smmu)
+{
+	const struct device_node *np = smmu->dev->of_node;
+
+	if (of_device_is_compatible(np, "qcom,msm8996-smmu-v2"))
+		return false;
+
+	return true;
+}
+
 static int qcom_adreno_smmu_init_context(struct arm_smmu_domain *smmu_domain,
 		struct io_pgtable_cfg *pgtbl_cfg, struct device *dev)
 {
@@ -144,7 +154,8 @@ static int qcom_adreno_smmu_init_context(struct arm_smmu_domain *smmu_domain,
 	 * be AARCH64 stage 1 but double check because the arm-smmu code assumes
 	 * that is the case when the TTBR1 quirk is enabled
 	 */
-	if ((smmu_domain->stage == ARM_SMMU_DOMAIN_S1) &&
+	if (qcom_adreno_can_do_ttbr1(smmu_domain->smmu) &&
+	    (smmu_domain->stage == ARM_SMMU_DOMAIN_S1) &&
 	    (smmu_domain->cfg.fmt == ARM_SMMU_CTX_FMT_AARCH64))
 		pgtbl_cfg->quirks |= IO_PGTABLE_QUIRK_ARM_TTBR1;
 
Signature · 6 lines
2.31.0

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
#1 lore raw

PATCH 2/2 arm64: dts: msm8996: Mark the GPU's SMMU as an adreno one.

This enables the adreno-specific SMMU path that sets HUPCF so (user-managed) page faults don't wedge the GPU.

---

We've been seeing a flaky test per day or so in Mesa CI where the kernel gets wedged after an iommu fault turns into CP errors. With this patch, the CI isn't throwing the string of CP errors on the faults in any of the ~10 jobs I've run so far.

 arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8996.dtsi +1 -1
index 6de136e3add9..432b87ec9c5e 100644
@@ -1127,7 +1127,7 @@ cci_i2c1: i2c-bus@1 {
 		};
 
 		adreno_smmu: iommu@b40000 {
-			compatible = "qcom,msm8996-smmu-v2", "qcom,smmu-v2";
+			compatible = "qcom,msm8996-smmu-v2", "qcom,adreno-smmu", "qcom,smmu-v2";
 			reg = <0x00b40000 0x10000>;
 
 			#global-interrupts = <1>;
Signature · 6 lines
2.31.0

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Acked-by on v1 2/2
#2 lore raw

Re: [PATCH 2/2] arm64: dts: msm8996: Mark the GPU's SMMU as an adreno one.

Quoted 4 lines · Eric Anholt

This enables the adreno-specific SMMU path that sets HUPCF so (user-managed) page faults don't wedge the GPU.

@Will, can you pick this together with the driver patch? (So that they land in order)

Regards,
Bjorn

Quoted 26 lines

---

We've been seeing a flaky test per day or so in Mesa CI where the kernel gets wedged after an iommu fault turns into CP errors. With this patch, the CI isn't throwing the string of CP errors on the faults in any of the ~10 jobs I've run so far.

 arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/boot/dts/qcom/msm8996.dtsi +1 -1
index 6de136e3add9..432b87ec9c5e 100644
@@ -1127,7 +1127,7 @@ cci_i2c1: i2c-bus@1 {
 		};
 
 		adreno_smmu: iommu@b40000 {
-			compatible = "qcom,msm8996-smmu-v2", "qcom,smmu-v2";
+			compatible = "qcom,msm8996-smmu-v2", "qcom,adreno-smmu", "qcom,smmu-v2";
 			reg = <0x00b40000 0x10000>;
 
 			#global-interrupts = <1>;
Signature · 1 line
2.31.0

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

maintainer
#3 lore raw
In reply to Eric Anholt
Quoted 4 lines · Eric Anholt

db820c wants to use the qcom smmu path to get HUPCF set (which keeps the GPU from wedging and then sometimes wedging the kernel after a page fault), but it doesn't have separate pagetables support yet in drm/msm so we can't go all the way to the TTBR1 path.

What do you mean by "doesn't have separate pagetables support yet"? The compatible string doesn't feel like the right way to determine this.

Will
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#4 lore raw
Quoted 9 lines · Will Deacon
Quoted 4 lines · Eric Anholt

db820c wants to use the qcom smmu path to get HUPCF set (which keeps the GPU from wedging and then sometimes wedging the kernel after a page fault), but it doesn't have separate pagetables support yet in drm/msm so we can't go all the way to the TTBR1 path.

What do you mean by "doesn't have separate pagetables support yet"? The compatible string doesn't feel like the right way to determine this.

In my past experience with DT, software looking at the (existing) board-specific compatibles has been a typical mechanism used to resolve something like this "ok, but you need to actually get down to what board is involved here to figure out how to play along with the rest of Linux that later attaches to other DT nodes". Do you have a preferred mechanism here?
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#5 lore raw
In reply to Will Deacon
Quoted 9 lines · Will Deacon
Quoted 4 lines · Eric Anholt

db820c wants to use the qcom smmu path to get HUPCF set (which keeps the GPU from wedging and then sometimes wedging the kernel after a page fault), but it doesn't have separate pagetables support yet in drm/msm so we can't go all the way to the TTBR1 path.

What do you mean by "doesn't have separate pagetables support yet"? The compatible string doesn't feel like the right way to determine this.

the compatible string identifies what it is, not what the sw limitations are, so in that regard it seems right to me..

BR,
-R
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

maintainer
#6 lore raw
Quoted 8 lines · Rob Clark
Quoted 7 lines · Will Deacon
Quoted 4 lines · Eric Anholt

db820c wants to use the qcom smmu path to get HUPCF set (which keeps the GPU from wedging and then sometimes wedging the kernel after a page fault), but it doesn't have separate pagetables support yet in drm/msm so we can't go all the way to the TTBR1 path.

Quoted 5 lines
Quoted 2 lines

What do you mean by "doesn't have separate pagetables support yet"? The compatible string doesn't feel like the right way to determine this.

the compatible string identifies what it is, not what the sw limitations are, so in that regard it seems right to me..

Well it depends on what "doesn't have separate pagetables support yet" means. I can't tell if it's a hardware issue, a firmware issue or a driver issue.

Will
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#7 lore raw
Quoted 13 lines · Will Deacon
Quoted 11 lines · Rob Clark
Quoted 9 lines · Will Deacon
Quoted 4 lines · Eric Anholt

db820c wants to use the qcom smmu path to get HUPCF set (which keeps the GPU from wedging and then sometimes wedging the kernel after a page fault), but it doesn't have separate pagetables support yet in drm/msm so we can't go all the way to the TTBR1 path.

What do you mean by "doesn't have separate pagetables support yet"? The compatible string doesn't feel like the right way to determine this.

Quoted 6 lines
Quoted 2 lines

the compatible string identifies what it is, not what the sw limitations are, so in that regard it seems right to me..

Well it depends on what "doesn't have separate pagetables support yet" means. I can't tell if it's a hardware issue, a firmware issue or a driver issue.

Just a driver issue (and the fact that currently we don't have physical access to a device... debugging a5xx per-process-pgtables by pushing untested things to the CI farm is kind of a difficult way to work)

BR,
-R
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

maintainer
#8 lore raw
Quoted 17 lines · Rob Clark
Quoted 16 lines · Will Deacon
Quoted 13 lines · Rob Clark
Quoted 9 lines · Will Deacon
Quoted 4 lines · Eric Anholt

db820c wants to use the qcom smmu path to get HUPCF set (which keeps the GPU from wedging and then sometimes wedging the kernel after a page fault), but it doesn't have separate pagetables support yet in drm/msm so we can't go all the way to the TTBR1 path.

What do you mean by "doesn't have separate pagetables support yet"? The compatible string doesn't feel like the right way to determine this.

the compatible string identifies what it is, not what the sw limitations are, so in that regard it seems right to me..

Quoted 8 lines
Quoted 3 lines

Well it depends on what "doesn't have separate pagetables support yet" means. I can't tell if it's a hardware issue, a firmware issue or a driver issue.

Just a driver issue (and the fact that currently we don't have physical access to a device... debugging a5xx per-process-pgtables by pushing untested things to the CI farm is kind of a difficult way to work)

But then in that case, this is using the compatible string to identify a driver issue, no?

Will
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#9 lore raw
Quoted 23 lines · Will Deacon
Quoted 21 lines · Rob Clark
Quoted 19 lines · Will Deacon
Quoted 8 lines · Rob Clark
Quoted 7 lines · Will Deacon
Quoted 4 lines · Eric Anholt

db820c wants to use the qcom smmu path to get HUPCF set (which keeps the GPU from wedging and then sometimes wedging the kernel after a page fault), but it doesn't have separate pagetables support yet in drm/msm so we can't go all the way to the TTBR1 path.

Quoted 5 lines
Quoted 2 lines

What do you mean by "doesn't have separate pagetables support yet"? The compatible string doesn't feel like the right way to determine this.

the compatible string identifies what it is, not what the sw limitations are, so in that regard it seems right to me..

Well it depends on what "doesn't have separate pagetables support yet" means. I can't tell if it's a hardware issue, a firmware issue or a driver issue.

Quoted 8 lines
Quoted 4 lines

Just a driver issue (and the fact that currently we don't have physical access to a device... debugging a5xx per-process-pgtables by pushing untested things to the CI farm is kind of a difficult way to work)

But then in that case, this is using the compatible string to identify a driver issue, no?

Well, I suppose yes.. but OTOH it is keeping the problem out of the dtb. Once per-process pgtables works for a5xx, there would be no dtb change, just a change to the quirk behavior in arm-smmu-qcom.

BR,
-R
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

#10 lore raw
In reply to Will Deacon
Quoted 22 lines · Will Deacon
Quoted 21 lines · Rob Clark
Quoted 19 lines · Will Deacon
Quoted 8 lines · Rob Clark
Quoted 7 lines · Will Deacon
Quoted 4 lines · Eric Anholt

db820c wants to use the qcom smmu path to get HUPCF set (which keeps the GPU from wedging and then sometimes wedging the kernel after a page fault), but it doesn't have separate pagetables support yet in drm/msm so we can't go all the way to the TTBR1 path.

Quoted 5 lines
Quoted 2 lines

What do you mean by "doesn't have separate pagetables support yet"? The compatible string doesn't feel like the right way to determine this.

the compatible string identifies what it is, not what the sw limitations are, so in that regard it seems right to me..

Well it depends on what "doesn't have separate pagetables support yet" means. I can't tell if it's a hardware issue, a firmware issue or a driver issue.

Quoted 8 lines
Quoted 4 lines

Just a driver issue (and the fact that currently we don't have physical access to a device... debugging a5xx per-process-pgtables by pushing untested things to the CI farm is kind of a difficult way to work)

But then in that case, this is using the compatible string to identify a driver issue, no?

No the compatible addition identifies the hardware, the implementation then uses this information to know that it needs to behave "differently" on this platform.

When/if someone decides to add the necessary support in the driver they can remove the driver quirk, but it doesn't invalidate the specific compatible.

Regards,
Bjorn

Reviewed-by on v1 1/2
#11 lore raw
In reply to Eric Anholt
Quoted 6 lines · Eric Anholt

db820c wants to use the qcom smmu path to get HUPCF set (which keeps the GPU from wedging and then sometimes wedging the kernel after a page fault), but it doesn't have separate pagetables support yet in drm/msm so we can't go all the way to the TTBR1 path.

Regards,
Bjorn

Quoted 44 lines

---

We've been seeing a flaky test per day or so in Mesa CI where the kernel gets wedged after an iommu fault turns into CP errors. With this patch, the CI isn't throwing the string of CP errors on the faults in any of the ~10 jobs I've run so far.

 drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +12 -1
index bcda17012aee..51f22193e456 100644
@@ -130,6 +130,16 @@ static int qcom_adreno_smmu_alloc_context_bank(struct arm_smmu_domain *smmu_doma
 	return __arm_smmu_alloc_bitmap(smmu->context_map, start, count);
 }
 
+static bool qcom_adreno_can_do_ttbr1(struct arm_smmu_device *smmu)
+{
+	const struct device_node *np = smmu->dev->of_node;
+
+	if (of_device_is_compatible(np, "qcom,msm8996-smmu-v2"))
+		return false;
+
+	return true;
+}
+
 static int qcom_adreno_smmu_init_context(struct arm_smmu_domain *smmu_domain,
 		struct io_pgtable_cfg *pgtbl_cfg, struct device *dev)
 {
@@ -144,7 +154,8 @@ static int qcom_adreno_smmu_init_context(struct arm_smmu_domain *smmu_domain,
 	 * be AARCH64 stage 1 but double check because the arm-smmu code assumes
 	 * that is the case when the TTBR1 quirk is enabled
 	 */
-	if ((smmu_domain->stage == ARM_SMMU_DOMAIN_S1) &&
+	if (qcom_adreno_can_do_ttbr1(smmu_domain->smmu) &&
+	    (smmu_domain->stage == ARM_SMMU_DOMAIN_S1) &&
 	    (smmu_domain->cfg.fmt == ARM_SMMU_CTX_FMT_AARCH64))
 		pgtbl_cfg->quirks |= IO_PGTABLE_QUIRK_ARM_TTBR1;
 
Signature · 1 line
2.31.0

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel

maintainer Applied
#12 lore raw
In reply to Eric Anholt
Quoted 4 lines · Eric Anholt

db820c wants to use the qcom smmu path to get HUPCF set (which keeps the GPU from wedging and then sometimes wedging the kernel after a page fault), but it doesn't have separate pagetables support yet in drm/msm so we can't go all the way to the TTBR1 path.

Applied to will (for-joerg/arm-smmu/updates), thanks!

[1/2] iommu/arm-smmu-qcom: Skip the TTBR1 quirk for db820c.

      https://git.kernel.org/will/c/a242f4297cfe
[2/2] arm64: dts: msm8996: Mark the GPU's SMMU as an adreno one.
      https://git.kernel.org/will/c/19c07b91f85d

Cheers,

Signature · 5 lines
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev
#13 lore raw
In reply to Eric Anholt
This series was applied to qcom/linux.git (refs/heads/for-next):

Hello:

This series was applied to qcom/linux.git (refs/heads/for-next):

Quoted 8 lines · On Fri, 26 Mar 2021 16:13:02 -0700 you wrote:

db820c wants to use the qcom smmu path to get HUPCF set (which keeps the GPU from wedging and then sometimes wedging the kernel after a page fault), but it doesn't have separate pagetables support yet in drm/msm so we can't go all the way to the TTBR1 path.

[...]

Here is the summary with links:
- [1/2] iommu/arm-smmu-qcom: Skip the TTBR1 quirk for db820c.

    https://git.kernel.org/qcom/c/a242f4297cfe
  - [2/2] arm64: dts: msm8996: Mark the GPU's SMMU as an adreno one.
    https://git.kernel.org/qcom/c/19c07b91f85d

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html