drm/amdgpu: Remove unused code
Subsystems (2)
PATCH 1/2 drm/amdgpu: Remove unused code
Remove unused code.
--- drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 69 -------------------------- 1 file changed, 69 deletions(-)
drivers/gpu/drm/amd/amdgpu/umc_v12_0.c +0 -69
@@ -376,75 +376,6 @@ static int umc_v12_0_err_cnt_init_per_channel(struct amdgpu_device *adev,return 0 ; } -static void umc_v12_0_ecc_info_query_ras_error_count (struct amdgpu_device *adev, -void *ras_error_status) -{ -struct ras_query_context qctx; - -memset (&qctx,0 ,sizeof (qctx)); - qctx.event_id =amdgpu_ras_acquire_event_id (adev,amdgpu_ras_intr_triggered () ? -RAS_EVENT_TYPE_ISR :RAS_EVENT_TYPE_INVALID ); - -amdgpu_mca_smu_log_ras_error (adev, -AMDGPU_RAS_BLOCK__UMC ,AMDGPU_MCA_ERROR_TYPE_CE , ras_error_status, &qctx); -amdgpu_mca_smu_log_ras_error (adev, -AMDGPU_RAS_BLOCK__UMC ,AMDGPU_MCA_ERROR_TYPE_UE , ras_error_status, &qctx); -} - -static void umc_v12_0_ecc_info_query_ras_error_address (struct amdgpu_device *adev, -void *ras_error_status) -{ -struct ras_err_node *err_node; -uint64_t mc_umc_status; -struct ras_err_info *err_info; -struct ras_err_addr *mca_err_addr, *tmp; -struct ras_err_data *err_data = (struct ras_err_data *)ras_error_status; -struct ta_ras_query_address_input addr_in; - -for_each_ras_error (err_node, err_data) { - err_info = &err_node->err_info; -if (list_empty (&err_info->err_addr_list)) -continue ; - - addr_in.ma.node_inst = err_info->mcm_info.die_id; - addr_in.ma.socket_id = err_info->mcm_info.socket_id; - -list_for_each_entry_safe (mca_err_addr, tmp, &err_info->err_addr_list, node) { - mc_umc_status = mca_err_addr->err_status; -if (mc_umc_status && - (umc_v12_0_is_uncorrectable_error (adev, mc_umc_status) || -umc_v12_0_is_deferred_error (adev, mc_umc_status))) { -uint64_t mca_addr, err_addr, mca_ipid; -uint32_t InstanceIdLo; - - mca_addr = mca_err_addr->err_addr; - mca_ipid = mca_err_addr->err_ipid; - - err_addr =REG_GET_FIELD (mca_addr, -MCA_UMC_UMC0_MCUMC_ADDRT0 , ErrorAddr); - InstanceIdLo =REG_GET_FIELD (mca_ipid,MCMP1_IPIDT0 , InstanceIdLo); - - addr_in.ma.err_addr = err_addr; - addr_in.ma.ch_inst =MCA_IPID_LO_2_UMC_CH (InstanceIdLo); - addr_in.ma.umc_inst =MCA_IPID_LO_2_UMC_INST (InstanceIdLo); - -dev_info (adev->dev,"UMC:IPID:0x%llx, aid:%d, inst:%d, ch:%d, err_addr:0x%llx\n" , - mca_ipid, - err_info->mcm_info.die_id, -MCA_IPID_LO_2_UMC_INST (InstanceIdLo), -MCA_IPID_LO_2_UMC_CH (InstanceIdLo), - err_addr); - -umc_v12_0_convert_error_address (adev, - err_data, &addr_in); - } - -/* Delete error address node from list and free memory */ -amdgpu_ras_del_mca_err_addr (err_info, mca_err_addr); - } - } -} -static bool umc_v12_0_check_ecc_err_status (struct amdgpu_device *adev,enum amdgpu_mca_error_type type,void *ras_error_status) {
Signature · 1 line
2.34.1
PATCH 2/2 drm/amdgpu: Remove redundant function call
Remove redundant function call.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +6 -16
@@ -2794,8 +2794,8 @@ static void amdgpu_ras_do_page_retirement(struct work_struct *work)mutex_unlock (&con->umc_ecc_log.lock); } -static int amdgpu_ras_query_ecc_status (struct amdgpu_device *adev, -enum amdgpu_ras_block ras_block,uint32_t timeout_ms) +static void amdgpu_ras_poison_creation_handler (struct amdgpu_device *adev, +uint32_t timeout_ms) {int ret =0 ;struct ras_ecc_log_info *ecc_log;
@@ -2804,7 +2804,7 @@ static int amdgpu_ras_query_ecc_status(struct amdgpu_device *adev,struct amdgpu_ras *ras =amdgpu_ras_get_context (adev);memset (&info,0 ,sizeof (info)); - info.head.block = ras_block; + info.head.block =AMDGPU_RAS_BLOCK__UMC ; ecc_log = &ras->umc_ecc_log; ecc_log->de_updated = false;
@@ -2812,7 +2812,7 @@ static int amdgpu_ras_query_ecc_status(struct amdgpu_device *adev, ret =amdgpu_ras_query_error_status (adev, &info);if (ret) {dev_err (adev->dev,"Failed to query ras error! ret:%d\n" , ret); -return ret; +return ; }if (timeout && !ecc_log->de_updated) {
@@ -2823,21 +2823,11 @@ static int amdgpu_ras_query_ecc_status(struct amdgpu_device *adev,if (timeout_ms && !timeout) {dev_warn (adev->dev,"Can't find deferred error\n" ); -return -ETIMEDOUT ; +return ; } -return 0 ; -} - -static void amdgpu_ras_poison_creation_handler (struct amdgpu_device *adev, -uint32_t timeout) -{ -struct amdgpu_ras *con =amdgpu_ras_get_context (adev); -int ret; - - ret =amdgpu_ras_query_ecc_status (adev,AMDGPU_RAS_BLOCK__UMC , timeout);if (!ret) -schedule_delayed_work (&con->page_retirement_dwork,0 ); +schedule_delayed_work (&ras->page_retirement_dwork,0 ); } static int amdgpu_ras_poison_consumption_handler(struct amdgpu_device *adev,
Signature · 1 line
2.34.1
RE: [PATCH 2/2] drm/amdgpu: Remove redundant function call
[AMD Official Use Only - General]
Series is
Regards,
Hawking
-----Original Message-----
From: Chai, Thomas <[email protected]>
Sent: Sunday, April 28, 2024 11:33
To: [email protected]
Cc: Zhang, Hawking <[email protected]>; Zhou1, Tao <[email protected]>; Li, Candice <[email protected]>; Wang, Yang(Kevin) <[email protected]>; Yang, Stanley <[email protected]>; Chai, Thomas <[email protected]>
Subject: [PATCH 2/2] drm/amdgpu: Remove redundant function call
Remove redundant function call.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 22 ++++++---------------- 1 file changed, 6 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +4 -4
@@ -2794,8 +2794,8 @@ static void amdgpu_ras_do_page_retirement(struct work_struct *work)mutex_unlock (&con->umc_ecc_log.lock); } -static int amdgpu_ras_query_ecc_status (struct amdgpu_device *adev, -enum amdgpu_ras_block ras_block,uint32_t timeout_ms) +static void amdgpu_ras_poison_creation_handler (struct amdgpu_device *adev, +uint32_t timeout_ms) {int ret =0 ;struct ras_ecc_log_info *ecc_log;
@@ -2804,7 +2804,7 @@ static int amdgpu_ras_query_ecc_status(struct amdgpu_device *adev,struct amdgpu_ras *ras =amdgpu_ras_get_context (adev);memset (&info,0 ,sizeof (info)); - info.head.block = ras_block; + info.head.block =AMDGPU_RAS_BLOCK__UMC ; ecc_log = &ras->umc_ecc_log; ecc_log->de_updated = false;
@@ -2812,7 +2812,7 @@ static int amdgpu_ras_query_ecc_status(struct amdgpu_device *adev, ret =amdgpu_ras_query_error_status (adev, &info);if (ret) {dev_err (adev->dev,"Failed to query ras error! ret:%d\n" , ret); -return ret; +return ; } if (timeout && !ecc_log->de_updated) { @@ -2823,21 +2823,11 @@ static int amdgpu_ras_query_ecc_status(struct amdgpu_device *adev,
if (timeout_ms && !timeout) {
dev_warn(adev->dev, "Can't find deferred error\n");
- return -ETIMEDOUT;
+ return;
}- return 0;
-}
-
-static void amdgpu_ras_poison_creation_handler(struct amdgpu_device *adev,
- uint32_t timeout)
-{
- struct amdgpu_ras *con = amdgpu_ras_get_context(adev);
- int ret;
-
- ret = amdgpu_ras_query_ecc_status(adev, AMDGPU_RAS_BLOCK__UMC, timeout);
if (!ret)- schedule_delayed_work(&con->page_retirement_dwork, 0);
+ schedule_delayed_work(&ras->page_retirement_dwork, 0);
}
static int amdgpu_ras_poison_consumption_handler(struct amdgpu_device *adev,
--
2.34.1