Commit 1d69511e authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/psp11: TA firmware is optional (v3) 



Don't warn or fail if it's missing.

v2: handle xgmi case more gracefully.
v3: handle older kernels properly

Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Tested-by: default avatarJames Zhu <James.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 727962f0

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

+7 −2
Original line number Diff line number Diff line
@@ -90,8 +90,10 @@ static int psp_sw_fini(void *handle) 
	adev->psp.sos_fw = NULL;

	release_firmware(adev->psp.asd_fw);

	adev->psp.asd_fw = NULL;

	if (adev->psp.ta_fw) {

		release_firmware(adev->psp.ta_fw);

		adev->psp.ta_fw = NULL;

	}

	return 0;

}
@@ -435,6 +437,9 @@ static int psp_xgmi_initialize(struct psp_context *psp) 
	struct ta_xgmi_shared_memory *xgmi_cmd;

	int ret;



	if (!psp->adev->psp.ta_fw)

		return -ENOENT;



	if (!psp->xgmi_context.initialized) {

		ret = psp_xgmi_init_shared_buf(psp);

		if (ret)

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

+16 −12
Original line number Diff line number Diff line
@@ -152,9 +152,12 @@ static int psp_v11_0_init_microcode(struct psp_context *psp) 


	snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_ta.bin", chip_name);

	err = request_firmware(&adev->psp.ta_fw, fw_name, adev->dev);

	if (err)

		goto out2;



	if (err) {

		release_firmware(adev->psp.ta_fw);

		adev->psp.ta_fw = NULL;

		dev_info(adev->dev,

			 "psp v11.0: Failed to load firmware \"%s\"\n", fw_name);

	} else {

		err = amdgpu_ucode_validate(adev->psp.ta_fw);

		if (err)

			goto out2;
@@ -164,6 +167,7 @@ static int psp_v11_0_init_microcode(struct psp_context *psp) 
		adev->psp.ta_xgmi_ucode_size = le32_to_cpu(ta_hdr->ta_xgmi_size_bytes);

		adev->psp.ta_xgmi_start_addr = (uint8_t *)ta_hdr +

			le32_to_cpu(ta_hdr->header.ucode_array_offset_bytes);

	}



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE