Commit 001a0a95 authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files

drm/amdgpu: switch to common ras ta helper 



TRIGGER_ERROR is common ras ta command for all the
ASICs that support RAS feature. switch to common helper
to avoid duplicate implementation per IP generation

Signed-off-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarGuchun Chen <guchun.chen@amd.com>
Reviewed-by: default avatarJohn Clements <john.clements@amd.com>
Reviewed-by: default avatarTao Zhou <tao.zhou1@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 35ccba4e

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

+27 −0
Original line number Diff line number Diff line
@@ -978,6 +978,33 @@ static int psp_ras_initialize(struct psp_context *psp) 


	return 0;

}



int psp_ras_trigger_error(struct psp_context *psp,

			  struct ta_ras_trigger_error_input *info)

{

	struct ta_ras_shared_memory *ras_cmd;

	int ret;



	if (!psp->ras.ras_initialized)

		return -EINVAL;



	ras_cmd = (struct ta_ras_shared_memory *)psp->ras.ras_shared_buf;

	memset(ras_cmd, 0, sizeof(struct ta_ras_shared_memory));



	ras_cmd->cmd_id = TA_RAS_COMMAND__TRIGGER_ERROR;

	ras_cmd->ras_in_message.trigger_error = *info;



	ret = psp_ras_invoke(psp, ras_cmd->cmd_id);

	if (ret)

		return -EINVAL;



	/* If err_event_athub occurs error inject was successful, however

	   return status from TA is no long reliable */

	if (amdgpu_ras_intr_triggered())

		return 0;



	return ras_cmd->ras_status;

}

// ras end



// HDCP start

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

+3 −5
Original line number Diff line number Diff line
@@ -95,8 +95,6 @@ struct psp_funcs 
			    enum psp_ring_type ring_type);

	bool (*smu_reload_quirk)(struct psp_context *psp);

	int (*mode1_reset)(struct psp_context *psp);

	int (*ras_trigger_error)(struct psp_context *psp,

			struct ta_ras_trigger_error_input *info);

	int (*ras_cure_posion)(struct psp_context *psp, uint64_t *mode_ptr);

	int (*rlc_autoload_start)(struct psp_context *psp);

	int (*mem_training_init)(struct psp_context *psp);
@@ -319,9 +317,6 @@ struct amdgpu_psp_funcs { 
#define psp_mem_training(psp, ops) \

	((psp)->funcs->mem_training ? (psp)->funcs->mem_training((psp), (ops)) : 0)



#define psp_ras_trigger_error(psp, info) \

	((psp)->funcs->ras_trigger_error ? \

	(psp)->funcs->ras_trigger_error((psp), (info)) : -EINVAL)

#define psp_ras_cure_posion(psp, addr) \

	((psp)->funcs->ras_cure_posion ? \

	(psp)->funcs->ras_cure_posion(psp, (addr)) : -EINVAL)
@@ -365,6 +360,9 @@ int psp_xgmi_set_topology_info(struct psp_context *psp, 
int psp_ras_invoke(struct psp_context *psp, uint32_t ta_cmd_id);

int psp_ras_enable_features(struct psp_context *psp,

		union ta_ras_cmd_input *info, bool enable);

int psp_ras_trigger_error(struct psp_context *psp,

			  struct ta_ras_trigger_error_input *info);



int psp_hdcp_invoke(struct psp_context *psp, uint32_t ta_cmd_id);

int psp_dtm_invoke(struct psp_context *psp, uint32_t ta_cmd_id);

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

+0 −28
Original line number Diff line number Diff line
@@ -524,33 +524,6 @@ static int psp_v11_0_mode1_reset(struct psp_context *psp) 
	return 0;

}



static int psp_v11_0_ras_trigger_error(struct psp_context *psp,

		struct ta_ras_trigger_error_input *info)

{

	struct ta_ras_shared_memory *ras_cmd;

	int ret;



	if (!psp->ras.ras_initialized)

		return -EINVAL;



	ras_cmd = (struct ta_ras_shared_memory *)psp->ras.ras_shared_buf;

	memset(ras_cmd, 0, sizeof(struct ta_ras_shared_memory));



	ras_cmd->cmd_id = TA_RAS_COMMAND__TRIGGER_ERROR;

	ras_cmd->ras_in_message.trigger_error = *info;



	ret = psp_ras_invoke(psp, ras_cmd->cmd_id);

	if (ret)

		return -EINVAL;



	/* If err_event_athub occurs error inject was successful, however

	   return status from TA is no long reliable */

	if (amdgpu_ras_intr_triggered())

		return 0;



	return ras_cmd->ras_status;

}



static int psp_v11_0_ras_cure_posion(struct psp_context *psp, uint64_t *mode_ptr)

{

#if 0
@@ -878,7 +851,6 @@ static const struct psp_funcs psp_v11_0_funcs = { 
	.ring_stop = psp_v11_0_ring_stop,

	.ring_destroy = psp_v11_0_ring_destroy,

	.mode1_reset = psp_v11_0_mode1_reset,

	.ras_trigger_error = psp_v11_0_ras_trigger_error,

	.ras_cure_posion = psp_v11_0_ras_cure_posion,

	.rlc_autoload_start = psp_v11_0_rlc_autoload_start,

	.mem_training_init = psp_v11_0_memory_training_init,

CRA Git | Maintained and supported by SUSTech CRA and CCSE