diff options
| author | Stanley.Yang <Stanley.Yang@amd.com> | 2020-05-14 16:44:42 +0800 | 
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2020-07-01 01:59:17 -0400 | 
| commit | 5278a159cf350142e91788f12659489e33a71a91 (patch) | |
| tree | 7e24b0431ae25c8ff64dd97dd109028a548bd347 /drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | |
| parent | 6961750f12c8e768c081b5fa8ced8b524d4a659d (diff) | |
drm/amdgpu: support reserve bad page for virt (v3)
v1: rename some functions name, only init ras error handler data for
    supported asic.
v2: fix potential memory leak.
Signed-off-by: Stanley.Yang <Stanley.Yang@amd.com>
Reviewed-by: Tao Zhou <tao.zhou1@amd.com>
Reviewed-by: Guchun Chen <guchun.chen@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 173 | 
1 files changed, 173 insertions, 0 deletions
| diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c index bab9286021a7..0891f27ba166 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c @@ -26,6 +26,7 @@  #include <drm/drm_drv.h>  #include "amdgpu.h" +#include "amdgpu_ras.h"  bool amdgpu_virt_mmio_blocked(struct amdgpu_device *adev)  { @@ -255,12 +256,171 @@ int amdgpu_virt_fw_reserve_get_checksum(void *obj,  	return ret;  } +static int amdgpu_virt_init_ras_err_handler_data(struct amdgpu_device *adev) +{ +	struct amdgpu_virt *virt = &adev->virt; +	struct amdgpu_virt_ras_err_handler_data **data = &virt->virt_eh_data; +	/* GPU will be marked bad on host if bp count more then 10, +	 * so alloc 512 is enough. +	 */ +	unsigned int align_space = 512; +	void *bps = NULL; +	struct amdgpu_bo **bps_bo = NULL; + +	*data = kmalloc(sizeof(struct amdgpu_virt_ras_err_handler_data), GFP_KERNEL); +	if (!*data) +		return -ENOMEM; + +	bps = kmalloc(align_space * sizeof((*data)->bps), GFP_KERNEL); +	bps_bo = kmalloc(align_space * sizeof((*data)->bps_bo), GFP_KERNEL); + +	if (!bps || !bps_bo) { +		kfree(bps); +		kfree(bps_bo); +		kfree(*data); +		return -ENOMEM; +	} + +	(*data)->bps = bps; +	(*data)->bps_bo = bps_bo; +	(*data)->count = 0; +	(*data)->last_reserved = 0; + +	virt->ras_init_done = true; + +	return 0; +} + +static void amdgpu_virt_ras_release_bp(struct amdgpu_device *adev) +{ +	struct amdgpu_virt *virt = &adev->virt; +	struct amdgpu_virt_ras_err_handler_data *data = virt->virt_eh_data; +	struct amdgpu_bo *bo; +	int i; + +	if (!data) +		return; + +	for (i = data->last_reserved - 1; i >= 0; i--) { +		bo = data->bps_bo[i]; +		amdgpu_bo_free_kernel(&bo, NULL, NULL); +		data->bps_bo[i] = bo; +		data->last_reserved = i; +	} +} + +void amdgpu_virt_release_ras_err_handler_data(struct amdgpu_device *adev) +{ +	struct amdgpu_virt *virt = &adev->virt; +	struct amdgpu_virt_ras_err_handler_data *data = virt->virt_eh_data; + +	virt->ras_init_done = false; + +	if (!data) +		return; + +	amdgpu_virt_ras_release_bp(adev); + +	kfree(data->bps); +	kfree(data->bps_bo); +	kfree(data); +	virt->virt_eh_data = NULL; +} + +static void amdgpu_virt_ras_add_bps(struct amdgpu_device *adev, +		struct eeprom_table_record *bps, int pages) +{ +	struct amdgpu_virt *virt = &adev->virt; +	struct amdgpu_virt_ras_err_handler_data *data = virt->virt_eh_data; + +	if (!data) +		return; + +	memcpy(&data->bps[data->count], bps, pages * sizeof(*data->bps)); +	data->count += pages; +} + +static void amdgpu_virt_ras_reserve_bps(struct amdgpu_device *adev) +{ +	struct amdgpu_virt *virt = &adev->virt; +	struct amdgpu_virt_ras_err_handler_data *data = virt->virt_eh_data; +	struct amdgpu_bo *bo = NULL; +	uint64_t bp; +	int i; + +	if (!data) +		return; + +	for (i = data->last_reserved; i < data->count; i++) { +		bp = data->bps[i].retired_page; + +		/* There are two cases of reserve error should be ignored: +		 * 1) a ras bad page has been allocated (used by someone); +		 * 2) a ras bad page has been reserved (duplicate error injection +		 *    for one page); +		 */ +		if (amdgpu_bo_create_kernel_at(adev, bp << AMDGPU_GPU_PAGE_SHIFT, +					       AMDGPU_GPU_PAGE_SIZE, +					       AMDGPU_GEM_DOMAIN_VRAM, +					       &bo, NULL)) +			DRM_DEBUG("RAS WARN: reserve vram for retired page %llx fail\n", bp); + +		data->bps_bo[i] = bo; +		data->last_reserved = i + 1; +		bo = NULL; +	} +} + +static bool amdgpu_virt_ras_check_bad_page(struct amdgpu_device *adev, +		uint64_t retired_page) +{ +	struct amdgpu_virt *virt = &adev->virt; +	struct amdgpu_virt_ras_err_handler_data *data = virt->virt_eh_data; +	int i; + +	if (!data) +		return true; + +	for (i = 0; i < data->count; i++) +		if (retired_page == data->bps[i].retired_page) +			return true; + +	return false; +} + +static void amdgpu_virt_add_bad_page(struct amdgpu_device *adev, +		uint64_t bp_block_offset, uint32_t bp_block_size) +{ +	struct eeprom_table_record bp; +	uint64_t retired_page; +	uint32_t bp_idx, bp_cnt; + +	if (bp_block_size) { +		bp_cnt = bp_block_size / sizeof(uint64_t); +		for (bp_idx = 0; bp_idx < bp_cnt; bp_idx++) { +			retired_page = *(uint64_t *)(adev->fw_vram_usage.va + +					bp_block_offset + bp_idx * sizeof(uint64_t)); +			bp.retired_page = retired_page; + +			if (amdgpu_virt_ras_check_bad_page(adev, retired_page)) +				continue; + +			amdgpu_virt_ras_add_bps(adev, &bp, 1); + +			amdgpu_virt_ras_reserve_bps(adev); +		} +	} +} +  void amdgpu_virt_init_data_exchange(struct amdgpu_device *adev)  {  	uint32_t pf2vf_size = 0;  	uint32_t checksum = 0;  	uint32_t checkval;  	char *str; +	uint64_t bp_block_offset = 0; +	uint32_t bp_block_size = 0; +	struct amdgim_pf2vf_info_v2 *pf2vf_v2 = NULL;  	adev->virt.fw_reserve.p_pf2vf = NULL;  	adev->virt.fw_reserve.p_vf2pf = NULL; @@ -275,6 +435,19 @@ void amdgpu_virt_init_data_exchange(struct amdgpu_device *adev)  		/* pf2vf message must be in 4K */  		if (pf2vf_size > 0 && pf2vf_size < 4096) { +			if (adev->virt.fw_reserve.p_pf2vf->version == 2) { +				pf2vf_v2 = (struct amdgim_pf2vf_info_v2 *)adev->virt.fw_reserve.p_pf2vf; +				bp_block_offset = ((uint64_t)pf2vf_v2->bp_block_offset_L & 0xFFFFFFFF) | +						((((uint64_t)pf2vf_v2->bp_block_offset_H) << 32) & 0xFFFFFFFF00000000); +				bp_block_size = pf2vf_v2->bp_block_size; + +				if (bp_block_size && !adev->virt.ras_init_done) +					amdgpu_virt_init_ras_err_handler_data(adev); + +				if (adev->virt.ras_init_done) +					amdgpu_virt_add_bad_page(adev, bp_block_offset, bp_block_size); +			} +  			checkval = amdgpu_virt_fw_reserve_get_checksum(  				adev->virt.fw_reserve.p_pf2vf, pf2vf_size,  				adev->virt.fw_reserve.checksum_key, checksum); | 
