drm/amdgpu: remove unused MCA driver codes
Subsystems (3)
PATCH 1/3 drm/amdgpu: remove unused MCA driver codes
- remove unused callback functions.
- make part of mca functions static and refine the function order.
Signed-off-by Yang Wang <[email protected]>
Reviewed-by Tao Zhou <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 199 ++++++++---------- drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 16 -- .../drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 50 ----- 3 files changed, 82 insertions(+), 183 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c +82 -117
@@ -153,7 +153,7 @@ int amdgpu_mca_mpio_ras_sw_init(struct amdgpu_device *adev)return 0 ; } -void amdgpu_mca_bank_set_init (struct mca_bank_set *mca_set) +static void amdgpu_mca_bank_set_init (struct mca_bank_set *mca_set) {if (!mca_set)return ;
@@ -162,7 +162,7 @@ void amdgpu_mca_bank_set_init(struct mca_bank_set *mca_set)INIT_LIST_HEAD (&mca_set->list); } -int amdgpu_mca_bank_set_add_entry (struct mca_bank_set *mca_set,struct mca_bank_entry *entry) +static int amdgpu_mca_bank_set_add_entry (struct mca_bank_set *mca_set,struct mca_bank_entry *entry) {struct mca_bank_node *node;
@@ -183,7 +183,7 @@ int amdgpu_mca_bank_set_add_entry(struct mca_bank_set *mca_set, struct mca_bank_return 0 ; } -void amdgpu_mca_bank_set_release (struct mca_bank_set *mca_set) +static void amdgpu_mca_bank_set_release (struct mca_bank_set *mca_set) {struct mca_bank_node *node, *tmp;
@@ -228,6 +228,84 @@ static void amdgpu_mca_smu_mca_bank_dump(struct amdgpu_device *adev, int idx, st idx, entry->regs[MCA_REG_IDX_SYND]); } +static int amdgpu_mca_smu_get_valid_mca_count (struct amdgpu_device *adev,enum amdgpu_mca_error_type type,uint32_t *count) +{ +const struct amdgpu_mca_smu_funcs *mca_funcs = adev->mca.mca_funcs; + +if (!count) +return -EINVAL ; + +if (mca_funcs && mca_funcs->mca_get_valid_mca_count) +return mca_funcs->mca_get_valid_mca_count (adev, type, count); + +return -EOPNOTSUPP ; +} + +static int amdgpu_mca_smu_get_mca_entry (struct amdgpu_device *adev,enum amdgpu_mca_error_type type, +int idx,struct mca_bank_entry *entry) +{ +const struct amdgpu_mca_smu_funcs *mca_funcs = adev->mca.mca_funcs; +int count; + +if (!mca_funcs || !mca_funcs->mca_get_mca_entry) +return -EOPNOTSUPP ; + +switch (type) { +case AMDGPU_MCA_ERROR_TYPE_UE : + count = mca_funcs->max_ue_count; +break ; +case AMDGPU_MCA_ERROR_TYPE_CE : + count = mca_funcs->max_ce_count; +break ; +default : +return -EINVAL ; + } + +if (idx >= count) +return -EINVAL ; + +return mca_funcs->mca_get_mca_entry (adev, type, idx, entry); +} + +static int amdgpu_mca_smu_get_mca_set (struct amdgpu_device *adev,enum amdgpu_mca_error_type type,struct mca_bank_set *mca_set) +{ +struct mca_bank_entry entry; +uint32_t count =0 , i; +int ret; + +if (!mca_set) +return -EINVAL ; + + ret =amdgpu_mca_smu_get_valid_mca_count (adev, type, &count); +if (ret) +return ret; + +for (i =0 ; i < count; i++) { +memset (&entry,0 ,sizeof (entry)); + ret =amdgpu_mca_smu_get_mca_entry (adev, type, i, &entry); +if (ret) +return ret; + +amdgpu_mca_bank_set_add_entry (mca_set, &entry); + } + +return 0 ; +} + +static int amdgpu_mca_smu_parse_mca_error_count (struct amdgpu_device *adev,enum amdgpu_ras_block blk, +enum amdgpu_mca_error_type type,struct mca_bank_entry *entry,uint32_t *count) +{ +const struct amdgpu_mca_smu_funcs *mca_funcs = adev->mca.mca_funcs; + +if (!count || !entry) +return -EINVAL ; + +if (!mca_funcs || !mca_funcs->mca_parse_mca_error_count) +return -EOPNOTSUPP ; + +return mca_funcs->mca_parse_mca_error_count (adev, blk, type, entry, count); +} +int amdgpu_mca_smu_log_ras_error (struct amdgpu_device *adev,enum amdgpu_ras_block blk,enum amdgpu_mca_error_type type,struct ras_err_data *err_data,struct ras_query_context *qctx) {
@@ -241,7 +319,7 @@ int amdgpu_mca_smu_log_ras_error(struct amdgpu_device *adev, enum amdgpu_ras_bloamdgpu_mca_bank_set_init (&mca_set); - ret =amdgpu_mca_smu_get_mca_set (adev, blk, type, &mca_set); + ret =amdgpu_mca_smu_get_mca_set (adev, type, &mca_set);if (ret) goto out_mca_release;
@@ -286,119 +364,6 @@ int amdgpu_mca_smu_log_ras_error(struct amdgpu_device *adev, enum amdgpu_ras_bloreturn ret; } - -int amdgpu_mca_smu_get_valid_mca_count (struct amdgpu_device *adev,enum amdgpu_mca_error_type type,uint32_t *count) -{ -const struct amdgpu_mca_smu_funcs *mca_funcs = adev->mca.mca_funcs; - -if (!count) -return -EINVAL ; - -if (mca_funcs && mca_funcs->mca_get_valid_mca_count) -return mca_funcs->mca_get_valid_mca_count (adev, type, count); - -return -EOPNOTSUPP ; -} - -int amdgpu_mca_smu_get_mca_set_error_count (struct amdgpu_device *adev,enum amdgpu_ras_block blk, -enum amdgpu_mca_error_type type,uint32_t *total) -{ -const struct amdgpu_mca_smu_funcs *mca_funcs = adev->mca.mca_funcs; -struct mca_bank_set mca_set; -struct mca_bank_node *node; -struct mca_bank_entry *entry; -uint32_t count; -int ret; - -if (!total) -return -EINVAL ; - -if (!mca_funcs) -return -EOPNOTSUPP ; - -if (!mca_funcs->mca_get_ras_mca_set || !mca_funcs->mca_get_valid_mca_count) -return -EOPNOTSUPP ; - -amdgpu_mca_bank_set_init (&mca_set); - - ret = mca_funcs->mca_get_ras_mca_set (adev, blk, type, &mca_set); -if (ret) - goto err_mca_set_release; - - *total =0 ; -list_for_each_entry (node, &mca_set.list, node) { - entry = &node->entry; - - count =0 ; - ret = mca_funcs->mca_parse_mca_error_count (adev, blk, type, entry, &count); -if (ret) - goto err_mca_set_release; - - *total += count; - } - -err_mca_set_release: -amdgpu_mca_bank_set_release (&mca_set); - -return ret; -} - -int amdgpu_mca_smu_parse_mca_error_count (struct amdgpu_device *adev,enum amdgpu_ras_block blk, -enum amdgpu_mca_error_type type,struct mca_bank_entry *entry,uint32_t *count) -{ -const struct amdgpu_mca_smu_funcs *mca_funcs = adev->mca.mca_funcs; -if (!count || !entry) -return -EINVAL ; - -if (!mca_funcs || !mca_funcs->mca_parse_mca_error_count) -return -EOPNOTSUPP ; - - -return mca_funcs->mca_parse_mca_error_count (adev, blk, type, entry, count); -} - -int amdgpu_mca_smu_get_mca_set (struct amdgpu_device *adev,enum amdgpu_ras_block blk, -enum amdgpu_mca_error_type type,struct mca_bank_set *mca_set) -{ -const struct amdgpu_mca_smu_funcs *mca_funcs = adev->mca.mca_funcs; - -if (!mca_set) -return -EINVAL ; - -if (!mca_funcs || !mca_funcs->mca_get_ras_mca_set) -return -EOPNOTSUPP ; - -WARN_ON (!list_empty (&mca_set->list)); - -return mca_funcs->mca_get_ras_mca_set (adev, blk, type, mca_set); -} - -int amdgpu_mca_smu_get_mca_entry (struct amdgpu_device *adev,enum amdgpu_mca_error_type type, -int idx,struct mca_bank_entry *entry) -{ -const struct amdgpu_mca_smu_funcs *mca_funcs = adev->mca.mca_funcs; -int count; - -if (!mca_funcs || !mca_funcs->mca_get_mca_entry) -return -EOPNOTSUPP ; - -switch (type) { -case AMDGPU_MCA_ERROR_TYPE_UE : - count = mca_funcs->max_ue_count; -break ; -case AMDGPU_MCA_ERROR_TYPE_CE : - count = mca_funcs->max_ce_count; -break ; -default : -return -EINVAL ; - } - -if (idx >= count) -return -EINVAL ; - -return mca_funcs->mca_get_mca_entry (adev, type, idx, entry); -} -#if defined(CONFIG_DEBUG_FS )static int amdgpu_mca_smu_debug_mode_set (void *data,u64 val) {
drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h +0 -16
@@ -122,8 +122,6 @@ struct amdgpu_mca_smu_funcs {int max_ue_count;int max_ce_count;int (*mca_set_debug_mode)(struct amdgpu_device *adev,bool enable); -int (*mca_get_ras_mca_set)(struct amdgpu_device *adev,enum amdgpu_ras_block blk,enum amdgpu_mca_error_type type, -struct mca_bank_set *mca_set);int (*mca_parse_mca_error_count)(struct amdgpu_device *adev,enum amdgpu_ras_block blk,enum amdgpu_mca_error_type type,struct mca_bank_entry *entry,uint32_t *count); int (*mca_get_valid_mca_count)(struct amdgpu_device *adev, enum amdgpu_mca_error_type type,
@@ -152,23 +150,9 @@ int amdgpu_mca_mpio_ras_sw_init(struct amdgpu_device *adev);void amdgpu_mca_smu_init_funcs (struct amdgpu_device *adev,const struct amdgpu_mca_smu_funcs *mca_funcs);int amdgpu_mca_smu_set_debug_mode (struct amdgpu_device *adev,bool enable); -int amdgpu_mca_smu_get_valid_mca_count (struct amdgpu_device *adev,enum amdgpu_mca_error_type type,uint32_t *count);int amdgpu_mca_smu_get_mca_set_error_count (struct amdgpu_device *adev,enum amdgpu_ras_block blk,enum amdgpu_mca_error_type type,uint32_t *total); -int amdgpu_mca_smu_get_error_count (struct amdgpu_device *adev,enum amdgpu_ras_block blk, -enum amdgpu_mca_error_type type,uint32_t *count); -int amdgpu_mca_smu_parse_mca_error_count (struct amdgpu_device *adev,enum amdgpu_ras_block blk, -enum amdgpu_mca_error_type type,struct mca_bank_entry *entry,uint32_t *count); -int amdgpu_mca_smu_get_mca_set (struct amdgpu_device *adev,enum amdgpu_ras_block blk, -enum amdgpu_mca_error_type type,struct mca_bank_set *mca_set); -int amdgpu_mca_smu_get_mca_entry (struct amdgpu_device *adev,enum amdgpu_mca_error_type type, -int idx,struct mca_bank_entry *entry); -void amdgpu_mca_smu_debugfs_init (struct amdgpu_device *adev,struct dentry *root); - -void amdgpu_mca_bank_set_init (struct mca_bank_set *mca_set); -int amdgpu_mca_bank_set_add_entry (struct mca_bank_set *mca_set,struct mca_bank_entry *entry); -void amdgpu_mca_bank_set_release (struct mca_bank_set *mca_set);int amdgpu_mca_smu_log_ras_error (struct amdgpu_device *adev,enum amdgpu_ras_block blk,enum amdgpu_mca_error_type type,struct ras_err_data *err_data,struct ras_query_context *qctx);
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c +0 -50
62 lines not on this page · raw message
Signature · 1 line
2.34.1
PATCH 2/3 drm/amdgpu: add amdgpu MCA bank dispatch function support
- Refine mca driver code.
- Centralize mca bank dispatch code logic.
Signed-off-by Yang Wang <[email protected]>
Reviewed-by Tao Zhou <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 96 ++++++++++++++----------- 1 file changed, 53 insertions(+), 43 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c +53 -43
@@ -267,7 +267,8 @@ static int amdgpu_mca_smu_get_mca_entry(struct amdgpu_device *adev, enum amdgpu_return mca_funcs->mca_get_mca_entry (adev, type, idx, entry); } -static int amdgpu_mca_smu_get_mca_set (struct amdgpu_device *adev,enum amdgpu_mca_error_type type,struct mca_bank_set *mca_set) +static int amdgpu_mca_smu_get_mca_set (struct amdgpu_device *adev,enum amdgpu_mca_error_type type,struct mca_bank_set *mca_set, +struct ras_query_context *qctx) {struct mca_bank_entry entry;uint32_t count =0 , i;
@@ -287,6 +288,8 @@ static int amdgpu_mca_smu_get_mca_set(struct amdgpu_device *adev, enum amdgpu_mcreturn ret;amdgpu_mca_bank_set_add_entry (mca_set, &entry); + +amdgpu_mca_smu_mca_bank_dump (adev, i, &entry, qctx); }return 0 ;
@@ -306,36 +309,33 @@ static int amdgpu_mca_smu_parse_mca_error_count(struct amdgpu_device *adev, enumreturn mca_funcs->mca_parse_mca_error_count (adev, blk, type, entry, count); } -int amdgpu_mca_smu_log_ras_error (struct amdgpu_device *adev,enum amdgpu_ras_block blk,enum amdgpu_mca_error_type type, -struct ras_err_data *err_data,struct ras_query_context *qctx) +static int amdgpu_mca_dispatch_mca_set (struct amdgpu_device *adev,enum amdgpu_ras_block blk,enum amdgpu_mca_error_type type, +struct mca_bank_set *mca_set,struct ras_err_data *err_data) { +struct ras_err_addr err_addr;struct amdgpu_smuio_mcm_config_info mcm_info; -struct ras_err_addr err_addr = {0 }; -struct mca_bank_set mca_set;struct mca_bank_node *node;struct mca_bank_entry *entry;uint32_t count; -int ret, i =0 ; - -amdgpu_mca_bank_set_init (&mca_set); +int ret; - ret =amdgpu_mca_smu_get_mca_set (adev, type, &mca_set); -if (ret) - goto out_mca_release; +if (!mca_set) +return -EINVAL ; -list_for_each_entry (node, &mca_set.list, node) { +list_for_each_entry (node, &mca_set->list, node) { entry = &node->entry; -amdgpu_mca_smu_mca_bank_dump (adev, i++, entry, qctx); - count =0 ; ret =amdgpu_mca_smu_parse_mca_error_count (adev, blk, type, entry, &count);if (ret) - goto out_mca_release; +return ret;if (!count)continue ; +memset (&mcm_info,0 ,sizeof (mcm_info)); +memset (&err_addr,0 ,sizeof (err_addr)); + mcm_info.socket_id = entry->info.socket_id; mcm_info.die_id = entry->info.aid;
@@ -345,19 +345,36 @@ int amdgpu_mca_smu_log_ras_error(struct amdgpu_device *adev, enum amdgpu_ras_blo err_addr.err_addr = entry->regs[MCA_REG_IDX_ADDR ]; } -if (type ==AMDGPU_MCA_ERROR_TYPE_UE ) +if (type ==AMDGPU_MCA_ERROR_TYPE_UE ) {amdgpu_ras_error_statistic_ue_count (err_data, - &mcm_info, &err_addr, (uint64_t )count); -else { + &mcm_info, &err_addr, (uint64_t )count); + }else {if (amdgpu_mca_is_deferred_error (adev, entry->regs[MCA_REG_IDX_STATUS ]))amdgpu_ras_error_statistic_de_count (err_data, - &mcm_info, &err_addr, (uint64_t )count); + &mcm_info, &err_addr, (uint64_t )count);else amdgpu_ras_error_statistic_ce_count (err_data, - &mcm_info, &err_addr, (uint64_t )count); + &mcm_info, &err_addr, (uint64_t )count); } } +return 0 ; +} + +int amdgpu_mca_smu_log_ras_error (struct amdgpu_device *adev,enum amdgpu_ras_block blk,enum amdgpu_mca_error_type type, +struct ras_err_data *err_data,struct ras_query_context *qctx) +{ +struct mca_bank_set mca_set; +int ret; + +amdgpu_mca_bank_set_init (&mca_set); + + ret =amdgpu_mca_smu_get_mca_set (adev, type, &mca_set, qctx); +if (ret) + goto out_mca_release; + + ret =amdgpu_mca_dispatch_mca_set (adev, blk, type, &mca_set, err_data); + out_mca_release:amdgpu_mca_bank_set_release (&mca_set);
@@ -402,36 +419,29 @@ static void mca_dump_entry(struct seq_file *m, struct mca_bank_entry *entry)static int mca_dump_show (struct seq_file *m,enum amdgpu_mca_error_type type) {struct amdgpu_device *adev = (struct amdgpu_device *)m->private; -struct mca_bank_entry *entry; -uint32_t count =0 ; -int i, ret; +struct mca_bank_node *node; +struct mca_bank_set mca_set; +struct ras_query_context qctx; +int ret; - ret =amdgpu_mca_smu_get_valid_mca_count (adev, type, &count); +amdgpu_mca_bank_set_init (&mca_set); + + qctx.event_id =0ULL ; + ret =amdgpu_mca_smu_get_mca_set (adev, type, &mca_set, &qctx);if (ret) -return ret; + goto err_free_mca_set;seq_printf (m,"amdgpu smu %s valid mca count: %d\n" , - type ==AMDGPU_MCA_ERROR_TYPE_UE ?"UE" :"CE" , count); - -if (!count) -return 0 ; - - entry =kmalloc (sizeof (*entry),GFP_KERNEL ); -if (!entry) -return -ENOMEM ; - -for (i =0 ; i < count; i++) { -memset (entry,0 ,sizeof (*entry)); + type ==AMDGPU_MCA_ERROR_TYPE_UE ?"UE" :"CE" , mca_set.nr_entries); - ret =amdgpu_mca_smu_get_mca_entry (adev, type, i, entry); -if (ret) - goto err_free_entry; +if (!mca_set.nr_entries) + goto err_free_mca_set; -mca_dump_entry (m, entry); - } +list_for_each_entry (node, &mca_set.list, node) +mca_dump_entry (m, &node->entry); -err_free_entry: -kfree (entry); +err_free_mca_set: +amdgpu_mca_bank_set_release (&mca_set);return ret; }
Signature · 1 line
2.34.1
PATCH 3/3 drm/amdgpu: add MCA smu cache support
In reply to Yang Wangv1:
because SMU CE valid mca bank will be cleared after reading,
this patch adds mca cache at the driver level to ensure that the mca bank is not lost.
v2:
refine amdgpu_mca_init/fini/reset() function name.
v3:
add mca_cache.lock support
only add CE bank to mca bank cache.
Signed-off-by Yang Wang <[email protected]>
Reviewed-by Tao Zhou <[email protected]>
--- drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 94 ++++++++++++++++++++++++- drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 20 ++++-- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 9 +++ 3 files changed, 116 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c +92 -2
@@ -183,6 +183,29 @@ static int amdgpu_mca_bank_set_add_entry(struct mca_bank_set *mca_set, struct mcreturn 0 ; } +static int amdgpu_mca_bank_set_merge (struct mca_bank_set *mca_set,struct mca_bank_set *new) +{ +struct mca_bank_node *node; + +list_for_each_entry (node, &new->list, node) +amdgpu_mca_bank_set_add_entry (mca_set, &node->entry); + +return 0 ; +} + +static int amdgpu_mca_bank_set_remove_node (struct mca_bank_set *mca_set,struct mca_bank_node *node) +{ +if (!node) +return -EINVAL ; + +list_del (&node->node); +kvfree (node); + + mca_set->nr_entries--; + +return 0 ; +} +static void amdgpu_mca_bank_set_release (struct mca_bank_set *mca_set) {struct mca_bank_node *node, *tmp;
@@ -200,6 +223,41 @@ void amdgpu_mca_smu_init_funcs(struct amdgpu_device *adev, const struct amdgpu_m mca->mca_funcs = mca_funcs; } +int amdgpu_mca_init (struct amdgpu_device *adev) +{ +struct amdgpu_mca *mca = &adev->mca; +struct mca_bank_cache *mca_cache; +int i; + +for (i =0 ; i <ARRAY_SIZE (mca->mca_caches); i++) { + mca_cache = &mca->mca_caches[i]; +mutex_init (&mca_cache->lock); +amdgpu_mca_bank_set_init (&mca_cache->mca_set); + } + +return 0 ; +} + +void amdgpu_mca_fini (struct amdgpu_device *adev) +{ +struct amdgpu_mca *mca = &adev->mca; +struct mca_bank_cache *mca_cache; +int i; + +for (i =0 ; i <ARRAY_SIZE (mca->mca_caches); i++) { + mca_cache = &mca->mca_caches[i]; +amdgpu_mca_bank_set_release (&mca_cache->mca_set); +mutex_destroy (&mca_cache->lock); + } +} + +int amdgpu_mca_reset (struct amdgpu_device *adev) +{ +amdgpu_mca_fini (adev); + +return amdgpu_mca_init (adev); +} +int amdgpu_mca_smu_set_debug_mode (struct amdgpu_device *adev,bool enable) {const struct amdgpu_mca_smu_funcs *mca_funcs = adev->mca.mca_funcs;
@@ -314,7 +372,7 @@ static int amdgpu_mca_dispatch_mca_set(struct amdgpu_device *adev, enum amdgpu_r {struct ras_err_addr err_addr;struct amdgpu_smuio_mcm_config_info mcm_info; -struct mca_bank_node *node; +struct mca_bank_node *node, *tmp;struct mca_bank_entry *entry;uint32_t count;int ret;
@@ -322,7 +380,7 @@ static int amdgpu_mca_dispatch_mca_set(struct amdgpu_device *adev, enum amdgpu_rif (!mca_set)return -EINVAL ; -list_for_each_entry (node, &mca_set->list, node) { +list_for_each_entry_safe (node, tmp, &mca_set->list, node) { entry = &node->entry; count =0 ;
@@ -356,15 +414,30 @@ static int amdgpu_mca_dispatch_mca_set(struct amdgpu_device *adev, enum amdgpu_ramdgpu_ras_error_statistic_ce_count (err_data, &mcm_info, &err_addr, (uint64_t )count); } + +amdgpu_mca_bank_set_remove_node (mca_set, node); }return 0 ; } +static int amdgpu_mca_add_mca_set_to_cache (struct amdgpu_device *adev,enum amdgpu_mca_error_type type,struct mca_bank_set *new) +{ +struct mca_bank_cache *mca_cache = &adev->mca.mca_caches[type]; +int ret; + +mutex_lock (&mca_cache->lock); + ret =amdgpu_mca_bank_set_merge (&mca_cache->mca_set, new); +mutex_unlock (&mca_cache->lock); + +return ret; +} +int amdgpu_mca_smu_log_ras_error (struct amdgpu_device *adev,enum amdgpu_ras_block blk,enum amdgpu_mca_error_type type,struct ras_err_data *err_data,struct ras_query_context *qctx) {struct mca_bank_set mca_set; +struct mca_bank_cache *mca_cache = &adev->mca.mca_caches[type];int ret;amdgpu_mca_bank_set_init (&mca_set);
@@ -374,6 +447,21 @@ int amdgpu_mca_smu_log_ras_error(struct amdgpu_device *adev, enum amdgpu_ras_blo goto out_mca_release; ret =amdgpu_mca_dispatch_mca_set (adev, blk, type, &mca_set, err_data); +if (ret) + goto out_mca_release; + +/* add remain mca bank to mca cache */ +if (type ==AMDGPU_MCA_ERROR_TYPE_CE && mca_set.nr_entries) { + ret =amdgpu_mca_add_mca_set_to_cache (adev, type, &mca_set); +if (ret) + goto out_mca_release; + +/* dispatch mca set again if mca cache has valid data */ +mutex_lock (&mca_cache->lock); +if (mca_cache->mca_set.nr_entries) + ret =amdgpu_mca_dispatch_mca_set (adev, blk, type, &mca_cache->mca_set, err_data); +mutex_unlock (&mca_cache->lock); + } out_mca_release:amdgpu_mca_bank_set_release (&mca_set);
@@ -440,6 +528,8 @@ static int mca_dump_show(struct seq_file *m, enum amdgpu_mca_error_type type)list_for_each_entry (node, &mca_set.list, node)mca_dump_entry (m, &node->entry); +amdgpu_mca_add_mca_set_to_cache (adev, type, &mca_set); + err_free_mca_set:amdgpu_mca_bank_set_release (&mca_set);
drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h +15 -5
@@ -66,6 +66,7 @@ enum amdgpu_mca_error_type {AMDGPU_MCA_ERROR_TYPE_UE =0 ,AMDGPU_MCA_ERROR_TYPE_CE ,AMDGPU_MCA_ERROR_TYPE_DE , + AMDGPU_MCA_ERROR_TYPE_COUNT, }; struct amdgpu_mca_ras_block {
@@ -77,11 +78,22 @@ struct amdgpu_mca_ras {struct amdgpu_mca_ras_block *ras; }; +struct mca_bank_set { +int nr_entries; +struct list_head list; +}; + +struct mca_bank_cache { +struct mca_bank_set mca_set; +struct mutex lock; +}; +struct amdgpu_mca {struct amdgpu_mca_ras mp0;struct amdgpu_mca_ras mp1;struct amdgpu_mca_ras mpio;const struct amdgpu_mca_smu_funcs *mca_funcs; +struct mca_bank_cache mca_caches[AMDGPU_MCA_ERROR_TYPE_DE ]; };enum mca_reg_idx {
@@ -113,11 +125,6 @@ struct mca_bank_node {struct list_head node; }; -struct mca_bank_set { -int nr_entries; -struct list_head list; -}; -struct amdgpu_mca_smu_funcs {int max_ue_count;int max_ce_count;
@@ -149,6 +156,9 @@ int amdgpu_mca_mp1_ras_sw_init(struct amdgpu_device *adev);int amdgpu_mca_mpio_ras_sw_init (struct amdgpu_device *adev);void amdgpu_mca_smu_init_funcs (struct amdgpu_device *adev,const struct amdgpu_mca_smu_funcs *mca_funcs); +int amdgpu_mca_init (struct amdgpu_device *adev); +void amdgpu_mca_fini (struct amdgpu_device *adev); +int amdgpu_mca_reset (struct amdgpu_device *adev);int amdgpu_mca_smu_set_debug_mode (struct amdgpu_device *adev,bool enable);int amdgpu_mca_smu_get_mca_set_error_count (struct amdgpu_device *adev,enum amdgpu_ras_block blk,enum amdgpu_mca_error_type type,uint32_t *total);
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +9 -0
@@ -3426,6 +3426,13 @@ int amdgpu_ras_late_init(struct amdgpu_device *adev)amdgpu_ras_set_aca_debug_mode (adev, false); }else { +if (amdgpu_in_reset (adev)) + r =amdgpu_mca_reset (adev); +else + r =amdgpu_mca_init (adev); +if (r) +return r; +amdgpu_ras_set_mca_debug_mode (adev, false); }
@@ -3498,6 +3505,8 @@ int amdgpu_ras_fini(struct amdgpu_device *adev)if (amdgpu_aca_is_enabled (adev))amdgpu_aca_fini (adev); +else +amdgpu_mca_fini (adev);WARN (AMDGPU_RAS_GET_FEATURES (con->features),"Feature mask is not cleared" );
Signature · 1 line
2.34.1