Commit 54c2d973 authored by YiPeng Chai's avatar YiPeng Chai Committed by Alex Deucher
Browse files

drm/amd/ras: Compatible with legacy sriov host 



If sriov host is legacy, the guest uniras will
be disabled.

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 73c6c226

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

+4 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ 
#include "vi.h"

#include "soc15.h"

#include "nv.h"

#include "amdgpu_virt_ras_cmd.h"



#define POPULATE_UCODE_INFO(vf2pf_info, ucode, ver) \

	do { \
@@ -1533,6 +1534,9 @@ bool amdgpu_virt_get_ras_capability(struct amdgpu_device *adev) 
	if (adev->virt.ras_en_caps.bits.poison_propogation_mode)

		con->poison_supported = true; /* Poison is handled by host */



	if (adev->virt.ras_en_caps.bits.uniras_supported)

		amdgpu_virt_ras_set_remote_uniras(adev, true);



	return true;

}

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

+2 −1
Original line number Diff line number Diff line
@@ -201,7 +201,8 @@ union amd_sriov_ras_caps { 
		uint64_t block_mpio			: 1;

		uint64_t block_mmsch			: 1;

		uint64_t poison_propogation_mode	: 1;

		uint64_t reserved			: 43;

		uint64_t uniras_supported		: 1;

		uint64_t reserved			: 42;

	} bits;

	uint64_t all;

};

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

+3 −0
Original line number Diff line number Diff line
@@ -452,6 +452,9 @@ bool amdgpu_uniras_enabled(struct amdgpu_device *adev) 
{

	struct amdgpu_ras_mgr *ras_mgr = amdgpu_ras_mgr_get_context(adev);



	if (amdgpu_sriov_vf(adev))

		return amdgpu_virt_ras_remote_uniras_enabled(adev);



	if (!ras_mgr || !ras_mgr->ras_core)

		return false;

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

+30 −0
Original line number Diff line number Diff line
@@ -380,6 +380,8 @@ int amdgpu_virt_ras_hw_init(struct amdgpu_device *adev) 
			(struct amdgpu_virt_ras_cmd *)ras_mgr->virt_ras_cmd;

	struct vram_blocks_ecc *blks_ecc = &virt_ras->blocks_ecc;



	amdgpu_virt_get_ras_capability(adev);



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

	blks_ecc->size = PAGE_SIZE;

	if (amdgpu_bo_create_kernel(adev, blks_ecc->size,
@@ -428,3 +430,31 @@ int amdgpu_virt_ras_post_reset(struct amdgpu_device *adev) 
{

	return 0;

}



void amdgpu_virt_ras_set_remote_uniras(struct amdgpu_device *adev, bool en)

{

	struct amdgpu_ras_mgr *ras_mgr = amdgpu_ras_mgr_get_context(adev);

	struct amdgpu_virt_ras_cmd *virt_ras;



	if (!ras_mgr || !ras_mgr->virt_ras_cmd)

		return;



	virt_ras = (struct amdgpu_virt_ras_cmd *)ras_mgr->virt_ras_cmd;

	virt_ras->remote_uniras_supported = en;

}



bool amdgpu_virt_ras_remote_uniras_enabled(struct amdgpu_device *adev)

{

	struct amdgpu_ras_mgr *ras_mgr = amdgpu_ras_mgr_get_context(adev);

	struct amdgpu_virt_ras_cmd *virt_ras;



	if (amdgpu_in_reset(adev))

		return false;



	if (!ras_mgr || !ras_mgr->virt_ras_cmd)

		return false;



	virt_ras = (struct amdgpu_virt_ras_cmd *)ras_mgr->virt_ras_cmd;



	return virt_ras->remote_uniras_supported;

}

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

+3 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ struct vram_blocks_ecc { 
};



struct amdgpu_virt_ras_cmd {

	bool remote_uniras_supported;

	struct remote_batch_trace_mgr batch_mgr;

	struct vram_blocks_ecc blocks_ecc;

};
@@ -51,4 +52,6 @@ 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);

void amdgpu_virt_ras_set_remote_uniras(struct amdgpu_device *adev, bool en);

bool amdgpu_virt_ras_remote_uniras_enabled(struct amdgpu_device *adev);

#endif