Commit 73c6c226 authored by YiPeng Chai's avatar YiPeng Chai Committed by Alex Deucher
Browse files

drm/amd/ras: Add sriov ras preprocessing before gpu reset 



Sriov host may clear all VF commands registered to auto
update list during VF reset, set ecc.auto_uUpdate block
to false before VF reset, and after VF reset is complete,
RAS_CMD__GET_ALL_BLOCK_ECC_STATUS command will be re-registered
to auto update list of sriov host.

Signed-off-by: default avatarYiPeng Chai <YiPeng.Chai@amd.com>
Reviewed-by: default avatarTao Zhou <tao.zhou1@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 61a9a413

drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c

+6 −0
Original line number Diff line number Diff line
@@ -642,6 +642,9 @@ int amdgpu_ras_mgr_handle_ras_cmd(struct amdgpu_device *adev, 


int amdgpu_ras_mgr_pre_reset(struct amdgpu_device *adev)

{

	if (amdgpu_sriov_vf(adev))

		return amdgpu_virt_ras_pre_reset(adev);



	if (!amdgpu_ras_mgr_is_ready(adev)) {

		RAS_DEV_ERR(adev, "Invalid ras suspend!\n");

		return -EPERM;
@@ -653,6 +656,9 @@ int amdgpu_ras_mgr_pre_reset(struct amdgpu_device *adev) 


int amdgpu_ras_mgr_post_reset(struct amdgpu_device *adev)

{

	if (amdgpu_sriov_vf(adev))

		return amdgpu_virt_ras_post_reset(adev);



	if (!amdgpu_ras_mgr_is_ready(adev)) {

		RAS_DEV_ERR(adev, "Invalid ras resume!\n");

		return -EPERM;

drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_virt_ras_cmd.c

+15 −0
Original line number Diff line number Diff line
@@ -413,3 +413,18 @@ int amdgpu_virt_ras_hw_fini(struct amdgpu_device *adev) 


	return 0;

}



int amdgpu_virt_ras_pre_reset(struct amdgpu_device *adev)

{

	struct amdgpu_ras_mgr *ras_mgr = amdgpu_ras_mgr_get_context(adev);

	struct amdgpu_virt_ras_cmd *virt_ras =

		(struct amdgpu_virt_ras_cmd *)ras_mgr->virt_ras_cmd;



	virt_ras->blocks_ecc.auto_update_actived = false;

	return 0;

}



int amdgpu_virt_ras_post_reset(struct amdgpu_device *adev)

{

	return 0;

}

drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_virt_ras_cmd.h

+2 −1
Original line number Diff line number Diff line
@@ -49,5 +49,6 @@ int amdgpu_virt_ras_hw_init(struct amdgpu_device *adev); 
int amdgpu_virt_ras_hw_fini(struct amdgpu_device *adev);

int amdgpu_virt_ras_handle_cmd(struct ras_core_context *ras_core,

		struct ras_cmd_ctx *cmd);



int amdgpu_virt_ras_pre_reset(struct amdgpu_device *adev);

int amdgpu_virt_ras_post_reset(struct amdgpu_device *adev);

#endif