Skip to contentSkip to conversation

drm/amd/powerplay: Fix uninitialized warning in arcturus ppt driver

PATCH In review Tom St Denis 4 participants 7 messages Aug 12, 2020 – Aug 13, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 drm/amd/powerplay: Fix uninitialized warning in arcturus ppt driver

Fixes:

CC [M] drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_mst_types.o
drivers/gpu/drm/amd/amdgpu/../powerplay/arcturus_ppt.c: In function ‘arcturus_log_thermal_throttling_event’:
drivers/gpu/drm/amd/amdgpu/../powerplay/arcturus_ppt.c:2223:24: warning: ‘throttler_status’ may be used uninitialized in this function [-Wmaybe-uninitialized]
2223 | if (throttler_status & logging_label[throttler_idx].feature_mask) {

by making arcturus_get_smu_metrics_data() assign a default value (of zero) before any possible return point as well as simply error out of arcturus_log_thermal_throttling_event() if it fails.

---
 drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +10 -2
index 8b1025dc54fd..78f7ec95e4f5 100644
@@ -551,6 +551,9 @@ static int arcturus_get_smu_metrics_data(struct smu_context *smu,
 
 	mutex_lock(&smu->metrics_lock);
 
+	// assign default value
+	*value = 0;
+
 	ret = smu_cmn_get_metrics_table_locked(smu,
 					       NULL,
 					       false);
@@ -2208,15 +2211,20 @@ static const struct throttling_logging_label {
 };
 static void arcturus_log_thermal_throttling_event(struct smu_context *smu)
 {
-	int throttler_idx, throtting_events = 0, buf_idx = 0;
+	int throttler_idx, throtting_events = 0, buf_idx = 0, ret;
 	struct amdgpu_device *adev = smu->adev;
 	uint32_t throttler_status;
 	char log_buf[256];
 
-	arcturus_get_smu_metrics_data(smu,
+	ret = arcturus_get_smu_metrics_data(smu,
 				      METRICS_THROTTLER_STATUS,
 				      &throttler_status);
 
+	if (ret) {
+		dev_err(adev->dev, "Could not read from arcturus_get_smu_metrics_data()\n");
+		return;
+	}
+
 	memset(log_buf, 0, sizeof(log_buf));
 	for (throttler_idx = 0; throttler_idx < ARRAY_SIZE(logging_label);
 	     throttler_idx++) {
Signature · 6 lines
2.26.2

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
#1 lore raw
Quoted 31 lines · Tom St Denis

Fixes:

CC [M] drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_mst_types.o
drivers/gpu/drm/amd/amdgpu/../powerplay/arcturus_ppt.c: In function ‘arcturus_log_thermal_throttling_event’:
drivers/gpu/drm/amd/amdgpu/../powerplay/arcturus_ppt.c:2223:24: warning: ‘throttler_status’ may be used uninitialized in this function [-Wmaybe-uninitialized]
2223 | if (throttler_status & logging_label[throttler_idx].feature_mask) {

by making arcturus_get_smu_metrics_data() assign a default value (of zero) before any possible return point as well as simply error out of arcturus_log_thermal_throttling_event() if it fails.

---
  drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 12 ++++++++++--
  1 file changed, 10 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +3 -0
index 8b1025dc54fd..78f7ec95e4f5 100644
@@ -551,6 +551,9 @@ static int arcturus_get_smu_metrics_data(struct smu_context *smu,
 
  	mutex_lock(&smu->metrics_lock);
 
+	// assign default value
+	*value = 0;
+
  	ret = smu_cmn_get_metrics_table_locked(smu,
  					       NULL,
  					       false);

drivers/gpu/drm/amd/powerplay/arcturus_ppt.c static const struct throttling_logging_label { · line 2216

Quoted 7 lines
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +1 -1
@@ -2208,15 +2211,20 @@ static const struct throttling_logging_label {
  };
  static void arcturus_log_thermal_throttling_event(struct smu_context *smu)
  {
-	int throttler_idx, throtting_events = 0, buf_idx = 0;
+	int throttler_idx, throtting_events = 0, buf_idx = 0, ret;
  	struct amdgpu_device *adev = smu->adev;
  	uint32_t throttler_status;

I think initializing throttler_status here should resolve the warning.

Quoted 5 lines
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +1 -1
  	char log_buf[256];
 
-	arcturus_get_smu_metrics_data(smu,
+	ret = arcturus_get_smu_metrics_data(smu,
  				      METRICS_THROTTLER_STATUS,

drivers/gpu/drm/amd/powerplay/arcturus_ppt.c static const struct throttling_logging_label { · line 2230

Quoted 10 lines
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +5 -0
  				      &throttler_status);
 
+	if (ret) {
+		dev_err(adev->dev, "Could not read from arcturus_get_smu_metrics_data()\n");
+		return;
+	}
+
  	memset(log_buf, 0, sizeof(log_buf));
  	for (throttler_idx = 0; throttler_idx < ARRAY_SIZE(logging_label);
  	     throttler_idx++) {

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#2 lore raw

[AMD Official Use Only - Internal Distribution Only]

Possibly, but since the arcturus_get_smu_metrics_data() can error out we should check that return value no?

(also setting *value to 0 avoids this bug in the future...).

Tom

________________________________________
From: Das, Nirmoy <[email protected]>
Sent: Wednesday, August 12, 2020 08:40
To: StDenis, Tom; [email protected]
Subject: Re: [PATCH] drm/amd/powerplay: Fix uninitialized warning in arcturus ppt driver

Quoted 31 lines · Tom St Denis

Fixes:

CC [M] drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_mst_types.o
drivers/gpu/drm/amd/amdgpu/../powerplay/arcturus_ppt.c: In function ‘arcturus_log_thermal_throttling_event’:
drivers/gpu/drm/amd/amdgpu/../powerplay/arcturus_ppt.c:2223:24: warning: ‘throttler_status’ may be used uninitialized in this function [-Wmaybe-uninitialized]
2223 | if (throttler_status & logging_label[throttler_idx].feature_mask) {

by making arcturus_get_smu_metrics_data() assign a default value (of zero) before any possible return point as well as simply error out of arcturus_log_thermal_throttling_event() if it fails.

---
  drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 12 ++++++++++--
  1 file changed, 10 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +3 -0
index 8b1025dc54fd..78f7ec95e4f5 100644
@@ -551,6 +551,9 @@ static int arcturus_get_smu_metrics_data(struct smu_context *smu,
 
      mutex_lock(&smu->metrics_lock);
 
+     // assign default value
+     *value = 0;
+
      ret = smu_cmn_get_metrics_table_locked(smu,
                                             NULL,
                                             false);

drivers/gpu/drm/amd/powerplay/arcturus_ppt.c static const struct throttling_logging_label { · line 2216

Quoted 7 lines
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +1 -1
@@ -2208,15 +2211,20 @@ static const struct throttling_logging_label {
  };
  static void arcturus_log_thermal_throttling_event(struct smu_context *smu)
  {
-     int throttler_idx, throtting_events = 0, buf_idx = 0;
+     int throttler_idx, throtting_events = 0, buf_idx = 0, ret;
      struct amdgpu_device *adev = smu->adev;
      uint32_t throttler_status;

I think initializing throttler_status here should resolve the warning.

Quoted 5 lines
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +1 -1
      char log_buf[256];
 
-     arcturus_get_smu_metrics_data(smu,
+     ret = arcturus_get_smu_metrics_data(smu,
                                    METRICS_THROTTLER_STATUS,

drivers/gpu/drm/amd/powerplay/arcturus_ppt.c static const struct throttling_logging_label { · line 2230

Quoted 10 lines
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +5 -0
                                    &throttler_status);
 
+     if (ret) {
+             dev_err(adev->dev, "Could not read from arcturus_get_smu_metrics_data()\n");
+             return;
+     }
+
      memset(log_buf, 0, sizeof(log_buf));
      for (throttler_idx = 0; throttler_idx < ARRAY_SIZE(logging_label);
           throttler_idx++) {

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#3 lore raw
Quoted 3 lines · Tom

[AMD Official Use Only - Internal Distribution Only]

Possibly, but since the arcturus_get_smu_metrics_data() can error out we should check that return value no?

Yes, we need that return check.

Quoted 2 lines

(also setting *value to 0 avoids this bug in the future...).

I think caller should initialize the result value before passing it to arcturus_get_smu_metrics_data

as the warning is generated from the calling function. My comment is only concerning about setting "value"

to 0, which seems wrong. Rest of the patch is fine.

Nirmoy

Quoted 35 lines

Tom

________________________________________
From: Das, Nirmoy <[email protected]>
Sent: Wednesday, August 12, 2020 08:40
To: StDenis, Tom; [email protected]
Subject: Re: [PATCH] drm/amd/powerplay: Fix uninitialized warning in arcturus ppt driver

Quoted 24 lines · Tom St Denis

Fixes:

CC [M] drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_mst_types.o
drivers/gpu/drm/amd/amdgpu/../powerplay/arcturus_ppt.c: In function ‘arcturus_log_thermal_throttling_event’:
drivers/gpu/drm/amd/amdgpu/../powerplay/arcturus_ppt.c:2223:24: warning: ‘throttler_status’ may be used uninitialized in this function [-Wmaybe-uninitialized]
2223 | if (throttler_status & logging_label[throttler_idx].feature_mask) {

by making arcturus_get_smu_metrics_data() assign a default value (of zero) before any possible return point as well as simply error out of arcturus_log_thermal_throttling_event() if it fails.

---
   drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 12 ++++++++++--
   1 file changed, 10 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +0 -0
index 8b1025dc54fd..78f7ec95e4f5 100644
@@ -551,6 +551,9 @@ static int arcturus_get_smu_metrics_data(struct smu_context *smu,
 
       mutex_lock(&smu->metrics_lock);
 
Quoted 32 lines
Quoted 7 lines
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +3 -0
+     // assign default value
+     *value = 0;
+
       ret = smu_cmn_get_metrics_table_locked(smu,
                                              NULL,
                                              false);

drivers/gpu/drm/amd/powerplay/arcturus_ppt.c static const struct throttling_logging_label { · line 2216

Quoted 7 lines
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +1 -1
@@ -2208,15 +2211,20 @@ static const struct throttling_logging_label {
   };
   static void arcturus_log_thermal_throttling_event(struct smu_context *smu)
   {
-     int throttler_idx, throtting_events = 0, buf_idx = 0;
+     int throttler_idx, throtting_events = 0, buf_idx = 0, ret;
       struct amdgpu_device *adev = smu->adev;
       uint32_t throttler_status;

I think initializing throttler_status here should resolve the warning.

Quoted 15 lines
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +6 -1
       char log_buf[256];
 
-     arcturus_get_smu_metrics_data(smu,
+     ret = arcturus_get_smu_metrics_data(smu,
                                     METRICS_THROTTLER_STATUS,
                                     &throttler_status);
 
+     if (ret) {
+             dev_err(adev->dev, "Could not read from arcturus_get_smu_metrics_data()\n");
+             return;
+     }
+
       memset(log_buf, 0, sizeof(log_buf));
       for (throttler_idx = 0; throttler_idx < ARRAY_SIZE(logging_label);
            throttler_idx++) {

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#4 lore raw
In reply to Tom St Denis

[AMD Official Use Only - Internal Distribution Only]

Your change below should be able to suppress the compile warning. -arcturus_get_smu_metrics_data(smu,
+ret = arcturus_get_smu_metrics_data(smu,

       METRICS_THROTTLER_STATUS,
       &throttler_status);

+if (ret) {
+dev_err(adev->dev, "Could not read from arcturus_get_smu_metrics_data()\n");
+return;
+}
+
Setting *value as 0 may be unnecessary. However anyway this patch is reviewed-by: Evan Quan <[email protected]>

BR
Evan
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Tom St Denis
Sent: Wednesday, August 12, 2020 8:21 PM
To: [email protected]
Cc: StDenis, Tom <[email protected]>
Subject: [PATCH] drm/amd/powerplay: Fix uninitialized warning in arcturus ppt driver

Fixes:

CC [M] drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_mst_types.o
drivers/gpu/drm/amd/amdgpu/../powerplay/arcturus_ppt.c: In function ‘arcturus_log_thermal_throttling_event’:
drivers/gpu/drm/amd/amdgpu/../powerplay/arcturus_ppt.c:2223:24: warning: ‘throttler_status’ may be used uninitialized in this function [-Wmaybe-uninitialized]
2223 | if (throttler_status & logging_label[throttler_idx].feature_mask) {

by making arcturus_get_smu_metrics_data() assign a default value (of zero) before any possible return point as well as simply error out of arcturus_log_thermal_throttling_event() if it fails.

---
 drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +10 -3
index 8b1025dc54fd..78f7ec95e4f5 100644
@@ -551,6 +551,9 @@ static int arcturus_get_smu_metrics_data(struct smu_context *smu,
 
 mutex_lock(&smu->metrics_lock);
 
+// assign default value
+*value = 0;
+
 ret = smu_cmn_get_metrics_table_locked(smu,
        NULL,
        false);
@@ -2208,15 +2211,20 @@ static const struct throttling_logging_label {  };  static void arcturus_log_thermal_throttling_event(struct smu_context *smu)  {
-int throttler_idx, throtting_events = 0, buf_idx = 0;
+int throttler_idx, throtting_events = 0, buf_idx = 0, ret;
 struct amdgpu_device *adev = smu->adev;
 uint32_t throttler_status;
 char log_buf[256];
 
-arcturus_get_smu_metrics_data(smu,
+ret = arcturus_get_smu_metrics_data(smu,
       METRICS_THROTTLER_STATUS,
       &throttler_status);
 
+if (ret) {
+dev_err(adev->dev, "Could not read from arcturus_get_smu_metrics_data()\n");
+return;
+}
+
 memset(log_buf, 0, sizeof(log_buf));
 for (throttler_idx = 0; throttler_idx < ARRAY_SIZE(logging_label);
      throttler_idx++) {
--

2.26.2

_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=02%7C01%7Cevan.quan%40amd.com%7C33cba706ddbb41b6f01508d83eba26bd%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637328316549041092&amp;sdata=7BcUmmThbZU8quP0g4t3ajSYe3scCOahigO%2Bye2GHaw%3D&amp;reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#5 lore raw

[AMD Official Use Only - Internal Distribution Only]

Hi Tom,

drm/amdgpu: fix uninit-value in arcturus_log_thermal_throttling_event()

the fixed patch has been merged into drm-next branch.

Best Regards,
Kevin

________________________________
From: amd-gfx <[email protected]> on behalf of Quan, Evan <[email protected]>
Sent: Thursday, August 13, 2020 10:07 AM
To: StDenis, Tom <[email protected]>; [email protected] <[email protected]>
Cc: StDenis, Tom <[email protected]>
Subject: RE: [PATCH] drm/amd/powerplay: Fix uninitialized warning in arcturus ppt driver

[AMD Official Use Only - Internal Distribution Only]

[AMD Official Use Only - Internal Distribution Only]

Your change below should be able to suppress the compile warning. -arcturus_get_smu_metrics_data(smu,
+ret = arcturus_get_smu_metrics_data(smu,

       METRICS_THROTTLER_STATUS,
       &throttler_status);

+if (ret) {
+dev_err(adev->dev, "Could not read from arcturus_get_smu_metrics_data()\n");
+return;
+}
+
Setting *value as 0 may be unnecessary. However anyway this patch is reviewed-by: Evan Quan <[email protected]>

BR
Evan
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Tom St Denis
Sent: Wednesday, August 12, 2020 8:21 PM
To: [email protected]
Cc: StDenis, Tom <[email protected]>
Subject: [PATCH] drm/amd/powerplay: Fix uninitialized warning in arcturus ppt driver

Fixes:

CC [M] drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_mst_types.o
drivers/gpu/drm/amd/amdgpu/../powerplay/arcturus_ppt.c: In function ‘arcturus_log_thermal_throttling_event’:
drivers/gpu/drm/amd/amdgpu/../powerplay/arcturus_ppt.c:2223:24: warning: ‘throttler_status’ may be used uninitialized in this function [-Wmaybe-uninitialized]
2223 | if (throttler_status & logging_label[throttler_idx].feature_mask) {

by making arcturus_get_smu_metrics_data() assign a default value (of zero) before any possible return point as well as simply error out of arcturus_log_thermal_throttling_event() if it fails.

---
 drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +10 -3
index 8b1025dc54fd..78f7ec95e4f5 100644
@@ -551,6 +551,9 @@ static int arcturus_get_smu_metrics_data(struct smu_context *smu,
 
 mutex_lock(&smu->metrics_lock);
 
+// assign default value
+*value = 0;
+
 ret = smu_cmn_get_metrics_table_locked(smu,
        NULL,
        false);
@@ -2208,15 +2211,20 @@ static const struct throttling_logging_label {  };  static void arcturus_log_thermal_throttling_event(struct smu_context *smu)  {
-int throttler_idx, throtting_events = 0, buf_idx = 0;
+int throttler_idx, throtting_events = 0, buf_idx = 0, ret;
 struct amdgpu_device *adev = smu->adev;
 uint32_t throttler_status;
 char log_buf[256];
 
-arcturus_get_smu_metrics_data(smu,
+ret = arcturus_get_smu_metrics_data(smu,
       METRICS_THROTTLER_STATUS,
       &throttler_status);
 
+if (ret) {
+dev_err(adev->dev, "Could not read from arcturus_get_smu_metrics_data()\n");
+return;
+}
+
 memset(log_buf, 0, sizeof(log_buf));
 for (throttler_idx = 0; throttler_idx < ARRAY_SIZE(logging_label);
      throttler_idx++) {
--

2.26.2

_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=02%7C01%7CKevin1.Wang%40amd.com%7Cf47512097dfc40168e1a08d83f2db359%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637328812813110771&amp;sdata=xedbRrZeOi0PK3EM%2FKBYhfXxdfpOkocXPjQjcQ5ErI0%3D&amp;reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=02%7C01%7CKevin1.Wang%40amd.com%7Cf47512097dfc40168e1a08d83f2db359%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637328812813110771&amp;sdata=xedbRrZeOi0PK3EM%2FKBYhfXxdfpOkocXPjQjcQ5ErI0%3D&amp;reserved=0

_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx

#6 lore raw

[AMD Official Use Only - Internal Distribution Only]

Hi Kevin,

Ah ok disregard the (v2) I just sent then :-)

Thanks,
Tom

________________________________________
From: Wang, Kevin(Yang) <[email protected]>
Sent: Wednesday, August 12, 2020 22:47
To: Quan, Evan; StDenis, Tom; [email protected]
Subject: Re: [PATCH] drm/amd/powerplay: Fix uninitialized warning in arcturus ppt driver

[AMD Official Use Only - Internal Distribution Only]

Hi Tom,

drm/amdgpu: fix uninit-value in arcturus_log_thermal_throttling_event()

the fixed patch has been merged into drm-next branch.

Best Regards,
Kevin

________________________________
From: amd-gfx <[email protected]> on behalf of Quan, Evan <[email protected]>
Sent: Thursday, August 13, 2020 10:07 AM
To: StDenis, Tom <[email protected]>; [email protected] <[email protected]>
Cc: StDenis, Tom <[email protected]>
Subject: RE: [PATCH] drm/amd/powerplay: Fix uninitialized warning in arcturus ppt driver

[AMD Official Use Only - Internal Distribution Only]

[AMD Official Use Only - Internal Distribution Only]

Your change below should be able to suppress the compile warning. -arcturus_get_smu_metrics_data(smu,
+ret = arcturus_get_smu_metrics_data(smu,

       METRICS_THROTTLER_STATUS,
       &throttler_status);

+if (ret) {
+dev_err(adev->dev, "Could not read from arcturus_get_smu_metrics_data()\n");
+return;
+}
+
Setting *value as 0 may be unnecessary. However anyway this patch is reviewed-by: Evan Quan <[email protected]>

BR
Evan
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Tom St Denis
Sent: Wednesday, August 12, 2020 8:21 PM
To: [email protected]
Cc: StDenis, Tom <[email protected]>
Subject: [PATCH] drm/amd/powerplay: Fix uninitialized warning in arcturus ppt driver

Fixes:

CC [M] drivers/gpu/drm/amd/amdgpu/../display/amdgpu_dm/amdgpu_dm_mst_types.o
drivers/gpu/drm/amd/amdgpu/../powerplay/arcturus_ppt.c: In function ‘arcturus_log_thermal_throttling_event’:
drivers/gpu/drm/amd/amdgpu/../powerplay/arcturus_ppt.c:2223:24: warning: ‘throttler_status’ may be used uninitialized in this function [-Wmaybe-uninitialized]
2223 | if (throttler_status & logging_label[throttler_idx].feature_mask) {

by making arcturus_get_smu_metrics_data() assign a default value (of zero) before any possible return point as well as simply error out of arcturus_log_thermal_throttling_event() if it fails.

---
 drivers/gpu/drm/amd/powerplay/arcturus_ppt.c | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/arcturus_ppt.c +10 -3
index 8b1025dc54fd..78f7ec95e4f5 100644
@@ -551,6 +551,9 @@ static int arcturus_get_smu_metrics_data(struct smu_context *smu,
 
 mutex_lock(&smu->metrics_lock);
 
+// assign default value
+*value = 0;
+
 ret = smu_cmn_get_metrics_table_locked(smu,
        NULL,
        false);
@@ -2208,15 +2211,20 @@ static const struct throttling_logging_label {  };  static void arcturus_log_thermal_throttling_event(struct smu_context *smu)  {
-int throttler_idx, throtting_events = 0, buf_idx = 0;
+int throttler_idx, throtting_events = 0, buf_idx = 0, ret;
 struct amdgpu_device *adev = smu->adev;
 uint32_t throttler_status;
 char log_buf[256];
 
-arcturus_get_smu_metrics_data(smu,
+ret = arcturus_get_smu_metrics_data(smu,
       METRICS_THROTTLER_STATUS,
       &throttler_status);
 
+if (ret) {
+dev_err(adev->dev, "Could not read from arcturus_get_smu_metrics_data()\n");
+return;
+}
+
 memset(log_buf, 0, sizeof(log_buf));
 for (throttler_idx = 0; throttler_idx < ARRAY_SIZE(logging_label);
      throttler_idx++) {
--

2.26.2

_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=02%7C01%7CKevin1.Wang%40amd.com%7Cf47512097dfc40168e1a08d83f2db359%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637328812813110771&amp;sdata=xedbRrZeOi0PK3EM%2FKBYhfXxdfpOkocXPjQjcQ5ErI0%3D&amp;reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&amp;data=02%7C01%7CKevin1.Wang%40amd.com%7Cf47512097dfc40168e1a08d83f2db359%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637328812813110771&amp;sdata=xedbRrZeOi0PK3EM%2FKBYhfXxdfpOkocXPjQjcQ5ErI0%3D&amp;reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx