Commit cd74132b authored by Tao Zhou's avatar Tao Zhou Committed by Alex Deucher
Browse files

drm/amdgpu: make MCA IPID parse global 



So we can call it in other blocks.

v2: add a new IPID parse interface for umc and we can
    implement it for each ASIC.

Signed-off-by: default avatarTao Zhou <tao.zhou1@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4104c0a4

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

+2 −0
Original line number Diff line number Diff line
@@ -113,6 +113,8 @@ struct amdgpu_umc_ras { 
	uint32_t (*get_die_id_from_pa)(struct amdgpu_device *adev,

			uint64_t mca_addr, uint64_t retired_page);

	void (*get_retire_flip_bits)(struct amdgpu_device *adev);

	void (*mca_ipid_parse)(struct amdgpu_device *adev, uint64_t ipid,

			uint32_t *did, uint32_t *ch, uint32_t *umc_inst, uint32_t *sid);

};



struct amdgpu_umc_funcs {

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

+14 −0
Original line number Diff line number Diff line
@@ -711,6 +711,19 @@ static uint32_t umc_v12_0_get_die_id(struct amdgpu_device *adev, 
	return die;

}



static void umc_v12_0_mca_ipid_parse(struct amdgpu_device *adev, uint64_t ipid,

		uint32_t *did, uint32_t *ch, uint32_t *umc_inst, uint32_t *sid)

{

	if (did)

		*did = MCA_IPID_2_DIE_ID(ipid);

	if (ch)

		*ch = MCA_IPID_2_UMC_CH(ipid);

	if (umc_inst)

		*umc_inst = MCA_IPID_2_UMC_INST(ipid);

	if (sid)

		*sid = MCA_IPID_2_SOCKET_ID(ipid);

}



struct amdgpu_umc_ras umc_v12_0_ras = {

	.ras_block = {

		.hw_ops = &umc_v12_0_ras_hw_ops,
@@ -724,5 +737,6 @@ struct amdgpu_umc_ras umc_v12_0_ras = { 
	.convert_ras_err_addr = umc_v12_0_convert_error_address,

	.get_die_id_from_pa = umc_v12_0_get_die_id,

	.get_retire_flip_bits = umc_v12_0_get_retire_flip_bits,

	.mca_ipid_parse = umc_v12_0_mca_ipid_parse,

};