Skip to contentSkip to conversation

drm/amd/pm: avoid driver getting empty metrics table for the first time

PATCH In review Yang Wang 2 participants 3 messages Aug 4, 2023

Subsystems (3)
lore
Share & tools
lore

Yang Wang

author
#0 lore raw

PATCH 1/1 drm/amd/pm: avoid driver getting empty metrics table for the first time

From: Yang Wang <[email protected]>

add metrics.AccumulationCouter check to avoid driver getting an empty metrics data since metrics table not updated completely in pmfw side.

---
 .../drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c  | 20 ++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c +15 -5
index 6253ad13833c..5adc6b92bc49 100644
@@ -325,14 +325,24 @@ static int smu_v13_0_6_setup_driver_pptable(struct smu_context *smu)
 	MetricsTable_t *metrics = (MetricsTable_t *)smu_table->metrics_table;
 	struct PPTable_t *pptable =
 		(struct PPTable_t *)smu_table->driver_pptable;
-	int ret;
-	int i;
+	int ret, i, retry = 100;
 
 	/* Store one-time values in driver PPTable */
 	if (!pptable->Init) {
-		ret = smu_v13_0_6_get_metrics_table(smu, NULL, false);
-		if (ret)
-			return ret;
+		while (retry--) {
+			ret = smu_v13_0_6_get_metrics_table(smu, NULL, true);
+			if (ret)
+				return ret;
+
+			/* Ensure that metrics have been updated */
+			if (metrics->AccumulationCounter)
+				break;
+
+			msleep(1);
+		}
+
+		if (!retry)
+			return -ETIME;
 
 		pptable->MaxSocketPowerLimit =
 			SMUQ10_TO_UINT(metrics->MaxSocketPowerLimit);
Signature · 1 line
2.34.1
Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Yang Wang

From: Yang Wang <[email protected]>

add metrics.AccumulationCouter check to avoid driver getting an empty metrics data since metrics table not updated completely in pmfw side.

Thanks,
Lijo

Quoted 38 lines
---
  .../drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c  | 20 ++++++++++++++-----
  1 file changed, 15 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c +15 -5
index 6253ad13833c..5adc6b92bc49 100644
@@ -325,14 +325,24 @@ static int smu_v13_0_6_setup_driver_pptable(struct smu_context *smu)
  	MetricsTable_t *metrics = (MetricsTable_t *)smu_table->metrics_table;
  	struct PPTable_t *pptable =
  		(struct PPTable_t *)smu_table->driver_pptable;
-	int ret;
-	int i;
+	int ret, i, retry = 100;
 
  	/* Store one-time values in driver PPTable */
  	if (!pptable->Init) {
-		ret = smu_v13_0_6_get_metrics_table(smu, NULL, false);
-		if (ret)
-			return ret;
+		while (retry--) {
+			ret = smu_v13_0_6_get_metrics_table(smu, NULL, true);
+			if (ret)
+				return ret;
+
+			/* Ensure that metrics have been updated */
+			if (metrics->AccumulationCounter)
+				break;
+
+			msleep(1);
+		}
+
+		if (!retry)
+			return -ETIME;
 
  		pptable->MaxSocketPowerLimit =
  			SMUQ10_TO_UINT(metrics->MaxSocketPowerLimit);
Reviewed-by
#2 lore raw

[AMD Official Use Only - General]

Missed one thing - please replace msleep(1) with usleep_range.

Thanks,
Lijo
________________________________
From: amd-gfx <[email protected]> on behalf of Lazar, Lijo <[email protected]>
Sent: Friday, August 4, 2023 8:07:11 PM
To: Wang, Yang(Kevin) <[email protected]>; [email protected] <[email protected]>
Cc: Kamal, Asad <[email protected]>
Subject: Re: [PATCH] drm/amd/pm: avoid driver getting empty metrics table for the first time

Quoted 8 lines · Yang Wang

From: Yang Wang <[email protected]>

add metrics.AccumulationCouter check to avoid driver getting an empty metrics data since metrics table not updated completely in pmfw side.

Thanks,
Lijo

Quoted 38 lines
---
  .../drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c  | 20 ++++++++++++++-----
  1 file changed, 15 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c +15 -5
index 6253ad13833c..5adc6b92bc49 100644
@@ -325,14 +325,24 @@ static int smu_v13_0_6_setup_driver_pptable(struct smu_context *smu)
       MetricsTable_t *metrics = (MetricsTable_t *)smu_table->metrics_table;
       struct PPTable_t *pptable =
               (struct PPTable_t *)smu_table->driver_pptable;
-     int ret;
-     int i;
+     int ret, i, retry = 100;
 
       /* Store one-time values in driver PPTable */
       if (!pptable->Init) {
-             ret = smu_v13_0_6_get_metrics_table(smu, NULL, false);
-             if (ret)
-                     return ret;
+             while (retry--) {
+                     ret = smu_v13_0_6_get_metrics_table(smu, NULL, true);
+                     if (ret)
+                             return ret;
+
+                     /* Ensure that metrics have been updated */
+                     if (metrics->AccumulationCounter)
+                             break;
+
+                     msleep(1);
+             }
+
+             if (!retry)
+                     return -ETIME;
 
               pptable->MaxSocketPowerLimit =
                       SMUQ10_TO_UINT(metrics->MaxSocketPowerLimit);