* [PATCH 1/3] drm/msm/a3xx: report CP protected mode faults
2026-11-11 13:05 [PATCH 0/3] drm/msm/a3xx: follow the msm-3.10 kgsl CP setup Dmitry Baryshkov
@ 2026-11-11 13:05 ` Dmitry Baryshkov
2026-11-17 15:53 ` Konrad Dybcio
2026-11-11 13:05 ` [PATCH 2/3] drm/msm/a3xx: update the CP protected register ranges Dmitry Baryshkov
2026-11-11 13:05 ` [PATCH 3/3] drm/msm/a3xx: update the CP_ME_INIT data to msm-3.10 Dmitry Baryshkov
2 siblings, 1 reply; 5+ messages in thread
From: Dmitry Baryshkov @ 2026-11-11 13:05 UTC (permalink / raw)
To: Rob Clark, Sean Paul, Konrad Dybcio, Akhil P Oommen,
Dmitry Baryshkov, Abhinav Kumar, Jessica Zhang, Marijn Suijten,
David Airlie, Simona Vetter
Cc: linux-arm-msm, dri-devel, freedreno, linux-kernel
a3xx_irq() acks every interrupt without looking at it, so a write to a
protected register shows up only as a hangcheck timeout with no hint of
which register was hit. Print the faulting address the way a4xx and a5xx
already do.
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/msm/adreno/a3xx_gpu.c b/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
index 160d302e16a3..7e03b7305493 100644
--- a/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
@@ -419,7 +419,14 @@ static irqreturn_t a3xx_irq(struct msm_gpu *gpu)
status = gpu_read(gpu, REG_A3XX_RBBM_INT_0_STATUS);
DBG("%s: %08x", gpu->name, status);
- // TODO
+ if (status & A3XX_INT0_CP_REG_PROTECT_FAULT) {
+ u32 val = gpu_read(gpu, REG_A3XX_CP_PROTECT_STATUS);
+
+ dev_err_ratelimited(gpu->dev->dev,
+ "CP | protected mode error | %s | addr=0x%8.8X | status=0x%8.8X\n",
+ val & (1 << 24) ? "WRITE" : "READ",
+ (val & 0xFFFFF) >> 2, val);
+ }
gpu_write(gpu, REG_A3XX_RBBM_INT_CLEAR_CMD, status);
--
2.47.3
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 2/3] drm/msm/a3xx: update the CP protected register ranges
2026-11-11 13:05 [PATCH 0/3] drm/msm/a3xx: follow the msm-3.10 kgsl CP setup Dmitry Baryshkov
2026-11-11 13:05 ` [PATCH 1/3] drm/msm/a3xx: report CP protected mode faults Dmitry Baryshkov
@ 2026-11-11 13:05 ` Dmitry Baryshkov
2026-11-11 13:05 ` [PATCH 3/3] drm/msm/a3xx: update the CP_ME_INIT data to msm-3.10 Dmitry Baryshkov
2 siblings, 0 replies; 5+ messages in thread
From: Dmitry Baryshkov @ 2026-11-11 13:05 UTC (permalink / raw)
To: Rob Clark, Sean Paul, Konrad Dybcio, Akhil P Oommen,
Dmitry Baryshkov, Abhinav Kumar, Jessica Zhang, Marijn Suijten,
David Airlie, Simona Vetter
Cc: linux-arm-msm, dri-devel, freedreno, linux-kernel
The protected register table was taken from the msm-3.4 downstream
driver. Update it to the ranges of the msm-3.10 kgsl driver, keeping the
wider 0x100-0x13f RBBM range and also covering the VBIF QoS and AXI
registers at 0x3040-0x305f that the driver programs.
Fixes: 7198e6b03155 ("drm/msm: add a3xx gpu support")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 21 ++++++++++++---------
1 file changed, 12 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/msm/adreno/a3xx_gpu.c b/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
index 7e03b7305493..1de4277ebf9a 100644
--- a/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
@@ -288,25 +288,28 @@ static int a3xx_hw_init(struct msm_gpu *gpu)
gpu_write(gpu, REG_A3XX_CP_PROTECT_CTRL, 0x00000007);
/* RBBM registers */
- gpu_write(gpu, REG_A3XX_CP_PROTECT(0), 0x63000040);
+ gpu_write(gpu, REG_A3XX_CP_PROTECT(0), 0x60000060);
gpu_write(gpu, REG_A3XX_CP_PROTECT(1), 0x62000080);
gpu_write(gpu, REG_A3XX_CP_PROTECT(2), 0x600000cc);
gpu_write(gpu, REG_A3XX_CP_PROTECT(3), 0x60000108);
gpu_write(gpu, REG_A3XX_CP_PROTECT(4), 0x64000140);
- gpu_write(gpu, REG_A3XX_CP_PROTECT(5), 0x66000400);
+ gpu_write(gpu, REG_A3XX_CP_PROTECT(5), 0x6000018c);
+ gpu_write(gpu, REG_A3XX_CP_PROTECT(6), 0x66000400);
/* CP registers */
- gpu_write(gpu, REG_A3XX_CP_PROTECT(6), 0x65000700);
- gpu_write(gpu, REG_A3XX_CP_PROTECT(7), 0x610007d8);
- gpu_write(gpu, REG_A3XX_CP_PROTECT(8), 0x620007e0);
- gpu_write(gpu, REG_A3XX_CP_PROTECT(9), 0x61001178);
- gpu_write(gpu, REG_A3XX_CP_PROTECT(10), 0x64001180);
+ gpu_write(gpu, REG_A3XX_CP_PROTECT(7), 0x65000700);
+ gpu_write(gpu, REG_A3XX_CP_PROTECT(8), 0x610007b0);
+ gpu_write(gpu, REG_A3XX_CP_PROTECT(9), 0x610007d8);
+ gpu_write(gpu, REG_A3XX_CP_PROTECT(10), 0x620007e0);
+ gpu_write(gpu, REG_A3XX_CP_PROTECT(11), 0x61001178);
+ gpu_write(gpu, REG_A3XX_CP_PROTECT(12), 0x64001180);
/* RB registers */
- gpu_write(gpu, REG_A3XX_CP_PROTECT(11), 0x60003300);
+ gpu_write(gpu, REG_A3XX_CP_PROTECT(13), 0x60003300);
/* VBIF registers */
- gpu_write(gpu, REG_A3XX_CP_PROTECT(12), 0x6b00c000);
+ gpu_write(gpu, REG_A3XX_CP_PROTECT(14), 0x6600c000);
+ gpu_write(gpu, REG_A3XX_CP_PROTECT(15), 0x6500c100);
/* NOTE: PM4/micro-engine firmware registers look to be the same
* for a2xx and a3xx.. we could possibly push that part down to
--
2.47.3
^ permalink raw reply [flat|nested] 5+ messages in thread* [PATCH 3/3] drm/msm/a3xx: update the CP_ME_INIT data to msm-3.10
2026-11-11 13:05 [PATCH 0/3] drm/msm/a3xx: follow the msm-3.10 kgsl CP setup Dmitry Baryshkov
2026-11-11 13:05 ` [PATCH 1/3] drm/msm/a3xx: report CP protected mode faults Dmitry Baryshkov
2026-11-11 13:05 ` [PATCH 2/3] drm/msm/a3xx: update the CP protected register ranges Dmitry Baryshkov
@ 2026-11-11 13:05 ` Dmitry Baryshkov
2 siblings, 0 replies; 5+ messages in thread
From: Dmitry Baryshkov @ 2026-11-11 13:05 UTC (permalink / raw)
To: Rob Clark, Sean Paul, Konrad Dybcio, Akhil P Oommen,
Dmitry Baryshkov, Abhinav Kumar, Jessica Zhang, Marijn Suijten,
David Airlie, Simona Vetter
Cc: linux-arm-msm, dri-devel, freedreno, linux-kernel
Update the CP_ME_INIT payload to the values used by the msm-3.10 kgsl
driver.
Fixes: 7198e6b03155 ("drm/msm: add a3xx gpu support")
Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
---
drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/gpu/drm/msm/adreno/a3xx_gpu.c b/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
index 1de4277ebf9a..1420f18bcf75 100644
--- a/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
+++ b/drivers/gpu/drm/msm/adreno/a3xx_gpu.c
@@ -103,7 +103,7 @@ static bool a3xx_me_init(struct msm_gpu *gpu)
OUT_RING(ring, 0x00000001);
OUT_RING(ring, 0x00000000);
OUT_RING(ring, 0x00000000);
- OUT_RING(ring, 0x00000000);
+ OUT_RING(ring, 0x20000000);
OUT_RING(ring, 0x00000000);
OUT_RING(ring, 0x00000000);
--
2.47.3
^ permalink raw reply [flat|nested] 5+ messages in thread