drm/amd/pp: Refine function iceland_start_smu
Subsystems (2)
PATCH 1/3 drm/amd/pp: Refine function iceland_start_smu
if upload firmware failed, no matter how many times the function runs again, the same error will be encountered. so remove the duplicated code.
--- drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-)
drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c +1 -11
@@ -234,22 +234,12 @@ static int iceland_start_smu(struct pp_hwmgr *hwmgr) {int result; - result =iceland_smu_upload_firmware_image (hwmgr); -if (result) -return result; - result =iceland_smu_start_smc (hwmgr); -if (result) -return result; -if (!smu7_is_smc_ram_running (hwmgr)) { -pr_info ("smu not running, upload firmware again \n" ); result =iceland_smu_upload_firmware_image (hwmgr);if (result)return result; - result =iceland_smu_start_smc (hwmgr); -if (result) -return result; +iceland_smu_start_smc (hwmgr); } result =smu7_request_smu_load_fw (hwmgr);
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1538237832-3607-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
PATCH 2/3 drm/amd/pp: Setup SoftRegsStart before request smu load fw
need to know SoftRegsStart value to visit the register UcodeLoadStatus to check fw loading state.
--- drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c | 11 ++++++++++- drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c | 9 +++++++++ 2 files changed, 19 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c +10 -1
@@ -232,6 +232,7 @@ static int iceland_request_smu_load_specific_fw(struct pp_hwmgr *hwmgr,static int iceland_start_smu (struct pp_hwmgr *hwmgr) { +struct iceland_smumgr *priv = hwmgr->smu_backend;int result;if (!smu7_is_smc_ram_running (hwmgr)) {
@@ -242,6 +243,14 @@ static int iceland_start_smu(struct pp_hwmgr *hwmgr)iceland_smu_start_smc (hwmgr); } +/* Setup SoftRegsStart here to visit the register UcodeLoadStatus +* to check fw loading state +*/ +smu7_read_smc_sram_dword (hwmgr, +SMU71_FIRMWARE_HEADER_LOCATION + + offsetof(SMU71_Firmware_Header , SoftRegisters), + &(priv->smu7_data.soft_regs_start),0x40000 ); + result =smu7_request_smu_load_fw (hwmgr);return result;
@@ -2652,7 +2661,7 @@ static bool iceland_is_dpm_running(struct pp_hwmgr *hwmgr) .smu_fini = &smu7_smu_fini, .start_smu = &iceland_start_smu, .check_fw_load_finish = &smu7_check_fw_load_finish, - .request_smu_load_fw = &smu7_reload_firmware, + .request_smu_load_fw = &smu7_request_smu_load_fw, .request_smu_load_specific_fw = &iceland_request_smu_load_specific_fw, .send_msg_to_smc = &smu7_send_msg_to_smc, .send_msg_to_smc_with_parameter = &smu7_send_msg_to_smc_with_parameter,
drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c +9 -0
@@ -192,6 +192,7 @@ static int tonga_start_in_non_protection_mode(struct pp_hwmgr *hwmgr)static int tonga_start_smu (struct pp_hwmgr *hwmgr) { +struct tonga_smumgr *priv = hwmgr->smu_backend;int result;/* Only start SMC if SMC RAM is not running */
@@ -209,6 +210,14 @@ static int tonga_start_smu(struct pp_hwmgr *hwmgr) } } +/* Setup SoftRegsStart here to visit the register UcodeLoadStatus +* to check fw loading state +*/ +smu7_read_smc_sram_dword (hwmgr, +SMU72_FIRMWARE_HEADER_LOCATION + + offsetof(SMU72_Firmware_Header , SoftRegisters), + &(priv->smu7_data.soft_regs_start),0x40000 ); + result =smu7_request_smu_load_fw (hwmgr);return result;
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/3 drm/amd/pp: Refine smu7/8 request_smu_load_fw callback function
In reply to a message not in the archiveThe request_smu_load_fw of VI is used to load gfx/sdma ip's firmware.
Check whether the gfx/sdma firmware have been loaded successfully in this callback function.
if failed, driver can exit to avoid gpu hard hung.
if successful, clean the flag reload_fw to avoid duplicated fw load. when suspend/resume, driver need to reload fw.
so in suspend, reset the reload_fw flag to true to enable load fw when resume.
--- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 1 + drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 55 ++++----------------- drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c | 56 +++++++++++----------- 3 files changed, 39 insertions(+), 73 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +1 -0
@@ -301,6 +301,7 @@ int hwmgr_suspend(struct pp_hwmgr *hwmgr)if (!hwmgr || !hwmgr->pm_en)return 0 ; + hwmgr->reload_fw = true;phm_disable_smc_firmware_ctf (hwmgr); ret =psm_set_boot_states (hwmgr);if (ret)
drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c +9 -46
86 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c +29 -27
86 lines not on this page · raw message
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1538237832-3607-3-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
RE: [PATCH 3/3] drm/amd/pp: Refine smu7/8 request_smu_load_fw callback function
Series is Reviewed-by: Evan Quan <[email protected]>
Quoted 254 lines
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Rex Zhu
Sent: 2018年9月30日 0:17
To: [email protected]
Cc: Zhu, Rex <[email protected]>
Subject: [PATCH 3/3] drm/amd/pp: Refine smu7/8request_smu_load_fwcallback functionThe
request_smu_load_fwof VI is used to load gfx/sdma ip's firmware.Check whether the gfx/sdma firmware have been loaded successfully in this callback function.
if failed, driver can exit to avoid gpu hard hung.
if successful, clean the flagreload_fwto avoid duplicated fw load. when suspend/resume, driver need to reload fw.
so in suspend, reset thereload_fwflag to true to enable load fw when resume.Signed-off-by Rex Zhu <[email protected]>--- drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c | 1 + drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 55 ++++------- ---------- drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c | 56 +++++++++++----------- 3 files changed, 39 insertions(+), 73 deletions(-)drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c +1
-0@@ -301,6 +301,7 @@ int hwmgr_suspend(struct pp_hwmgr *hwmgr)if (!hwmgr || !hwmgr->pm_en)return 0 ; + hwmgr->reload_fw = true;phm_disable_smc_firmware_ctf (hwmgr); ret =psm_set_boot_states (hwmgr);if (ret)drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c +0
-1@@ -302,44 +302,6 @@ int smu7_write_smc_sram_dword(struct pp_hwmgr *hwmgr, uint32_t smc_addr, uint32_return 0 ; } -/* Convert the firmware type to SMU type mask. For MEC, we need to check all MEC related type */
drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c +1
-39- -static uint32_t smu7_get_mask_for_firmware_type(uint32_t fw_type) -{ -uint32_t result =0 ; - -switch (fw_type) { -case UCODE_ID_SDMA0 : - result =UCODE_ID_SDMA0_MASK ; -break ; -case UCODE_ID_SDMA1 : - result =UCODE_ID_SDMA1_MASK ; -break ; -case UCODE_ID_CP_CE : - result =UCODE_ID_CP_CE_MASK ; -break ; -case UCODE_ID_CP_PFP : - result =UCODE_ID_CP_PFP_MASK ; -break ; -case UCODE_ID_CP_ME : - result =UCODE_ID_CP_ME_MASK ; -break ; -case UCODE_ID_CP_MEC : -case UCODE_ID_CP_MEC_JT1 : -case UCODE_ID_CP_MEC_JT2 : - result =UCODE_ID_CP_MEC_MASK ; -break ; -case UCODE_ID_RLC_G : - result =UCODE_ID_RLC_G_MASK ; -break ; -default : -pr_info ("UCode type is out of range! \n" ); - result =0 ; - } - -return result; -} -static int smu7_populate_single_firmware_entry (struct pp_hwmgr *hwmgr,uint32_t fw_type,struct SMU_Entry *entry)@@ -381,10 +343,8 @@ int smu7_request_smu_load_fw(struct pp_hwmgr *hwmgr)uint32_t fw_to_load;int r =0 ; -if (!hwmgr->reload_fw) { -pr_info ("skip reloading...\n" ); +if (!hwmgr->reload_fw)return 0 ; - }if (smu_data->soft_regs_start)cgs_write_ind_register(hwmgr->device,
CGS_IND_REG__SMC, @@ -467,10 +427,14 @@ intsmu7_request_smu_load_fw(struct pp_hwmgr *hwmgr)
smu7_send_msg_to_smc_with_parameter(hwmgr,PPSMC_MSG_DRV_DRAM_ADDR_HI, upper_32_bits(smu_data-Quoted 1 line
header_buffer.mc_addr));
smu7_send_msg_to_smc_with_parameter(hwmgr,
PPSMC_MSG_DRV_DRAM_ADDR_LO, lower_32_bits(smu_data-Quoted 1 line
header_buffer.mc_addr));
drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c +0
-1- if (smu7_send_msg_to_smc_with_parameter(hwmgr,
PPSMC_MSG_LoadUcodes,fw_to_load))drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c +1
-1-pr_err ("Fail to Request SMU Load uCode" ); + smu7_send_msg_to_smc_with_parameter(hwmgr,
PPSMC_MSG_LoadUcodes,drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c +8
-3+fw_to_load); -return r; + r =smu7_check_fw_load_finish (hwmgr, fw_to_load); +if (!r) { + hwmgr->reload_fw =0 ; +return 0 ; + } +pr_err ("SMU load firmware failed\n" ); failed:kfree (smu_data->toc);@@ -482,13 +446,12 @@ int smu7_request_smu_load_fw(struct pp_hwmgr *hwmgr) int smu7_check_fw_load_finish(struct pp_hwmgr *hwmgr,uint32_t fw_type) {struct smu7_smumgr *smu_data = (struct smu7_smumgr *)(hwmgr- >smu_backend); -uint32_t fw_mask =smu7_get_mask_for_firmware_type (fw_type);uint32_t ret; ret =phm_wait_on_indirect_register (hwmgr, mmSMC_IND_INDEX_11, smu_data->soft_regs_start +smum_get_offsetof (hwmgr, SMU_SoftRegisters, UcodeLoadStatus), - fw_mask, fw_mask); + fw_type, fw_type);return ret; }drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c +4
-4@@ -658,11 +658,11 @@ static int smu8_request_smu_load_fw(struct pp_hwmgr *hwmgr) {struct smu8_smumgr *smu8_smu = hwmgr->smu_backend;uint32_t smc_address; +uint32_t fw_to_check =0 ; +int ret; -if (!hwmgr->reload_fw) { -pr_info ("skip reloading...\n" ); +if (!hwmgr->reload_fw)return 0 ; - }smu8_smu_populate_firmware_entries (hwmgr);@@ -689,28 +689,9 @@ static int smu8_request_smu_load_fw(struct pp_hwmgr *hwmgr) smu8_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_ExecuteJob, smu8_smu- >toc_entry_power_profiling_index); - return smu8_send_msg_to_smc_with_parameter(hwmgr, + smu8_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_ExecuteJob, smu8_smu-Quoted 1 line
toc_entry_initialize_index);drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c +0
-16-} - -static int smu8_start_smu(struct pp_hwmgr *hwmgr) -{ -int ret =0 ; -uint32_t fw_to_check =0 ; -struct amdgpu_device *adev = hwmgr->adev; - -uint32_t index =SMN_MP1_SRAM_START_ADDR + -SMU8_FIRMWARE_HEADER_LOCATION + - offsetof(struct SMU8_Firmware_Header , Version); - - -if (hwmgr ==NULL || hwmgr->device ==NULL ) -return -EINVAL ; - - cgs_write_register(hwmgr->device, mmMP0PUB_IND_INDEX,index);
drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c +0
-1- hwmgr->smu_version = cgs_read_register(hwmgr->device,
mmMP0PUB_IND_DATA);drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c +0
-3- adev->pm.fw_version = hwmgr->smu_version >>8 ; fw_to_check =UCODE_ID_RLC_G_MASK | UCODE_ID_SDMA0_MASK |@@ -724,8 +705,6 @@ static int smu8_start_smu(struct pp_hwmgr *hwmgr)if (hwmgr->chip_id ==CHIP_STONEY ) fw_to_check &= ~(UCODE_ID_SDMA1_MASK |UCODE_ID_CP_MEC_JT2_MASK ); -smu8_request_smu_load_fw (hwmgr); - ret =smu8_check_fw_load_finish (hwmgr, fw_to_check);if (ret) {
pr_err("SMU firmware load failed\n"); @@ -733,10 +712,33
@@ static intsmu8_start_smu(struct pp_hwmgr *hwmgr)drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c +20
-2} ret =smu8_load_mec_firmware (hwmgr); -if (ret) +if (ret) {pr_err ("Mec Firmware load failed\n" ); +return ret; + } -return ret; + hwmgr->reload_fw =0 ; + +return 0 ; +} + +static int smu8_start_smu (struct pp_hwmgr *hwmgr) { +struct amdgpu_device *adev = hwmgr->adev; + +uint32_t index =SMN_MP1_SRAM_START_ADDR + +SMU8_FIRMWARE_HEADER_LOCATION + + offsetof(struct SMU8_Firmware_Header , Version); + + +if (hwmgr ==NULL || hwmgr->device ==NULL ) +return -EINVAL ; + + cgs_write_register(hwmgr->device, mmMP0PUB_IND_INDEX,index);
drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c +1
-0+ hwmgr->smu_version = cgs_read_register(hwmgr->device,
mmMP0PUB_IND_DATA);drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c +3
-1+ adev->pm.fw_version = hwmgr->smu_version >>8 ; + +return smu8_request_smu_load_fw (hwmgr); }static int smu8_smu_init (struct pp_hwmgr *hwmgr) --1.9.1
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx