Skip to content

Commit 775acc6

Browse files
Lijo Lazarkentrussell
Lijo Lazar
authored and
kentrussell
committed
drm/amd/pm: Add caching to SMUv13.0.12 temp metric
Add table caching logic to temperature metrics tables in SMUv13.0.12 Signed-off-by: Lijo Lazar <lijo.lazar@amd.com> Reviewed-by: Asad Kamal <asad.kamal@amd.com>
1 parent 31dd90c commit 775acc6

File tree

3 files changed

+79
-24
lines changed

3 files changed

+79
-24
lines changed

‎drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c‎

Lines changed: 64 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,42 @@ const struct cmn2asic_msg_mapping smu_v13_0_12_message_map[SMU_MSG_MAX_COUNT] =
140140
MSG_MAP(GetSystemMetricsTable, PPSMC_MSG_GetSystemMetricsTable, 0),
141141
};
142142

143+
int smu_v13_0_12_tables_init(struct smu_context *smu)
144+
{
145+
struct amdgpu_baseboard_temp_metrics_v1_0 *baseboard_temp_metrics;
146+
struct amdgpu_gpuboard_temp_metrics_v1_0 *gpuboard_temp_metrics;
147+
struct smu_table_context *smu_table = &smu->smu_table;
148+
struct smu_table *tables = smu_table->tables;
149+
struct smu_table_cache *cache;
150+
int ret;
151+
152+
ret = smu_table_cache_init(smu, SMU_TABLE_BASEBOARD_TEMP_METRICS,
153+
sizeof(*baseboard_temp_metrics), 50);
154+
if (ret)
155+
return ret;
156+
/* Initialize base board temperature metrics */
157+
cache = &(tables[SMU_TABLE_BASEBOARD_TEMP_METRICS].cache);
158+
baseboard_temp_metrics =
159+
(struct amdgpu_baseboard_temp_metrics_v1_0 *) cache->buffer;
160+
smu_cmn_init_baseboard_temp_metrics(baseboard_temp_metrics, 1, 0);
161+
/* Initialize GPU board temperature metrics */
162+
ret = smu_table_cache_init(smu, SMU_TABLE_GPUBOARD_TEMP_METRICS,
163+
sizeof(*gpuboard_temp_metrics), 50);
164+
if (ret)
165+
return ret;
166+
cache = &(tables[SMU_TABLE_GPUBOARD_TEMP_METRICS].cache);
167+
gpuboard_temp_metrics = (struct amdgpu_gpuboard_temp_metrics_v1_0 *)cache->buffer;
168+
smu_cmn_init_gpuboard_temp_metrics(gpuboard_temp_metrics, 1, 0);
169+
170+
return 0;
171+
}
172+
173+
void smu_v13_0_12_tables_fini(struct smu_context *smu)
174+
{
175+
smu_table_cache_fini(smu, SMU_TABLE_BASEBOARD_TEMP_METRICS);
176+
smu_table_cache_fini(smu, SMU_TABLE_GPUBOARD_TEMP_METRICS);
177+
}
178+
143179
static int smu_v13_0_12_get_enabled_mask(struct smu_context *smu,
144180
uint64_t *feature_mask)
145181
{
@@ -489,34 +525,40 @@ static bool smu_v13_0_12_is_temp_metrics_supported(struct smu_context *smu,
489525
static ssize_t smu_v13_0_12_get_temp_metrics(struct smu_context *smu,
490526
enum smu_temp_metric_type type, void *table)
491527
{
492-
struct amdgpu_gpuboard_temp_metrics_v1_0 *gpuboard_temp_metrics;
493528
struct amdgpu_baseboard_temp_metrics_v1_0 *baseboard_temp_metrics;
494-
SystemMetricsTable_t *metrics;
529+
struct amdgpu_gpuboard_temp_metrics_v1_0 *gpuboard_temp_metrics;
530+
struct smu_table_context *smu_table = &smu->smu_table;
531+
SystemMetricsTable_t *metrics =
532+
(SystemMetricsTable_t *)smu_table->metrics_table;
533+
534+
struct smu_table *data_table;
495535
int ret, sensor_type;
496536
u32 idx, sensors;
497537
ssize_t size;
498538

499-
size = (type == SMU_TEMP_METRIC_GPUBOARD) ?
500-
sizeof(*gpuboard_temp_metrics) : sizeof(*baseboard_temp_metrics);
501-
502-
if (!table)
503-
goto out;
504-
metrics = kzalloc(sizeof(SystemMetricsTable_t), GFP_KERNEL);
505-
if (!metrics)
506-
return -ENOMEM;
507-
gpuboard_temp_metrics = (struct amdgpu_gpuboard_temp_metrics_v1_0 *)table;
508-
baseboard_temp_metrics = (struct amdgpu_baseboard_temp_metrics_v1_0 *)table;
509-
if (type == SMU_TEMP_METRIC_GPUBOARD)
510-
smu_cmn_init_gpuboard_temp_metrics(gpuboard_temp_metrics, 1, 0);
511-
else if (type == SMU_TEMP_METRIC_BASEBOARD)
512-
smu_cmn_init_baseboard_temp_metrics(baseboard_temp_metrics, 1, 0);
513-
514-
ret = smu_v13_0_12_get_system_metrics_table(smu, metrics);
515-
if (ret) {
516-
kfree(metrics);
517-
return ret;
539+
if (type == SMU_TEMP_METRIC_BASEBOARD) {
540+
/* Initialize base board temperature metrics */
541+
data_table =
542+
&smu->smu_table.tables[SMU_TABLE_BASEBOARD_TEMP_METRICS];
543+
baseboard_temp_metrics =
544+
(struct amdgpu_baseboard_temp_metrics_v1_0 *)
545+
data_table->cache.buffer;
546+
size = sizeof(*baseboard_temp_metrics);
547+
} else {
548+
data_table =
549+
&smu->smu_table.tables[SMU_TABLE_GPUBOARD_TEMP_METRICS];
550+
gpuboard_temp_metrics =
551+
(struct amdgpu_gpuboard_temp_metrics_v1_0 *)
552+
data_table->cache.buffer;
553+
size = sizeof(*baseboard_temp_metrics);
518554
}
519555

556+
ret = smu_v13_0_12_get_system_metrics_table(smu, NULL);
557+
if (ret)
558+
return ret;
559+
560+
smu_table_cache_update_time(data_table, jiffies);
561+
520562
if (type == SMU_TEMP_METRIC_GPUBOARD) {
521563
gpuboard_temp_metrics->accumulation_counter = metrics->AccumulationCounter;
522564
gpuboard_temp_metrics->label_version = metrics->LabelVersion;
@@ -561,9 +603,8 @@ static ssize_t smu_v13_0_12_get_temp_metrics(struct smu_context *smu,
561603
}
562604
}
563605

564-
kfree(metrics);
606+
memcpy(table, data_table->cache.buffer, size);
565607

566-
out:
567608
return size;
568609
}
569610

‎drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,6 +361,8 @@ static void smu_v13_0_12_init_caps(struct smu_context *smu)
361361
if (fw_ver >= 0x04560700) {
362362
if (!amdgpu_sriov_vf(smu->adev))
363363
smu_v13_0_6_cap_set(smu, SMU_CAP(TEMP_METRICS));
364+
} else {
365+
smu_v13_0_12_tables_fini(smu);
364366
}
365367
}
366368

@@ -561,6 +563,9 @@ static int smu_v13_0_6_tables_init(struct smu_context *smu)
561563
return -ENOMEM;
562564
}
563565

566+
if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 12))
567+
return smu_v13_0_12_tables_init(smu);
568+
564569
return 0;
565570
}
566571

