Commit 90bd0147 authored by Candice Li's avatar Candice Li Committed by Alex Deucher

drm/amdgpu: Drop unnecessary sentences about CE and deferred error.

Remove "no user action is needed" for correctable and deferred error
to avoid confusion.
Signed-off-by: default avatarCandice Li <candice.li@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 d32156a0
...@@ -1067,8 +1067,7 @@ static void amdgpu_ras_error_print_error_data(struct amdgpu_device *adev, ...@@ -1067,8 +1067,7 @@ static void amdgpu_ras_error_print_error_data(struct amdgpu_device *adev,
mcm_info = &err_info->mcm_info; mcm_info = &err_info->mcm_info;
if (err_info->ce_count) { if (err_info->ce_count) {
dev_info(adev->dev, "socket: %d, die: %d, " dev_info(adev->dev, "socket: %d, die: %d, "
"%lld new correctable hardware errors detected in %s block, " "%lld new correctable hardware errors detected in %s block\n",
"no user action is needed\n",
mcm_info->socket_id, mcm_info->socket_id,
mcm_info->die_id, mcm_info->die_id,
err_info->ce_count, err_info->ce_count,
...@@ -1080,8 +1079,7 @@ static void amdgpu_ras_error_print_error_data(struct amdgpu_device *adev, ...@@ -1080,8 +1079,7 @@ static void amdgpu_ras_error_print_error_data(struct amdgpu_device *adev,
err_info = &err_node->err_info; err_info = &err_node->err_info;
mcm_info = &err_info->mcm_info; mcm_info = &err_info->mcm_info;
dev_info(adev->dev, "socket: %d, die: %d, " dev_info(adev->dev, "socket: %d, die: %d, "
"%lld correctable hardware errors detected in total in %s block, " "%lld correctable hardware errors detected in total in %s block\n",
"no user action is needed\n",
mcm_info->socket_id, mcm_info->die_id, err_info->ce_count, blk_name); mcm_info->socket_id, mcm_info->die_id, err_info->ce_count, blk_name);
} }
} }
...@@ -1108,16 +1106,14 @@ static void amdgpu_ras_error_generate_report(struct amdgpu_device *adev, ...@@ -1108,16 +1106,14 @@ static void amdgpu_ras_error_generate_report(struct amdgpu_device *adev,
adev->smuio.funcs->get_die_id) { adev->smuio.funcs->get_die_id) {
dev_info(adev->dev, "socket: %d, die: %d " dev_info(adev->dev, "socket: %d, die: %d "
"%ld correctable hardware errors " "%ld correctable hardware errors "
"detected in %s block, no user " "detected in %s block\n",
"action is needed.\n",
adev->smuio.funcs->get_socket_id(adev), adev->smuio.funcs->get_socket_id(adev),
adev->smuio.funcs->get_die_id(adev), adev->smuio.funcs->get_die_id(adev),
ras_mgr->err_data.ce_count, ras_mgr->err_data.ce_count,
blk_name); blk_name);
} else { } else {
dev_info(adev->dev, "%ld correctable hardware errors " dev_info(adev->dev, "%ld correctable hardware errors "
"detected in %s block, no user " "detected in %s block\n",
"action is needed.\n",
ras_mgr->err_data.ce_count, ras_mgr->err_data.ce_count,
blk_name); blk_name);
} }
...@@ -1920,7 +1916,7 @@ static void amdgpu_ras_interrupt_poison_creation_handler(struct ras_manager *obj ...@@ -1920,7 +1916,7 @@ static void amdgpu_ras_interrupt_poison_creation_handler(struct ras_manager *obj
struct amdgpu_iv_entry *entry) struct amdgpu_iv_entry *entry)
{ {
dev_info(obj->adev->dev, dev_info(obj->adev->dev,
"Poison is created, no user action is needed.\n"); "Poison is created\n");
} }
static void amdgpu_ras_interrupt_umc_handler(struct ras_manager *obj, static void amdgpu_ras_interrupt_umc_handler(struct ras_manager *obj,
......
...@@ -401,8 +401,7 @@ static void nbio_v7_4_handle_ras_controller_intr_no_bifring(struct amdgpu_device ...@@ -401,8 +401,7 @@ static void nbio_v7_4_handle_ras_controller_intr_no_bifring(struct amdgpu_device
if (err_data.ce_count) if (err_data.ce_count)
dev_info(adev->dev, "%ld correctable hardware " dev_info(adev->dev, "%ld correctable hardware "
"errors detected in %s block, " "errors detected in %s block\n",
"no user action is needed.\n",
obj->err_data.ce_count, obj->err_data.ce_count,
get_ras_block_str(adev->nbio.ras_if)); get_ras_block_str(adev->nbio.ras_if));
......
...@@ -597,8 +597,7 @@ static void nbio_v7_9_handle_ras_controller_intr_no_bifring(struct amdgpu_device ...@@ -597,8 +597,7 @@ static void nbio_v7_9_handle_ras_controller_intr_no_bifring(struct amdgpu_device
if (err_data.ce_count) if (err_data.ce_count)
dev_info(adev->dev, "%ld correctable hardware " dev_info(adev->dev, "%ld correctable hardware "
"errors detected in %s block, " "errors detected in %s block\n",
"no user action is needed.\n",
obj->err_data.ce_count, obj->err_data.ce_count,
get_ras_block_str(adev->nbio.ras_if)); get_ras_block_str(adev->nbio.ras_if));
......
...@@ -64,7 +64,7 @@ static void umc_v6_7_query_error_status_helper(struct amdgpu_device *adev, ...@@ -64,7 +64,7 @@ static void umc_v6_7_query_error_status_helper(struct amdgpu_device *adev,
uint64_t reg_value; uint64_t reg_value;
if (REG_GET_FIELD(mc_umc_status, MCA_UMC_UMC0_MCUMC_STATUST0, Deferred) == 1) if (REG_GET_FIELD(mc_umc_status, MCA_UMC_UMC0_MCUMC_STATUST0, Deferred) == 1)
dev_info(adev->dev, "Deferred error, no user action is needed.\n"); dev_info(adev->dev, "Deferred error\n");
if (mc_umc_status) if (mc_umc_status)
dev_info(adev->dev, "MCA STATUS 0x%llx, umc_reg_offset 0x%x\n", mc_umc_status, umc_reg_offset); dev_info(adev->dev, "MCA STATUS 0x%llx, umc_reg_offset 0x%x\n", mc_umc_status, umc_reg_offset);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment