Commit 48880f96 authored by Lijo Lazar's avatar Lijo Lazar Committed by Alex Deucher
Browse files

drm/amdgpu: Don't show false warning for reg list 



If reg list is already loaded on PSP 13.0.2 SOCs, psp will give
TEE_ERR_CANCEL response on second time load. Avoid printing warn
message for it.

Signed-off-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarFeifei Xu <Feifei.Xu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent bcfa48ff

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

+21 −4
Original line number Diff line number Diff line
@@ -640,6 +640,20 @@ static const char *psp_gfx_cmd_name(enum psp_gfx_cmd_id cmd_id) 
	}

}



static bool psp_err_warn(struct psp_context *psp)

{

	struct psp_gfx_cmd_resp *cmd = psp->cmd_buf_mem;



	/* This response indicates reg list is already loaded */

	if (amdgpu_ip_version(psp->adev, MP0_HWIP, 0) == IP_VERSION(13, 0, 2) &&

	    cmd->cmd_id == GFX_CMD_ID_LOAD_IP_FW &&

	    cmd->cmd.cmd_load_ip_fw.fw_type == GFX_FW_TYPE_REG_LIST &&

	    cmd->resp.status == TEE_ERROR_CANCEL)

		return false;



	return true;

}



static int

psp_cmd_submit_buf(struct psp_context *psp,

		   struct amdgpu_firmware_info *ucode,
@@ -699,9 +713,12 @@ psp_cmd_submit_buf(struct psp_context *psp, 
			dev_warn(psp->adev->dev,

				 "failed to load ucode %s(0x%X) ",

				 amdgpu_ucode_name(ucode->ucode_id), ucode->ucode_id);

		dev_warn(psp->adev->dev,

		if (psp_err_warn(psp))

			dev_warn(

				psp->adev->dev,

				"psp gfx command %s(0x%X) failed and response status is (0x%X)\n",

			 psp_gfx_cmd_name(psp->cmd_buf_mem->cmd_id), psp->cmd_buf_mem->cmd_id,

				psp_gfx_cmd_name(psp->cmd_buf_mem->cmd_id),

				psp->cmd_buf_mem->cmd_id,

				psp->cmd_buf_mem->resp.status);

		/* If any firmware (including CAP) load fails under SRIOV, it should

		 * return failure to stop the VF from initializing.

drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h

+3 −2
Original line number Diff line number Diff line
@@ -465,6 +465,7 @@ struct psp_gfx_rb_frame 


enum tee_error_code {

	TEE_SUCCESS			= 0x00000000,

	TEE_ERROR_CANCEL		= 0xFFFF0002,

	TEE_ERROR_NOT_SUPPORTED		= 0xFFFF000A,

};