@@ -831,6 +836,13 @@ static int smu_v13_0_6_init_smc_tables(struct smu_context *smu)
831836
return ret;
832837
}
833838

839+
static int smu_v13_0_6_fini_smc_tables(struct smu_context *smu)
840+
{
841+
if (amdgpu_ip_version(smu->adev, MP1_HWIP, 0) == IP_VERSION(13, 0, 12))
842+
smu_v13_0_12_tables_fini(smu);
843+
return smu_v13_0_fini_smc_tables(smu);
844+
}
845+
834846
static int smu_v13_0_6_get_allowed_feature_mask(struct smu_context *smu,
835847
uint32_t *feature_mask,
836848
uint32_t num)
@@ -3977,7 +3989,7 @@ static const struct pptable_funcs smu_v13_0_6_ppt_funcs = {
39773989
.init_microcode = smu_v13_0_6_init_microcode,
39783990
.fini_microcode = smu_v13_0_fini_microcode,
39793991
.init_smc_tables = smu_v13_0_6_init_smc_tables,
3980-
.fini_smc_tables = smu_v13_0_fini_smc_tables,
3992+
.fini_smc_tables = smu_v13_0_6_fini_smc_tables,
39813993
.init_power = smu_v13_0_init_power,
39823994
.fini_power = smu_v13_0_fini_power,
39833995
.check_fw_status = smu_v13_0_6_check_fw_status,

‎drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ ssize_t smu_v13_0_12_get_gpu_metrics(struct smu_context *smu, void **table, void
8686
ssize_t smu_v13_0_12_get_xcp_metrics(struct smu_context *smu,
8787
struct amdgpu_xcp *xcp, void *table,
8888
void *smu_metrics);
89+
int smu_v13_0_12_tables_init(struct smu_context *smu);
90+
void smu_v13_0_12_tables_fini(struct smu_context *smu);
8991
extern const struct cmn2asic_mapping smu_v13_0_12_feature_mask_map[];
9092
extern const struct cmn2asic_msg_mapping smu_v13_0_12_message_map[];
9193
extern const struct smu_temp_funcs smu_v13_0_12_temp_funcs;

0 commit comments

Comments
 (0)