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

drm/amdgpu: retire unused aca_bank_report data structure 



retire unused aca_bank_report data structure.

Signed-off-by: default avatarYang Wang <kevinyang.wang@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent b5b6d625

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

+7 −10
Original line number Diff line number Diff line
@@ -297,29 +297,26 @@ int aca_error_cache_log_bank_error(struct aca_handle *handle, struct aca_bank_in 
	return 0;

}



static int aca_generate_bank_report(struct aca_handle *handle, struct aca_bank *bank,

				    enum aca_smu_type type, struct aca_bank_report *report)

static int aca_bank_parser(struct aca_handle *handle, struct aca_bank *bank, enum aca_smu_type type)

{

	const struct aca_bank_ops *bank_ops = handle->bank_ops;



	if (!bank || !report)

	if (!bank)

		return -EINVAL;



	if (!bank_ops->aca_bank_generate_report)

	if (!bank_ops->aca_bank_parser)

		return -EOPNOTSUPP;



	memset(report, 0, sizeof(*report));

	return bank_ops->aca_bank_generate_report(handle, bank, type,

						  report, handle->data);

	return bank_ops->aca_bank_parser(handle, bank, type,

					 handle->data);

}



static int handler_aca_log_bank_error(struct aca_handle *handle, struct aca_bank *bank,

				      enum aca_smu_type smu_type, void *data)

				      enum aca_smu_type type, void *data)

{

	struct aca_bank_report report;

	int ret;



	ret = aca_generate_bank_report(handle, bank, smu_type, &report);

	ret = aca_bank_parser(handle, bank, type);

	if (ret)

		return ret;

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

+1 −7
Original line number Diff line number Diff line
@@ -122,11 +122,6 @@ struct aca_bank_info { 
	int mcatype;

};



struct aca_bank_report {

	struct aca_bank_info info;

	u64 count[ACA_ERROR_TYPE_COUNT];

};



struct aca_bank_error {

	struct list_head node;

	struct aca_bank_info info;
@@ -164,8 +159,7 @@ struct aca_handle { 
};



struct aca_bank_ops {

	int (*aca_bank_generate_report)(struct aca_handle *handle, struct aca_bank *bank, enum aca_smu_type type,

					struct aca_bank_report *report, void *data);

	int (*aca_bank_parser)(struct aca_handle *handle, struct aca_bank *bank, enum aca_smu_type type, void *data);

	bool (*aca_bank_is_valid)(struct aca_handle *handle, struct aca_bank *bank, enum aca_smu_type type,

				  void *data);

};

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

+3 −3
Original line number Diff line number Diff line
@@ -1035,8 +1035,8 @@ int amdgpu_xgmi_remove_device(struct amdgpu_device *adev) 
	return 0;

}



static int xgmi_v6_4_0_aca_bank_generate_report(struct aca_handle *handle, struct aca_bank *bank, enum aca_smu_type type,

						struct aca_bank_report *report, void *data)

static int xgmi_v6_4_0_aca_bank_parser(struct aca_handle *handle, struct aca_bank *bank,

				       enum aca_smu_type type, void *data)

{

	struct amdgpu_device *adev = handle->adev;

	struct aca_bank_info info;
@@ -1075,7 +1075,7 @@ static int xgmi_v6_4_0_aca_bank_generate_report(struct aca_handle *handle, struc 
}



static const struct aca_bank_ops xgmi_v6_4_0_aca_bank_ops = {

	.aca_bank_generate_report = xgmi_v6_4_0_aca_bank_generate_report,

	.aca_bank_parser = xgmi_v6_4_0_aca_bank_parser,

};



static const struct aca_info xgmi_v6_4_0_aca_info = {

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

+4 −4
Original line number Diff line number Diff line
@@ -680,9 +680,9 @@ static const struct amdgpu_gfx_funcs gfx_v9_4_3_gfx_funcs = { 
	.ih_node_to_logical_xcc = &gfx_v9_4_3_ih_to_xcc_inst,

};



static int gfx_v9_4_3_aca_bank_generate_report(struct aca_handle *handle,

static int gfx_v9_4_3_aca_bank_parser(struct aca_handle *handle,

				      struct aca_bank *bank, enum aca_smu_type type,

					       struct aca_bank_report *report, void *data)

				      void *data)

{

	struct aca_bank_info info;

	u64 misc0;
@@ -736,7 +736,7 @@ static bool gfx_v9_4_3_aca_bank_is_valid(struct aca_handle *handle, struct aca_b 
}



static const struct aca_bank_ops gfx_v9_4_3_aca_bank_ops = {

	.aca_bank_generate_report = gfx_v9_4_3_aca_bank_generate_report,

	.aca_bank_parser = gfx_v9_4_3_aca_bank_parser,

	.aca_bank_is_valid = gfx_v9_4_3_aca_bank_is_valid,

};

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

+3 −4
Original line number Diff line number Diff line
@@ -721,9 +721,8 @@ static const struct amdgpu_ras_block_hw_ops mmhub_v1_8_ras_hw_ops = { 
	.reset_ras_error_count = mmhub_v1_8_reset_ras_error_count,

};



static int mmhub_v1_8_aca_bank_generate_report(struct aca_handle *handle,

					       struct aca_bank *bank, enum aca_smu_type type,

					       struct aca_bank_report *report, void *data)

static int mmhub_v1_8_aca_bank_parser(struct aca_handle *handle, struct aca_bank *bank,

				      enum aca_smu_type type, void *data)

{

	struct aca_bank_info info;

	u64 misc0;
@@ -780,7 +779,7 @@ static bool mmhub_v1_8_aca_bank_is_valid(struct aca_handle *handle, struct aca_b 
}



static const struct aca_bank_ops mmhub_v1_8_aca_bank_ops = {

	.aca_bank_generate_report = mmhub_v1_8_aca_bank_generate_report,

	.aca_bank_parser = mmhub_v1_8_aca_bank_parser,

	.aca_bank_is_valid = mmhub_v1_8_aca_bank_is_valid,

};