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: Tao Zhou <tao.zhou1@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h
index ec203f9e5ffab7a768c4c15fa6acf4ccf384d2e9..28dff750c47e3d371bd2117b8aa33f2998ab01ce 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h
@@ -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 {

diff --git a/drivers/gpu/drm/amd/amdgpu/umc_v12_0.c b/drivers/gpu/drm/amd/amdgpu/umc_v12_0.c
index 8dc32787d625072c656ea62e9bf34a4690937c90..0f5b1719fda56a09d3b2de8496677bb576dae790 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/umc_v12_0.c
+++ b/drivers/gpu/drm/amd/amdgpu/umc_v12_0.c
@@ -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,
 };