[PATCH] drm/amdgpu: Destroy psp ring in hw_fini

[Yu, Xiangliang]

Better to add SRIOV case in your commit message, I think bare metal doesn't care re-initialization.
Reviewed-by: Xiangliang Yu <Xiangliang.Yu at amd.com> with fixing.


Thanks!
Xiangliang Yu


> -----Original Message-----
> From: Trigger Huang [mailto:trigger.huang at amd.com]
> Sent: Tuesday, April 18, 2017 10:26 AM
> To: amd-gfx at lists.freedesktop.org
> Cc: Liu, Monk <Monk.Liu at amd.com>; Yu, Xiangliang
> <Xiangliang.Yu at amd.com>; Huang, Ray <Ray.Huang at amd.com>; Huang,
> Trigger <Trigger.Huang at amd.com>
> Subject: [PATCH] drm/amdgpu: Destroy psp ring in hw_fini
> 
> Fix issue that PSP initialization will fail if reload amdgpu module.
> That's because the PSP ring must be destroyed to be ready for the next time
> PSP initialization.
> 
> Signed-off-by: Trigger Huang <trigger.huang at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c |  3 +++
> drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h |  3 +++
>  drivers/gpu/drm/amd/amdgpu/psp_v3_1.c   | 27
> +++++++++++++++++++++++++++
>  drivers/gpu/drm/amd/amdgpu/psp_v3_1.h   |  2 ++
>  4 files changed, 35 insertions(+)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> index 19180aa..51b8a15 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
> @@ -56,6 +56,7 @@ static int psp_sw_init(void *handle)
>  		psp->prep_cmd_buf = psp_v3_1_prep_cmd_buf;
>  		psp->ring_init = psp_v3_1_ring_init;
>  		psp->ring_create = psp_v3_1_ring_create;
> +		psp->ring_destroy = psp_v3_1_ring_destroy;
>  		psp->cmd_submit = psp_v3_1_cmd_submit;
>  		psp->compare_sram_data = psp_v3_1_compare_sram_data;
>  		psp->smu_reload_quirk = psp_v3_1_smu_reload_quirk; @@
> -425,6 +426,8 @@ static int psp_hw_fini(void *handle)
>  		amdgpu_bo_free_kernel(&psp->fence_buf_bo,
>  				      &psp->fence_buf_mc_addr, &psp-
> >fence_buf);
> 
> +	psp_ring_destroy(psp, PSP_RING_TYPE__KM);
> +
>  	return 0;
>  }
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
> index 28faba5..0301e4e 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h
> @@ -66,6 +66,8 @@ struct psp_context
>  			    struct psp_gfx_cmd_resp *cmd);
>  	int (*ring_init)(struct psp_context *psp, enum psp_ring_type
> ring_type);
>  	int (*ring_create)(struct psp_context *psp, enum psp_ring_type
> ring_type);
> +	int (*ring_destroy)(struct psp_context *psp,
> +			    enum psp_ring_type ring_type);
>  	int (*cmd_submit)(struct psp_context *psp, struct
> amdgpu_firmware_info *ucode,
>  			  uint64_t cmd_buf_mc_addr, uint64_t
> fence_mc_addr, int index);
>  	bool (*compare_sram_data)(struct psp_context *psp, @@ -116,6
> +118,7 @@ struct amdgpu_psp_funcs {  #define psp_prep_cmd_buf(ucode,
> type) (psp)->prep_cmd_buf((ucode), (type))  #define psp_ring_init(psp,
> type) (psp)->ring_init((psp), (type))  #define psp_ring_create(psp, type)
> (psp)->ring_create((psp), (type))
> +#define psp_ring_destroy(psp, type) ((psp)->ring_destroy((psp),
> +(type)))
>  #define psp_cmd_submit(psp, ucode, cmd_mc, fence_mc, index) \
>  		(psp)->cmd_submit((psp), (ucode), (cmd_mc), (fence_mc),
> (index))  #define psp_compare_sram_data(psp, ucode, type) \ diff --git
> a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
> b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
> index d351583..e834b55 100644
> --- a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
> +++ b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
> @@ -321,6 +321,33 @@ int psp_v3_1_ring_create(struct psp_context *psp,
> enum psp_ring_type ring_type)
>  	return ret;
>  }
> 
> +int psp_v3_1_ring_destroy(struct psp_context *psp, enum psp_ring_type
> +ring_type) {
> +	int ret = 0;
> +	struct psp_ring *ring;
> +	unsigned int psp_ring_reg = 0;
> +	struct amdgpu_device *adev = psp->adev;
> +
> +	ring = &psp->km_ring;
> +
> +	/* Write the ring destroy command to C2PMSG_64 */
> +	psp_ring_reg = 3 << 16;
> +	WREG32(SOC15_REG_OFFSET(MP0, 0, mmMP0_SMN_C2PMSG_64),
> psp_ring_reg);
> +
> +	/* there might be handshake issue with hardware which needs delay
> */
> +	mdelay(20);
> +
> +	/* Wait for response flag (bit 31) in C2PMSG_64 */
> +	ret = psp_wait_for(psp, SOC15_REG_OFFSET(MP0, 0,
> mmMP0_SMN_C2PMSG_64),
> +			   0x80000000, 0x8000FFFF, false);
> +
> +	if (ring->ring_mem)
> +		amdgpu_bo_free_kernel(&adev->firmware.rbuf,
> +				      &ring->ring_mem_mc_addr,
> +				      (void **)&ring->ring_mem);
> +	return ret;
> +}
> +
>  int psp_v3_1_cmd_submit(struct psp_context *psp,
>  		        struct amdgpu_firmware_info *ucode,
>  		        uint64_t cmd_buf_mc_addr, uint64_t fence_mc_addr,
> diff --git a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.h
> b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.h
> index 5230d278..9dcd0b2 100644
> --- a/drivers/gpu/drm/amd/amdgpu/psp_v3_1.h
> +++ b/drivers/gpu/drm/amd/amdgpu/psp_v3_1.h
> @@ -41,6 +41,8 @@ extern int psp_v3_1_ring_init(struct psp_context *psp,
>  			      enum psp_ring_type ring_type);  extern int
> psp_v3_1_ring_create(struct psp_context *psp,
>  				enum psp_ring_type ring_type);
> +extern int psp_v3_1_ring_destroy(struct psp_context *psp,
> +				enum psp_ring_type ring_type);
>  extern int psp_v3_1_cmd_submit(struct psp_context *psp,
>  			       struct amdgpu_firmware_info *ucode,
>  			       uint64_t cmd_buf_mc_addr, uint64_t
> fence_mc_addr,
> --
> 2.7.4