drm/amdgpu: support print psp v2_0 hdr debug information
Subsystems (2)
Alex Deucher
maintainerPATCH 1/7 drm/amdgpu: support print psp v2_0 hdr debug information
From: Hawking Zhang <[email protected]>
print out psp firmware v2_0 hdr information for debugging purpose
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 67 +++++++++++++++++++++++ 1 file changed, 67 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c +67 -0
@@ -248,6 +248,8 @@ void amdgpu_ucode_print_psp_hdr(const struct common_firmware_header *hdr) {uint16_t version_major =le16_to_cpu (hdr->header_version_major);uint16_t version_minor =le16_to_cpu (hdr->header_version_minor); +uint32_t fw_index; +const struct psp_fw_bin_desc *desc;DRM_DEBUG ("PSP\n" );amdgpu_ucode_print_common_hdr (hdr);
@@ -312,6 +314,71 @@ void amdgpu_ucode_print_psp_hdr(const struct common_firmware_header *hdr)DRM_DEBUG ("spl_size_bytes: %u\n" ,le32_to_cpu (psp_hdr_v1_3->spl.size_bytes)); } + }else if (version_major ==2 ) { +const struct psp_firmware_header_v2_0 *psp_hdr_v2_0 = + container_of(hdr, struct psp_firmware_header_v2_0, header); +for (fw_index =0 ; fw_index <le32_to_cpu (psp_hdr_v2_0->psp_fw_bin_count); fw_index++) { + desc = &(psp_hdr_v2_0->psp_fw_bin[fw_index]); +switch (desc->fw_type) { +case PSP_FW_TYPE_PSP_SOS : +DRM_DEBUG ("psp_sos_version: %u\n" , +le32_to_cpu (desc->fw_version)); +DRM_DEBUG ("psp_sos_size_bytes: %u\n" , +le32_to_cpu (desc->size_bytes)); +break ; +case PSP_FW_TYPE_PSP_SYS_DRV : +DRM_DEBUG ("psp_sys_drv_version: %u\n" , +le32_to_cpu (desc->fw_version)); +DRM_DEBUG ("psp_sys_drv_size_bytes: %u\n" , +le32_to_cpu (desc->size_bytes)); +break ; +case PSP_FW_TYPE_PSP_KDB : +DRM_DEBUG ("psp_kdb_version: %u\n" , +le32_to_cpu (desc->fw_version)); +DRM_DEBUG ("psp_kdb_size_bytes: %u\n" , +le32_to_cpu (desc->size_bytes)); +break ; +case PSP_FW_TYPE_PSP_TOC : +DRM_DEBUG ("psp_toc_version: %u\n" , +le32_to_cpu (desc->fw_version)); +DRM_DEBUG ("psp_toc_size_bytes: %u\n" , +le32_to_cpu (desc->size_bytes)); +break ; +case PSP_FW_TYPE_PSP_SPL : +DRM_DEBUG ("psp_spl_version: %u\n" , +le32_to_cpu (desc->fw_version)); +DRM_DEBUG ("psp_spl_size_bytes: %u\n" , +le32_to_cpu (desc->size_bytes)); +break ; +case PSP_FW_TYPE_PSP_RL : +DRM_DEBUG ("psp_rl_version: %u\n" , +le32_to_cpu (desc->fw_version)); +DRM_DEBUG ("psp_rl_size_bytes: %u\n" , +le32_to_cpu (desc->size_bytes)); +break ; +case PSP_FW_TYPE_PSP_SOC_DRV : +DRM_DEBUG ("psp_soc_drv_version: %u\n" , +le32_to_cpu (desc->fw_version)); +DRM_DEBUG ("psp_soc_drv_size_bytes: %u\n" , +le32_to_cpu (desc->size_bytes)); +break ; +case PSP_FW_TYPE_PSP_INTF_DRV : +DRM_DEBUG ("psp_intf_drv_version: %u\n" , +le32_to_cpu (desc->fw_version)); +DRM_DEBUG ("psp_intf_drv_size_bytes: %u\n" , +le32_to_cpu (desc->size_bytes)); +break ; +case PSP_FW_TYPE_PSP_DBG_DRV : +DRM_DEBUG ("psp_dbg_drv_version: %u\n" , +le32_to_cpu (desc->fw_version)); +DRM_DEBUG ("psp_dbg_drv_size_bytes: %u\n" , +le32_to_cpu (desc->size_bytes)); +break ; +default : +DRM_DEBUG ("Unsupported PSP fw type: %d\n" , desc->fw_type); +break ; + } + } }else {DRM_ERROR ("Unknown PSP ucode version: %u.%u\n" , version_major, version_minor);
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 2/7 drm/amdgpu: extend PSP GFX FW type
From: Likun Gao <[email protected]>
Extend PSP GFX FW type to support IMU, LSDMA, SDMA v6, RS64 MES related fw load.
--- drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 30 +++++++++++++++++++++++++ 1 file changed, 30 insertions(+)
drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h +30 -0
@@ -260,6 +260,36 @@ enum psp_gfx_fw_type {GFX_FW_TYPE_VCN1 =58 ,/* VCN1 MI */ GFX_FW_TYPE_CAP =62 ,/* CAP_FW */ GFX_FW_TYPE_REG_LIST =67 ,/* REG_LIST MI */ +GFX_FW_TYPE_IMU_I =68 ,/* IMU Instruction FW SOC21 */ +GFX_FW_TYPE_IMU_D =69 ,/* IMU Data FW SOC21 */ +GFX_FW_TYPE_LSDMA =70 ,/* LSDMA FW SOC21 */ +GFX_FW_TYPE_SDMA_UCODE_TH0 =71 ,/* SDMA Thread 0/CTX SOC21 */ +GFX_FW_TYPE_SDMA_UCODE_TH1 =72 ,/* SDMA Thread 1/CTL SOC21 */ +GFX_FW_TYPE_PPTABLE =73 ,/* PPTABLE SOC21 */ +GFX_FW_TYPE_DISCRETE_USB4 =74 ,/* dUSB4 FW SOC21 */ +GFX_FW_TYPE_TA =75 ,/* SRIOV TA FW UUID SOC21 */ +GFX_FW_TYPE_RS64_MES =76 ,/* RS64 MES ucode SOC21 */ +GFX_FW_TYPE_RS64_MES_STACK =77 ,/* RS64 MES stack ucode SOC21 */ +GFX_FW_TYPE_RS64_KIQ =78 ,/* RS64 KIQ ucode SOC21 */ +GFX_FW_TYPE_RS64_KIQ_STACK =79 ,/* RS64 KIQ Heap stack SOC21 */ +GFX_FW_TYPE_ISP_DATA =80 ,/* ISP DATA SOC21 */ +GFX_FW_TYPE_CP_MES_KIQ =81 ,/* MES KIQ ucode SOC21 */ +GFX_FW_TYPE_MES_KIQ_STACK =82 ,/* MES KIQ stack SOC21 */ +GFX_FW_TYPE_UMSCH_DATA =83 ,/* User Mode Scheduler Data SOC21 */ +GFX_FW_TYPE_UMSCH_UCODE =84 ,/* User Mode Scheduler Ucode SOC21 */ +GFX_FW_TYPE_UMSCH_CMD_BUFFER =85 ,/* User Mode Scheduler Command Buffer SOC21 */ +GFX_FW_TYPE_USB_DP_COMBO_PHY =86 ,/* USB-Display port Combo SOC21 */ +GFX_FW_TYPE_RS64_PFP =87 ,/* RS64 PFP SOC21 */ +GFX_FW_TYPE_RS64_ME =88 ,/* RS64 ME SOC21 */ +GFX_FW_TYPE_RS64_MEC =89 ,/* RS64 MEC SOC21 */ +GFX_FW_TYPE_RS64_PFP_P0_STACK =90 ,/* RS64 PFP stack P0 SOC21 */ +GFX_FW_TYPE_RS64_PFP_P1_STACK =91 ,/* RS64 PFP stack P1 SOC21 */ +GFX_FW_TYPE_RS64_ME_P0_STACK =92 ,/* RS64 ME stack P0 SOC21 */ +GFX_FW_TYPE_RS64_ME_P1_STACK =93 ,/* RS64 ME stack P1 SOC21 */ +GFX_FW_TYPE_RS64_MEC_P0_STACK =94 ,/* RS64 MEC stack P0 SOC21 */ +GFX_FW_TYPE_RS64_MEC_P1_STACK =95 ,/* RS64 MEC stack P1 SOC21 */ +GFX_FW_TYPE_RS64_MEC_P2_STACK =96 ,/* RS64 MEC stack P2 SOC21 */ +GFX_FW_TYPE_RS64_MEC_P3_STACK =97 ,/* RS64 MEC stack P3 SOC21 */ GFX_FW_TYPE_MAX };
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 3/7 drm/amdgpu: add support for spl fw load on psp v13
In reply to Alex DeucherFrom: Likun Gao <[email protected]>
Support for spl firmware load on psp v13.
--- drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/amdgpu/psp_v13_0.c +6 -0
@@ -174,6 +174,11 @@ static int psp_v13_0_bootloader_load_kdb(struct psp_context *psp)return psp_v13_0_bootloader_load_component (psp, &psp->kdb,PSP_BL__LOAD_KEY_DATABASE ); } +static int psp_v13_0_bootloader_load_spl (struct psp_context *psp) +{ +return psp_v13_0_bootloader_load_component (psp, &psp->kdb,PSP_BL__LOAD_TOS_SPL_TABLE ); +} +static int psp_v13_0_bootloader_load_sysdrv (struct psp_context *psp) {return psp_v13_0_bootloader_load_component (psp, &psp->sys,PSP_BL__LOAD_SYSDRV );
@@ -457,6 +462,7 @@ static int psp_v13_0_read_usbc_pd_fw(struct psp_context *psp, uint32_t *fw_ver)static const struct psp_funcs psp_v13_0_funcs = { .init_microcode = psp_v13_0_init_microcode, .bootloader_load_kdb = psp_v13_0_bootloader_load_kdb, + .bootloader_load_spl = psp_v13_0_bootloader_load_spl, .bootloader_load_sysdrv = psp_v13_0_bootloader_load_sysdrv, .bootloader_load_soc_drv = psp_v13_0_bootloader_load_soc_drv, .bootloader_load_intf_drv = psp_v13_0_bootloader_load_intf_drv,
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 4/7 drm/amdgpu: support psp v13_0_0 microcode init
In reply to Alex DeucherFrom: Likun Gao <[email protected]>
Support psp v13_0_0 microcode init.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 5 +++++ drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 9 +++++++++ 2 files changed, 14 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +5 -0
@@ -82,6 +82,7 @@ static void psp_check_pmfw_centralized_cstate_management(struct psp_context *pspcase IP_VERSION (11 ,0 ,11 ):case IP_VERSION (11 ,0 ,12 ):case IP_VERSION (11 ,0 ,13 ): +case IP_VERSION (13 ,0 ,0 ):case IP_VERSION (13 ,0 ,2 ): psp->pmfw_centralized_cstate_management = true;break ;
@@ -142,6 +143,10 @@ static int psp_early_init(void *handle) psp->autoload_supported = false; }break ; +case IP_VERSION (13 ,0 ,0 ): +psp_v13_0_set_psp_funcs (psp); + psp->autoload_supported = true; +break ;default :return -EINVAL ; }
drivers/gpu/drm/amd/amdgpu/psp_v13_0.c +9 -0
@@ -41,6 +41,7 @@ MODULE_FIRMWARE("amdgpu/psp_13_0_5_ta.bin");MODULE_FIRMWARE ("amdgpu/psp_13_0_8_asd.bin" );MODULE_FIRMWARE ("amdgpu/psp_13_0_8_toc.bin" );MODULE_FIRMWARE ("amdgpu/psp_13_0_8_ta.bin" ); +MODULE_FIRMWARE ("amdgpu/psp_13_0_0_sos.bin" );/* For large FW files the time to complete can be very long */ #define USBC_PD_POLLING_LIMIT_S 240
@@ -68,6 +69,9 @@ static int psp_v13_0_init_microcode(struct psp_context *psp)case IP_VERSION (13 ,0 ,8 ): chip_name ="psp_13_0_8" ;break ; +case IP_VERSION (13 ,0 ,0 ): + chip_name ="psp_13_0_0" ; +break ;default :BUG (); }
@@ -94,6 +98,11 @@ static int psp_v13_0_init_microcode(struct psp_context *psp)if (err)return err;break ; +case IP_VERSION (13 ,0 ,0 ): + err =psp_init_sos_microcode (psp, chip_name); +if (err) +return err; +break ;default :BUG (); }
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 5/7 drm/amdgpu: rework psp firmware name
In reply to Alex DeucherFrom: Likun Gao <[email protected]>
Use the new helper for deriving the fw name from
the IP version.
--- drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/psp_v13_0.c +5 -10
@@ -53,6 +53,7 @@ static int psp_v13_0_init_microcode(struct psp_context *psp) {struct amdgpu_device *adev = psp->adev;const char *chip_name; +char ucode_prefix[30 ];int err =0 ;switch (adev->ip_versions[MP0_HWIP ][0 ]) {
@@ -63,18 +64,12 @@ static int psp_v13_0_init_microcode(struct psp_context *psp)case IP_VERSION (13 ,0 ,3 ): chip_name ="yellow_carp" ;break ; -case IP_VERSION (13 ,0 ,5 ): - chip_name ="psp_13_0_5" ; -break ; -case IP_VERSION (13 ,0 ,8 ): - chip_name ="psp_13_0_8" ; -break ; -case IP_VERSION (13 ,0 ,0 ): - chip_name ="psp_13_0_0" ; -break ;default : -BUG (); +amdgpu_ucode_ip_version_decode (adev,MP0_HWIP , ucode_prefix,sizeof (ucode_prefix)); + chip_name = ucode_prefix; +break ; } +switch (adev->ip_versions[MP0_HWIP ][0 ]) {case IP_VERSION (13 ,0 ,2 ): err =psp_init_sos_microcode (psp, chip_name);
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 6/7 drm/amdgpu: add tracking for the enablement of SCPM
In reply to Alex DeucherFrom: Likun Gao <[email protected]>
Add parmeter to shows whether SCPM feature is enabled or not, and whether is valid.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +++ drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 28 ++++++++++++++++++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 13 ++++++++++++ 3 files changed, 43 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +3 -0
@@ -1016,6 +1016,9 @@ struct amdgpu_device {int num_regs;struct amdgpu_reset_domain *reset_domain; + +bool scpm_enabled; +uint32_t scpm_status; };static inline struct amdgpu_device *drm_to_adev (struct drm_device *ddev)
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +27 -1
@@ -246,7 +246,7 @@ static bool psp_get_runtime_db_entry(struct amdgpu_device *adev,case PSP_RUNTIME_ENTRY_TYPE_BOOT_CONFIG :if (db_dir.entry_list[i].size <sizeof (struct psp_runtime_boot_cfg_entry )) {/* invalid db entry size */ -dev_warn (adev->dev,"Invalid PSP runtime database entry size\n" ); +dev_warn (adev->dev,"Invalid PSP runtime database boot cfg entry size\n" );return false; }/* read runtime database entry */
@@ -254,6 +254,17 @@ static bool psp_get_runtime_db_entry(struct amdgpu_device *adev, (uint32_t *)db_entry, sizeof(struct psp_runtime_boot_cfg_entry), false); ret = true;break ; +case PSP_RUNTIME_ENTRY_TYPE_PPTABLE_ERR_STATUS : +if (db_dir.entry_list[i].size <sizeof (struct psp_runtime_scpm_entry )) { +/* invalid db entry size */ +dev_warn (adev->dev,"Invalid PSP runtime database scpm entry size\n" ); +return false; + } +/* read runtime database entry */ +amdgpu_device_vram_access (adev, db_header_pos + db_dir.entry_list[i].offset, + (uint32_t *)db_entry,sizeof (struct psp_runtime_scpm_entry ), false); + ret = true; +break ;default : ret = false;break ;
@@ -298,6 +309,7 @@ static int psp_sw_init(void *handle)int ret;struct psp_runtime_boot_cfg_entry boot_cfg_entry;struct psp_memory_training_context *mem_training_ctx = &psp->mem_train_ctx; +struct psp_runtime_scpm_entry scpm_entry; psp->cmd =kzalloc (sizeof (struct psp_gfx_cmd_resp ),GFP_KERNEL );if (!psp->cmd) {
@@ -318,6 +330,20 @@ static int psp_sw_init(void *handle) !adev->gmc.xgmi.connected_to_cpu && adev->ip_versions[MP0_HWIP ][0 ] ==IP_VERSION (13 ,0 ,2 ); +memset (&scpm_entry,0 ,sizeof (scpm_entry)); +if ((psp_get_runtime_db_entry (adev, +PSP_RUNTIME_ENTRY_TYPE_PPTABLE_ERR_STATUS , + &scpm_entry)) && + (SCPM_DISABLE != scpm_entry.scpm_status)) { + adev->scpm_enabled = true; + adev->scpm_status = scpm_entry.scpm_status; + }else { + adev->scpm_enabled = false; + adev->scpm_status =SCPM_DISABLE ; + } + +/* TODO: stop gpu driver services and print alarm if scpm is enabled with error status */ +memset (&boot_cfg_entry,0 ,sizeof (boot_cfg_entry)); if (psp_get_runtime_db_entry(adev, PSP_RUNTIME_ENTRY_TYPE_BOOT_CONFIG,
drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h +13 -0
@@ -244,6 +244,7 @@ enum psp_runtime_entry_type {PSP_RUNTIME_ENTRY_TYPE_MGPU_WAFL =0x3 ,/* WAFL runtime data */ PSP_RUNTIME_ENTRY_TYPE_MGPU_XGMI =0x4 ,/* XGMI runtime data */ PSP_RUNTIME_ENTRY_TYPE_BOOT_CONFIG =0x5 ,/* Boot Config runtime data */ + PSP_RUNTIME_ENTRY_TYPE_PPTABLE_ERR_STATUS = 0x6, /* SCPM validation data */ };/* PSP runtime DB header */
@@ -278,12 +279,24 @@ enum psp_runtime_boot_cfg_feature { BOOT_CFG_FEATURE_TWO_STAGE_DRAM_TRAINING = 0x2, }; +/* PSP run time DB SCPM authentication defines */ +enum psp_runtime_scpm_authentication { +SCPM_DISABLE =0x0 , +SCPM_ENABLE =0x1 , +SCPM_ENABLE_WITH_SCPM_ERR =0x2 , +}; +/* PSP runtime DB boot config entry */ struct psp_runtime_boot_cfg_entry {uint32_t boot_cfg_bitmask;uint32_t reserved; }; +/* PSP runtime DB SCPM entry */ +struct psp_runtime_scpm_entry { +enum psp_runtime_scpm_authentication scpm_status; +}; +struct psp_context {struct amdgpu_device *adev;
Signature · 1 line
2.35.1
Alex Deucher
maintainerPATCH 7/7 drm/amdgpu/discovery: Enable PSP for PSP 13.0.0
In reply to Alex DeucherFrom: Likun Gao <[email protected]>
Enable PSP on PSP IP version 13.0.0
--- drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +1 -0
@@ -1586,6 +1586,7 @@ static int amdgpu_discovery_set_psp_ip_blocks(struct amdgpu_device *adev)case IP_VERSION (12 ,0 ,1 ):amdgpu_device_ip_block_add (adev, &psp_v12_0_ip_block);break ; +case IP_VERSION (13 ,0 ,0 ):case IP_VERSION (13 ,0 ,1 ):case IP_VERSION (13 ,0 ,2 ):case IP_VERSION (13 ,0 ,3 ):
Signature · 1 line
2.35.1