Commit 3e931368 authored by Tao Zhou's avatar Tao Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: remove the check of init status in psp_ras_initialize 



The initialized status indicates RAS TA is loaded, but in some cases
(such as RAS fatal error) RAS TA could be destroyed although it's not
unloaded. Hence we load RAS TA unconditionally here.

Signed-off-by: default avatarTao Zhou <tao.zhou1@amd.com>
Reviewed-by: default avatarCandice Li <candice.li@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent a1903b01

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

+3 −5
Original line number Diff line number Diff line
@@ -1526,11 +1526,6 @@ int psp_ras_initialize(struct psp_context *psp) 
	if (amdgpu_sriov_vf(adev))

		return 0;



	if (psp->ras_context.context.initialized) {

		dev_warn(adev->dev, "RAS WARN: TA has already been loaded\n");

		return 0;

	}



	if (!adev->psp.ras_context.context.bin_desc.size_bytes ||

	    !adev->psp.ras_context.context.bin_desc.start_addr) {

		dev_info(adev->dev, "RAS: optional ras ta ucode is not available\n");
@@ -1602,6 +1597,9 @@ int psp_ras_initialize(struct psp_context *psp) 
	else {

		if (ras_cmd->ras_status)

			dev_warn(psp->adev->dev, "RAS Init Status: 0x%X\n", ras_cmd->ras_status);



		/* fail to load RAS TA */

		psp->ras_context.context.initialized = false;

	}



	return ret;