Commit e30c50cd authored by Emily Deng's avatar Emily Deng Committed by Alex Deucher
Browse files

drm/amdgpu/psp_v3_1: Get psp fw version through reading register 



If PSP FW is running already, driver will not load PSP FW again and skip
it. So psp fw version is not correct if reading it from FW binary file,
need to get right version from register.

Signed-off-by: default avatarEmily Deng <Emily.Deng@amd.com>
Reviewed-by: default avatarXiangliang Yu <Xiangliang.Yu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 07944623

drivers/gpu/drm/amd/amdgpu/psp_v3_1.c

+4 −1
Original line number Diff line number Diff line
@@ -240,8 +240,11 @@ static int psp_v3_1_bootloader_load_sos(struct psp_context *psp) 
	 * are already been loaded.

	 */

	sol_reg = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_81);

	if (sol_reg)

	if (sol_reg) {

		psp->sos_fw_version = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_58);

		printk("sos fw version = 0x%x.\n", psp->sos_fw_version);

		return 0;

	}



	/* Wait for bootloader to signify that is ready having bit 31 of C2PMSG_35 set to 1 */

	ret = psp_wait_for(psp, SOC15_REG_OFFSET(MP0, 0, mmMP0_SMN_C2PMSG_35),

CRA Git | Maintained and supported by SUSTech CRA and CCSE