tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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: Candice Li <candice.li@amd.com>
Reviewed-by: Tao Zhou <tao.zhou1@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

authored by

Candice Li and committed by
Alex Deucher 90bd0147 d32156a0

+8 -14
+5 -9
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
··· 1067 1067 mcm_info = &err_info->mcm_info; 1068 1068 if (err_info->ce_count) { 1069 1069 dev_info(adev->dev, "socket: %d, die: %d, " 1070 - "%lld new correctable hardware errors detected in %s block, " 1071 - "no user action is needed\n", 1070 + "%lld new correctable hardware errors detected in %s block\n", 1072 1071 mcm_info->socket_id, 1073 1072 mcm_info->die_id, 1074 1073 err_info->ce_count, ··· 1079 1080 err_info = &err_node->err_info; 1080 1081 mcm_info = &err_info->mcm_info; 1081 1082 dev_info(adev->dev, "socket: %d, die: %d, " 1082 - "%lld correctable hardware errors detected in total in %s block, " 1083 - "no user action is needed\n", 1083 + "%lld correctable hardware errors detected in total in %s block\n", 1084 1084 mcm_info->socket_id, mcm_info->die_id, err_info->ce_count, blk_name); 1085 1085 } 1086 1086 } ··· 1106 1108 adev->smuio.funcs->get_die_id) { 1107 1109 dev_info(adev->dev, "socket: %d, die: %d " 1108 1110 "%ld correctable hardware errors " 1109 - "detected in %s block, no user " 1110 - "action is needed.\n", 1111 + "detected in %s block\n", 1111 1112 adev->smuio.funcs->get_socket_id(adev), 1112 1113 adev->smuio.funcs->get_die_id(adev), 1113 1114 ras_mgr->err_data.ce_count, 1114 1115 blk_name); 1115 1116 } else { 1116 1117 dev_info(adev->dev, "%ld correctable hardware errors " 1117 - "detected in %s block, no user " 1118 - "action is needed.\n", 1118 + "detected in %s block\n", 1119 1119 ras_mgr->err_data.ce_count, 1120 1120 blk_name); 1121 1121 } ··· 1916 1920 struct amdgpu_iv_entry *entry) 1917 1921 { 1918 1922 dev_info(obj->adev->dev, 1919 - "Poison is created, no user action is needed.\n"); 1923 + "Poison is created\n"); 1920 1924 } 1921 1925 1922 1926 static void amdgpu_ras_interrupt_umc_handler(struct ras_manager *obj,
+1 -2
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
··· 401 401 402 402 if (err_data.ce_count) 403 403 dev_info(adev->dev, "%ld correctable hardware " 404 - "errors detected in %s block, " 405 - "no user action is needed.\n", 404 + "errors detected in %s block\n", 406 405 obj->err_data.ce_count, 407 406 get_ras_block_str(adev->nbio.ras_if)); 408 407
+1 -2
drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c
··· 597 597 598 598 if (err_data.ce_count) 599 599 dev_info(adev->dev, "%ld correctable hardware " 600 - "errors detected in %s block, " 601 - "no user action is needed.\n", 600 + "errors detected in %s block\n", 602 601 obj->err_data.ce_count, 603 602 get_ras_block_str(adev->nbio.ras_if)); 604 603
+1 -1
drivers/gpu/drm/amd/amdgpu/umc_v6_7.c
··· 64 64 uint64_t reg_value; 65 65 66 66 if (REG_GET_FIELD(mc_umc_status, MCA_UMC_UMC0_MCUMC_STATUST0, Deferred) == 1) 67 - dev_info(adev->dev, "Deferred error, no user action is needed.\n"); 67 + dev_info(adev->dev, "Deferred error\n"); 68 68 69 69 if (mc_umc_status) 70 70 dev_info(adev->dev, "MCA STATUS 0x%llx, umc_reg_offset 0x%x\n", mc_umc_status, umc_reg_offset);