Skip to contentSkip to conversation

drm/amd/pm: Fix negative array index read warning for pptable->DpmDescriptor

PATCH Superseded Jesse Zhang 2 participants 2 messages Apr 26, 2024 – Apr 28, 2024

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/3 drm/amd/pm: Fix negative array index read warning for pptable->DpmDescriptor

Avoid using the negative values
for clk_idex as an index into an array pptable->DpmDescriptor.

---
 .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c   | 25 +++++++++++++++----
 1 file changed, 20 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +20 -5
index 5a68d365967f..cd88d2c3841a 100644
@@ -1219,15 +1219,18 @@ static int navi10_get_current_clk_freq_by_table(struct smu_context *smu,
 					   value);
 }
 
-static bool navi10_is_support_fine_grained_dpm(struct smu_context *smu, enum smu_clk_type clk_type)
+static int navi10_is_support_fine_grained_dpm(struct smu_context *smu, enum smu_clk_type clk_type)
 {
 	PPTable_t *pptable = smu->smu_table.driver_pptable;
 	DpmDescriptor_t *dpm_desc = NULL;
-	uint32_t clk_index = 0;
+	int clk_index = 0;
 
 	clk_index = smu_cmn_to_asic_specific_index(smu,
 						   CMN2ASIC_MAPPING_CLK,
 						   clk_type);
+	if(clk_index)
+		return clk_index;
+
 	dpm_desc = &pptable->DpmDescriptor[clk_index];
 
 	/* 0 - Fine grained DPM, 1 - Discrete DPM */
@@ -1287,7 +1290,11 @@ static int navi10_emit_clk_levels(struct smu_context *smu,
 		if (ret)
 			return ret;
 
-		if (!navi10_is_support_fine_grained_dpm(smu, clk_type)) {
+		ret = navi10_is_support_fine_grained_dpm(smu, clk_type);
+		if (ret < 0)
+			return ret;
+
+		if (!ret) {
 			for (i = 0; i < count; i++) {
 				ret = smu_v11_0_get_dpm_freq_by_index(smu,
 								      clk_type, i, &value);
@@ -1496,7 +1503,11 @@ static int navi10_print_clk_levels(struct smu_context *smu,
 		if (ret)
 			return size;
 
-		if (!navi10_is_support_fine_grained_dpm(smu, clk_type)) {
+		ret = navi10_is_support_fine_grained_dpm(smu, clk_type);
+		if (ret < 0)
+			return ret;
+
+		if (!ret) {
 			for (i = 0; i < count; i++) {
 				ret = smu_v11_0_get_dpm_freq_by_index(smu, clk_type, i, &value);
 				if (ret)
@@ -1665,7 +1676,11 @@ static int navi10_force_clk_levels(struct smu_context *smu,
 	case SMU_UCLK:
 	case SMU_FCLK:
 		/* There is only 2 levels for fine grained DPM */
-		if (navi10_is_support_fine_grained_dpm(smu, clk_type)) {
+		ret = navi10_is_support_fine_grained_dpm(smu, clk_type);
+		if (ret < 0)
+			return ret;
+
+		if (ret) {
 			soft_max_level = (soft_max_level >= 1 ? 1 : 0);
 			soft_min_level = (soft_min_level >= 1 ? 1 : 0);
 		}
Signature · 1 line
2.25.1
#1 lore raw

[AMD Official Use Only - General]

Quoted 34 lines

-----Original Message-----
From: Jesse Zhang <[email protected]>
Sent: Friday, April 26, 2024 3:28 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Huang, Tim <[email protected]>; Zhang, Jesse(Jie) <[email protected]>; Zhang, Jesse(Jie) <[email protected]>
Subject: [PATCH 1/3] drm/amd/pm: Fix negative array index read warning for pptable->DpmDescriptor

Avoid using the negative values
for clk_idex as an index into an array pptable->DpmDescriptor.

---
 .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c   | 25 +++++++++++++++---
(quoted diff) +0 -1
-
 1 file changed, 20 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2 -1
index 5a68d365967f..cd88d2c3841a 100644
@@ -1219,15 +1219,18 @@ static int
 navi10_get_current_clk_freq_by_table(struct smu_context *smu,
                                         value);
 }
 
-static bool navi10_is_support_fine_grained_dpm(struct smu_context *smu,
 enum smu_clk_type clk_type)
+static int navi10_is_support_fine_grained_dpm(struct smu_context *smu,
+enum smu_clk_type clk_type)

drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c static int · line 1234

Quoted 10 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2 -1
 {
      PPTable_t *pptable = smu->smu_table.driver_pptable;
      DpmDescriptor_t *dpm_desc = NULL;
-     uint32_t clk_index = 0;
+     int clk_index = 0;
 
      clk_index = smu_cmn_to_asic_specific_index(smu,
                                                 CMN2ASIC_MAPPING_CLK,
                                                 clk_type);
+     if(clk_index)

Hi jesse,

If should only be "if(clk_index < 0)" to return an error.

Tim

Quoted 52 lines
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +2 -0
+             return clk_index;
 
+
      dpm_desc = &pptable->DpmDescriptor[clk_index];
 
      /* 0 - Fine grained DPM, 1 - Discrete DPM */ @@ -1287,7 +1290,11

@@ static int navi10_emit_clk_levels(struct smu_context *smu,

              if (ret)
                      return ret;
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +5 -1
-             if (!navi10_is_support_fine_grained_dpm(smu, clk_type)) {
+             ret = navi10_is_support_fine_grained_dpm(smu, clk_type);
+             if (ret < 0)
+                     return ret;
+
+             if (!ret) {
                      for (i = 0; i < count; i++) {
                              ret =

smu_v11_0_get_dpm_freq_by_index(smu,
clk_type, i,
&value);

drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +5 -1
@@ -1496,7 +1503,11 @@ static int navi10_print_clk_levels(struct
 smu_context *smu,
              if (ret)
                      return size;
 
-             if (!navi10_is_support_fine_grained_dpm(smu, clk_type)) {
+             ret = navi10_is_support_fine_grained_dpm(smu, clk_type);
+             if (ret < 0)
+                     return ret;
+
+             if (!ret) {
                      for (i = 0; i < count; i++) {
                              ret =

smu_v11_0_get_dpm_freq_by_index(smu, clk_type, i, &value);
if (ret)

drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +5 -1
@@ -1665,7 +1676,11 @@ static int navi10_force_clk_levels(struct
 smu_context *smu,
      case SMU_UCLK:
      case SMU_FCLK:
              /* There is only 2 levels for fine grained DPM */
-             if (navi10_is_support_fine_grained_dpm(smu, clk_type)) {
+             ret = navi10_is_support_fine_grained_dpm(smu, clk_type);
+             if (ret < 0)
+                     return ret;
+
+             if (ret) {
                      soft_max_level = (soft_max_level >= 1 ? 1 : 0);
                      soft_min_level = (soft_min_level >= 1 ? 1 : 0);
              }

--
2.25.1