RE: [PATCH] drm/amdgpu: replace DRM prefix with PCI device info for gfx/mmhub

2020-04-19 Thread Chen, Guchun 
[AMD Public Use]

Reviewed-by: Guchun Chen 

Regards,
Guchun

-Original Message-
From: Dennis Li  
Sent: Saturday, April 18, 2020 12:11 PM
To: amd-gfx@lists.freedesktop.org; Deucher, Alexander 
; Zhou1, Tao ; Zhang, Hawking 
; Chen, Guchun 
Cc: Li, Dennis 
Subject: [PATCH] drm/amdgpu: replace DRM prefix with PCI device info for 
gfx/mmhub

Prefix RAS message printing in gfx/mmhub with PCI device info, which assists 
the debug in multiple GPU case.

Change-Id: Iceba7cafd5aac7d0251d9f871503745cc617fba2
Signed-off-by: Dennis Li 

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c 
b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c
old mode 100644
new mode 100755
index dce945ef21a5..46351db36922
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c
@@ -732,7 +732,8 @@ static int gfx_v9_4_query_utc_edc_status(struct 
amdgpu_device *adev,
sec_count = REG_GET_FIELD(data, VML2_WALKER_MEM_ECC_CNTL,
  SEC_COUNT);
if (sec_count) {
-   DRM_INFO("Instance[%d]: SubBlock %s, SEC %d\n", i,
+   dev_info(adev->dev,
+"Instance[%d]: SubBlock %s, SEC %d\n", i,
 vml2_walker_mems[i], sec_count);
err_data->ce_count += sec_count;
}
@@ -740,7 +741,8 @@ static int gfx_v9_4_query_utc_edc_status(struct 
amdgpu_device *adev,
ded_count = REG_GET_FIELD(data, VML2_WALKER_MEM_ECC_CNTL,
  DED_COUNT);
if (ded_count) {
-   DRM_INFO("Instance[%d]: SubBlock %s, DED %d\n", i,
+   dev_info(adev->dev,
+"Instance[%d]: SubBlock %s, DED %d\n", i,
 vml2_walker_mems[i], ded_count);
err_data->ue_count += ded_count;
}
@@ -752,14 +754,16 @@ static int gfx_v9_4_query_utc_edc_status(struct 
amdgpu_device *adev,
 
sec_count = REG_GET_FIELD(data, UTCL2_MEM_ECC_CNTL, SEC_COUNT);
if (sec_count) {
-   DRM_INFO("Instance[%d]: SubBlock %s, SEC %d\n", i,
+   dev_info(adev->dev,
+"Instance[%d]: SubBlock %s, SEC %d\n", i,
 utcl2_router_mems[i], sec_count);
err_data->ce_count += sec_count;
}
 
ded_count = REG_GET_FIELD(data, UTCL2_MEM_ECC_CNTL, DED_COUNT);
if (ded_count) {
-   DRM_INFO("Instance[%d]: SubBlock %s, DED %d\n", i,
+   dev_info(adev->dev,
+"Instance[%d]: SubBlock %s, DED %d\n", i,
 utcl2_router_mems[i], ded_count);
err_data->ue_count += ded_count;
}
@@ -772,7 +776,8 @@ static int gfx_v9_4_query_utc_edc_status(struct 
amdgpu_device *adev,
sec_count = REG_GET_FIELD(data, ATC_L2_CACHE_2M_DSM_CNTL,
  SEC_COUNT);
if (sec_count) {
-   DRM_INFO("Instance[%d]: SubBlock %s, SEC %d\n", i,
+   dev_info(adev->dev,
+"Instance[%d]: SubBlock %s, SEC %d\n", i,
 atc_l2_cache_2m_mems[i], sec_count);
err_data->ce_count += sec_count;
}
@@ -780,7 +785,8 @@ static int gfx_v9_4_query_utc_edc_status(struct 
amdgpu_device *adev,
ded_count = REG_GET_FIELD(data, ATC_L2_CACHE_2M_DSM_CNTL,
  DED_COUNT);
if (ded_count) {
-   DRM_INFO("Instance[%d]: SubBlock %s, DED %d\n", i,
+   dev_info(adev->dev,
+"Instance[%d]: SubBlock %s, DED %d\n", i,
 atc_l2_cache_2m_mems[i], ded_count);
err_data->ue_count += ded_count;
}
@@ -793,7 +799,8 @@ static int gfx_v9_4_query_utc_edc_status(struct 
amdgpu_device *adev,
sec_count = REG_GET_FIELD(data, ATC_L2_CACHE_4K_DSM_CNTL,
  SEC_COUNT);
if (sec_count) {
-   DRM_INFO("Instance[%d]: SubBlock %s, SEC %d\n", i,
+   dev_info(adev->dev,
+"Instance[%d]: SubBlock %s, SEC %d\n", i,
 atc_l2_cache_4k_mems[i], sec_count);
err_data->ce_count += sec_count;
}
@@ -801,7 +808,8 @@ static int gfx_v9_4_query_utc_edc_status(stru

[PATCH] drm/amdgpu: replace DRM prefix with PCI device info for gfx/mmhub

2020-04-17 Thread Dennis Li 
Prefix RAS message printing in gfx/mmhub with PCI device info,
which assists the debug in multiple GPU case.

Change-Id: Iceba7cafd5aac7d0251d9f871503745cc617fba2
Signed-off-by: Dennis Li 

diff --git a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c 
b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c
old mode 100644
new mode 100755
index dce945ef21a5..46351db36922
--- a/drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c
+++ b/drivers/gpu/drm/amd/amdgpu/gfx_v9_4.c
@@ -732,7 +732,8 @@ static int gfx_v9_4_query_utc_edc_status(struct 
amdgpu_device *adev,
sec_count = REG_GET_FIELD(data, VML2_WALKER_MEM_ECC_CNTL,
  SEC_COUNT);
if (sec_count) {
-   DRM_INFO("Instance[%d]: SubBlock %s, SEC %d\n", i,
+   dev_info(adev->dev,
+"Instance[%d]: SubBlock %s, SEC %d\n", i,
 vml2_walker_mems[i], sec_count);
err_data->ce_count += sec_count;
}
@@ -740,7 +741,8 @@ static int gfx_v9_4_query_utc_edc_status(struct 
amdgpu_device *adev,
ded_count = REG_GET_FIELD(data, VML2_WALKER_MEM_ECC_CNTL,
  DED_COUNT);
if (ded_count) {
-   DRM_INFO("Instance[%d]: SubBlock %s, DED %d\n", i,
+   dev_info(adev->dev,
+"Instance[%d]: SubBlock %s, DED %d\n", i,
 vml2_walker_mems[i], ded_count);
err_data->ue_count += ded_count;
}
@@ -752,14 +754,16 @@ static int gfx_v9_4_query_utc_edc_status(struct 
amdgpu_device *adev,
 
sec_count = REG_GET_FIELD(data, UTCL2_MEM_ECC_CNTL, SEC_COUNT);
if (sec_count) {
-   DRM_INFO("Instance[%d]: SubBlock %s, SEC %d\n", i,
+   dev_info(adev->dev,
+"Instance[%d]: SubBlock %s, SEC %d\n", i,
 utcl2_router_mems[i], sec_count);
err_data->ce_count += sec_count;
}
 
ded_count = REG_GET_FIELD(data, UTCL2_MEM_ECC_CNTL, DED_COUNT);
if (ded_count) {
-   DRM_INFO("Instance[%d]: SubBlock %s, DED %d\n", i,
+   dev_info(adev->dev,
+"Instance[%d]: SubBlock %s, DED %d\n", i,
 utcl2_router_mems[i], ded_count);
err_data->ue_count += ded_count;
}
@@ -772,7 +776,8 @@ static int gfx_v9_4_query_utc_edc_status(struct 
amdgpu_device *adev,
sec_count = REG_GET_FIELD(data, ATC_L2_CACHE_2M_DSM_CNTL,
  SEC_COUNT);
if (sec_count) {
-   DRM_INFO("Instance[%d]: SubBlock %s, SEC %d\n", i,
+   dev_info(adev->dev,
+"Instance[%d]: SubBlock %s, SEC %d\n", i,
 atc_l2_cache_2m_mems[i], sec_count);
err_data->ce_count += sec_count;
}
@@ -780,7 +785,8 @@ static int gfx_v9_4_query_utc_edc_status(struct 
amdgpu_device *adev,
ded_count = REG_GET_FIELD(data, ATC_L2_CACHE_2M_DSM_CNTL,
  DED_COUNT);
if (ded_count) {
-   DRM_INFO("Instance[%d]: SubBlock %s, DED %d\n", i,
+   dev_info(adev->dev,
+"Instance[%d]: SubBlock %s, DED %d\n", i,
 atc_l2_cache_2m_mems[i], ded_count);
err_data->ue_count += ded_count;
}
@@ -793,7 +799,8 @@ static int gfx_v9_4_query_utc_edc_status(struct 
amdgpu_device *adev,
sec_count = REG_GET_FIELD(data, ATC_L2_CACHE_4K_DSM_CNTL,
  SEC_COUNT);
if (sec_count) {
-   DRM_INFO("Instance[%d]: SubBlock %s, SEC %d\n", i,
+   dev_info(adev->dev,
+"Instance[%d]: SubBlock %s, SEC %d\n", i,
 atc_l2_cache_4k_mems[i], sec_count);
err_data->ce_count += sec_count;
}
@@ -801,7 +808,8 @@ static int gfx_v9_4_query_utc_edc_status(struct 
amdgpu_device *adev,
ded_count = REG_GET_FIELD(data, ATC_L2_CACHE_4K_DSM_CNTL,
  DED_COUNT);
if (ded_count) {
-   DRM_INFO("Instance[%d]: SubBlock %s, DED %d\n", i,
+   dev_info(adev->dev,
+"Instance[%d]: SubBlock %s, DED %d\n", i,
 atc_l2_cache_4k_mems[i], ded_count);
err_data->ue_count += ded_count;
}
@@ -816,7 +824,8 @@ static int gfx_v9_