Commit f2355862 authored by Yang Wang's avatar Yang Wang Committed by Alex Deucher
Browse files

drm/amdgpu: add new aca smu callback func parse_error_code() 



add new aca smu callback parse_error_code{} to avoid specific asic check
in amdgpu_aca.c file

Signed-off-by: default avatarYang Wang <kevinyang.wang@amd.com>
Reviewed-by: default avatarTao Zhou <tao.zhou1@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 86842046

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

+8 −15
Original line number Diff line number Diff line
@@ -753,23 +753,13 @@ int aca_bank_info_decode(struct aca_bank *bank, struct aca_bank_info *info) 


static int aca_bank_get_error_code(struct amdgpu_device *adev, struct aca_bank *bank)

{

	int error_code;



	switch (amdgpu_ip_version(adev, MP1_HWIP, 0)) {

	case IP_VERSION(13, 0, 6):

		if (!(adev->flags & AMD_IS_APU) && adev->pm.fw_version >= 0x00555600) {

			error_code = ACA_REG__SYND__ERRORINFORMATION(bank->regs[ACA_REG_IDX_SYND]);

			return error_code & 0xff;

		}

		break;

	default:

		break;

	}

	struct amdgpu_aca *aca = &adev->aca;

	const struct aca_smu_funcs *smu_funcs = aca->smu_funcs;



	/* NOTE: the true error code is encoded in status.errorcode[0:7] */

	error_code = ACA_REG__STATUS__ERRORCODE(bank->regs[ACA_REG_IDX_STATUS]);

	if (!smu_funcs || !smu_funcs->parse_error_code)

		return -EOPNOTSUPP;



	return error_code & 0xff;

	return smu_funcs->parse_error_code(adev, bank);

}



int aca_bank_check_error_codes(struct amdgpu_device *adev, struct aca_bank *bank, int *err_codes, int size)
@@ -780,6 +770,9 @@ int aca_bank_check_error_codes(struct amdgpu_device *adev, struct aca_bank *bank 
		return -EINVAL;



	error_code = aca_bank_get_error_code(adev, bank);

	if (error_code < 0)

		return error_code;



	for (i = 0; i < size; i++) {

		if (err_codes[i] == error_code)

			return 0;

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

+1 −0
Original line number Diff line number Diff line
@@ -173,6 +173,7 @@ struct aca_smu_funcs { 
	int (*set_debug_mode)(struct amdgpu_device *adev, bool enable);

	int (*get_valid_aca_count)(struct amdgpu_device *adev, enum aca_smu_type type, u32 *count);

	int (*get_valid_aca_bank)(struct amdgpu_device *adev, enum aca_smu_type type, int idx, struct aca_bank *bank);

	int (*parse_error_code)(struct amdgpu_device *adev, struct aca_bank *bank);

};



struct amdgpu_aca {

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c

+13 −0
Original line number Diff line number Diff line
@@ -3118,12 +3118,25 @@ static int aca_smu_get_valid_aca_bank(struct amdgpu_device *adev, 
	return 0;

}



static int aca_smu_parse_error_code(struct amdgpu_device *adev, struct aca_bank *bank)

{

	int error_code;



	if (!(adev->flags & AMD_IS_APU) && adev->pm.fw_version >= 0x00555600)

		error_code = ACA_REG__SYND__ERRORINFORMATION(bank->regs[ACA_REG_IDX_SYND]);

	else

		error_code = ACA_REG__STATUS__ERRORCODE(bank->regs[ACA_REG_IDX_STATUS]);



	return error_code & 0xff;

}



static const struct aca_smu_funcs smu_v13_0_6_aca_smu_funcs = {

	.max_ue_bank_count = 12,

	.max_ce_bank_count = 12,

	.set_debug_mode = aca_smu_set_debug_mode,

	.get_valid_aca_count = aca_smu_get_valid_aca_count,

	.get_valid_aca_bank = aca_smu_get_valid_aca_bank,

	.parse_error_code = aca_smu_parse_error_code,

};



static int smu_v13_0_6_select_xgmi_plpd_policy(struct smu_context *smu,