drm/amdgpu: add umc query error status function
Subsystems (2)
PATCH 1/1 drm/amdgpu: add umc query error status function
In order to debug ras error, driver will print IPID/SYND/MISC0 register value if detect correctable or uncorrectable error. Provide umc_query_error_status_helper function to reduce code redundancy.
--- drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 106 ++++++++++++-------------- 1 file changed, 48 insertions(+), 58 deletions(-)
drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +48 -58
@@ -64,21 +64,62 @@ static inline uint32_t get_umc_v6_7_channel_index(struct amdgpu_device *adev,return adev->umc.channel_idx_tbl[umc_inst * adev->umc.channel_inst_num + ch_inst]; } +static void umc_query_error_status_helper (struct amdgpu_device *adev, +uint64_t mc_umc_status,uint32_t umc_reg_offset) +{ +uint32_t mc_umc_addr; +uint64_t reg_value; + +if (REG_GET_FIELD (mc_umc_status,MCA_UMC_UMC0_MCUMC_STATUST0 , Deferred) ==1 ) +dev_info (adev->dev,"Deferred error, no user action is needed.\n" ); + +if (mc_umc_status) +dev_info (adev->dev,"MCA STATUS 0x%llx, umc_reg_offset 0x%x\n" , mc_umc_status, umc_reg_offset); + +/* print IPID registers value */ + mc_umc_addr = +SOC15_REG_OFFSET (UMC ,0 , regMCA_UMC_UMC0_MCUMC_IPIDT0); + reg_value =RREG64_PCIE ((mc_umc_addr + umc_reg_offset) *4 ); +if (reg_value) +dev_info (adev->dev,"MCA IPID 0x%llx, umc_reg_offset 0x%x\n" , reg_value, umc_reg_offset); + +/* print SYND registers value */ + mc_umc_addr = +SOC15_REG_OFFSET (UMC ,0 , regMCA_UMC_UMC0_MCUMC_SYNDT0); + reg_value =RREG64_PCIE ((mc_umc_addr + umc_reg_offset) *4 ); +if (reg_value) +dev_info (adev->dev,"MCA SYND 0x%llx, umc_reg_offset 0x%x\n" , reg_value, umc_reg_offset); + +/* print MISC0 registers value */ + mc_umc_addr = +SOC15_REG_OFFSET (UMC ,0 , regMCA_UMC_UMC0_MCUMC_MISC0T0); + reg_value =RREG64_PCIE ((mc_umc_addr + umc_reg_offset) *4 ); +if (reg_value) +dev_info (adev->dev,"MCA MISC0 0x%llx, umc_reg_offset 0x%x\n" , reg_value, umc_reg_offset); +} +static void umc_v6_7_ecc_info_query_correctable_error_count (struct amdgpu_device *adev,uint32_t umc_inst,uint32_t ch_inst,unsigned long *error_count) {uint64_t mc_umc_status;uint32_t eccinfo_table_idx; +uint32_t umc_reg_offset;struct amdgpu_ras *ras =amdgpu_ras_get_context (adev); + umc_reg_offset =get_umc_v6_7_reg_offset (adev, + umc_inst, ch_inst); + eccinfo_table_idx = umc_inst * adev->umc.channel_inst_num + ch_inst;/* check for SRAM correctable error MCUMC_STATUS is a 64 bit register */ mc_umc_status = ras->umc_ecc.ecc[eccinfo_table_idx].mca_umc_status;if (REG_GET_FIELD (mc_umc_status,MCA_UMC_UMC0_MCUMC_STATUST0 , Val) ==1 && -REG_GET_FIELD (mc_umc_status,MCA_UMC_UMC0_MCUMC_STATUST0 ,CECC ) ==1 ) +REG_GET_FIELD (mc_umc_status,MCA_UMC_UMC0_MCUMC_STATUST0 ,CECC ) ==1 ) { *error_count +=1 ; + +umc_query_error_status_helper (adev, mc_umc_status, umc_reg_offset); + } } static void umc_v6_7_ecc_info_querry_uncorrectable_error_count(struct amdgpu_device *adev,
@@ -88,8 +129,6 @@ static void umc_v6_7_ecc_info_querry_uncorrectable_error_count(struct amdgpu_devuint64_t mc_umc_status;uint32_t eccinfo_table_idx;uint32_t umc_reg_offset; -uint32_t mc_umc_addr; -uint64_t reg_value;struct amdgpu_ras *ras =amdgpu_ras_get_context (adev); umc_reg_offset = get_umc_v6_7_reg_offset(adev,
@@ -106,32 +145,7 @@ static void umc_v6_7_ecc_info_querry_uncorrectable_error_count(struct amdgpu_dev REG_GET_FIELD(mc_umc_status, MCA_UMC_UMC0_MCUMC_STATUST0, TCC) == 1)) { *error_count +=1 ; -if (REG_GET_FIELD (mc_umc_status,MCA_UMC_UMC0_MCUMC_STATUST0 , Deferred) ==1 ) -dev_info (adev->dev,"Deferred error, no user action is needed.\n" ); - -if (mc_umc_status) -dev_info (adev->dev,"MCA STATUS 0x%llx, umc_reg_offset 0x%x\n" , mc_umc_status, umc_reg_offset); - -/* print IPID registers value */ - mc_umc_addr = -SOC15_REG_OFFSET (UMC ,0 , regMCA_UMC_UMC0_MCUMC_IPIDT0); - reg_value =RREG64_PCIE ((mc_umc_addr + umc_reg_offset) *4 ); -if (reg_value) -dev_info (adev->dev,"MCA IPID 0x%llx, umc_reg_offset 0x%x\n" , reg_value, umc_reg_offset); - -/* print SYND registers value */ - mc_umc_addr = -SOC15_REG_OFFSET (UMC ,0 , regMCA_UMC_UMC0_MCUMC_SYNDT0); - reg_value =RREG64_PCIE ((mc_umc_addr + umc_reg_offset) *4 ); -if (reg_value) -dev_info (adev->dev,"MCA SYND 0x%llx, umc_reg_offset 0x%x\n" , reg_value, umc_reg_offset); - -/* print MISC0 registers value */ - mc_umc_addr = -SOC15_REG_OFFSET (UMC ,0 , regMCA_UMC_UMC0_MCUMC_MISC0T0); - reg_value =RREG64_PCIE ((mc_umc_addr + umc_reg_offset) *4 ); -if (reg_value) -dev_info (adev->dev,"MCA MISC0 0x%llx, umc_reg_offset 0x%x\n" , reg_value, umc_reg_offset); +umc_query_error_status_helper (adev, mc_umc_status, umc_reg_offset); } }
@@ -277,8 +291,11 @@ static void umc_v6_7_query_correctable_error_count(struct amdgpu_device *adev,MCUMC_STATUS is a 64 bit register */ mc_umc_status =RREG64_PCIE ((mc_umc_status_addr + umc_reg_offset) *4 );if (REG_GET_FIELD (mc_umc_status,MCA_UMC_UMC0_MCUMC_STATUST0 , Val) ==1 && -REG_GET_FIELD (mc_umc_status,MCA_UMC_UMC0_MCUMC_STATUST0 ,CECC ) ==1 ) +REG_GET_FIELD (mc_umc_status,MCA_UMC_UMC0_MCUMC_STATUST0 ,CECC ) ==1 ) { *error_count +=1 ; + +umc_query_error_status_helper (adev, mc_umc_status, umc_reg_offset); + } } static void umc_v6_7_querry_uncorrectable_error_count(struct amdgpu_device *adev,
@@ -287,8 +304,6 @@ static void umc_v6_7_querry_uncorrectable_error_count(struct amdgpu_device *adev {uint64_t mc_umc_status;uint32_t mc_umc_status_addr; -uint32_t mc_umc_addr; -uint64_t reg_value; mc_umc_status_addr =SOC15_REG_OFFSET (UMC ,0 , regMCA_UMC_UMC0_MCUMC_STATUST0);
@@ -303,32 +318,7 @@ static void umc_v6_7_querry_uncorrectable_error_count(struct amdgpu_device *adev REG_GET_FIELD(mc_umc_status, MCA_UMC_UMC0_MCUMC_STATUST0, TCC) == 1)) { *error_count +=1 ; -if (REG_GET_FIELD (mc_umc_status,MCA_UMC_UMC0_MCUMC_STATUST0 , Deferred) ==1 ) -dev_info (adev->dev,"Deferred error, no user action is needed.\n" ); - -if (mc_umc_status) -dev_info (adev->dev,"MCA STATUS 0x%llx, umc_reg_offset 0x%x\n" , mc_umc_status, umc_reg_offset); - -/* print IPID registers value */ - mc_umc_addr = -SOC15_REG_OFFSET (UMC ,0 , regMCA_UMC_UMC0_MCUMC_IPIDT0); - reg_value =RREG64_PCIE ((mc_umc_addr + umc_reg_offset) *4 ); -if (reg_value) -dev_info (adev->dev,"MCA IPID 0x%llx, umc_reg_offset 0x%x\n" , reg_value, umc_reg_offset); - -/* print SYND registers value */ - mc_umc_addr = -SOC15_REG_OFFSET (UMC ,0 , regMCA_UMC_UMC0_MCUMC_SYNDT0); - reg_value =RREG64_PCIE ((mc_umc_addr + umc_reg_offset) *4 ); -if (reg_value) -dev_info (adev->dev,"MCA SYND 0x%llx, umc_reg_offset 0x%x\n" , reg_value, umc_reg_offset); - -/* print MISC0 registers value */ - mc_umc_addr = -SOC15_REG_OFFSET (UMC ,0 , regMCA_UMC_UMC0_MCUMC_MISC0T0); - reg_value =RREG64_PCIE ((mc_umc_addr + umc_reg_offset) *4 ); -if (reg_value) -dev_info (adev->dev,"MCA MISC0 0x%llx, umc_reg_offset 0x%x\n" , reg_value, umc_reg_offset); +umc_query_error_status_helper (adev, mc_umc_status, umc_reg_offset); } }
Signature · 1 line
2.17.1
[AMD Official Use Only]
Quoted 248 lines
-----Original Message-----
From: Stanley.Yang <[email protected]>
Sent: Friday, April 8, 2022 4:10 PM
To: [email protected]; Zhang, Hawking <[email protected]>; Zhou1, Tao <[email protected]>; Li, Candice <[email protected]>
Cc: Yang, Stanley <[email protected]>
Subject: [PATCH Review 1/1] drm/amdgpu: add umc query error status functionIn order to debug ras error, driver will print IPID/SYND/MISC0 register value if detect correctable or uncorrectable error.
Provideumc_query_error_status_helperfunction to reduce code redundancy.Change-Id I09a2aae85cde3ab2cb6b042b973da6839ad024ecSigned-off-by Stanley.Yang <[email protected]>--- drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 106 ++++++++++++-------------- 1 file changed, 48 insertions(+), 58 deletions(-)drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +40
-0@@ -64,21 +64,62 @@ static inline uint32_t get_umc_v6_7_channel_index(struct amdgpu_device *adev, return adev->umc.channel_idx_tbl[umc_inst * adev- >umc.channel_inst_num + ch_inst]; } +static void umc_query_error_status_helper (struct amdgpu_device *adev, +uint64_t mc_umc_status,uint32_t umc_reg_offset) { +uint32_t mc_umc_addr; +uint64_t reg_value; + +if (REG_GET_FIELD (mc_umc_status,MCA_UMC_UMC0_MCUMC_STATUST0 , Deferred) ==1 ) + dev_info(adev->dev, "Deferred error, no user action is needed.\n"); + +if (mc_umc_status) + dev_info(adev->dev, "MCA STATUS 0x%llx, umc_reg_offset 0x%x\n", +mc_umc_status, umc_reg_offset); + +/* print IPID registers value */ + mc_umc_addr = +SOC15_REG_OFFSET (UMC ,0 , regMCA_UMC_UMC0_MCUMC_IPIDT0); + reg_value =RREG64_PCIE ((mc_umc_addr + umc_reg_offset) *4 ); +if (reg_value) + dev_info(adev->dev, "MCA IPID 0x%llx, umc_reg_offset 0x%x\n", +reg_value, umc_reg_offset); + +/* print SYND registers value */ + mc_umc_addr = +SOC15_REG_OFFSET (UMC ,0 , regMCA_UMC_UMC0_MCUMC_SYNDT0); + reg_value =RREG64_PCIE ((mc_umc_addr + umc_reg_offset) *4 ); +if (reg_value) + dev_info(adev->dev, "MCA SYND 0x%llx, umc_reg_offset 0x%x\n", +reg_value, umc_reg_offset); + +/* print MISC0 registers value */ + mc_umc_addr = +SOC15_REG_OFFSET (UMC ,0 , regMCA_UMC_UMC0_MCUMC_MISC0T0); + reg_value =RREG64_PCIE ((mc_umc_addr + umc_reg_offset) *4 ); +if (reg_value) + dev_info(adev->dev, "MCA MISC0 0x%llx, umc_reg_offset 0x%x\n", +reg_value, umc_reg_offset); } +static void umc_v6_7_ecc_info_query_correctable_error_count (struct amdgpu_device *adev,uint32_t umc_inst,uint32_t ch_inst,unsigned long *error_count) {uint64_t mc_umc_status;uint32_t eccinfo_table_idx; +uint32_t umc_reg_offset;struct amdgpu_ras *ras =amdgpu_ras_get_context (adev); + umc_reg_offset =get_umc_v6_7_reg_offset (adev, + umc_inst, ch_inst); + eccinfo_table_idx = umc_inst * adev->umc.channel_inst_num + ch_inst;/* check for SRAM correctable error MCUMC_STATUS is a 64 bit register */ mc_umc_status = ras-Quoted 1 line
umc_ecc.ecc[eccinfo_table_idx].mca_umc_status;
if (REG_GET_FIELD(mc_umc_status,
MCA_UMC_UMC0_MCUMC_STATUST0, Val) == 1 &&drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-1- REG_GET_FIELD(mc_umc_status,
MCA_UMC_UMC0_MCUMC_STATUST0, CECC) == 1)drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +1
-0+ REG_GET_FIELD(mc_umc_status,
MCA_UMC_UMC0_MCUMC_STATUST0, CECC) ==
+1) {drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +2
-0*error_count +=1 ; + + umc_query_error_status_helper(adev, mc_umc_status,
umc_reg_offset);drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +1
-0+ } } static void umc_v6_7_ecc_info_querry_uncorrectable_error_count(struct
amdgpu_device*adev, @@ -88,8 +129,6 @@ static void umc_v6_7_ecc_info_querry_uncorrectable_error_count(structamdgpu_devdrivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-2uint64_t mc_umc_status;uint32_t eccinfo_table_idx;uint32_t umc_reg_offset; -uint32_t mc_umc_addr; -uint64_t reg_value;struct amdgpu_ras *ras =amdgpu_ras_get_context (adev); umc_reg_offset = get_umc_v6_7_reg_offset(adev, @@ -106,32 +145,7@@ static void umc_v6_7_ecc_info_querry_uncorrectable_error_count(struct
amdgpu_dev
REG_GET_FIELD(mc_umc_status,MCA_UMC_UMC0_MCUMC_STATUST0, TCC) == 1)) {drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-1*error_count +=1 ; - if (REG_GET_FIELD(mc_umc_status,
MCA_UMC_UMC0_MCUMC_STATUST0, Deferred) == 1)drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-1- dev_info(adev->dev, "Deferred error, no user action isneeded.\n");
drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-3- -if (mc_umc_status) - dev_info(adev->dev, "MCA STATUS 0x%llx,
umc_reg_offset0x%x\n",mc_umc_status,umc_reg_offset);drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-4- -/* print IPID registers value */ - mc_umc_addr = - SOC15_REG_OFFSET(UMC, 0,
regMCA_UMC_UMC0_MCUMC_IPIDT0);drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-1- reg_value = RREG64_PCIE((mc_umc_addr + umc_reg_offset) *4);
drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-2-if (reg_value) - dev_info(adev->dev, "MCA IPID 0x%llx, umc_reg_offset0x%x\n",
reg_value,umc_reg_offset);drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-4- -/* print SYND registers value */ - mc_umc_addr = - SOC15_REG_OFFSET(UMC, 0,
regMCA_UMC_UMC0_MCUMC_SYNDT0);drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-1- reg_value = RREG64_PCIE((mc_umc_addr + umc_reg_offset) *4);
drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-2-if (reg_value) - dev_info(adev->dev, "MCA SYND 0x%llx,
umc_reg_offset0x%x\n",reg_value,umc_reg_offset);drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-4- -/* print MISC0 registers value */ - mc_umc_addr = - SOC15_REG_OFFSET(UMC, 0,
regMCA_UMC_UMC0_MCUMC_MISC0T0);drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-1- reg_value = RREG64_PCIE((mc_umc_addr + umc_reg_offset) *4);
drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-2-if (reg_value) - dev_info(adev->dev, "MCA MISC0 0x%llx,
umc_reg_offset0x%x\n",reg_value,umc_reg_offset);drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +1
-0+ umc_query_error_status_helper(adev, mc_umc_status,
umc_reg_offset);drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-0} }@@ -277,8 +291,11 @@ static voidumc_v6_7_query_correctable_error_count(struct amdgpu_device *adev, MCUMC_STATUS is a 64 bit register */ mc_umc_status =RREG64_PCIE ((mc_umc_status_addr + umc_reg_offset) *4 ); if (REG_GET_FIELD(mc_umc_status,
MCA_UMC_UMC0_MCUMC_STATUST0, Val) == 1 &&drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-1- REG_GET_FIELD(mc_umc_status,
MCA_UMC_UMC0_MCUMC_STATUST0, CECC) == 1)drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +1
-0+ REG_GET_FIELD(mc_umc_status,
MCA_UMC_UMC0_MCUMC_STATUST0, CECC) ==
+1) {drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +2
-0*error_count +=1 ; + + umc_query_error_status_helper(adev, mc_umc_status,
umc_reg_offset);drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +1
-0+ } } static void umc_v6_7_querry_uncorrectable_error_count(struct amdgpu_device*adev, @@ -287,8 +304,6 @@ static void umc_v6_7_querry_uncorrectable_error_count(struct
amdgpu_device*adev {drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-2uint64_t mc_umc_status;uint32_t mc_umc_status_addr; -uint32_t mc_umc_addr; -uint64_t reg_value; mc_umc_status_addr = SOC15_REG_OFFSET(UMC, 0,
regMCA_UMC_UMC0_MCUMC_STATUST0); @@ -303,32 +318,7 @@ static void umc_v6_7_querry_uncorrectable_error_count(structamdgpu_device*adev
REG_GET_FIELD(mc_umc_status,MCA_UMC_UMC0_MCUMC_STATUST0, TCC) == 1)) {drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-1*error_count +=1 ; - if (REG_GET_FIELD(mc_umc_status,
MCA_UMC_UMC0_MCUMC_STATUST0, Deferred) == 1)drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-1- dev_info(adev->dev, "Deferred error, no user action isneeded.\n");
drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-3- -if (mc_umc_status) - dev_info(adev->dev, "MCA STATUS 0x%llx,
umc_reg_offset0x%x\n",mc_umc_status,umc_reg_offset);drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-4- -/* print IPID registers value */ - mc_umc_addr = - SOC15_REG_OFFSET(UMC, 0,
regMCA_UMC_UMC0_MCUMC_IPIDT0);drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-1- reg_value = RREG64_PCIE((mc_umc_addr + umc_reg_offset) *4);
drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-2-if (reg_value) - dev_info(adev->dev, "MCA IPID 0x%llx, umc_reg_offset0x%x\n",
reg_value,umc_reg_offset);drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-4- -/* print SYND registers value */ - mc_umc_addr = - SOC15_REG_OFFSET(UMC, 0,
regMCA_UMC_UMC0_MCUMC_SYNDT0);drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-1- reg_value = RREG64_PCIE((mc_umc_addr + umc_reg_offset) *4);
drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-2-if (reg_value) - dev_info(adev->dev, "MCA SYND 0x%llx,
umc_reg_offset0x%x\n",reg_value,umc_reg_offset);drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-4- -/* print MISC0 registers value */ - mc_umc_addr = - SOC15_REG_OFFSET(UMC, 0,
regMCA_UMC_UMC0_MCUMC_MISC0T0);drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-1- reg_value = RREG64_PCIE((mc_umc_addr + umc_reg_offset) *4);
drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +0
-2-if (reg_value) - dev_info(adev->dev, "MCA MISC0 0x%llx,
umc_reg_offset0x%x\n",reg_value,umc_reg_offset);drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +1
-0+ umc_query_error_status_helper(adev, mc_umc_status,
umc_reg_offset);
}
}--
2.17.1
Dear Stanley,
Thank you for the patch.
Am 08.04.22 um 10:10 schrieb Stanley.Yang:
Please remove the dot/period from the name.
Quoted 2 lines
In order to debug ras error, driver will print IPID/SYND/MISC0 register value if detect correctable or uncorrectable error.
… if it detects …
Quoted 2 lines
Provide
umc_query_error_status_helperfunction to reduce code redundancy.
Can you please make this two patches. First refactoring, and then adding new call sites. (The current commit message summary, does not say anything about new call-sites.)
Quoted 1 line
Change-Id: I09a2aae85cde3ab2cb6b042b973da6839ad024ec
Without the Gerrit review instance, the Change-Id is not of any use.
Quoted 1 line
Signed-off-by Stanley.Yang <[email protected]>
Please remove the . from the name.
Kind regards,
Paul
Quoted 171 lines
--- drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 106 ++++++++++++-------------- 1 file changed, 48 insertions(+), 58 deletions(-)drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +48
-58@@ -64,21 +64,62 @@ static inline uint32_t get_umc_v6_7_channel_index(struct amdgpu_device *adev,return adev->umc.channel_idx_tbl[umc_inst * adev->umc.channel_inst_num + ch_inst]; } +static void umc_query_error_status_helper (struct amdgpu_device *adev, +uint64_t mc_umc_status,uint32_t umc_reg_offset) +{ +uint32_t mc_umc_addr; +uint64_t reg_value; + +if (REG_GET_FIELD (mc_umc_status,MCA_UMC_UMC0_MCUMC_STATUST0 , Deferred) ==1 ) +dev_info (adev->dev,"Deferred error, no user action is needed.\n" ); + +if (mc_umc_status) +dev_info (adev->dev,"MCA STATUS 0x%llx, umc_reg_offset 0x%x\n" , mc_umc_status, umc_reg_offset); + +/* print IPID registers value */ + mc_umc_addr = +SOC15_REG_OFFSET (UMC ,0 , regMCA_UMC_UMC0_MCUMC_IPIDT0); + reg_value =RREG64_PCIE ((mc_umc_addr + umc_reg_offset) *4 ); +if (reg_value) +dev_info (adev->dev,"MCA IPID 0x%llx, umc_reg_offset 0x%x\n" , reg_value, umc_reg_offset); + +/* print SYND registers value */ + mc_umc_addr = +SOC15_REG_OFFSET (UMC ,0 , regMCA_UMC_UMC0_MCUMC_SYNDT0); + reg_value =RREG64_PCIE ((mc_umc_addr + umc_reg_offset) *4 ); +if (reg_value) +dev_info (adev->dev,"MCA SYND 0x%llx, umc_reg_offset 0x%x\n" , reg_value, umc_reg_offset); + +/* print MISC0 registers value */ + mc_umc_addr = +SOC15_REG_OFFSET (UMC ,0 , regMCA_UMC_UMC0_MCUMC_MISC0T0); + reg_value =RREG64_PCIE ((mc_umc_addr + umc_reg_offset) *4 ); +if (reg_value) +dev_info (adev->dev,"MCA MISC0 0x%llx, umc_reg_offset 0x%x\n" , reg_value, umc_reg_offset); +} +static void umc_v6_7_ecc_info_query_correctable_error_count (struct amdgpu_device *adev,uint32_t umc_inst,uint32_t ch_inst,unsigned long *error_count) {uint64_t mc_umc_status;uint32_t eccinfo_table_idx; +uint32_t umc_reg_offset;struct amdgpu_ras *ras =amdgpu_ras_get_context (adev); + umc_reg_offset =get_umc_v6_7_reg_offset (adev, + umc_inst, ch_inst); + eccinfo_table_idx = umc_inst * adev->umc.channel_inst_num + ch_inst;/* check for SRAM correctable error MCUMC_STATUS is a 64 bit register */ mc_umc_status = ras->umc_ecc.ecc[eccinfo_table_idx].mca_umc_status;if (REG_GET_FIELD (mc_umc_status,MCA_UMC_UMC0_MCUMC_STATUST0 , Val) ==1 && -REG_GET_FIELD (mc_umc_status,MCA_UMC_UMC0_MCUMC_STATUST0 ,CECC ) ==1 ) +REG_GET_FIELD (mc_umc_status,MCA_UMC_UMC0_MCUMC_STATUST0 ,CECC ) ==1 ) { *error_count +=1 ; + +umc_query_error_status_helper (adev, mc_umc_status, umc_reg_offset); + } } static void umc_v6_7_ecc_info_querry_uncorrectable_error_count(struct amdgpu_device *adev,@@ -88,8 +129,6 @@ static void umc_v6_7_ecc_info_querry_uncorrectable_error_count(struct amdgpu_devuint64_t mc_umc_status;uint32_t eccinfo_table_idx;uint32_t umc_reg_offset; -uint32_t mc_umc_addr; -uint64_t reg_value;struct amdgpu_ras *ras =amdgpu_ras_get_context (adev); umc_reg_offset = get_umc_v6_7_reg_offset(adev,@@ -106,32 +145,7 @@ static void umc_v6_7_ecc_info_querry_uncorrectable_error_count(struct amdgpu_dev REG_GET_FIELD(mc_umc_status, MCA_UMC_UMC0_MCUMC_STATUST0, TCC) == 1)) { *error_count +=1 ; -if (REG_GET_FIELD (mc_umc_status,MCA_UMC_UMC0_MCUMC_STATUST0 , Deferred) ==1 ) -dev_info (adev->dev,"Deferred error, no user action is needed.\n" ); - -if (mc_umc_status) -dev_info (adev->dev,"MCA STATUS 0x%llx, umc_reg_offset 0x%x\n" , mc_umc_status, umc_reg_offset); - -/* print IPID registers value */ - mc_umc_addr = -SOC15_REG_OFFSET (UMC ,0 , regMCA_UMC_UMC0_MCUMC_IPIDT0); - reg_value =RREG64_PCIE ((mc_umc_addr + umc_reg_offset) *4 ); -if (reg_value) -dev_info (adev->dev,"MCA IPID 0x%llx, umc_reg_offset 0x%x\n" , reg_value, umc_reg_offset); - -/* print SYND registers value */ - mc_umc_addr = -SOC15_REG_OFFSET (UMC ,0 , regMCA_UMC_UMC0_MCUMC_SYNDT0); - reg_value =RREG64_PCIE ((mc_umc_addr + umc_reg_offset) *4 ); -if (reg_value) -dev_info (adev->dev,"MCA SYND 0x%llx, umc_reg_offset 0x%x\n" , reg_value, umc_reg_offset); - -/* print MISC0 registers value */ - mc_umc_addr = -SOC15_REG_OFFSET (UMC ,0 , regMCA_UMC_UMC0_MCUMC_MISC0T0); - reg_value =RREG64_PCIE ((mc_umc_addr + umc_reg_offset) *4 ); -if (reg_value) -dev_info (adev->dev,"MCA MISC0 0x%llx, umc_reg_offset 0x%x\n" , reg_value, umc_reg_offset); +umc_query_error_status_helper (adev, mc_umc_status, umc_reg_offset); } }@@ -277,8 +291,11 @@ static void umc_v6_7_query_correctable_error_count(struct amdgpu_device *adev,MCUMC_STATUS is a 64 bit register */ mc_umc_status =RREG64_PCIE ((mc_umc_status_addr + umc_reg_offset) *4 );if (REG_GET_FIELD (mc_umc_status,MCA_UMC_UMC0_MCUMC_STATUST0 , Val) ==1 && -REG_GET_FIELD (mc_umc_status,MCA_UMC_UMC0_MCUMC_STATUST0 ,CECC ) ==1 ) +REG_GET_FIELD (mc_umc_status,MCA_UMC_UMC0_MCUMC_STATUST0 ,CECC ) ==1 ) { *error_count +=1 ; + +umc_query_error_status_helper (adev, mc_umc_status, umc_reg_offset); + } } static void umc_v6_7_querry_uncorrectable_error_count(struct amdgpu_device *adev,@@ -287,8 +304,6 @@ static void umc_v6_7_querry_uncorrectable_error_count(struct amdgpu_device *adev {uint64_t mc_umc_status;uint32_t mc_umc_status_addr; -uint32_t mc_umc_addr; -uint64_t reg_value; mc_umc_status_addr =SOC15_REG_OFFSET (UMC ,0 , regMCA_UMC_UMC0_MCUMC_STATUST0);@@ -303,32 +318,7 @@ static void umc_v6_7_querry_uncorrectable_error_count(struct amdgpu_device *adev REG_GET_FIELD(mc_umc_status, MCA_UMC_UMC0_MCUMC_STATUST0, TCC) == 1)) { *error_count +=1 ; -if (REG_GET_FIELD (mc_umc_status,MCA_UMC_UMC0_MCUMC_STATUST0 , Deferred) ==1 ) -dev_info (adev->dev,"Deferred error, no user action is needed.\n" ); - -if (mc_umc_status) -dev_info (adev->dev,"MCA STATUS 0x%llx, umc_reg_offset 0x%x\n" , mc_umc_status, umc_reg_offset); - -/* print IPID registers value */ - mc_umc_addr = -SOC15_REG_OFFSET (UMC ,0 , regMCA_UMC_UMC0_MCUMC_IPIDT0); - reg_value =RREG64_PCIE ((mc_umc_addr + umc_reg_offset) *4 ); -if (reg_value) -dev_info (adev->dev,"MCA IPID 0x%llx, umc_reg_offset 0x%x\n" , reg_value, umc_reg_offset); - -/* print SYND registers value */ - mc_umc_addr = -SOC15_REG_OFFSET (UMC ,0 , regMCA_UMC_UMC0_MCUMC_SYNDT0); - reg_value =RREG64_PCIE ((mc_umc_addr + umc_reg_offset) *4 ); -if (reg_value) -dev_info (adev->dev,"MCA SYND 0x%llx, umc_reg_offset 0x%x\n" , reg_value, umc_reg_offset); - -/* print MISC0 registers value */ - mc_umc_addr = -SOC15_REG_OFFSET (UMC ,0 , regMCA_UMC_UMC0_MCUMC_MISC0T0); - reg_value =RREG64_PCIE ((mc_umc_addr + umc_reg_offset) *4 ); -if (reg_value) -dev_info (adev->dev,"MCA MISC0 0x%llx, umc_reg_offset 0x%x\n" , reg_value, umc_reg_offset); +umc_query_error_status_helper (adev, mc_umc_status, umc_reg_offset); } }
[AMD Official Use Only]
+static void umc_query_error_status_helper(struct amdgpu_device *adev,
+ uint64_t mc_umc_status, uint32_t umc_reg_offset)
Might be better keep umc_v6_7 naming style. Call it umc_v6_7_query_mca_status. Apart from that, the patch is
Regards,
Hawking
-----Original Message-----
From: Stanley.Yang <[email protected]>
Sent: Friday, April 8, 2022 16:10
To: [email protected]; Zhang, Hawking <[email protected]>; Zhou1, Tao <[email protected]>; Li, Candice <[email protected]>
Cc: Yang, Stanley <[email protected]>
Subject: [PATCH Review 1/1] drm/amdgpu: add umc query error status function
In order to debug ras error, driver will print IPID/SYND/MISC0 register value if detect correctable or uncorrectable error. Provide umc_query_error_status_helper function to reduce code redundancy.
--- drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 106 ++++++++++++-------------- 1 file changed, 48 insertions(+), 58 deletions(-)
drivers/gpu/drm/amd/amdgpu/umc_v6_7.c +45 -1
@@ -64,21 +64,62 @@ static inline uint32_t get_umc_v6_7_channel_index(struct amdgpu_device *adev,return adev->umc.channel_idx_tbl[umc_inst * adev->umc.channel_inst_num + ch_inst]; } +static void umc_query_error_status_helper (struct amdgpu_device *adev, +uint64_t mc_umc_status,uint32_t umc_reg_offset) { +uint32_t mc_umc_addr; +uint64_t reg_value; + +if (REG_GET_FIELD (mc_umc_status,MCA_UMC_UMC0_MCUMC_STATUST0 , Deferred) ==1 ) +dev_info (adev->dev,"Deferred error, no user action is needed.\n" ); + +if (mc_umc_status) +dev_info (adev->dev,"MCA STATUS 0x%llx, umc_reg_offset 0x%x\n" , +mc_umc_status, umc_reg_offset); + +/* print IPID registers value */ + mc_umc_addr = +SOC15_REG_OFFSET (UMC ,0 , regMCA_UMC_UMC0_MCUMC_IPIDT0); + reg_value =RREG64_PCIE ((mc_umc_addr + umc_reg_offset) *4 ); +if (reg_value) +dev_info (adev->dev,"MCA IPID 0x%llx, umc_reg_offset 0x%x\n" , +reg_value, umc_reg_offset); + +/* print SYND registers value */ + mc_umc_addr = +SOC15_REG_OFFSET (UMC ,0 , regMCA_UMC_UMC0_MCUMC_SYNDT0); + reg_value =RREG64_PCIE ((mc_umc_addr + umc_reg_offset) *4 ); +if (reg_value) +dev_info (adev->dev,"MCA SYND 0x%llx, umc_reg_offset 0x%x\n" , +reg_value, umc_reg_offset); + +/* print MISC0 registers value */ + mc_umc_addr = +SOC15_REG_OFFSET (UMC ,0 , regMCA_UMC_UMC0_MCUMC_MISC0T0); + reg_value =RREG64_PCIE ((mc_umc_addr + umc_reg_offset) *4 ); +if (reg_value) +dev_info (adev->dev,"MCA MISC0 0x%llx, umc_reg_offset 0x%x\n" , +reg_value, umc_reg_offset); } +static void umc_v6_7_ecc_info_query_correctable_error_count (struct amdgpu_device *adev,uint32_t umc_inst,uint32_t ch_inst,unsigned long *error_count) {uint64_t mc_umc_status;uint32_t eccinfo_table_idx; +uint32_t umc_reg_offset;struct amdgpu_ras *ras =amdgpu_ras_get_context (adev); + umc_reg_offset =get_umc_v6_7_reg_offset (adev, + umc_inst, ch_inst); + eccinfo_table_idx = umc_inst * adev->umc.channel_inst_num + ch_inst;/* check for SRAM correctable error MCUMC_STATUS is a 64 bit register */ mc_umc_status = ras->umc_ecc.ecc[eccinfo_table_idx].mca_umc_status;if (REG_GET_FIELD (mc_umc_status,MCA_UMC_UMC0_MCUMC_STATUST0 , Val) ==1 && -REG_GET_FIELD (mc_umc_status,MCA_UMC_UMC0_MCUMC_STATUST0 ,CECC ) ==1 ) +REG_GET_FIELD (mc_umc_status,MCA_UMC_UMC0_MCUMC_STATUST0 ,CECC ) == +1 ) { *error_count +=1 ; + +umc_query_error_status_helper (adev, mc_umc_status, umc_reg_offset); + } }
static void umc_v6_7_ecc_info_querry_uncorrectable_error_count(struct amdgpu_device *adev, @@ -88,8 +129,6 @@ static void umc_v6_7_ecc_info_querry_uncorrectable_error_count(struct amdgpu_dev
uint64_t mc_umc_status;
uint32_t eccinfo_table_idx;
uint32_t umc_reg_offset;
- uint32_t mc_umc_addr;
- uint64_t reg_value;
struct amdgpu_ras *ras = amdgpu_ras_get_context(adev);
umc_reg_offset = get_umc_v6_7_reg_offset(adev, @@ -106,32 +145,7 @@ static void umc_v6_7_ecc_info_querry_uncorrectable_error_count(struct amdgpu_dev
REG_GET_FIELD(mc_umc_status, MCA_UMC_UMC0_MCUMC_STATUST0, TCC) == 1)) {
*error_count += 1;- if (REG_GET_FIELD(mc_umc_status, MCA_UMC_UMC0_MCUMC_STATUST0, Deferred) == 1)
- dev_info(adev->dev, "Deferred error, no user action is needed.\n");
-
- if (mc_umc_status)
- dev_info(adev->dev, "MCA STATUS 0x%llx, umc_reg_offset 0x%x\n", mc_umc_status, umc_reg_offset);
-
- /* print IPID registers value */
- mc_umc_addr =
- SOC15_REG_OFFSET(UMC, 0, regMCA_UMC_UMC0_MCUMC_IPIDT0);
- reg_value = RREG64_PCIE((mc_umc_addr + umc_reg_offset) * 4);
- if (reg_value)
- dev_info(adev->dev, "MCA IPID 0x%llx, umc_reg_offset 0x%x\n", reg_value, umc_reg_offset);
-
- /* print SYND registers value */
- mc_umc_addr =
- SOC15_REG_OFFSET(UMC, 0, regMCA_UMC_UMC0_MCUMC_SYNDT0);
- reg_value = RREG64_PCIE((mc_umc_addr + umc_reg_offset) * 4);
- if (reg_value)
- dev_info(adev->dev, "MCA SYND 0x%llx, umc_reg_offset 0x%x\n", reg_value, umc_reg_offset);
-
- /* print MISC0 registers value */
- mc_umc_addr =
- SOC15_REG_OFFSET(UMC, 0, regMCA_UMC_UMC0_MCUMC_MISC0T0);
- reg_value = RREG64_PCIE((mc_umc_addr + umc_reg_offset) * 4);
- if (reg_value)
- dev_info(adev->dev, "MCA MISC0 0x%llx, umc_reg_offset 0x%x\n", reg_value, umc_reg_offset);
+ umc_query_error_status_helper(adev, mc_umc_status, umc_reg_offset);
}}
@@ -277,8 +291,11 @@ static void umc_v6_7_query_correctable_error_count(struct amdgpu_device *adev,
MCUMC_STATUS is a 64 bit register */
mc_umc_status = RREG64_PCIE((mc_umc_status_addr + umc_reg_offset) * 4);
if (REG_GET_FIELD(mc_umc_status, MCA_UMC_UMC0_MCUMC_STATUST0, Val) == 1 &&
- REG_GET_FIELD(mc_umc_status, MCA_UMC_UMC0_MCUMC_STATUST0, CECC) == 1)
+ REG_GET_FIELD(mc_umc_status, MCA_UMC_UMC0_MCUMC_STATUST0, CECC) ==
+1) {
*error_count += 1;+
+ umc_query_error_status_helper(adev, mc_umc_status, umc_reg_offset);
+ }
}
static void umc_v6_7_querry_uncorrectable_error_count(struct amdgpu_device *adev, @@ -287,8 +304,6 @@ static void umc_v6_7_querry_uncorrectable_error_count(struct amdgpu_device *adev {
uint64_t mc_umc_status;
uint32_t mc_umc_status_addr;- uint32_t mc_umc_addr;
- uint64_t reg_value;
mc_umc_status_addr =
SOC15_REG_OFFSET(UMC, 0, regMCA_UMC_UMC0_MCUMC_STATUST0); @@ -303,32 +318,7 @@ static void umc_v6_7_querry_uncorrectable_error_count(struct amdgpu_device *adev
REG_GET_FIELD(mc_umc_status, MCA_UMC_UMC0_MCUMC_STATUST0, TCC) == 1)) {
*error_count += 1;- if (REG_GET_FIELD(mc_umc_status, MCA_UMC_UMC0_MCUMC_STATUST0, Deferred) == 1)
- dev_info(adev->dev, "Deferred error, no user action is needed.\n");
-
- if (mc_umc_status)
- dev_info(adev->dev, "MCA STATUS 0x%llx, umc_reg_offset 0x%x\n", mc_umc_status, umc_reg_offset);
-
- /* print IPID registers value */
- mc_umc_addr =
- SOC15_REG_OFFSET(UMC, 0, regMCA_UMC_UMC0_MCUMC_IPIDT0);
- reg_value = RREG64_PCIE((mc_umc_addr + umc_reg_offset) * 4);
- if (reg_value)
- dev_info(adev->dev, "MCA IPID 0x%llx, umc_reg_offset 0x%x\n", reg_value, umc_reg_offset);
-
- /* print SYND registers value */
- mc_umc_addr =
- SOC15_REG_OFFSET(UMC, 0, regMCA_UMC_UMC0_MCUMC_SYNDT0);
- reg_value = RREG64_PCIE((mc_umc_addr + umc_reg_offset) * 4);
- if (reg_value)
- dev_info(adev->dev, "MCA SYND 0x%llx, umc_reg_offset 0x%x\n", reg_value, umc_reg_offset);
-
- /* print MISC0 registers value */
- mc_umc_addr =
- SOC15_REG_OFFSET(UMC, 0, regMCA_UMC_UMC0_MCUMC_MISC0T0);
- reg_value = RREG64_PCIE((mc_umc_addr + umc_reg_offset) * 4);
- if (reg_value)
- dev_info(adev->dev, "MCA MISC0 0x%llx, umc_reg_offset 0x%x\n", reg_value, umc_reg_offset);
+ umc_query_error_status_helper(adev, mc_umc_status, umc_reg_offset);
}}
--
2.17.1