On Thu, Jun 11, 2026 at 12:39:32PM +0530, Lazar, Lijo wrote: > > > On 11-Jun-26 11:56 AM, Huang Rui wrote: > > On Thu, Jun 11, 2026 at 01:57:15PM +0800, Jiqian Chen wrote: > > > For Renior APU with gfx9, in some test scenarios with disabling > > > ring_reset, like accessing an unmapped invalid address, it can > > > trigger a gpu job timeout event, then driver uses Mode2 reset > > > to reset GPU, but after Mode2 compute Ring test and IB test fail > > > randomly. It because the CPC and CPF are still stuck after Mode2, > > > that causes compute Ring test fail. What's more, the HQDs of > > > MECs are still active, that causes MECs use stale HQDs when MECs > > > are unhalted before driver restore MQDs, then causes compute IB > > > tests fail. > > > > > > So, add sequences to reset CPC and CPF after Mode2, and de-active > > > HQDs of MECs before unhalting MECs. > > > > > > Signed-off-by: Jiqian Chen <[email protected]> > > > --- > > > v1->v2 changes: > > > * Move my sequences into a new function gfx_v9_0_cp_mode2_clear_state > > > * Add reset Mode2 method check to the if condition that call my sequences > > > > > > v1: > > > Hi all, > > > > > > My board is Renior APU with gfx9, smu12. I run a testcase that > > > accesses an invalid address to trigger a amdgpu_job_timedout() > > > with disabling ring_reset, so that driver will call mode2 reset > > > directly. After mode2 reset I found compute Ring tests and compute > > > IB tests fail randomly on random compute ring. > > > > > > We checked the scan dump of GPU, we can see the CPC and CPF are > > > still stuck, that caused Compute Ring tests fail. > > > > > > I added printings in driver codes (gfx_v9_0_cp_resume), and found > > > the HQDs of MECs are still active, that may cause MECs use stale > > > HQDs when MECs are unhalted before mapping compute queues (restoring > > > MQDs to HQDs). > > > > > > So, I send this patch to fix above problems. > > > There are two main changes of my patch: > > > One is to reset CPC and CPF before resuming KCQ. > > > Another is to disable HQDs beofre unhalting MECs. > > > --- > > > drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 44 +++++++++++++++++++++++++++ > > > 1 file changed, 44 insertions(+) > > > > > > diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c > > > b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c > > > index 47721d0c3781..d3ef45aa299a 100644 > > > --- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c > > > +++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c > > > @@ -3942,6 +3942,46 @@ static int gfx_v9_0_kcq_resume(struct > > > amdgpu_device *adev) > > > return amdgpu_gfx_enable_kcq(adev, 0); > > > } > > > +static void gfx_v9_0_cp_mode2_clear_state(struct amdgpu_device *adev) > > > +{ > > > + u32 tmp; > > > + int i, j, k; > > > + > > > + /* > > > + * CPC and CPF are still stuck after Mode2 reset, that causes later > > > + * compute ring test fail and then loop Mode2 reset infinitely > > > + */ > > > + tmp = RREG32_SOC15(GC, 0, mmGRBM_SOFT_RESET); > > > + tmp = REG_SET_FIELD(tmp, GRBM_SOFT_RESET, SOFT_RESET_CPC, 1); > > > + tmp = REG_SET_FIELD(tmp, GRBM_SOFT_RESET, SOFT_RESET_CPF, 1); > > > + WREG32_SOC15(GC, 0, mmGRBM_SOFT_RESET, tmp); > > > + tmp = RREG32_SOC15(GC, 0, mmGRBM_SOFT_RESET); > > > + udelay(50); > > > + > > > + tmp &= ~(GRBM_SOFT_RESET__SOFT_RESET_CPC_MASK | > > > + GRBM_SOFT_RESET__SOFT_RESET_CPF_MASK); > > > + WREG32_SOC15(GC, 0, mmGRBM_SOFT_RESET, tmp); > > > + tmp = RREG32_SOC15(GC, 0, mmGRBM_SOFT_RESET); > > > + udelay(50); > > > + > > > + /* > > > + * CP_HQD_ACTIVE survives Mode2 reset. Deactivate every MEC HQD to > > > + * prevent MEC use stale HQD when MEC unhalted before restoring MQD. > > > + * Otherwise, later compute IB test may fail > > > + */ > > > + for (i = 0; i < adev->gfx.mec.num_mec; i++) { > > > + for (j = 0; j < adev->gfx.mec.num_pipe_per_mec; j++) { > > > + for (k = 0; k < adev->gfx.mec.num_queue_per_pipe; k++) { > > > + mutex_lock(&adev->srbm_mutex); > > > + soc15_grbm_select(adev, i + 1, j, k, 0, 0); > > > + WREG32_SOC15_RLC(GC, 0, mmCP_HQD_ACTIVE, 0); > > > > I think we don't need to use WREG32_SOC15_RLC here, because SRIOV GPU won't > > access this code path. > > > > > + soc15_grbm_select(adev, 0, 0, 0, 0, 0); > > > + mutex_unlock(&adev->srbm_mutex); > > > + } > > > + } > > > + } > > > +} > > > + > > > static int gfx_v9_0_cp_resume(struct amdgpu_device *adev) > > > { > > > int r, i; > > > @@ -3967,6 +4007,10 @@ static int gfx_v9_0_cp_resume(struct amdgpu_device > > > *adev) > > > gfx_v9_0_cp_gfx_enable(adev, false); > > > gfx_v9_0_cp_compute_enable(adev, false); > > > + if ((adev->flags & AMD_IS_APU) && amdgpu_in_reset(adev) && > > > + amdgpu_asic_reset_method(adev) == AMD_RESET_METHOD_MODE2) > > > > If we constrain the condition to a mode2 reset, does that mean we no longer > > need to restrict it to APU? > > > > This issue is not reported on aldebaran which also supports mode-2 reset. >
Nice catch, thanks Lijo. We should still keep APU flag. Thanks, Ray > Thanks, > Lijo > > > Thanks, > > Ray > > > > > + gfx_v9_0_cp_mode2_clear_state(adev); > > > + > > > r = gfx_v9_0_kiq_resume(adev); > > > if (r) > > > return r; > > > -- > > > 2.39.5 > > > >
