Commit 00f85667 authored by Xiang Liu's avatar Xiang Liu Committed by Alex Deucher
Browse files

drm/amdgpu: Decode deferred error type in aca bank parser 



In the case of poison inband log, the error type need to be specified
by checking the deferred or poison bit of status register.

v2: check both deferred and poison bit

Signed-off-by: default avatarXiang Liu <xiang.liu@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 5b5f01ef

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

+6 −0
Original line number Diff line number Diff line
@@ -76,6 +76,12 @@ struct ras_query_context; 
#define mmSMNAID_XCD1_MCA_SMU		0x38430400	/* SMN AID XCD1 */

#define mmSMNXCD_XCD0_MCA_SMU		0x40430400	/* SMN XCD XCD0 */



#define ACA_BANK_ERR_CE_DE_DECODE(bank)                                  \

	((ACA_REG__STATUS__POISON((bank)->regs[ACA_REG_IDX_STATUS]) ||   \

	  ACA_REG__STATUS__DEFERRED((bank)->regs[ACA_REG_IDX_STATUS])) ? \

		ACA_ERROR_TYPE_DEFERRED :                                \

		ACA_ERROR_TYPE_CE)



enum aca_reg_idx {

	ACA_REG_IDX_CTL			= 0,

	ACA_REG_IDX_STATUS		= 1,

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

+2 −2
Original line number Diff line number Diff line
@@ -1169,8 +1169,8 @@ static int xgmi_v6_4_0_aca_bank_parser(struct aca_handle *handle, struct aca_ban 
		break;

	case ACA_SMU_TYPE_CE:

		count = ext_error_code == 6 ? count : 0ULL;

		bank->aca_err_type = ACA_ERROR_TYPE_CE;

		ret = aca_error_cache_log_bank_error(handle, &info, ACA_ERROR_TYPE_CE, count);

		bank->aca_err_type = ACA_BANK_ERR_CE_DE_DECODE(bank);

		ret = aca_error_cache_log_bank_error(handle, &info, bank->aca_err_type, count);

		break;

	default:

		return -EINVAL;

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

+3 −2
Original line number Diff line number Diff line
@@ -883,9 +883,10 @@ static int gfx_v9_4_3_aca_bank_parser(struct aca_handle *handle, 
						     ACA_ERROR_TYPE_UE, 1ULL);

		break;

	case ACA_SMU_TYPE_CE:

		bank->aca_err_type = ACA_ERROR_TYPE_CE;

		bank->aca_err_type = ACA_BANK_ERR_CE_DE_DECODE(bank);

		ret = aca_error_cache_log_bank_error(handle, &info,

						     ACA_ERROR_TYPE_CE, ACA_REG__MISC0__ERRCNT(misc0));

						     bank->aca_err_type,

						     ACA_REG__MISC0__ERRCNT(misc0));

		break;

	default:

		return -EINVAL;

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

+2 −2
Original line number Diff line number Diff line
@@ -1332,8 +1332,8 @@ static int jpeg_v4_0_3_aca_bank_parser(struct aca_handle *handle, struct aca_ban 
						     1ULL);

		break;

	case ACA_SMU_TYPE_CE:

		bank->aca_err_type = ACA_ERROR_TYPE_CE;

		ret = aca_error_cache_log_bank_error(handle, &info, ACA_ERROR_TYPE_CE,

		bank->aca_err_type = ACA_BANK_ERR_CE_DE_DECODE(bank);

		ret = aca_error_cache_log_bank_error(handle, &info, bank->aca_err_type,

						     ACA_REG__MISC0__ERRCNT(misc0));

		break;

	default:

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

+2 −2
Original line number Diff line number Diff line
@@ -751,8 +751,8 @@ static int mmhub_v1_8_aca_bank_parser(struct aca_handle *handle, struct aca_bank 
						     1ULL);

		break;

	case ACA_SMU_TYPE_CE:

		bank->aca_err_type = ACA_ERROR_TYPE_CE;

		ret = aca_error_cache_log_bank_error(handle, &info, ACA_ERROR_TYPE_CE,

		bank->aca_err_type = ACA_BANK_ERR_CE_DE_DECODE(bank);

		ret = aca_error_cache_log_bank_error(handle, &info, bank->aca_err_type,

						     ACA_REG__MISC0__ERRCNT(misc0));

		break;

	default: