[PATCH 1/2] drm/amdgpu: remove re-route ih in psp v12

[Huang Rui]

On Tue, Apr 29, 2025 at 03:50:25PM +0200, Christian König wrote:
> On 4/29/25 12:29, Huang Rui wrote:
> > APU doesn't have second IH ring, so re-routing action here is a no-op.
> > It will take a lot of time to wait timeout from PSP during the
> > initialization. So remove the function in psp v12.
> 
> 
> Not 100% sure, but I think this code is also used for non APUs.
> 
> So we need to keep it around, just don't try to re-route faults to the second IH ring on APUs.

Yes, psp v12 is only for APUs like Renoir and related APU kicker and won't
be applied to dGPU. I think we should make series to modify these series to
update re-routing into dGPUs next step.

Thanks,
Ray

> 
> Regards,
> Christian.
> 
> > 
> > Signed-off-by: Huang Rui <ray.huang at amd.com>
> > ---
> >  drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 34 --------------------------
> >  1 file changed, 34 deletions(-)
> > 
> > diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
> > index 6331941440d9..ed24f61e1ab8 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/psp_v12_0.c
> > @@ -34,9 +34,6 @@
> >  #include "sdma0/sdma0_4_0_offset.h"
> >  #include "nbio/nbio_7_4_offset.h"
> >  
> > -#include "oss/osssys_4_0_offset.h"
> > -#include "oss/osssys_4_0_sh_mask.h"
> > -
> >  MODULE_FIRMWARE("amdgpu/renoir_asd.bin");
> >  MODULE_FIRMWARE("amdgpu/renoir_ta.bin");
> >  MODULE_FIRMWARE("amdgpu/green_sardine_asd.bin");
> > @@ -142,35 +139,6 @@ static int psp_v12_0_bootloader_load_sos(struct psp_context *psp)
> >  	return ret;
> >  }
> >  
> > -static void psp_v12_0_reroute_ih(struct psp_context *psp)
> > -{
> > -	struct amdgpu_device *adev = psp->adev;
> > -	uint32_t tmp;
> > -
> > -	/* Change IH ring for VMC */
> > -	tmp = REG_SET_FIELD(0, IH_CLIENT_CFG_DATA, CREDIT_RETURN_ADDR, 0x1244b);
> > -	tmp = REG_SET_FIELD(tmp, IH_CLIENT_CFG_DATA, CLIENT_TYPE, 1);
> > -	tmp = REG_SET_FIELD(tmp, IH_CLIENT_CFG_DATA, RING_ID, 1);
> > -
> > -	WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_69, 3);
> > -	WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_70, tmp);
> > -	WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_64, GFX_CTRL_CMD_ID_GBR_IH_SET);
> > -
> > -	psp_wait_for(psp, SOC15_REG_OFFSET(MP0, 0, mmMP0_SMN_C2PMSG_64),
> > -		     0x80000000, 0x8000FFFF, false);
> > -
> > -	/* Change IH ring for UMC */
> > -	tmp = REG_SET_FIELD(0, IH_CLIENT_CFG_DATA, CREDIT_RETURN_ADDR, 0x1216b);
> > -	tmp = REG_SET_FIELD(tmp, IH_CLIENT_CFG_DATA, RING_ID, 1);
> > -
> > -	WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_69, 4);
> > -	WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_70, tmp);
> > -	WREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_64, GFX_CTRL_CMD_ID_GBR_IH_SET);
> > -
> > -	psp_wait_for(psp, SOC15_REG_OFFSET(MP0, 0, mmMP0_SMN_C2PMSG_64),
> > -		     0x80000000, 0x8000FFFF, false);
> > -}
> > -
> >  static int psp_v12_0_ring_create(struct psp_context *psp,
> >  				enum psp_ring_type ring_type)
> >  {
> > @@ -179,8 +147,6 @@ static int psp_v12_0_ring_create(struct psp_context *psp,
> >  	struct psp_ring *ring = &psp->km_ring;
> >  	struct amdgpu_device *adev = psp->adev;
> >  
> > -	psp_v12_0_reroute_ih(psp);
> > -
> >  	if (amdgpu_sriov_vf(psp->adev)) {
> >  		/* Write low address of the ring to C2PMSG_102 */
> >  		psp_ring_reg = lower_32_bits(ring->ring_mem_mc_addr);
>