RE: [PATCH 1/5] drm/amdgpu: Fix the code style warnings in amdgpu_ras

2022-01-13 Thread Chai, Thomas
OK, I will update the patches to add the fixed warning types.

-Original Message-
From: Zhou1, Tao  
Sent: Friday, January 14, 2022 11:45 AM
To: Chai, Thomas ; amd-gfx@lists.freedesktop.org
Cc: Zhang, Hawking ; Clements, John 

Subject: RE: [PATCH 1/5] drm/amdgpu: Fix the code style warnings in amdgpu_ras

[AMD Official Use Only]



> -Original Message-
> From: Chai, Thomas 
> Sent: Friday, January 14, 2022 11:36 AM
> To: amd-gfx@lists.freedesktop.org
> Cc: Chai, Thomas ; Zhang, Hawking 
> ; Zhou1, Tao ; Clements, 
> John ; Chai, Thomas 
> Subject: [PATCH 1/5] drm/amdgpu: Fix the code style warnings in 
> amdgpu_ras
> 
> Fix the code style warnings in amdgpu_ras.

[Tao] Could you add more description to explain the warnings you want to fix?

> 
> Signed-off-by: yipechai 
> ---
>  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(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> index 0bb6b5354802..23502b2b0770 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> @@ -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_d  int 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)  sta

RE: [PATCH 1/5] drm/amdgpu: Fix the code style warnings in amdgpu_ras

2022-01-13 Thread Zhou1, Tao
[AMD Official Use Only]



> -Original Message-
> From: Chai, Thomas 
> Sent: Friday, January 14, 2022 11:36 AM
> To: amd-gfx@lists.freedesktop.org
> Cc: Chai, Thomas ; Zhang, Hawking
> ; Zhou1, Tao ; Clements,
> John ; Chai, Thomas 
> Subject: [PATCH 1/5] drm/amdgpu: Fix the code style warnings in amdgpu_ras
> 
> Fix the code style warnings in amdgpu_ras.

[Tao] Could you add more description to explain the warnings you want to fix?

> 
> Signed-off-by: yipechai 
> ---
>  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(-)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> index 0bb6b5354802..23502b2b0770 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
> @@ -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_d  int 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_o