drm/amd/amdgpu: skip ucode loading if ucode_size == 0

Chengming Gui · alexdeucher · commit 39c84b8e929d · 2022-08-31T17:02:20.000-04:00
Restrict the ucode loading check to avoid frontdoor loading error.

Signed-off-by: Chengming Gui &lt;Jack.Gui@amd.com&gt;
Reviewed-by: Hawking Zhang &lt;Hawking.Zhang@amd.com&gt;
Signed-off-by: Alex Deucher &lt;alexander.deucher@amd.com&gt;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c
@@ -2401,7 +2401,7 @@ static int psp_load_smu_fw(struct psp_context *psp)
 static bool fw_load_skip_check(struct psp_context *psp,
 			       struct amdgpu_firmware_info *ucode)
 {
-	if (!ucode->fw)
+	if (!ucode->fw || !ucode->ucode_size)
 		return true;
 
 	if (ucode->ucode_id == AMDGPU_UCODE_ID_SMC &&

Original file line number	Diff line number	Diff line change
`@@ -2401,7 +2401,7 @@ static int psp_load_smu_fw(struct psp_context *psp)`
`2401`	`2401`	`static bool fw_load_skip_check(struct psp_context *psp,`
`2402`	`2402`	`struct amdgpu_firmware_info *ucode)`
`2403`	`2403`	`{`
`2404`		`- if (!ucode->fw)`
	`2404`	`+ if (!ucode->fw \|\| !ucode->ucode_size)`
`2405`	`2405`	`return true;`
`2406`	`2406`
`2407`	`2407`	`if (ucode->ucode_id == AMDGPU_UCODE_ID_SMC &&`