drm/amdgpu: Fix the code style warnings in amdgpu_ras
Subsystems (2)
PATCH 1/5 drm/amdgpu: Fix the code style warnings in amdgpu_ras
Fix the code style warnings in amdgpu_ras.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 41 +++++++++++++++---------- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 10 +++--- 2 files changed, 30 insertions(+), 21 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +24 -17
@@ -872,7 +872,7 @@ static int amdgpu_ras_enable_all_features(struct amdgpu_device *adev,static int amdgpu_ras_block_match_default (struct amdgpu_ras_block_object *block_obj,enum amdgpu_ras_block block) { -if (!block_obj) +if (!block_obj)return -EINVAL ;if (block_obj->block == block)
@@ -881,7 +881,7 @@ static int amdgpu_ras_block_match_default(struct amdgpu_ras_block_object *block_return -EINVAL ; } -static struct amdgpu_ras_block_object *amdgpu_ras_get_ras_block (struct amdgpu_device *adev, +static struct amdgpu_ras_block_object *amdgpu_ras_get_ras_block (struct amdgpu_device *adev,enum amdgpu_ras_block block,uint32_t sub_block_index) {struct amdgpu_ras_block_object *obj, *tmp;
@@ -941,7 +941,7 @@ static void amdgpu_ras_get_ecc_info(struct amdgpu_device *adev, struct ras_err_dint amdgpu_ras_query_error_status (struct amdgpu_device *adev,struct ras_query_if *info) { -struct amdgpu_ras_block_object * block_obj =NULL ; +struct amdgpu_ras_block_object *block_obj =NULL ;struct ras_manager *obj =amdgpu_ras_find_obj (adev, &info->head);struct ras_err_data err_data = {0 ,0 ,0 ,NULL };
@@ -953,7 +953,7 @@ int amdgpu_ras_query_error_status(struct amdgpu_device *adev, }else { block_obj =amdgpu_ras_get_ras_block (adev, info->head.block,0 );if (!block_obj || !block_obj->hw_ops) { -dev_info (adev->dev,"%s doesn't config ras function \n" , +dev_info (adev->dev,"%s doesn't config ras function.\n" ,get_ras_block_str (&info->head));return -EINVAL ; }
@@ -1023,13 +1023,14 @@ int amdgpu_ras_query_error_status(struct amdgpu_device *adev,int amdgpu_ras_reset_error_status (struct amdgpu_device *adev,enum amdgpu_ras_block block) { -struct amdgpu_ras_block_object * block_obj =amdgpu_ras_get_ras_block (adev, block,0 ); +struct amdgpu_ras_block_object *block_obj =amdgpu_ras_get_ras_block (adev, block,0 );if (!amdgpu_ras_is_supported (adev, block))return -EINVAL ;if (!block_obj || !block_obj->hw_ops) { -dev_info (adev->dev,"%s doesn't config ras function \n" ,ras_block_str (block)); +dev_info (adev->dev,"%s doesn't config ras function.\n" , +ras_block_str (block));return -EINVAL ; }
@@ -1066,7 +1067,8 @@ int amdgpu_ras_error_inject(struct amdgpu_device *adev,return -EINVAL ;if (!block_obj || !block_obj->hw_ops) { -dev_info (adev->dev,"%s doesn't config ras function \n" ,get_ras_block_str (&info->head)); +dev_info (adev->dev,"%s doesn't config ras function.\n" , +get_ras_block_str (&info->head));return -EINVAL ; }
@@ -1702,19 +1704,25 @@ static void amdgpu_ras_log_on_err_counter(struct amdgpu_device *adev)static void amdgpu_ras_error_status_query (struct amdgpu_device *adev,struct ras_query_if *info) { -struct amdgpu_ras_block_object * block_obj =amdgpu_ras_get_ras_block (adev, info->head.block, info->head.sub_block_index); +struct amdgpu_ras_block_object *block_obj =amdgpu_ras_get_ras_block (adev, + info->head.block, + info->head.sub_block_index);/* * Only two block need to query read/write * RspStatus at current state */ if ((info->head.block !=AMDGPU_RAS_BLOCK__GFX ) && (info->head.block !=AMDGPU_RAS_BLOCK__MMHUB )) -return ; +return ; + + block_obj =amdgpu_ras_get_ras_block (adev, + info->head.block, + info->head.sub_block_index); - block_obj =amdgpu_ras_get_ras_block (adev, info->head.block, info->head.sub_block_index);if (!block_obj || !block_obj->hw_ops) { -dev_info (adev->dev,"%s doesn't config ras function \n" ,get_ras_block_str (&info->head)); -return ; +dev_info (adev->dev,"%s doesn't config ras function.\n" , +get_ras_block_str (&info->head)); +return ; }if (block_obj->hw_ops->query_ras_error_status)
@@ -2715,7 +2723,7 @@ static void amdgpu_register_bad_pages_mca_notifier(struct amdgpu_device *adev) }#endif -struct amdgpu_ras *amdgpu_ras_get_context (struct amdgpu_device *adev) +struct amdgpu_ras *amdgpu_ras_get_context (struct amdgpu_device *adev) {if (!adev)return NULL ;
@@ -2723,7 +2731,7 @@ struct amdgpu_ras* amdgpu_ras_get_context(struct amdgpu_device *adev)return adev->psp.ras_context.ras; } -int amdgpu_ras_set_context (struct amdgpu_device *adev,struct amdgpu_ras * ras_con) +int amdgpu_ras_set_context (struct amdgpu_device *adev,struct amdgpu_ras *ras_con) {if (!adev)return -EINVAL ;
@@ -2755,7 +2763,7 @@ int amdgpu_ras_reset_gpu(struct amdgpu_device *adev)/* Register each ip ras block into amdgpu ras */ int amdgpu_ras_register_ras_block (struct amdgpu_device *adev, -struct amdgpu_ras_block_object * ras_block_obj) +struct amdgpu_ras_block_object *ras_block_obj) {struct amdgpu_ras_block_object *obj, *tmp;if (!adev || !ras_block_obj)
@@ -2766,9 +2774,8 @@ int amdgpu_ras_register_ras_block(struct amdgpu_device *adev,/* If the ras object is in ras_list, don't add it again */ list_for_each_entry_safe (obj, tmp, &adev->ras_list, node) { -if (obj == ras_block_obj) { +if (obj == ras_block_obj)return 0 ; - } }INIT_LIST_HEAD (&ras_block_obj->node);
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +6 -4
@@ -496,7 +496,8 @@ struct amdgpu_ras_block_object {/* ras block link */ struct list_head node; -int (*ras_block_match)(struct amdgpu_ras_block_object *block_obj,enum amdgpu_ras_block block,uint32_t sub_block_index); +int (*ras_block_match)(struct amdgpu_ras_block_object *block_obj, +enum amdgpu_ras_block block,uint32_t sub_block_index);int (*ras_late_init)(struct amdgpu_device *adev,void *ras_info);void (*ras_fini)(struct amdgpu_device *adev);const struct amdgpu_ras_block_hw_ops *hw_ops;
@@ -504,7 +505,7 @@ struct amdgpu_ras_block_object {struct amdgpu_ras_block_hw_ops {int (*ras_error_inject)(struct amdgpu_device *adev,void *inject_if); -void (*query_ras_error_count)(struct amdgpu_device *adev,void *ras_error_status); +void (*query_ras_error_count)(struct amdgpu_device *adev,void *ras_error_status);void (*query_ras_error_status)(struct amdgpu_device *adev);void (*query_ras_error_address)(struct amdgpu_device *adev,void *ras_error_status);void (*reset_ras_error_count)(struct amdgpu_device *adev);
@@ -678,7 +679,8 @@ int amdgpu_ras_reset_gpu(struct amdgpu_device *adev);struct amdgpu_ras *amdgpu_ras_get_context (struct amdgpu_device *adev); -int amdgpu_ras_set_context (struct amdgpu_device *adev,struct amdgpu_ras * ras_con); +int amdgpu_ras_set_context (struct amdgpu_device *adev,struct amdgpu_ras *ras_con); -int amdgpu_ras_register_ras_block (struct amdgpu_device *adev,struct amdgpu_ras_block_object * ras_block_obj); +int amdgpu_ras_register_ras_block (struct amdgpu_device *adev, +struct amdgpu_ras_block_object *ras_block_obj);#endif
Signature · 1 line
2.25.1
PATCH 2/5 drm/amdgpu: Fix the code style warnings in gfx
Fix the code style warnings in gfx.
--- drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 4 ++-- drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +2 -2
@@ -2314,11 +2314,11 @@ static int gfx_v9_0_gpu_early_init(struct amdgpu_device *adev)/* If not define special ras_late_init function, use gfx default ras_late_init */ if (!adev->gfx.ras->ras_block.ras_late_init) - adev->gfx.ras->ras_block.ras_late_init = amdgpu_gfx_ras_late_init; + adev->gfx.ras->ras_block.ras_late_init = amdgpu_gfx_ras_late_init;/* If not define special ras_fini function, use gfx default ras_fini */ if (!adev->gfx.ras->ras_block.ras_fini) - adev->gfx.ras->ras_block.ras_fini = amdgpu_gfx_ras_fini; + adev->gfx.ras->ras_block.ras_fini = amdgpu_gfx_ras_fini; } adev->gfx.config.gb_addr_config = gb_addr_config;
drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c +1 -1
@@ -1930,7 +1930,7 @@ static void gfx_v9_4_2_reset_sq_timeout_status(struct amdgpu_device *adev)mutex_unlock (&adev->grbm_idx_mutex); } -struct amdgpu_ras_block_hw_ops gfx_v9_4_2_ras_ops ={ +struct amdgpu_ras_block_hw_ops gfx_v9_4_2_ras_ops = { .ras_error_inject = &gfx_v9_4_2_ras_error_inject, .query_ras_error_count = &gfx_v9_4_2_query_ras_error_count, .reset_ras_error_count = &gfx_v9_4_2_reset_ras_error_count,
Signature · 1 line
2.25.1
PATCH 3/5 drm/amdgpu: Fix the code style warnings in gmc
In reply to yipechaiFix the code style warnings in gmc.
--- drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 2 +- drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c +1 -1
@@ -672,7 +672,7 @@ static void gmc_v10_0_set_umc_funcs(struct amdgpu_device *adev)if (adev->umc.ras) {amdgpu_ras_register_ras_block (adev, &adev->umc.ras->ras_block); -strcpy (adev->umc.ras->ras_block.name,"umc" ); +strcpy (adev->umc.ras->ras_block.name,"umc" ); adev->umc.ras->ras_block.block =AMDGPU_RAS_BLOCK__UMC ;/* If don't define special ras_late_init function, use default ras_late_init */
drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c +1 -1
@@ -1231,7 +1231,7 @@ static void gmc_v9_0_set_umc_funcs(struct amdgpu_device *adev)if (adev->umc.ras) {amdgpu_ras_register_ras_block (adev, &adev->umc.ras->ras_block); -strcpy (adev->umc.ras->ras_block.name,"umc" ); +strcpy (adev->umc.ras->ras_block.name,"umc" ); adev->umc.ras->ras_block.block =AMDGPU_RAS_BLOCK__UMC ;/* If don't define special ras_late_init function, use default ras_late_init */
Signature · 1 line
2.25.1
PATCH 4/5 drm/amdgpu: Fix the code style warnings in sdma
In reply to yipechaiFix the code style warnings in sdma.
--- drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 5 ++--- drivers/gpu/drm/amd/amdgpu/sdma_v4_4.c | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c +2 -3
@@ -2767,8 +2767,7 @@ static void sdma_v4_0_query_ras_error_count(struct amdgpu_device *adev, void *r {int i =0 ;for (i =0 ; i < adev->sdma.num_instances; i++) { -if (sdma_v4_0_query_ras_error_count_by_instance (adev, i, ras_error_status)) - { +if (sdma_v4_0_query_ras_error_count_by_instance (adev, i, ras_error_status)) {dev_err (adev->dev,"Query ras error count failed in SDMA%d \n" , i);return ; }
@@ -2814,7 +2813,7 @@ static void sdma_v4_0_set_ras_funcs(struct amdgpu_device *adev)if (adev->sdma.ras) {amdgpu_ras_register_ras_block (adev, &adev->sdma.ras->ras_block); -strcpy (adev->sdma.ras->ras_block.name,"sdma" ); +strcpy (adev->sdma.ras->ras_block.name,"sdma" ); adev->sdma.ras->ras_block.block =AMDGPU_RAS_BLOCK__SDMA ;/* If don't define special ras_late_init function, use default ras_late_init */
drivers/gpu/drm/amd/amdgpu/sdma_v4_4.c +1 -2
@@ -249,8 +249,7 @@ static void sdma_v4_4_query_ras_error_count(struct amdgpu_device *adev, void *r {int i =0 ;for (i =0 ; i < adev->sdma.num_instances; i++) { -if (sdma_v4_4_query_ras_error_count_by_instance (adev, i, ras_error_status)) - { +if (sdma_v4_4_query_ras_error_count_by_instance (adev, i, ras_error_status)) {dev_err (adev->dev,"Query ras error count failed in SDMA%d \n" , i);return ; }
Signature · 1 line
2.25.1
PATCH 5/5 drm/amdgpu: Fix the code style warnings in hdp xgmi mca and umc
In reply to yipechaidrm/amdgpu: Fix the code style warnings in hdp xgmi mca and umc.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h | 4 ++-- drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 3 ++- drivers/gpu/drm/amd/amdgpu/mca_v3_0.c | 7 ++++--- drivers/gpu/drm/amd/amdgpu/umc_v6_1.c | 3 ++- 4 files changed, 10 insertions(+), 7 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_hdp.h +2 -2
@@ -24,7 +24,7 @@#define __AMDGPU_HDP_H__#include "amdgpu_ras.h" -struct amdgpu_hdp_ras { +struct amdgpu_hdp_ras {struct amdgpu_ras_block_object ras_block; };
@@ -40,7 +40,7 @@ struct amdgpu_hdp_funcs {struct amdgpu_hdp {struct ras_common_if *ras_if;const struct amdgpu_hdp_funcs *funcs; -struct amdgpu_hdp_ras *ras; +struct amdgpu_hdp_ras *ras; };int amdgpu_hdp_ras_late_init (struct amdgpu_device *adev,void *ras_info);
drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c +2 -1
@@ -950,7 +950,8 @@ static void amdgpu_xgmi_query_ras_error_count(struct amdgpu_device *adev,static int amdgpu_ras_error_inject_xgmi (struct amdgpu_device *adev,void *inject_if) {int ret =0 ; -struct ta_ras_trigger_error_input *block_info = (struct ta_ras_trigger_error_input *)inject_if; +struct ta_ras_trigger_error_input *block_info = + (struct ta_ras_trigger_error_input *)inject_if;if (amdgpu_dpm_set_df_cstate (adev,DF_CSTATE_DISALLOW ))dev_warn (adev->dev,"Failed to disallow df cstate" );
drivers/gpu/drm/amd/amdgpu/mca_v3_0.c +4 -3
@@ -47,12 +47,13 @@ static void mca_v3_0_mp0_ras_fini(struct amdgpu_device *adev)amdgpu_mca_ras_fini (adev, &adev->mca.mp0); } -static int mca_v3_0_ras_block_match (struct amdgpu_ras_block_object * block_obj,enum amdgpu_ras_block block,uint32_t sub_block_index) +static int mca_v3_0_ras_block_match (struct amdgpu_ras_block_object *block_obj, +enum amdgpu_ras_block block,uint32_t sub_block_index) { -if (!block_obj) +if (!block_obj)return -EINVAL ; -if ( (block_obj->block == block) && +if ((block_obj->block == block) && (block_obj->sub_block_index == sub_block_index)) {return 0 ; }
drivers/gpu/drm/amd/amdgpu/umc_v6_1.c +2 -1
@@ -475,4 +475,5 @@ struct amdgpu_umc_ras umc_v6_1_ras = { .hw_ops = &umc_v6_1_ras_hw_ops, }, .err_cnt_init = umc_v6_1_err_cnt_init, -}; +}; +
Signature · 1 line
2.25.1
[AMD Official Use Only]
Quoted 10 lines
-----Original Message-----
From: Chai, Thomas <[email protected]>
Sent: Friday, January 14, 2022 11:36 AM
To: [email protected]
Cc: Chai, Thomas <[email protected]>; Zhang, Hawking <[email protected]>; Zhou1, Tao <[email protected]>; Clements, John <[email protected]>; Chai, Thomas <[email protected]>
Subject: [PATCH 1/5] drm/amdgpu: Fix the code style warnings inamdgpu_rasFix the code style warnings in
amdgpu_ras.
[Tao] Could you add more description to explain the warnings you want to fix?
Quoted 215 lines
Signed-off-by yipechai <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 41 +++++++++++++++---------- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 10 +++--- 2 files changed, 30 insertions(+), 21 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +0
-0@@ -872,7 +872,7 @@ static int amdgpu_ras_enable_all_features(struct
amdgpu_device*adev, static int amdgpu_ras_block_match_default(structamdgpu_ras_block_object*block_obj,drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +1
-1enum amdgpu_ras_block block) { -if (!block_obj) +if (!block_obj)return -EINVAL ;if (block_obj->block == block)@@ -881,7 +881,7 @@ static int amdgpu_ras_block_match_default(struct
amdgpu_ras_block_object*block_drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +0
-1return -EINVAL ; } -static struct amdgpu_ras_block_object* amdgpu_ras_get_ras_block(struct
amdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +2
-0+static struct amdgpu_ras_block_object *amdgpu_ras_get_ras_block(struct +amdgpu_device *adev, enum amdgpu_ras_block block,
uint32_tsub_block_index) {
structamdgpu_ras_block_object*obj, *tmp; @@ -941,7 +941,7 @@
static void amdgpu_ras_get_ecc_info(structamdgpu_device*adev, structras_err_dint amdgpu_ras_query_error_status(structamdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +2
-2struct ras_query_if *info) { -struct amdgpu_ras_block_object * block_obj =NULL ; +struct amdgpu_ras_block_object *block_obj =NULL ;struct ras_manager *obj =amdgpu_ras_find_obj (adev, &info->head);struct ras_err_data err_data = {0 ,0 ,0 ,NULL };@@ -953,7 +953,7 @@ int amdgpu_ras_query_error_status(structamdgpu_device *adev, } else { block_obj =amdgpu_ras_get_ras_block (adev, info->head.block,0 );if (!block_obj || !block_obj->hw_ops) { -dev_info (adev->dev,"%s doesn't config ras function \n" , +dev_info (adev->dev,"%s doesn't config ras function.\n" ,get_ras_block_str (&info->head));drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +0
-0return -EINVAL ; }@@ -1023,13 +1023,14 @@ int amdgpu_ras_query_error_status(struct
amdgpu_device*adev, int amdgpu_ras_reset_error_status(structamdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +0
-1enum amdgpu_ras_block block) { - struct amdgpu_ras_block_object* block_obj =
amdgpu_ras_get_ras_block(adev, block, 0);drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +2
-1+struct amdgpu_ras_block_object *block_obj = +amdgpu_ras_get_ras_block (adev, block,0 );if (!amdgpu_ras_is_supported (adev, block))return -EINVAL ;if (!block_obj || !block_obj->hw_ops) { - dev_info(adev->dev, "%s doesn't config ras function \n",
ras_block_str(block));drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +4
-1+dev_info (adev->dev,"%s doesn't config ras function.\n" , +ras_block_str (block));return -EINVAL ; }@@ -1066,7 +1067,8 @@ int amdgpu_ras_error_inject(struct amdgpu_device *adev, return -EINVAL ;if (!block_obj || !block_obj->hw_ops) { -dev_info (adev->dev,"%s doesn't config ras function \n" , get_ras_block_str(&info->head)); +dev_info (adev->dev,"%s doesn't config ras function.\n" , +get_ras_block_str (&info->head));return -EINVAL ;drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +0
-0}@@ -1702,19 +1704,25 @@ static void amdgpu_ras_log_on_err_counter(struct
amdgpu_device*adev) static void amdgpu_ras_error_status_query(structamdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +0
-1struct ras_query_if *info) { - struct amdgpu_ras_block_object* block_obj =amdgpu_ras_get_ras_block(adev,
info->head.block, info-Quoted 1 line
head.sub_block_index);
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +1
-0+ struct amdgpu_ras_block_object *block_obj =amdgpu_ras_get_ras_block(adev,
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +1
-0+ info-Quoted 1 line
head.block,
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +1
-0+ info-Quoted 1 line
head.sub_block_index);
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +5
-2/* * Only two block need to query read/write * RspStatus at current state */ if ((info->head.block !=AMDGPU_RAS_BLOCK__GFX ) && (info->head.block !=AMDGPU_RAS_BLOCK__MMHUB )) -return ; +return ; + + block_obj =amdgpu_ras_get_ras_block (adev, + info->head.block, + info->head.sub_block_index); - block_obj = amdgpu_ras_get_ras_block(adev, info->head.block, info-Quoted 1 line
head.sub_block_index);
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +0
-1if (!block_obj || !block_obj->hw_ops) { - dev_info(adev->dev, "%s doesn't config ras function \n",
get_ras_block_str(&info->head));drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +7
-4-return ; +dev_info (adev->dev,"%s doesn't config ras function.\n" , +get_ras_block_str (&info->head)); +return ; }if (block_obj->hw_ops->query_ras_error_status)@@ -2715,7 +2723,7 @@ static void amdgpu_register_bad_pages_mca_notifier(struct amdgpu_device *adev) }#endif -struct amdgpu_ras *amdgpu_ras_get_context (struct amdgpu_device *adev) +struct amdgpu_ras *amdgpu_ras_get_context (struct amdgpu_device *adev) {if (!adev)return NULL ;@@ -2723,7 +2731,7 @@ struct amdgpu_ras* amdgpu_ras_get_context(struct amdgpu_device *adev)return adev->psp.ras_context.ras; } -int amdgpu_ras_set_context (struct amdgpu_device *adev,struct amdgpu_ras * ras_con) +int amdgpu_ras_set_context (struct amdgpu_device *adev,struct +amdgpu_ras *ras_con) {if (!adev)return -EINVAL ;@@ -2755,7 +2763,7 @@ int amdgpu_ras_reset_gpu(struct amdgpu_device *adev)/* Register each ip ras block into amdgpu ras */ int amdgpu_ras_register_ras_block (struct amdgpu_device *adev, -struct amdgpu_ras_block_object * ras_block_obj) +struct amdgpu_ras_block_object *ras_block_obj) {struct amdgpu_ras_block_object *obj, *tmp;drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +1
-2if (!adev || !ras_block_obj)@@ -2766,9 +2774,8 @@ int amdgpu_ras_register_ras_block(struct amdgpu_device *adev,/* If the ras object is in ras_list, don't add it again */ list_for_each_entry_safe(obj, tmp, &adev->ras_list, node) { -if (obj == ras_block_obj) { +if (obj == ras_block_obj)return 0 ; - } }drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +0
-0INIT_LIST_HEAD (&ras_block_obj->node);drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +2
-1@@ -496,7 +496,8 @@ struct amdgpu_ras_block_object {/* ras block link */ struct list_head node; -int (*ras_block_match)(struct amdgpu_ras_block_object *block_obj, enum amdgpu_ras_block block, uint32_t sub_block_index); +int (*ras_block_match)(struct amdgpu_ras_block_object *block_obj, +enum amdgpu_ras_block block,uint32_t sub_block_index);int (*ras_late_init)(struct amdgpu_device *adev,void *ras_info);drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +0
-0void (*ras_fini)(struct amdgpu_device *adev); const struct amdgpu_ras_block_hw_ops *hw_ops; @@ -504,7 +505,7@@ struct
amdgpu_ras_block_object{struct
amdgpu_ras_block_hw_ops{drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +0
-1int (*ras_error_inject)(struct amdgpu_device *adev,void *inject_if); - void (*query_ras_error_count)(struct amdgpu_device *adev,void
*ras_error_status);drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +2
-0+void (*query_ras_error_count)(struct amdgpu_device *adev,void +*ras_error_status);void (*query_ras_error_status)(struct amdgpu_device *adev); void (*query_ras_error_address)(struct amdgpu_device *adev, void
*ras_error_status);
void (*reset_ras_error_count)(structamdgpu_device*adev); @@ -
678,7 +679,8 @@ intamdgpu_ras_reset_gpu(struct amdgpu_device *adev);struct amdgpu_ras*
amdgpu_ras_get_context(struct amdgpu_device *adev);-int
amdgpu_ras_set_context(struct amdgpu_device *adev, struct amdgpu_ras* ras_con);drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +2
-1+int amdgpu_ras_set_context (struct amdgpu_device *adev,struct +amdgpu_ras *ras_con); -int amdgpu_ras_register_ras_block(struct amdgpu_device *adev, structamdgpu_ras_block_object*
ras_block_obj);drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +2
-0+int amdgpu_ras_register_ras_block (struct amdgpu_device *adev, + struct amdgpu_ras_block_object
*ras_block_obj);
#endif
--
2.25.1
OK, I will update the patches to add the fixed warning types.
-----Original Message-----
From: Zhou1, Tao <[email protected]>
Sent: Friday, January 14, 2022 11:45 AM
To: Chai, Thomas <[email protected]>; [email protected]
Cc: Zhang, Hawking <[email protected]>; Clements, John <[email protected]>
Subject: RE: [PATCH 1/5] drm/amdgpu: Fix the code style warnings in amdgpu_ras
[AMD Official Use Only]
Quoted 11 lines
-----Original Message-----
From: Chai, Thomas <[email protected]>
Sent: Friday, January 14, 2022 11:36 AM
To: [email protected]
Cc: Chai, Thomas <[email protected]>; Zhang, Hawking <[email protected]>; Zhou1, Tao <[email protected]>; Clements, John <[email protected]>; Chai, Thomas <[email protected]>
Subject: [PATCH 1/5] drm/amdgpu: Fix the code style warnings inamdgpu_rasFix the code style warnings in
amdgpu_ras.
[Tao] Could you add more description to explain the warnings you want to fix?
Quoted 218 lines
Signed-off-by yipechai <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 41 +++++++++++++++---------- drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 10 +++--- 2 files changed, 30 insertions(+), 21 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +0
-0@@ -872,7 +872,7 @@ static int amdgpu_ras_enable_all_features(struct
amdgpu_device*adev, static int amdgpu_ras_block_match_default(structamdgpu_ras_block_object*block_obj,drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +1
-1enum amdgpu_ras_block block) { -if (!block_obj) +if (!block_obj)return -EINVAL ;if (block_obj->block == block)@@ -881,7 +881,7 @@ static int amdgpu_ras_block_match_default(struct
amdgpu_ras_block_object*block_drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +0
-1return -EINVAL ; } -static struct amdgpu_ras_block_object*amdgpu_ras_get_ras_block(struct
amdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +2
-0+static struct amdgpu_ras_block_object +*amdgpu_ras_get_ras_block(struct amdgpu_device *adev, enum amdgpu_ras_block block,
uint32_tsub_block_index) {
structamdgpu_ras_block_object*obj, *tmp; @@ -941,7 +941,7 @@
static void amdgpu_ras_get_ecc_info(structamdgpu_device*adev, structras_err_dint amdgpu_ras_query_error_status(structamdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +2
-2struct ras_query_if *info) { -struct amdgpu_ras_block_object * block_obj =NULL ; +struct amdgpu_ras_block_object *block_obj =NULL ;struct ras_manager *obj =amdgpu_ras_find_obj (adev, &info->head);struct ras_err_data err_data = {0 ,0 ,0 ,NULL };@@ -953,7 +953,7 @@ int amdgpu_ras_query_error_status(structamdgpu_device *adev, } else { block_obj =amdgpu_ras_get_ras_block (adev, info->head.block,0 );if (!block_obj || !block_obj->hw_ops) { -dev_info (adev->dev,"%s doesn't config ras function \n" , +dev_info (adev->dev,"%s doesn't config ras function.\n" ,get_ras_block_str (&info->head));return -EINVAL ;drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +0
-0}@@ -1023,13 +1023,14 @@ int amdgpu_ras_query_error_status(struct
amdgpu_device*adev, int amdgpu_ras_reset_error_status(structamdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +0
-1enum amdgpu_ras_block block) { - struct amdgpu_ras_block_object* block_obj =
amdgpu_ras_get_ras_block(adev, block, 0);drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +2
-1+struct amdgpu_ras_block_object *block_obj = +amdgpu_ras_get_ras_block (adev, block,0 );if (!amdgpu_ras_is_supported (adev, block))return -EINVAL ;if (!block_obj || !block_obj->hw_ops) { - dev_info(adev->dev, "%s doesn't config ras function \n",
ras_block_str(block));drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +4
-1+dev_info (adev->dev,"%s doesn't config ras function.\n" , +ras_block_str (block));return -EINVAL ; }@@ -1066,7 +1067,8 @@ int amdgpu_ras_error_inject(struct amdgpu_device *adev, return -EINVAL ;if (!block_obj || !block_obj->hw_ops) { -dev_info (adev->dev,"%s doesn't config ras function \n" , get_ras_block_str(&info->head)); +dev_info (adev->dev,"%s doesn't config ras function.\n" , +get_ras_block_str (&info->head));return -EINVAL ;drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +0
-0}@@ -1702,19 +1704,25 @@ static voidamdgpu_ras_log_on_err_counter(struct
amdgpu_device*adev) static void amdgpu_ras_error_status_query(structamdgpu_device*adev,drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +0
-1struct ras_query_if *info) { - struct amdgpu_ras_block_object* block_obj =amdgpu_ras_get_ras_block(adev,
info->head.block, info-Quoted 1 line
head.sub_block_index);
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +1
-0+ struct amdgpu_ras_block_object *block_obj =amdgpu_ras_get_ras_block(adev,
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +1
-0+ info-Quoted 1 line
head.block,
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +1
-0+ info-Quoted 1 line
head.sub_block_index);
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +5
-2/* * Only two block need to query read/write * RspStatus at current state */ if ((info->head.block !=AMDGPU_RAS_BLOCK__GFX ) && (info->head.block !=AMDGPU_RAS_BLOCK__MMHUB )) -return ; +return ; + + block_obj =amdgpu_ras_get_ras_block (adev, + info->head.block, + info->head.sub_block_index); - block_obj = amdgpu_ras_get_ras_block(adev, info->head.block, info-Quoted 1 line
head.sub_block_index);
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +0
-1if (!block_obj || !block_obj->hw_ops) { - dev_info(adev->dev, "%s doesn't config ras function \n",
get_ras_block_str(&info->head));drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +4
-3-return ; +dev_info (adev->dev,"%s doesn't config ras function.\n" , +get_ras_block_str (&info->head)); +return ; }if (block_obj->hw_ops->query_ras_error_status)@@ -2715,7 +2723,7 @@ static void amdgpu_register_bad_pages_mca_notifier(struct amdgpu_device *adev) }#endif -struct amdgpu_ras *amdgpu_ras_get_context (struct amdgpu_device *adev) +struct amdgpu_ras *amdgpu_ras_get_context (struct amdgpu_device *adev) {if (!adev)return NULL ;@@ -2723,7 +2731,7 @@ struct amdgpu_ras* amdgpu_ras_get_context(struct amdgpu_device *adev)return adev->psp.ras_context.ras; } -int amdgpu_ras_set_context(struct amdgpu_device *adev, structamdgpu_ras*
ras_con)drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +3
-1+int amdgpu_ras_set_context (struct amdgpu_device *adev,struct +amdgpu_ras *ras_con) {if (!adev)return -EINVAL ;@@ -2755,7 +2763,7 @@ int amdgpu_ras_reset_gpu(struct amdgpu_device *adev)/* Register each ip ras block into amdgpu ras */ int amdgpu_ras_register_ras_block (struct amdgpu_device *adev, -struct amdgpu_ras_block_object * ras_block_obj) +struct amdgpu_ras_block_object *ras_block_obj) {struct amdgpu_ras_block_object *obj, *tmp;drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +1
-2if (!adev || !ras_block_obj)@@ -2766,9 +2774,8 @@ int amdgpu_ras_register_ras_block(struct amdgpu_device *adev,/* If the ras object is in ras_list, don't add it again */ list_for_each_entry_safe(obj, tmp, &adev->ras_list, node) { -if (obj == ras_block_obj) { +if (obj == ras_block_obj)return 0 ; - } }drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +0
-0INIT_LIST_HEAD (&ras_block_obj->node);drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +2
-1@@ -496,7 +496,8 @@ struct amdgpu_ras_block_object {/* ras block link */ struct list_head node; -int (*ras_block_match)(struct amdgpu_ras_block_object *block_obj, enum amdgpu_ras_block block, uint32_t sub_block_index); +int (*ras_block_match)(struct amdgpu_ras_block_object *block_obj, +enum amdgpu_ras_block block,uint32_t sub_block_index);int (*ras_late_init)(struct amdgpu_device *adev,void *ras_info);drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +0
-0void (*ras_fini)(struct amdgpu_device *adev); const struct amdgpu_ras_block_hw_ops *hw_ops; @@ -504,7 +505,7 @@struct
amdgpu_ras_block_object{struct
amdgpu_ras_block_hw_ops{drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +0
-1int (*ras_error_inject)(struct amdgpu_device *adev,void *inject_if); - void (*query_ras_error_count)(struct amdgpu_device *adev,void
*ras_error_status);drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +2
-0+void (*query_ras_error_count)(struct amdgpu_device *adev,void +*ras_error_status);void (*query_ras_error_status)(struct amdgpu_device *adev); void (*query_ras_error_address)(struct amdgpu_device *adev, void
*ras_error_status);
void (*reset_ras_error_count)(structamdgpu_device*adev); @@ -
678,7 +679,8 @@ intamdgpu_ras_reset_gpu(struct amdgpu_device *adev);struct amdgpu_ras* amdgpu_ras_get_context(struct
amdgpu_device
*adev);-int
amdgpu_ras_set_context(struct amdgpu_device *adev, struct amdgpu_ras* ras_con);drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +2
-1+int amdgpu_ras_set_context (struct amdgpu_device *adev,struct +amdgpu_ras *ras_con); -int amdgpu_ras_register_ras_block(struct amdgpu_device *adev, structamdgpu_ras_block_object*
ras_block_obj);drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h +2
-0+int amdgpu_ras_register_ras_block (struct amdgpu_device *adev, + struct amdgpu_ras_block_object
*ras_block_obj);
#endif
--
2.25.1