drm/msm: fix for "Timeout waiting for GMU OOB set GPU_SET: 0x0"
Subsystems (4)
v3 cover drm/msm: fix for "Timeout waiting for GMU OOB set GPU_SET: 0x0"
Updated commit messages over v2, no code changes.
Eric Anholt (3):
drm/msm: Fix race of GPU init vs timestamp power management. drm/msm: Fix races managing the OOB state for timestamp vs timestamps. drm/msm: Clean up GMU OOB set/clear handling.
drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 105 +++++++++++++++----------- drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 49 ++++-------- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 8 +- 3 files changed, 84 insertions(+), 78 deletions(-)
Signature · 6 lines
2.30.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 1/3 drm/msm: Fix race of GPU init vs timestamp power management.
We were using the same force-poweron bit in the two codepaths, so they could race to have one of them lose GPU power early.
freedreno CI was seeing intermittent errors like:
[drm:_a6xx_gmu_set_oob] *ERROR* Timeout waiting for GMU OOB set GPU_SET: 0x0 and this issue could have contributed to it.
--- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 25 ++++++++++++++++++++++--- drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 8 ++++++++ drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 4 ++-- 3 files changed, 32 insertions(+), 5 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gmu.c +22 -3
@@ -264,6 +264,16 @@ int a6xx_gmu_set_oob(struct a6xx_gmu *gmu, enum a6xx_gmu_oob_state state) } name ="GPU_SET" ;break ; +case GMU_OOB_PERFCOUNTER_SET : +if (gmu->legacy) { + request =GMU_OOB_PERFCOUNTER_REQUEST ; + ack =GMU_OOB_PERFCOUNTER_ACK ; + }else { + request =GMU_OOB_PERFCOUNTER_REQUEST_NEW ; + ack =GMU_OOB_PERFCOUNTER_ACK_NEW ; + } + name ="PERFCOUNTER" ; +break ;case GMU_OOB_BOOT_SLUMBER : request =GMU_OOB_BOOT_SLUMBER_REQUEST ; ack =GMU_OOB_BOOT_SLUMBER_ACK ;
@@ -301,9 +311,14 @@ int a6xx_gmu_set_oob(struct a6xx_gmu *gmu, enum a6xx_gmu_oob_state state)void a6xx_gmu_clear_oob (struct a6xx_gmu *gmu,enum a6xx_gmu_oob_state state) {if (!gmu->legacy) { -WARN_ON (state !=GMU_OOB_GPU_SET ); -gmu_write (gmu,REG_A6XX_GMU_HOST2GMU_INTR_SET , -1 <<GMU_OOB_GPU_SET_CLEAR_NEW ); +if (state ==GMU_OOB_GPU_SET ) { +gmu_write (gmu,REG_A6XX_GMU_HOST2GMU_INTR_SET , +1 <<GMU_OOB_GPU_SET_CLEAR_NEW ); + }else { +WARN_ON (state !=GMU_OOB_PERFCOUNTER_SET ); +gmu_write (gmu,REG_A6XX_GMU_HOST2GMU_INTR_SET , +1 <<GMU_OOB_PERFCOUNTER_CLEAR_NEW ); + }return ; }
@@ -312,6 +327,10 @@ void a6xx_gmu_clear_oob(struct a6xx_gmu *gmu, enum a6xx_gmu_oob_state state)gmu_write (gmu,REG_A6XX_GMU_HOST2GMU_INTR_SET ,1 <<GMU_OOB_GPU_SET_CLEAR );break ; +case GMU_OOB_PERFCOUNTER_SET : +gmu_write (gmu,REG_A6XX_GMU_HOST2GMU_INTR_SET , +1 <<GMU_OOB_PERFCOUNTER_CLEAR ); +break ;case GMU_OOB_BOOT_SLUMBER :gmu_write (gmu,REG_A6XX_GMU_HOST2GMU_INTR_SET ,1 <<GMU_OOB_BOOT_SLUMBER_CLEAR );
drivers/gpu/drm/msm/adreno/a6xx_gmu.h +8 -0
@@ -156,6 +156,7 @@ enum a6xx_gmu_oob_state {GMU_OOB_BOOT_SLUMBER =0 ,GMU_OOB_GPU_SET ,GMU_OOB_DCVS_SET , + GMU_OOB_PERFCOUNTER_SET, };/* These are the interrupt / ack bits for each OOB request that are set
@@ -190,6 +191,13 @@ enum a6xx_gmu_oob_state {#define GMU_OOB_GPU_SET_ACK_NEW 31#define GMU_OOB_GPU_SET_CLEAR_NEW 31 +#define GMU_OOB_PERFCOUNTER_REQUEST 17 +#define GMU_OOB_PERFCOUNTER_ACK 25 +#define GMU_OOB_PERFCOUNTER_CLEAR 25 + +#define GMU_OOB_PERFCOUNTER_REQUEST_NEW 28 +#define GMU_OOB_PERFCOUNTER_ACK_NEW 30 +#define GMU_OOB_PERFCOUNTER_CLEAR_NEW 30void a6xx_hfi_init (struct a6xx_gmu *gmu);int a6xx_hfi_start (struct a6xx_gmu *gmu,int boot_state);
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +2 -2
@@ -1177,12 +1177,12 @@ static int a6xx_get_timestamp(struct msm_gpu *gpu, uint64_t *value)struct a6xx_gpu *a6xx_gpu =to_a6xx_gpu (adreno_gpu);/* Force the GPU power on so we can read this register */ -a6xx_gmu_set_oob (&a6xx_gpu->gmu,GMU_OOB_GPU_SET ); +a6xx_gmu_set_oob (&a6xx_gpu->gmu,GMU_OOB_PERFCOUNTER_SET ); *value =gpu_read64 (gpu,REG_A6XX_RBBM_PERFCTR_CP_0_LO ,REG_A6XX_RBBM_PERFCTR_CP_0_HI ); -a6xx_gmu_clear_oob (&a6xx_gpu->gmu,GMU_OOB_GPU_SET ); +a6xx_gmu_clear_oob (&a6xx_gpu->gmu,GMU_OOB_PERFCOUNTER_SET );return 0 ; }
Signature · 6 lines
2.30.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 2/3 drm/msm: Fix races managing the OOB state for timestamp vs timestamps.
In reply to Eric AnholtNow that we're not racing with GPU setup, also fix races of timestamps against other timestamps. In freedreno CI, we were seeing this path trigger timeouts on setting the GMU bit, producing:
[drm:_a6xx_gmu_set_oob] *ERROR* Timeout waiting for GMU OOB set GPU_SET: 0x0
and this triggered especially on the first set of tests right after boot (it's probably easier to lose the race than one might think, given that we start many tests in parallel, and waiting for NFS to page in code probably means that lots of tests hit the same point of screen init at the same time). As of this patch, the message seems to have completely gone away.
--- drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 4 ++++ 1 file changed, 4 insertions(+)
drivers/gpu/drm/msm/adreno/a6xx_gpu.c +4 -0
@@ -1175,6 +1175,9 @@ static int a6xx_get_timestamp(struct msm_gpu *gpu, uint64_t *value) {struct adreno_gpu *adreno_gpu =to_adreno_gpu (gpu);struct a6xx_gpu *a6xx_gpu =to_a6xx_gpu (adreno_gpu); +static DEFINE_MUTEX (perfcounter_oob); + +mutex_lock (&perfcounter_oob);/* Force the GPU power on so we can read this register */ a6xx_gmu_set_oob (&a6xx_gpu->gmu,GMU_OOB_PERFCOUNTER_SET );
@@ -1183,6 +1186,7 @@ static int a6xx_get_timestamp(struct msm_gpu *gpu, uint64_t *value) REG_A6XX_RBBM_PERFCTR_CP_0_HI);a6xx_gmu_clear_oob (&a6xx_gpu->gmu,GMU_OOB_PERFCOUNTER_SET ); +mutex_unlock (&perfcounter_oob);return 0 ; }
Signature · 6 lines
2.30.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 3/3 drm/msm: Clean up GMU OOB set/clear handling.
In reply to Eric AnholtNow that the bug is fixed in the minimal way for stable, go make the code table-driven.
--- drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 124 +++++++++++++------------- drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 55 ++++-------- 2 files changed, 77 insertions(+), 102 deletions(-)
drivers/gpu/drm/msm/adreno/a6xx_gmu.c +62 -62
@@ -245,47 +245,66 @@ static int a6xx_gmu_hfi_start(struct a6xx_gmu *gmu)return ret; } +struct a6xx_gmu_oob_bits { +int set, ack, set_new, ack_new; +const char *name; +}; + +/* These are the interrupt / ack bits for each OOB request that are set +* in a6xx_gmu_set_oob and a6xx_clear_oob +*/ +static const struct a6xx_gmu_oob_bits a6xx_gmu_oob_bits[] = { + [GMU_OOB_GPU_SET ] = { + .name ="GPU_SET" , + .set =16 , + .ack =24 , + .set_new =30 , + .ack_new =31 , + }, + + [GMU_OOB_PERFCOUNTER_SET ] = { + .name ="PERFCOUNTER" , + .set =17 , + .ack =25 , + .set_new =28 , + .ack_new =30 , + }, + + [GMU_OOB_BOOT_SLUMBER ] = { + .name ="BOOT_SLUMBER" , + .set =22 , + .ack =30 , + }, + + [GMU_OOB_DCVS_SET ] = { + .name ="GPU_DCVS" , + .set =23 , + .ack =31 , + }, +}; +/* Trigger a OOB (out of band) request to the GMU */ int a6xx_gmu_set_oob (struct a6xx_gmu *gmu,enum a6xx_gmu_oob_state state) {int ret;u32 val;int request, ack; -const char *name; -switch (state) { -case GMU_OOB_GPU_SET : -if (gmu->legacy) { - request =GMU_OOB_GPU_SET_REQUEST ; - ack =GMU_OOB_GPU_SET_ACK ; - }else { - request =GMU_OOB_GPU_SET_REQUEST_NEW ; - ack =GMU_OOB_GPU_SET_ACK_NEW ; - } - name ="GPU_SET" ; -break ; -case GMU_OOB_PERFCOUNTER_SET : -if (gmu->legacy) { - request =GMU_OOB_PERFCOUNTER_REQUEST ; - ack =GMU_OOB_PERFCOUNTER_ACK ; - }else { - request =GMU_OOB_PERFCOUNTER_REQUEST_NEW ; - ack =GMU_OOB_PERFCOUNTER_ACK_NEW ; - } - name ="PERFCOUNTER" ; -break ; -case GMU_OOB_BOOT_SLUMBER : - request =GMU_OOB_BOOT_SLUMBER_REQUEST ; - ack =GMU_OOB_BOOT_SLUMBER_ACK ; - name ="BOOT_SLUMBER" ; -break ; -case GMU_OOB_DCVS_SET : - request =GMU_OOB_DCVS_REQUEST ; - ack =GMU_OOB_DCVS_ACK ; - name ="GPU_DCVS" ; -break ; -default : +if (state >=ARRAY_SIZE (a6xx_gmu_oob_bits))return -EINVAL ; + +if (gmu->legacy) { + request = a6xx_gmu_oob_bits[state].set; + ack = a6xx_gmu_oob_bits[state].ack; + }else { + request = a6xx_gmu_oob_bits[state].set_new; + ack = a6xx_gmu_oob_bits[state].ack_new; +if (!request || !ack) { +DRM_DEV_ERROR (gmu->dev, +"Invalid non-legacy GMU request %s\n" , + a6xx_gmu_oob_bits[state].name); +return -EINVAL ; + } }/* Trigger the equested OOB operation */
@@ -298,7 +317,7 @@ int a6xx_gmu_set_oob(struct a6xx_gmu *gmu, enum a6xx_gmu_oob_state state)if (ret)DRM_DEV_ERROR (gmu->dev,"Timeout waiting for GMU OOB set %s: 0x%x\n" , - name, + a6xx_gmu_oob_bits[state].name,gmu_read (gmu,REG_A6XX_GMU_GMU2HOST_INTR_INFO ));/* Clear the acknowledge interrupt */
@@ -310,36 +329,17 @@ int a6xx_gmu_set_oob(struct a6xx_gmu *gmu, enum a6xx_gmu_oob_state state)/* Clear a pending OOB state in the GMU */ void a6xx_gmu_clear_oob (struct a6xx_gmu *gmu,enum a6xx_gmu_oob_state state) { -if (!gmu->legacy) { -if (state ==GMU_OOB_GPU_SET ) { -gmu_write (gmu,REG_A6XX_GMU_HOST2GMU_INTR_SET , -1 <<GMU_OOB_GPU_SET_CLEAR_NEW ); - }else { -WARN_ON (state !=GMU_OOB_PERFCOUNTER_SET ); -gmu_write (gmu,REG_A6XX_GMU_HOST2GMU_INTR_SET , -1 <<GMU_OOB_PERFCOUNTER_CLEAR_NEW ); - } +int bit; + +if (state >=ARRAY_SIZE (a6xx_gmu_oob_bits))return ; - } -switch (state) { -case GMU_OOB_GPU_SET : -gmu_write (gmu,REG_A6XX_GMU_HOST2GMU_INTR_SET , -1 <<GMU_OOB_GPU_SET_CLEAR ); -break ; -case GMU_OOB_PERFCOUNTER_SET : -gmu_write (gmu,REG_A6XX_GMU_HOST2GMU_INTR_SET , -1 <<GMU_OOB_PERFCOUNTER_CLEAR ); -break ; -case GMU_OOB_BOOT_SLUMBER : -gmu_write (gmu,REG_A6XX_GMU_HOST2GMU_INTR_SET , -1 <<GMU_OOB_BOOT_SLUMBER_CLEAR ); -break ; -case GMU_OOB_DCVS_SET : -gmu_write (gmu,REG_A6XX_GMU_HOST2GMU_INTR_SET , -1 <<GMU_OOB_DCVS_CLEAR ); -break ; - } +if (gmu->legacy) + bit = a6xx_gmu_oob_bits[state].ack; +else + bit = a6xx_gmu_oob_bits[state].ack_new; + +gmu_write (gmu,REG_A6XX_GMU_HOST2GMU_INTR_SET , bit); }/* Enable CPU control of SPTP power power collapse */
drivers/gpu/drm/msm/adreno/a6xx_gmu.h +15 -40
67 lines not on this page · raw message
Signature · 6 lines
2.30.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
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 Thu, 28 Jan 2021 13:03:29 -0800 you wrote:
Updated commit messages over v2, no code changes.
Eric Anholt (3):
drm/msm: Fix race of GPU init vs timestamp power management. drm/msm: Fix races managing the OOB state for timestamp vs timestamps. drm/msm: Clean up GMU OOB set/clear handling.[...]
Here is the summary with links:
- [v3,1/3] drm/msm: Fix race of GPU init vs timestamp power management.
https://git.kernel.org/qcom/c/7a7cbf2a8197 - [v3,2/3] drm/msm: Fix races managing the OOB state for timestamp vs timestamps. https://git.kernel.org/qcom/c/5f98b33b04c0 - [v3,3/3] drm/msm: Clean up GMU OOB set/clear handling. https://git.kernel.org/qcom/c/555c50a4a19b
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html