drm/amdgpu/psp: Return failure when firmware failed to load in SRIOV

In SRIOV, PSP will block incompatible firmware from loading. When this happens,
driver should be prevented from continue initialization and start cleanup.
Return failure in psp_cmd_submit_buf when firmware load failed in SRIOV.

Signed-off-by: Alice Wong <shiwei.wong@amd.com>
Reviewed-by: Sashank Saye <sashank.saye@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
index d01050808626ad4f7478d75b6866193ecaccbd8a..214e4e89a02876e5724be35b75995e7e6d3441f2 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -630,10 +630,11 @@ psp_cmd_submit_buf(struct psp_context *psp,
                DRM_WARN("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 we load CAP FW, PSP must return 0 under SRIOV
-                * also return failure in case of timeout
+               /* 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
                 */
-               if ((ucode && (ucode->ucode_id == AMDGPU_UCODE_ID_CAP)) || !timeout) {
+               if ((ucode && amdgpu_sriov_vf(psp->adev)) || !timeout) {
                        ret = -EINVAL;
                        goto exit;
                }