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: Lijo Lazar <[email protected]>
Reviewed-by: Feifei Xu <[email protected]>
Signed-off-by: Alex Deucher <[email protected]>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index 93025522fbfc8a4a6431fc309e019d5d582eb129..f89de056a828fbf15933b50554ed06767fc9825e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -643,6 +643,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,
@@ -702,10 +716,13 @@ 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,
-                        "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->cmd_buf_mem->resp.status);
+               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->cmd_buf_mem->resp.status);
                /* If any firmware (including CAP) load fails under SRIOV, it should
                 * return failure to stop the VF from initializing.
                 * Also return failure in case of timeout

diff --git a/drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h b/drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h
index 7566973ed8f596a605b7956149642bf07eb7a5b9..37b5ddd6f13b33fbd7bc302827361fca3d00cdbf 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h
+++ b/drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h
@@ -464,8 +464,9 @@ struct psp_gfx_rb_frame
 #define PSP_ERR_UNKNOWN_COMMAND 0x00000100
 
 enum tee_error_code {
-    TEE_SUCCESS                         = 0x00000000,
-    TEE_ERROR_NOT_SUPPORTED             = 0xFFFF000A,
+       TEE_SUCCESS                     = 0x00000000,
+       TEE_ERROR_CANCEL                = 0xFFFF0002,
+       TEE_ERROR_NOT_SUPPORTED         = 0xFFFF000A,
 };
 
 #endif /* _PSP_TEE_GFX_IF_H_ */