Commit c6eec902 authored by xinhui pan's avatar xinhui pan Committed by Alex Deucher
Browse files

drm/amdgpu: add ta ras fw info (v2) 



Add ras fw part, xgmi and ras fw are combined together in ta binary.
Reading the data from the info is not implemented yet.

v2: squash in "drm/amdgpu: fix NULL pointer when ta is missing"

Signed-off-by: default avatarxinhui pan <xinhui.pan@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1fb4f155

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

+4 −0
Original line number Diff line number Diff line
@@ -150,9 +150,13 @@ struct psp_context 


	/* xgmi ta firmware and buffer */

	const struct firmware		*ta_fw;

	uint32_t			ta_fw_version;

	uint32_t			ta_xgmi_ucode_version;

	uint32_t			ta_xgmi_ucode_size;

	uint8_t				*ta_xgmi_start_addr;

	uint32_t			ta_ras_ucode_version;

	uint32_t			ta_ras_ucode_size;

	uint8_t				*ta_ras_start_addr;

	struct psp_xgmi_context		xgmi_context;

};

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

+7 −0
Original line number Diff line number Diff line
@@ -116,6 +116,13 @@ 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);



		adev->psp.ta_fw_version = le32_to_cpu(ta_hdr->header.ucode_version);



		adev->psp.ta_ras_ucode_version = le32_to_cpu(ta_hdr->ta_ras_ucode_version);

		adev->psp.ta_ras_ucode_size = le32_to_cpu(ta_hdr->ta_ras_size_bytes);

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

			le32_to_cpu(ta_hdr->ta_ras_offset_bytes);

	}



	return 0;

CRA Git | Maintained and supported by SUSTech CRA and CCSE