drm/amdgpu: Destroy psp ring in hw_fini
Subsystems (2)
PATCH 1/1 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.
--- 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(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +3 -0
@@ -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 ; }
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +3 -0
@@ -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) \
drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +27 -0
@@ -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,
drivers/gpu/drm/amd/amdgpu/psp_v3_1.h +2 -0
@@ -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,
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Yu, Xiangliang
Reviewed-by Xiangliang YuBetter to add SRIOV case in your commit message, I think bare metal doesn't care re-initialization.
Thanks!
Xiangliang Yu
Quoted 129 lines
-----Original Message-----
From: Trigger Huang [mailto:[email protected]]
Sent: Tuesday, April 18, 2017 10:26 AM
To: [email protected]
Cc: Liu, Monk <[email protected]>; Yu, Xiangliang <[email protected]>; Huang, Ray <[email protected]>; Huang, Trigger <[email protected]>
Subject: [PATCH] drm/amdgpu: Destroy psp ring inhw_finiFix 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 <[email protected]>--- 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(+)drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +1
-1@@ -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-Quoted 1 line
fence_buf);drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +2
-0+psp_ring_destroy (psp,PSP_RING_TYPE__KM ); +return 0 ; }drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +2
-0@@ -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_tcmd_buf_mc_addr,uint64_tfence_mc_addr, int index);
bool (*compare_sram_data)(structpsp_context*psp, @@ -116,6
+118,7 @@ structamdgpu_psp_funcs{ #definepsp_prep_cmd_buf(ucode, type)(psp)->prep_cmd_buf((ucode), (type)) #definepsp_ring_init(psp, type)(psp)->ring_init((psp), (type)) #definepsp_ring_create(psp, type)(psp)->ring_create((psp), (type))drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +2
-0+#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 --gita/drivers/gpu/drm/amd/amdgpu/psp_v3_1.cb/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
index d351583..e834b55 100644drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +18
-0@@ -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),drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +9
-0+ 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,drivers/gpu/drm/amd/amdgpu/psp_v3_1.h +2
-0@@ -41,6 +41,8 @@ extern int psp_v3_1_ring_init(struct psp_context *psp, enum psp_ring_type ring_type); extern intpsp_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
Quoted 3 lines
fence_mc_addr,
--
2.7.4
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 26 lines · Trigger Huang
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 <[email protected]>--- 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(+)drivers/gpu/drm/amd/ renamed from drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +0
-0
amdgpu/amdgpu_psp.c
index 19180aa..51b8a15 100644drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +1
-0@@ -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;
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c static int psp_hw_fini(void *handle) · line 430
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +1
-0@@ -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 );
Move psp_ring_destroy before all BOs free.
Quoted 51 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +1
-0+return 0 ; }drivers/gpu/drm/amd/ renamed from drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +0
-0
amdgpu/amdgpu_psp.h
index 28faba5..0301e4e 100644drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +2
-0@@ -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)(structpsp_context*psp,drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +1
-0@@ -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)\drivers/gpu/drm/amd/amdgpu renamed from drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +0
-0/psp_v3_1.c
index d351583..e834b55 100644drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +9
-0@@ -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; +
drivers/gpu/drm/amd/amdgpu/psp_v3_1.c int psp_v3_1_ring_create(struct psp_context *psp, enum · line 344
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +10
-0+/* 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);
The mask should be 0x80000000.
drivers/gpu/drm/amd/amdgpu/psp_v3_1.c int psp_v3_1_ring_create(struct psp_context *psp, enum psp_ring_type ring_type) · line 347
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +5
-0+ +if (ring->ring_mem) +amdgpu_bo_free_kernel (&adev->firmware.rbuf, + &ring->ring_mem_mc_addr, + (void **)&ring->ring_mem);
You cannot free the global firmware like this, the firmware lists tearing down is already done with amdgpu_ucode_fini_bo.
Furthermore, we would better check the LOAD_PSP flag at first hw_fini after you add destroy ring.
if (adev->firmware.load_type != AMDGPU_FW_LOAD_PSP)
return 0;
amdgpu_ucode_fini_bo(adev);psp_ring_destroy(psp, PSP_RING_TYPE__KM);
...
Thanks,
Rui
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 2 lines · Xiangliang
Better to add SRIOV case in your commit message, I think bare metal doesn't care re-initialization.
Needn't add SRIOV case, because this is the common behavior for psp.
Thanks,
Rui
Quoted 131 lines
Reviewed-by Xiangliang Yu <[email protected]> with fixing.Thanks!
Xiangliang YuQuoted 124 lines
-----Original Message-----
From: Trigger Huang [mailto:[email protected]]
Sent: Tuesday, April 18, 2017 10:26 AM
To: [email protected]
Cc: Liu, Monk <[email protected]>; Yu, Xiangliang <[email protected]>; Huang, Ray <[email protected]>; Huang, Trigger <[email protected]>
Subject: [PATCH] drm/amdgpu: Destroy psp ring inhw_finiFix 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 <[email protected]>--- 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(+)drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +1
-1@@ -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-Quoted 1 line
fence_buf);drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +2
-0+psp_ring_destroy (psp,PSP_RING_TYPE__KM ); +return 0 ; }drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +2
-0@@ -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{ #definepsp_prep_cmd_buf(ucode, type)(psp)->prep_cmd_buf((ucode), (type)) #definepsp_ring_init(psp, type)(psp)->ring_init((psp), (type)) #definepsp_ring_create(psp, type)(psp)->ring_create((psp), (type))drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +2
-0+#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 --gita/drivers/gpu/drm/amd/amdgpu/psp_v3_1.cb/drivers/gpu/drm/amd/amdgpu/psp_v3_1.c
index d351583..e834b55 100644drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +18
-0@@ -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),drivers/gpu/drm/amd/amdgpu/psp_v3_1.c +9
-0+ 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,drivers/gpu/drm/amd/amdgpu/psp_v3_1.h +0
-0@@ -41,6 +41,8 @@ extern int psp_v3_1_ring_init(struct psp_context *psp, enum psp_ring_type ring_type); extern intpsp_v3_1_ring_create (struct psp_context *psp,enum psp_ring_type ring_type);
Quoted 9 lines
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/psp_v3_1.h +2
-0+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
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx