drm/amdgpu: add function to show ucode name via id
Subsystems (2)
PATCH 1/3 drm/amdgpu: add function to show ucode name via id
From: Lang Yu <[email protected]>
Implement function amdgpu_ucode_show to show ucode name via ucode id.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 78 +++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 2 + 2 files changed, 80 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +78 -0
@@ -416,6 +416,84 @@ amdgpu_ucode_get_load_type(struct amdgpu_device *adev, int load_type)return AMDGPU_FW_LOAD_DIRECT ; } +const char *amdgpu_ucode_show (enum AMDGPU_UCODE_ID ucode_id) +{ +switch (ucode_id) { +case AMDGPU_UCODE_ID_SDMA0 : +return "SDMA0" ; +case AMDGPU_UCODE_ID_SDMA1 : +return "SDMA1" ; +case AMDGPU_UCODE_ID_SDMA2 : +return "SDMA2" ; +case AMDGPU_UCODE_ID_SDMA3 : +return "SDMA3" ; +case AMDGPU_UCODE_ID_SDMA4 : +return "SDMA4" ; +case AMDGPU_UCODE_ID_SDMA5 : +return "SDMA5" ; +case AMDGPU_UCODE_ID_SDMA6 : +return "SDMA6" ; +case AMDGPU_UCODE_ID_SDMA7 : +return "SDMA7" ; +case AMDGPU_UCODE_ID_CP_CE : +return "CP_CE" ; +case AMDGPU_UCODE_ID_CP_PFP : +return "CP_PFP" ; +case AMDGPU_UCODE_ID_CP_ME : +return "CP_ME" ; +case AMDGPU_UCODE_ID_CP_MEC1 : +return "CP_MEC1" ; +case AMDGPU_UCODE_ID_CP_MEC1_JT : +return "CP_MEC1_JT" ; +case AMDGPU_UCODE_ID_CP_MEC2 : +return "CP_MEC2" ; +case AMDGPU_UCODE_ID_CP_MEC2_JT : +return "CP_MEC2_JT" ; +case AMDGPU_UCODE_ID_CP_MES : +return "CP_MES" ; +case AMDGPU_UCODE_ID_CP_MES_DATA : +return "CP_MES_DATA" ; +case AMDGPU_UCODE_ID_RLC_RESTORE_LIST_CNTL : +return "RLC_RESTORE_LIST_CNTL" ; +case AMDGPU_UCODE_ID_RLC_RESTORE_LIST_GPM_MEM : +return "RLC_RESTORE_LIST_GPM_MEM" ; +case AMDGPU_UCODE_ID_RLC_RESTORE_LIST_SRM_MEM : +return "RLC_RESTORE_LIST_SRM_MEM" ; +case AMDGPU_UCODE_ID_RLC_IRAM : +return "RLC_IRAM" ; +case AMDGPU_UCODE_ID_RLC_DRAM : +return "RLC_DRAM" ; +case AMDGPU_UCODE_ID_RLC_G : +return "RLC_G" ; +case AMDGPU_UCODE_ID_STORAGE : +return "STORAGE" ; +case AMDGPU_UCODE_ID_SMC : +return "SMC" ; +case AMDGPU_UCODE_ID_UVD : +return "UVD" ; +case AMDGPU_UCODE_ID_UVD1 : +return "UVD1" ; +case AMDGPU_UCODE_ID_VCE : +return "VCE" ; +case AMDGPU_UCODE_ID_VCN : +return "VCN" ; +case AMDGPU_UCODE_ID_VCN1 : +return "VCN1" ; +case AMDGPU_UCODE_ID_DMCU_ERAM : +return "DMCU_ERAM" ; +case AMDGPU_UCODE_ID_DMCU_INTV : +return "DMCU_INTV" ; +case AMDGPU_UCODE_ID_VCN0_RAM : +return "VCN0_RAM" ; +case AMDGPU_UCODE_ID_VCN1_RAM : +return "VCN1_RAM" ; +case AMDGPU_UCODE_ID_DMCUB : +return "DMCUB" ; +default : +return "UNKNOWN UCODE" ; + } +} +#define FW_VERSION_ATTR (name, mode, field) \ static ssize_t show_##name(struct device *dev, \ struct device_attribute *attr, \
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h +2 -0
@@ -449,4 +449,6 @@ void amdgpu_ucode_sysfs_fini(struct amdgpu_device *adev);enum amdgpu_firmware_load_type amdgpu_ucode_get_load_type (struct amdgpu_device *adev,int load_type); +const char *amdgpu_ucode_show (enum AMDGPU_UCODE_ID ucode_id); +#endif
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 drm/amdgpu: show explicit name instead of id in psp_cmd_submit_buf
From: Lang Yu <[email protected]>
Use amdgpu_ucode_show to show ucode name and psp_gfx_cmd_show to show psp_gfx_cmd name in psp_cmd_submit_buf.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +4 -4
@@ -450,10 +450,10 @@ psp_cmd_submit_buf(struct psp_context *psp,*/ if (!skip_unsupport && (psp->cmd_buf_mem->resp.status || !timeout) && !ras_intr) {if (ucode) -DRM_WARN ("failed to load ucode id (%d) " , - ucode->ucode_id); -DRM_WARN ("psp command (0x%X) failed and response status is (0x%X)\n" , - psp->cmd_buf_mem->cmd_id, +DRM_WARN ("failed to load ucode (%s) " , +amdgpu_ucode_show (ucode->ucode_id)); +DRM_WARN ("psp gfx command (%s) failed and response status is (0x%X)\n" , +psp_gfx_cmd_show (psp->cmd_buf_mem->cmd_id), psp->cmd_buf_mem->resp.status);if (!timeout) {mutex_unlock (&psp->mutex);
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/3 drm/amdgpu: add function to show psp_gfx_cmd name via id
In reply to Lang YuFrom: Lang Yu <[email protected]>
Implement function psp_gfx_cmd_show to show cmd name via cmd id.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 38 +++++++++++++++++++++++++ 1 file changed, 38 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +38 -0
@@ -353,6 +353,44 @@ int psp_wait_for(struct psp_context *psp, uint32_t reg_index,return -ETIME ; } +static const char *psp_gfx_cmd_show (enum psp_gfx_cmd_id cmd_id) +{ +switch (cmd_id) { +case GFX_CMD_ID_LOAD_TA : +return "LOAD_TA" ; +case GFX_CMD_ID_UNLOAD_TA : +return "UNLOAD_TA" ; +case GFX_CMD_ID_INVOKE_CMD : +return "INVOKE_CMD" ; +case GFX_CMD_ID_LOAD_ASD : +return "LOAD_ASD" ; +case GFX_CMD_ID_SETUP_TMR : +return "SETUP_TMR" ; +case GFX_CMD_ID_LOAD_IP_FW : +return "LOAD_IP_FW" ; +case GFX_CMD_ID_DESTROY_TMR : +return "DESTROY_TMR" ; +case GFX_CMD_ID_SAVE_RESTORE : +return "SAVE_RESTORE_IP_FW" ; +case GFX_CMD_ID_SETUP_VMR : +return "SETUP_VMR" ; +case GFX_CMD_ID_DESTROY_VMR : +return "DESTROY_VMR" ; +case GFX_CMD_ID_PROG_REG : +return "PROG_REG" ; +case GFX_CMD_ID_GET_FW_ATTESTATION : +return "GET_FW_ATTESTATION" ; +case GFX_CMD_ID_LOAD_TOC : +return "ID_LOAD_TOC" ; +case GFX_CMD_ID_AUTOLOAD_RLC : +return "AUTOLOAD_RLC" ; +case GFX_CMD_ID_BOOT_CFG : +return "BOOT_CFG" ; +default : +return "UNKNOWN CMD" ; + } +} + static int psp_cmd_submit_buf(struct psp_context *psp, struct amdgpu_firmware_info *ucode,
Signature · 6 lines
2.25.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Quoted 6 lines · Lang
From: Lang Yu <[email protected]>
Implement function
amdgpu_ucode_showto show ucode name via ucode id.Signed-off-by Lang Yu <[email protected]>
Series are Reviewed-by: Huang Rui <[email protected]>
Quoted 108 lines
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 78 +++++++++++++++++++++++ drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 2 + 2 files changed, 80 insertions(+)drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +78
-0@@ -416,6 +416,84 @@ amdgpu_ucode_get_load_type(struct amdgpu_device *adev, int load_type)return AMDGPU_FW_LOAD_DIRECT ; } +const char *amdgpu_ucode_show (enum AMDGPU_UCODE_ID ucode_id) +{ +switch (ucode_id) { +case AMDGPU_UCODE_ID_SDMA0 : +return "SDMA0" ; +case AMDGPU_UCODE_ID_SDMA1 : +return "SDMA1" ; +case AMDGPU_UCODE_ID_SDMA2 : +return "SDMA2" ; +case AMDGPU_UCODE_ID_SDMA3 : +return "SDMA3" ; +case AMDGPU_UCODE_ID_SDMA4 : +return "SDMA4" ; +case AMDGPU_UCODE_ID_SDMA5 : +return "SDMA5" ; +case AMDGPU_UCODE_ID_SDMA6 : +return "SDMA6" ; +case AMDGPU_UCODE_ID_SDMA7 : +return "SDMA7" ; +case AMDGPU_UCODE_ID_CP_CE : +return "CP_CE" ; +case AMDGPU_UCODE_ID_CP_PFP : +return "CP_PFP" ; +case AMDGPU_UCODE_ID_CP_ME : +return "CP_ME" ; +case AMDGPU_UCODE_ID_CP_MEC1 : +return "CP_MEC1" ; +case AMDGPU_UCODE_ID_CP_MEC1_JT : +return "CP_MEC1_JT" ; +case AMDGPU_UCODE_ID_CP_MEC2 : +return "CP_MEC2" ; +case AMDGPU_UCODE_ID_CP_MEC2_JT : +return "CP_MEC2_JT" ; +case AMDGPU_UCODE_ID_CP_MES : +return "CP_MES" ; +case AMDGPU_UCODE_ID_CP_MES_DATA : +return "CP_MES_DATA" ; +case AMDGPU_UCODE_ID_RLC_RESTORE_LIST_CNTL : +return "RLC_RESTORE_LIST_CNTL" ; +case AMDGPU_UCODE_ID_RLC_RESTORE_LIST_GPM_MEM : +return "RLC_RESTORE_LIST_GPM_MEM" ; +case AMDGPU_UCODE_ID_RLC_RESTORE_LIST_SRM_MEM : +return "RLC_RESTORE_LIST_SRM_MEM" ; +case AMDGPU_UCODE_ID_RLC_IRAM : +return "RLC_IRAM" ; +case AMDGPU_UCODE_ID_RLC_DRAM : +return "RLC_DRAM" ; +case AMDGPU_UCODE_ID_RLC_G : +return "RLC_G" ; +case AMDGPU_UCODE_ID_STORAGE : +return "STORAGE" ; +case AMDGPU_UCODE_ID_SMC : +return "SMC" ; +case AMDGPU_UCODE_ID_UVD : +return "UVD" ; +case AMDGPU_UCODE_ID_UVD1 : +return "UVD1" ; +case AMDGPU_UCODE_ID_VCE : +return "VCE" ; +case AMDGPU_UCODE_ID_VCN : +return "VCN" ; +case AMDGPU_UCODE_ID_VCN1 : +return "VCN1" ; +case AMDGPU_UCODE_ID_DMCU_ERAM : +return "DMCU_ERAM" ; +case AMDGPU_UCODE_ID_DMCU_INTV : +return "DMCU_INTV" ; +case AMDGPU_UCODE_ID_VCN0_RAM : +return "VCN0_RAM" ; +case AMDGPU_UCODE_ID_VCN1_RAM : +return "VCN1_RAM" ; +case AMDGPU_UCODE_ID_DMCUB : +return "DMCUB" ; +default : +return "UNKNOWN UCODE" ; + } +} +#define FW_VERSION_ATTR (name, mode, field) \ static ssize_t show_##name(struct device *dev, \ struct device_attribute *attr, \drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h +2
-0@@ -449,4 +449,6 @@ void amdgpu_ucode_sysfs_fini(struct amdgpu_device *adev);enum amdgpu_firmware_load_type amdgpu_ucode_get_load_type (struct amdgpu_device *adev,int load_type); +const char *amdgpu_ucode_show (enum AMDGPU_UCODE_ID ucode_id); +#endif Signature · 1 line
2.25.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx