drm/amdgpu: Update usage for bad page threshold
Subsystems (2)
PATCH 1/1 drm/amdgpu: Update usage for bad page threshold
The driver's behavior varies based on
the configuration of amdgpu_bad_page_threshold setting
Signed-off-by Hawking Zhang <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 54 ++++++++++--------- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 2 +- .../gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 28 +++++----- 4 files changed, 46 insertions(+), 40 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +1 -1
@@ -983,7 +983,7 @@ module_param_named(reset_method, amdgpu_reset_method, int, 0644);* result in the GPU entering bad status when the number of total * faulty pages by ECC exceeds the threshold value. */ -MODULE_PARM_DESC (bad_page_threshold,"Bad page threshold(-1 = ignore threshold (default value), 0 = disable bad page retirement, -2 = driver sets threshold)" ); +MODULE_PARM_DESC (bad_page_threshold,"Bad page threshold(-1 = ignore threshold (default value), 0 = disable bad page retirement, -2 = threshold determined by a formula, 0 < threshold < max records, user-defined threshold)" );module_param_named (bad_page_threshold, amdgpu_bad_page_threshold, int,0444 );MODULE_PARM_DESC (num_kcq,"number of kernel compute queue user want to setup (8 if set to greater than 8 or less than 0, only affect gfx 8+)" );
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +28 -26
71 lines not on this page · raw message
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +1 -1
@@ -65,7 +65,7 @@ struct amdgpu_iv_entry;/* Reserve 8 physical dram row for possible retirement. * In worst cases, it will lose 8 * 2MB memory in vram domain */ -#define AMDGPU_RAS_RESERVED_VRAM_SIZE (16ULL << 20) +#define AMDGPU_RAS_RESERVED_VRAM_SIZE_DEFAULT (16ULL << 20)/* The high three bits indicates socketid */ #define AMDGPU_RAS_GET_FEATURES (val) ((val) & ~AMDGPU_RAS_FEATURES_SOCKETID_MASK)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c +16 -12
@@ -758,7 +758,8 @@ amdgpu_ras_eeprom_update_header(struct amdgpu_ras_eeprom_control *control) control->tbl_rai.health_percent =0 ; } -if (amdgpu_bad_page_threshold !=-1 ) +if ((amdgpu_bad_page_threshold !=-1 ) && + (amdgpu_bad_page_threshold !=-2 )) ras->is_rma = true;/* ignore the -ENOTSUPP return value */
@@ -1428,8 +1429,9 @@ int amdgpu_ras_eeprom_check(struct amdgpu_ras_eeprom_control *control) res =__verify_ras_table_checksum (control);if (res) -DRM_ERROR ("RAS table incorrect checksum or error:%d\n" , - res); +dev_err (adev->dev, +"RAS table incorrect checksum or error:%d\n" , + res);/* Warn if we are at 90% of the threshold or above */
@@ -1447,8 +1449,9 @@ int amdgpu_ras_eeprom_check(struct amdgpu_ras_eeprom_control *control) res =__verify_ras_table_checksum (control);if (res) { -dev_err (adev->dev,"RAS Table incorrect checksum or error:%d\n" , - res); +dev_err (adev->dev, +"RAS Table incorrect checksum or error:%d\n" , + res);return -EINVAL ; }if (ras->bad_page_cnt_threshold > control->ras_num_bad_pages) {
@@ -1466,17 +1469,18 @@ int amdgpu_ras_eeprom_check(struct amdgpu_ras_eeprom_control *control) res =amdgpu_ras_eeprom_correct_header_tag (control,RAS_TABLE_HDR_VAL ); }else { -dev_err (adev->dev,"RAS records:%d exceed threshold:%d" , +dev_warn (adev->dev, +"RAS records:%d exceed threshold:%d\n" , control->ras_num_bad_pages, ras->bad_page_cnt_threshold); -if (amdgpu_bad_page_threshold ==-1 ) { -dev_warn (adev->dev,"GPU will be initialized due to bad_page_threshold = -1." ); +if ((amdgpu_bad_page_threshold ==-1 ) || + (amdgpu_bad_page_threshold ==-2 )) { res =0 ; +dev_warn (adev->dev, +"Please consult AMD Service Action Guide (SAG) for appropriate service procedures\n" ); }else { ras->is_rma = true; -dev_err (adev->dev, -"RAS records:%d exceed threshold:%d, " -"GPU will not be initialized. Replace this GPU or increase the threshold" , - control->ras_num_bad_pages, ras->bad_page_cnt_threshold); +dev_warn (adev->dev, +"User defined threshold is set, runtime service will be halt when threshold is reached\n" ); } } }else {
Signature · 1 line
2.17.1