drm/amd/pm: Add u64 throttler status field to gpu_metrics
Subsystems (3)
PATCH v2 1/8 drm/amd/pm: Add u64 throttler status field to gpu_metrics
This patch piggybacks off the gpu_metrics_v1_3 bump and adds a new ASIC independant u64 throttler status field (indep_throttle_status). Similarly bumps gpu_metrics_v2 version (to v2_2) to add field. The alternative to adding this new field would be to overwrite the original u32 throttle_status (would still require a version bump for gpu_metrics_v2). The benefit to adding a new field is that we can allocate 16 bits to each "type" of throttler information and have more leeway for adding additional throttler bits in the future.
--- .../gpu/drm/amd/include/kgd_pp_interface.h | 58 ++++++++++++++++++- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 3 + 2 files changed, 60 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/include/kgd_pp_interface.h +57 -1
@@ -577,7 +577,7 @@ struct gpu_metrics_v1_3 {uint16_t current_vclk1;uint16_t current_dclk1; -/* Throttle status */ +/* Throttle status (ASIC dependant) */ uint32_t throttle_status;/* Fans */
@@ -602,6 +602,9 @@ struct gpu_metrics_v1_3 {uint16_t voltage_gfx;uint16_t voltage_mem; +/* Throttle status (ASIC independant) */ +uint64_t indep_throttle_status; +uint16_t padding1; };
@@ -709,4 +712,57 @@ struct gpu_metrics_v2_1 { uint16_t padding[3]; }; +struct gpu_metrics_v2_2 { +struct metrics_table_header common_header; + +/* Temperature */ +uint16_t temperature_gfx;// gfx temperature on APUs +uint16_t temperature_soc;// soc temperature on APUs +uint16_t temperature_core[8 ];// CPU core temperature on APUs +uint16_t temperature_l3[2 ]; + +/* Utilization */ +uint16_t average_gfx_activity; +uint16_t average_mm_activity;// UVD or VCN + +/* Driver attached timestamp (in ns) */ +uint64_t system_clock_counter; + +/* Power/Energy */ +uint16_t average_socket_power;// dGPU + APU power on A + A platform +uint16_t average_cpu_power; +uint16_t average_soc_power; +uint16_t average_gfx_power; +uint16_t average_core_power[8 ];// CPU core power on APUs + +/* Average clocks */ +uint16_t average_gfxclk_frequency; +uint16_t average_socclk_frequency; +uint16_t average_uclk_frequency; +uint16_t average_fclk_frequency; +uint16_t average_vclk_frequency; +uint16_t average_dclk_frequency; + +/* Current clocks */ +uint16_t current_gfxclk; +uint16_t current_socclk; +uint16_t current_uclk; +uint16_t current_fclk; +uint16_t current_vclk; +uint16_t current_dclk; +uint16_t current_coreclk[8 ];// CPU core clocks +uint16_t current_l3clk[2 ]; + +/* Throttle status (ASIC dependant) */ +uint32_t throttle_status; + +/* Fans */ +uint16_t fan_pwm; + +/* Throttle status (ASIC independant) */ +uint64_t indep_throttle_status; + +uint16_t padding[3 ]; +}; +#endif
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +3 -0
@@ -773,6 +773,9 @@ void smu_cmn_init_soft_gpu_metrics(void *table, uint8_t frev, uint8_t crev)case METRICS_VERSION (2 ,1 ): structure_size =sizeof (struct gpu_metrics_v2_1 );break ; +case METRICS_VERSION (2 ,2 ): + structure_size =sizeof (struct gpu_metrics_v2_2 ); +break ;default :return ; }
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 2/8 drm/amd/pm: Add ASIC independent throttle bits
Add new defines for thermal throttle status bits which are ASIC independent. This bit field will be visible to userspace via gpu_metrics alongside the previous ASIC dependent bit fields. Seperated into four 16-bit "types": power throttlers, current throttlers, temperature, other. Also added extra defines new to v2 applicable to renoir, namely PROCHOT and EDC bits.
Defined macro smu_u64_throttler_bit which is used instead of __assign_bit + test_bit from previous patch revision due to upgrading to 64-bit field.
--- drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h | 42 +++++++++++++++++++++++++ 1 file changed, 42 insertions(+)
drivers/gpu/drm/amd/pm/inc/amdgpu_smu.h +42 -0
@@ -35,6 +35,48 @@#define SMU_DPM_USER_PROFILE_RESTORE (1 << 0) +// Power Throttlers +#define SMU_THROTTLER_PPT0_BIT 0 +#define SMU_THROTTLER_PPT1_BIT 1 +#define SMU_THROTTLER_PPT2_BIT 2 +#define SMU_THROTTLER_PPT3_BIT 3 +#define SMU_THROTTLER_SPL_BIT 4 +#define SMU_THROTTLER_FPPT_BIT 5 +#define SMU_THROTTLER_SPPT_BIT 6 +#define SMU_THROTTLER_SPPT_APU_BIT 7 + +// Current Throttlers +#define SMU_THROTTLER_TDC_GFX_BIT 16 +#define SMU_THROTTLER_TDC_SOC_BIT 17 +#define SMU_THROTTLER_TDC_MEM_BIT 18 +#define SMU_THROTTLER_TDC_VDD_BIT 19 +#define SMU_THROTTLER_TDC_CVIP_BIT 20 +#define SMU_THROTTLER_EDC_CPU_BIT 21 +#define SMU_THROTTLER_EDC_GFX_BIT 22 +#define SMU_THROTTLER_APCC_BIT 23 + +// Temperature +#define SMU_THROTTLER_TEMP_GPU_BIT 32 +#define SMU_THROTTLER_TEMP_CORE_BIT 33 +#define SMU_THROTTLER_TEMP_MEM_BIT 34 +#define SMU_THROTTLER_TEMP_EDGE_BIT 35 +#define SMU_THROTTLER_TEMP_HOTSPOT_BIT 36 +#define SMU_THROTTLER_TEMP_VR_GFX_BIT 37 +#define SMU_THROTTLER_TEMP_VR_SOC_BIT 38 +#define SMU_THROTTLER_TEMP_VR_MEM_BIT 39 +#define SMU_THROTTLER_TEMP_LIQUID_BIT 40 +#define SMU_THROTTLER_VRHOT0_BIT 41 +#define SMU_THROTTLER_VRHOT1_BIT 42 +#define SMU_THROTTLER_PROCHOT_CPU_BIT 43 +#define SMU_THROTTLER_PROCHOT_GFX_BIT 44 + +// Other +#define SMU_THROTTLER_PPM_BIT 48 +#define SMU_THROTTLER_FIT_BIT 49 + +#define smu_u64_throttler_bit (dep,INDEP_BIT ,DEP_BIT ) \ + ((1ULL & (dep >> DEP_BIT)) << INDEP_BIT) +struct smu_hw_power_state {unsigned int magic; };
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 3/8 drm/amd/pm: Add arcturus throttler translation
In reply to Graham SiderPerform dependent to independent throttle status translation for arcturus.
--- .../gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 58 +++++++++++++++++-- 1 file changed, 53 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c +53 -5
@@ -237,7 +237,7 @@ static int arcturus_tables_init(struct smu_context *smu)return -ENOMEM ; smu_table->metrics_time =0 ; - smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v1_1 ); + smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v1_3 ); smu_table->gpu_metrics_table =kzalloc (smu_table->gpu_metrics_table_size,GFP_KERNEL );if (!smu_table->gpu_metrics_table) {kfree (smu_table->metrics_table);
@@ -540,6 +540,52 @@ static int arcturus_freqs_in_same_level(int32_t frequency1,return (abs (frequency1 - frequency2) <=EPSILON ); } +static uint64_t arcturus_get_indep_throttler_status ( +uint32_t dep_status) +{ +if (dep_status ==0 ) +return 0 ; + +uint64_t indep_status =0 ; + + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_EDGE_BIT ,THROTTLER_TEMP_EDGE_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_HOTSPOT_BIT ,THROTTLER_TEMP_HOTSPOT_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_MEM_BIT ,THROTTLER_TEMP_MEM_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_VR_GFX_BIT ,THROTTLER_TEMP_VR_GFX_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_VR_MEM_BIT ,THROTTLER_TEMP_VR_MEM_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_VR_SOC_BIT ,THROTTLER_TEMP_VR_SOC_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TDC_GFX_BIT ,THROTTLER_TDC_GFX_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TDC_SOC_BIT ,THROTTLER_TDC_SOC_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_PPT0_BIT ,THROTTLER_PPT0_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_PPT1_BIT ,THROTTLER_PPT1_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_PPT2_BIT ,THROTTLER_PPT2_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_PPT3_BIT ,THROTTLER_PPT3_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_PPM_BIT ,THROTTLER_PPM_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_FIT_BIT ,THROTTLER_FIT_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_APCC_BIT ,THROTTLER_APCC_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_VRHOT0_BIT ,THROTTLER_VRHOT0_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_VRHOT1_BIT ,THROTTLER_VRHOT1_BIT ); + +return indep_status; +} +static int arcturus_get_smu_metrics_data (struct smu_context *smu,MetricsMember_t member,uint32_t *value)
@@ -2275,8 +2321,8 @@ static ssize_t arcturus_get_gpu_metrics(struct smu_context *smu, void **table) {struct smu_table_context *smu_table = &smu->smu_table; -struct gpu_metrics_v1_1 *gpu_metrics = - (struct gpu_metrics_v1_1 *)smu_table->gpu_metrics_table; +struct gpu_metrics_v1_3 *gpu_metrics = + (struct gpu_metrics_v1_3 *)smu_table->gpu_metrics_table;SmuMetrics_t metrics;int ret =0 ;
@@ -2286,7 +2332,7 @@ static ssize_t arcturus_get_gpu_metrics(struct smu_context *smu,if (ret)return ret; -smu_cmn_init_soft_gpu_metrics (gpu_metrics,1 ,1 ); +smu_cmn_init_soft_gpu_metrics (gpu_metrics,1 ,3 ); gpu_metrics->temperature_edge = metrics.TemperatureEdge; gpu_metrics->temperature_hotspot = metrics.TemperatureHotspot;
@@ -2315,6 +2361,8 @@ static ssize_t arcturus_get_gpu_metrics(struct smu_context *smu, gpu_metrics->current_dclk0 = metrics.CurrClock[PPCLK_DCLK ]; gpu_metrics->throttle_status = metrics.ThrottlerStatus; + gpu_metrics->indep_throttle_status = +arcturus_get_indep_throttler_status (metrics.ThrottlerStatus); gpu_metrics->current_fan_speed = metrics.CurrFanSpeed;
@@ -2327,7 +2375,7 @@ static ssize_t arcturus_get_gpu_metrics(struct smu_context *smu, *table = (void *)gpu_metrics; -return sizeof (struct gpu_metrics_v1_1 ); +return sizeof (struct gpu_metrics_v1_3 ); }static const struct pptable_funcs arcturus_ppt_funcs = {
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 4/8 drm/amd/pm: Add navi1x throttler translation
In reply to Graham SiderPerform dependent to independent throttle status translation for navi1x.
--- .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +56 -0
@@ -524,6 +524,54 @@ static int navi10_tables_init(struct smu_context *smu)return -ENOMEM ; } +static uint64_t navi1x_get_indep_throttler_status ( +uint32_t dep_status) +{ +if (dep_status ==0 ) +return 0 ; + +uint64_t indep_status =0 ; + + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_EDGE_BIT ,THROTTLER_TEMP_EDGE_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_HOTSPOT_BIT ,THROTTLER_TEMP_HOTSPOT_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_MEM_BIT ,THROTTLER_TEMP_MEM_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_VR_GFX_BIT ,THROTTLER_TEMP_VR_GFX_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_VR_MEM_BIT ,THROTTLER_TEMP_VR_MEM0_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_VR_MEM_BIT ,THROTTLER_TEMP_VR_MEM1_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_VR_SOC_BIT ,THROTTLER_TEMP_VR_SOC_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_LIQUID_BIT ,THROTTLER_TEMP_LIQUID0_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_LIQUID_BIT ,THROTTLER_TEMP_LIQUID1_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TDC_GFX_BIT ,THROTTLER_TDC_GFX_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TDC_SOC_BIT ,THROTTLER_TDC_SOC_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_PPT0_BIT ,THROTTLER_PPT0_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_PPT1_BIT ,THROTTLER_PPT1_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_PPT2_BIT ,THROTTLER_PPT2_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_PPT3_BIT ,THROTTLER_PPT3_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_FIT_BIT ,THROTTLER_FIT_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_PPM_BIT ,THROTTLER_PPM_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_APCC_BIT ,THROTTLER_APCC_BIT ); + +return indep_status; +} +static int navi10_get_legacy_smu_metrics_data (struct smu_context *smu,MetricsMember_t member,uint32_t *value)
@@ -2673,6 +2721,8 @@ static ssize_t navi10_get_legacy_gpu_metrics(struct smu_context *smu, gpu_metrics->current_dclk0 = metrics.CurrClock[PPCLK_DCLK ]; gpu_metrics->throttle_status = metrics.ThrottlerStatus; + gpu_metrics->indep_throttle_status = +navi1x_get_indep_throttler_status (metrics.ThrottlerStatus); gpu_metrics->current_fan_speed = metrics.CurrFanSpeed;
@@ -2750,6 +2800,8 @@ static ssize_t navi10_get_gpu_metrics(struct smu_context *smu, gpu_metrics->current_dclk0 = metrics.CurrClock[PPCLK_DCLK ]; gpu_metrics->throttle_status = metrics.ThrottlerStatus; + gpu_metrics->indep_throttle_status = +navi1x_get_indep_throttler_status (metrics.ThrottlerStatus); gpu_metrics->current_fan_speed = metrics.CurrFanSpeed;
@@ -2826,6 +2878,8 @@ static ssize_t navi12_get_legacy_gpu_metrics(struct smu_context *smu, gpu_metrics->current_dclk0 = metrics.CurrClock[PPCLK_DCLK ]; gpu_metrics->throttle_status = metrics.ThrottlerStatus; + gpu_metrics->indep_throttle_status = +navi1x_get_indep_throttler_status (metrics.ThrottlerStatus); gpu_metrics->current_fan_speed = metrics.CurrFanSpeed;
@@ -2908,6 +2962,8 @@ static ssize_t navi12_get_gpu_metrics(struct smu_context *smu, gpu_metrics->current_dclk0 = metrics.CurrClock[PPCLK_DCLK ]; gpu_metrics->throttle_status = metrics.ThrottlerStatus; + gpu_metrics->indep_throttle_status = +navi1x_get_indep_throttler_status (metrics.ThrottlerStatus); gpu_metrics->current_fan_speed = metrics.CurrFanSpeed;
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH v2 4/8] drm/amd/pm: Add navi1x throttler translation
[AMD Official Use Only]
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Graham Sider
Sent: Saturday, May 29, 2021 1:28 AM
To: [email protected]
Cc: Kasiviswanathan, Harish <[email protected]>; Sider, Graham <[email protected]>; Sakhnovitch, Elena (Elen) <[email protected]>
Subject: [PATCH v2 4/8] drm/amd/pm: Add navi1x throttler translation
Perform dependent to independent throttle status translation for navi1x.
--- .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +7 -0
@@ -524,6 +524,54 @@ static int navi10_tables_init(struct smu_context *smu)return -ENOMEM ; } +static uint64_t navi1x_get_indep_throttler_status ( +uint32_t dep_status) +{ +if (dep_status ==0 ) +return 0 ; + +uint64_t indep_status =0 ;
< > Extending Harish's comments - it's very unlikely that all or even 50% of these bits are set together. It may be better to do something like
while (bit=ffs(dep_status)) {
indep_status |= 1ULL << mapping[bit-1];dep_status &= ~(1UL << bit - 1);
}
Will need a lookup table, should be fine though.
Thanks,
Lijo
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_TEMP_EDGE_BIT, THROTTLER_TEMP_EDGE_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_TEMP_HOTSPOT_BIT, THROTTLER_TEMP_HOTSPOT_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_TEMP_MEM_BIT, THROTTLER_TEMP_MEM_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_TEMP_VR_GFX_BIT, THROTTLER_TEMP_VR_GFX_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_TEMP_VR_MEM_BIT, THROTTLER_TEMP_VR_MEM0_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_TEMP_VR_MEM_BIT, THROTTLER_TEMP_VR_MEM1_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_TEMP_VR_SOC_BIT, THROTTLER_TEMP_VR_SOC_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_TEMP_LIQUID_BIT, THROTTLER_TEMP_LIQUID0_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_TEMP_LIQUID_BIT, THROTTLER_TEMP_LIQUID1_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_TDC_GFX_BIT, THROTTLER_TDC_GFX_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_TDC_SOC_BIT, THROTTLER_TDC_SOC_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_PPT0_BIT, THROTTLER_PPT0_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_PPT1_BIT, THROTTLER_PPT1_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_PPT2_BIT, THROTTLER_PPT2_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_PPT3_BIT, THROTTLER_PPT3_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_FIT_BIT, THROTTLER_FIT_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_PPM_BIT, THROTTLER_PPM_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_APCC_BIT, THROTTLER_APCC_BIT);
+
+ return indep_status;
+}
+
static int navi10_get_legacy_smu_metrics_data(struct smu_context *smu,
MetricsMember_t member, uint32_t *value)
@@ -2673,6 +2721,8 @@ static ssize_t navi10_get_legacy_gpu_metrics(struct smu_context *smu,
gpu_metrics->current_dclk0 = metrics.CurrClock[PPCLK_DCLK];
gpu_metrics->throttle_status = metrics.ThrottlerStatus;
+ gpu_metrics->indep_throttle_status =
+ navi1x_get_indep_throttler_status(metrics.ThrottlerStatus);
gpu_metrics->current_fan_speed = metrics.CurrFanSpeed;
@@ -2750,6 +2800,8 @@ static ssize_t navi10_get_gpu_metrics(struct smu_context *smu,
gpu_metrics->current_dclk0 = metrics.CurrClock[PPCLK_DCLK];
gpu_metrics->throttle_status = metrics.ThrottlerStatus;
+ gpu_metrics->indep_throttle_status =
+ navi1x_get_indep_throttler_status(metrics.ThrottlerStatus);
gpu_metrics->current_fan_speed = metrics.CurrFanSpeed;
@@ -2826,6 +2878,8 @@ static ssize_t navi12_get_legacy_gpu_metrics(struct smu_context *smu,
gpu_metrics->current_dclk0 = metrics.CurrClock[PPCLK_DCLK];
gpu_metrics->throttle_status = metrics.ThrottlerStatus;
+ gpu_metrics->indep_throttle_status =
+ navi1x_get_indep_throttler_status(metrics.ThrottlerStatus);
gpu_metrics->current_fan_speed = metrics.CurrFanSpeed;
@@ -2908,6 +2962,8 @@ static ssize_t navi12_get_gpu_metrics(struct smu_context *smu,
gpu_metrics->current_dclk0 = metrics.CurrClock[PPCLK_DCLK];
gpu_metrics->throttle_status = metrics.ThrottlerStatus;
+ gpu_metrics->indep_throttle_status =
+ navi1x_get_indep_throttler_status(metrics.ThrottlerStatus);
gpu_metrics->current_fan_speed = metrics.CurrFanSpeed;
--
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Clijo.lazar%40amd.com%7C0e8287b706374269018508d922135f02%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637578288869743604%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=9u%2FUr8%2FPuSekq2ttc0NiYeacZoAnPZNb2BTXUSD2Fd8%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH v2 4/8] drm/amd/pm: Add navi1x throttler translation
That's fair, I wasn't sure if adding a lookup table for the bitmapping of each ASIC was necessarily wanted, but it would definitely result in less runtime overhead.
This way we can also make use of the for_each_set_bit() macro in bitops.h. I'll make the change and fix the padding and resubmit. Thanks for the feedback.
Graham
-----Original Message-----
From: Lazar, Lijo <[email protected]>
Sent: Monday, May 31, 2021 1:13 AM
To: Sider, Graham <[email protected]>; [email protected]
Cc: Kasiviswanathan, Harish <[email protected]>; Sider, Graham <[email protected]>; Sakhnovitch, Elena (Elen) <[email protected]>
Subject: RE: [PATCH v2 4/8] drm/amd/pm: Add navi1x throttler translation
[AMD Official Use Only]
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Graham Sider
Sent: Saturday, May 29, 2021 1:28 AM
To: [email protected]
Cc: Kasiviswanathan, Harish <[email protected]>; Sider, Graham <[email protected]>; Sakhnovitch, Elena (Elen) <[email protected]>
Subject: [PATCH v2 4/8] drm/amd/pm: Add navi1x throttler translation
Perform dependent to independent throttle status translation for navi1x.
--- .../gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+)
drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c +7 -0
@@ -524,6 +524,54 @@ static int navi10_tables_init(struct smu_context *smu)return -ENOMEM ; } +static uint64_t navi1x_get_indep_throttler_status ( +uint32_t dep_status) +{ +if (dep_status ==0 ) +return 0 ; + +uint64_t indep_status =0 ;
< > Extending Harish's comments - it's very unlikely that all or even 50% of these bits are set together. It may be better to do something like
while (bit=ffs(dep_status)) {
indep_status |= 1ULL << mapping[bit-1]; dep_status &= ~(1UL << bit - 1); } Will need a lookup table, should be fine though.
Thanks,
Lijo
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_TEMP_EDGE_BIT, THROTTLER_TEMP_EDGE_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_TEMP_HOTSPOT_BIT, THROTTLER_TEMP_HOTSPOT_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_TEMP_MEM_BIT, THROTTLER_TEMP_MEM_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_TEMP_VR_GFX_BIT, THROTTLER_TEMP_VR_GFX_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_TEMP_VR_MEM_BIT, THROTTLER_TEMP_VR_MEM0_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_TEMP_VR_MEM_BIT, THROTTLER_TEMP_VR_MEM1_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_TEMP_VR_SOC_BIT, THROTTLER_TEMP_VR_SOC_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_TEMP_LIQUID_BIT, THROTTLER_TEMP_LIQUID0_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_TEMP_LIQUID_BIT, THROTTLER_TEMP_LIQUID1_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_TDC_GFX_BIT, THROTTLER_TDC_GFX_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_TDC_SOC_BIT, THROTTLER_TDC_SOC_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_PPT0_BIT, THROTTLER_PPT0_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_PPT1_BIT, THROTTLER_PPT1_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_PPT2_BIT, THROTTLER_PPT2_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_PPT3_BIT, THROTTLER_PPT3_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_FIT_BIT, THROTTLER_FIT_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_PPM_BIT, THROTTLER_PPM_BIT);
+ indep_status |= smu_u64_throttler_bit(dep_status,
+ SMU_THROTTLER_APCC_BIT, THROTTLER_APCC_BIT);
+
+ return indep_status;
+}
+
static int navi10_get_legacy_smu_metrics_data(struct smu_context *smu,
MetricsMember_t member, uint32_t *value)
@@ -2673,6 +2721,8 @@ static ssize_t navi10_get_legacy_gpu_metrics(struct smu_context *smu,
gpu_metrics->current_dclk0 = metrics.CurrClock[PPCLK_DCLK];
gpu_metrics->throttle_status = metrics.ThrottlerStatus;
+ gpu_metrics->indep_throttle_status =
+ navi1x_get_indep_throttler_status(metrics.ThrottlerStatus);
gpu_metrics->current_fan_speed = metrics.CurrFanSpeed;
@@ -2750,6 +2800,8 @@ static ssize_t navi10_get_gpu_metrics(struct smu_context *smu,
gpu_metrics->current_dclk0 = metrics.CurrClock[PPCLK_DCLK];
gpu_metrics->throttle_status = metrics.ThrottlerStatus;
+ gpu_metrics->indep_throttle_status =
+ navi1x_get_indep_throttler_status(metrics.ThrottlerStatus);
gpu_metrics->current_fan_speed = metrics.CurrFanSpeed;
@@ -2826,6 +2878,8 @@ static ssize_t navi12_get_legacy_gpu_metrics(struct smu_context *smu,
gpu_metrics->current_dclk0 = metrics.CurrClock[PPCLK_DCLK];
gpu_metrics->throttle_status = metrics.ThrottlerStatus;
+ gpu_metrics->indep_throttle_status =
+ navi1x_get_indep_throttler_status(metrics.ThrottlerStatus);
gpu_metrics->current_fan_speed = metrics.CurrFanSpeed;
@@ -2908,6 +2962,8 @@ static ssize_t navi12_get_gpu_metrics(struct smu_context *smu,
gpu_metrics->current_dclk0 = metrics.CurrClock[PPCLK_DCLK];
gpu_metrics->throttle_status = metrics.ThrottlerStatus;
+ gpu_metrics->indep_throttle_status =
+ navi1x_get_indep_throttler_status(metrics.ThrottlerStatus);
gpu_metrics->current_fan_speed = metrics.CurrFanSpeed;
--
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Clijo.lazar%40amd.com%7C0e8287b706374269018508d922135f02%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637578288869743604%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=9u%2FUr8%2FPuSekq2ttc0NiYeacZoAnPZNb2BTXUSD2Fd8%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 5/8 drm/amd/pm: Add sienna cichlid throttler translation
In reply to Graham SiderPerform dependent to independent throttle status translation for sienna cichlid.
--- .../amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 60 +++++++++++++++++-- 1 file changed, 55 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +55 -5
@@ -434,7 +434,7 @@ static int sienna_cichlid_tables_init(struct smu_context *smu) goto err0_out; smu_table->metrics_time =0 ; - smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v1_1 ); + smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v1_3 ); smu_table->gpu_metrics_table =kzalloc (smu_table->gpu_metrics_table_size,GFP_KERNEL );if (!smu_table->gpu_metrics_table) goto err1_out;
@@ -453,6 +453,54 @@ static int sienna_cichlid_tables_init(struct smu_context *smu)return -ENOMEM ; } +static uint64_t sienna_cichlid_get_indep_throttler_status ( +uint32_t dep_status) +{ +if (dep_status ==0 ) +return 0 ; + +uint64_t indep_status =0 ; + + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_EDGE_BIT ,THROTTLER_TEMP_EDGE_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_HOTSPOT_BIT ,THROTTLER_TEMP_HOTSPOT_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_MEM_BIT ,THROTTLER_TEMP_MEM_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_VR_GFX_BIT ,THROTTLER_TEMP_VR_GFX_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_VR_MEM_BIT ,THROTTLER_TEMP_VR_MEM0_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_VR_MEM_BIT ,THROTTLER_TEMP_VR_MEM1_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_VR_SOC_BIT ,THROTTLER_TEMP_VR_SOC_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_LIQUID_BIT ,THROTTLER_TEMP_LIQUID0_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_LIQUID_BIT ,THROTTLER_TEMP_LIQUID1_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TDC_GFX_BIT ,THROTTLER_TDC_GFX_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TDC_SOC_BIT ,THROTTLER_TDC_SOC_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_PPT0_BIT ,THROTTLER_PPT0_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_PPT1_BIT ,THROTTLER_PPT1_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_PPT2_BIT ,THROTTLER_PPT2_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_PPT3_BIT ,THROTTLER_PPT3_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_FIT_BIT ,THROTTLER_FIT_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_PPM_BIT ,THROTTLER_PPM_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_APCC_BIT ,THROTTLER_APCC_BIT ); + +return indep_status; +} +static int sienna_cichlid_get_smu_metrics_data (struct smu_context *smu,MetricsMember_t member,uint32_t *value)
@@ -3617,8 +3665,8 @@ static ssize_t sienna_cichlid_get_gpu_metrics(struct smu_context *smu, void **table) {struct smu_table_context *smu_table = &smu->smu_table; -struct gpu_metrics_v1_1 *gpu_metrics = - (struct gpu_metrics_v1_1 *)smu_table->gpu_metrics_table; +struct gpu_metrics_v1_3 *gpu_metrics = + (struct gpu_metrics_v1_3 *)smu_table->gpu_metrics_table;SmuMetricsExternal_t metrics_external;SmuMetrics_t *metrics = &(metrics_external.SmuMetrics);
@@ -3632,7 +3680,7 @@ static ssize_t sienna_cichlid_get_gpu_metrics(struct smu_context *smu,if (ret)return ret; -smu_cmn_init_soft_gpu_metrics (gpu_metrics,1 ,1 ); +smu_cmn_init_soft_gpu_metrics (gpu_metrics,1 ,3 ); gpu_metrics->temperature_edge = metrics->TemperatureEdge; gpu_metrics->temperature_hotspot = metrics->TemperatureHotspot;
@@ -3667,6 +3715,8 @@ static ssize_t sienna_cichlid_get_gpu_metrics(struct smu_context *smu, gpu_metrics->current_dclk1 = metrics->CurrClock[PPCLK_DCLK_1 ]; gpu_metrics->throttle_status = metrics->ThrottlerStatus; + gpu_metrics->indep_throttle_status = +sienna_cichlid_get_indep_throttler_status (metrics->ThrottlerStatus); gpu_metrics->current_fan_speed = metrics->CurrFanSpeed;
@@ -3689,7 +3739,7 @@ static ssize_t sienna_cichlid_get_gpu_metrics(struct smu_context *smu, *table = (void *)gpu_metrics; -return sizeof (struct gpu_metrics_v1_1 ); +return sizeof (struct gpu_metrics_v1_3 ); }static int sienna_cichlid_enable_mgpu_fan_boost (struct smu_context *smu)
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 6/8 drm/amd/pm: Add vangogh throttler translation
In reply to Graham SiderPerform dependent to independent throttle status translation for vangogh.
--- .../gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 56 ++++++++++++++++--- 1 file changed, 47 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c +47 -9
@@ -226,7 +226,7 @@ static int vangogh_tables_init(struct smu_context *smu) goto err0_out; smu_table->metrics_time =0 ; - smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v2_1 ); + smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v2_2 ); smu_table->gpu_metrics_table =kzalloc (smu_table->gpu_metrics_table_size,GFP_KERNEL );if (!smu_table->gpu_metrics_table) goto err1_out;
@@ -251,6 +251,40 @@ static int vangogh_tables_init(struct smu_context *smu)return -ENOMEM ; } +static uint64_t vangogh_get_indep_throttler_status ( +uint32_t dep_status) +{ +if (dep_status ==0 ) +return 0 ; + +uint64_t indep_status =0 ; + + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_SPL_BIT ,THROTTLER_STATUS_BIT_SPL ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_FPPT_BIT ,THROTTLER_STATUS_BIT_FPPT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_SPPT_BIT ,THROTTLER_STATUS_BIT_SPPT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_SPPT_APU_BIT ,THROTTLER_STATUS_BIT_SPPT_APU ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_CORE_BIT ,THROTTLER_STATUS_BIT_THM_CORE ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_VR_GFX_BIT ,THROTTLER_STATUS_BIT_THM_GFX ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_VR_SOC_BIT ,THROTTLER_STATUS_BIT_THM_SOC ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TDC_VDD_BIT ,THROTTLER_STATUS_BIT_TDC_VDD ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TDC_SOC_BIT ,THROTTLER_STATUS_BIT_TDC_SOC ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TDC_GFX_BIT ,THROTTLER_STATUS_BIT_TDC_GFX ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TDC_CVIP_BIT ,THROTTLER_STATUS_BIT_TDC_CVIP ); + +return indep_status; +} +static int vangogh_get_legacy_smu_metrics_data (struct smu_context *smu,MetricsMember_t member,uint32_t *value)
@@ -1632,8 +1666,8 @@ static ssize_t vangogh_get_legacy_gpu_metrics(struct smu_context *smu, void **table) {struct smu_table_context *smu_table = &smu->smu_table; -struct gpu_metrics_v2_1 *gpu_metrics = - (struct gpu_metrics_v2_1 *)smu_table->gpu_metrics_table; +struct gpu_metrics_v2_2 *gpu_metrics = + (struct gpu_metrics_v2_2 *)smu_table->gpu_metrics_table;SmuMetrics_legacy_t metrics;int ret =0 ;
@@ -1641,7 +1675,7 @@ static ssize_t vangogh_get_legacy_gpu_metrics(struct smu_context *smu,if (ret)return ret; -smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,1 ); +smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,2 ); gpu_metrics->temperature_gfx = metrics.GfxTemperature; gpu_metrics->temperature_soc = metrics.SocTemperature;
@@ -1674,20 +1708,22 @@ static ssize_t vangogh_get_legacy_gpu_metrics(struct smu_context *smu, gpu_metrics->current_l3clk[0 ] = metrics.L3Frequency[0 ]; gpu_metrics->throttle_status = metrics.ThrottlerStatus; + gpu_metrics->indep_throttle_status = +vangogh_get_indep_throttler_status (metrics.ThrottlerStatus); gpu_metrics->system_clock_counter =ktime_get_boottime_ns (); *table = (void *)gpu_metrics; -return sizeof (struct gpu_metrics_v2_1 ); +return sizeof (struct gpu_metrics_v2_2 ); }static ssize_t vangogh_get_gpu_metrics (struct smu_context *smu,void **table) {struct smu_table_context *smu_table = &smu->smu_table; -struct gpu_metrics_v2_1 *gpu_metrics = - (struct gpu_metrics_v2_1 *)smu_table->gpu_metrics_table; +struct gpu_metrics_v2_2 *gpu_metrics = + (struct gpu_metrics_v2_2 *)smu_table->gpu_metrics_table;SmuMetrics_t metrics;int ret =0 ;
@@ -1695,7 +1731,7 @@ static ssize_t vangogh_get_gpu_metrics(struct smu_context *smu,if (ret)return ret; -smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,1 ); +smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,2 ); gpu_metrics->temperature_gfx = metrics.Current.GfxTemperature; gpu_metrics->temperature_soc = metrics.Current.SocTemperature;
@@ -1735,12 +1771,14 @@ static ssize_t vangogh_get_gpu_metrics(struct smu_context *smu, gpu_metrics->current_l3clk[0 ] = metrics.Current.L3Frequency[0 ]; gpu_metrics->throttle_status = metrics.Current.ThrottlerStatus; + gpu_metrics->indep_throttle_status = +vangogh_get_indep_throttler_status (metrics.Current.ThrottlerStatus); gpu_metrics->system_clock_counter =ktime_get_boottime_ns (); *table = (void *)gpu_metrics; -return sizeof (struct gpu_metrics_v2_1 ); +return sizeof (struct gpu_metrics_v2_2 ); } static ssize_t vangogh_common_get_gpu_metrics(struct smu_context *smu,
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 7/8 drm/amd/pm: Add renoir throttler translation
In reply to Graham SiderPerform dependent to independent throttle status translation for renoir.
--- .../gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 50 +++++++++++++++++-- 1 file changed, 45 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c +45 -5
@@ -153,7 +153,7 @@ static int renoir_init_smc_tables(struct smu_context *smu)if (!smu_table->watermarks_table) goto err2_out; - smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v2_1 ); + smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v2_2 ); smu_table->gpu_metrics_table =kzalloc (smu_table->gpu_metrics_table_size,GFP_KERNEL );if (!smu_table->gpu_metrics_table) goto err3_out;
@@ -170,6 +170,44 @@ static int renoir_init_smc_tables(struct smu_context *smu)return -ENOMEM ; } +static uint64_t renoir_get_indep_throttler_status ( +uint32_t dep_status) +{ +if (dep_status ==0 ) +return 0 ; + +uint64_t indep_status =0 ; + + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_SPL_BIT ,THROTTLER_STATUS_BIT_SPL ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_FPPT_BIT ,THROTTLER_STATUS_BIT_FPPT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_SPPT_BIT ,THROTTLER_STATUS_BIT_SPPT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_SPPT_APU_BIT ,THROTTLER_STATUS_BIT_SPPT_APU ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_CORE_BIT ,THROTTLER_STATUS_BIT_THM_CORE ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_VR_GFX_BIT ,THROTTLER_STATUS_BIT_THM_GFX ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_VR_SOC_BIT ,THROTTLER_STATUS_BIT_THM_SOC ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TDC_VDD_BIT ,THROTTLER_STATUS_BIT_TDC_VDD ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TDC_SOC_BIT ,THROTTLER_STATUS_BIT_TDC_SOC ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_PROCHOT_CPU_BIT ,THROTTLER_STATUS_BIT_PROCHOT_CPU ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_PROCHOT_GFX_BIT ,THROTTLER_STATUS_BIT_PROCHOT_GFX ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_EDC_CPU_BIT ,THROTTLER_STATUS_BIT_EDC_CPU ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_EDC_GFX_BIT ,THROTTLER_STATUS_BIT_EDC_GFX ); + +return indep_status; +} +/* * This interface just for getting uclk ultimate freq and should't introduce * other likewise function result in overmuch callback.
@@ -1264,8 +1302,8 @@ static ssize_t renoir_get_gpu_metrics(struct smu_context *smu, void **table) {struct smu_table_context *smu_table = &smu->smu_table; -struct gpu_metrics_v2_1 *gpu_metrics = - (struct gpu_metrics_v2_1 *)smu_table->gpu_metrics_table; +struct gpu_metrics_v2_2 *gpu_metrics = + (struct gpu_metrics_v2_2 *)smu_table->gpu_metrics_table;SmuMetrics_t metrics;int ret =0 ;
@@ -1273,7 +1311,7 @@ static ssize_t renoir_get_gpu_metrics(struct smu_context *smu,if (ret)return ret; -smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,1 ); +smu_cmn_init_soft_gpu_metrics (gpu_metrics,2 ,2 ); gpu_metrics->temperature_gfx = metrics.GfxTemperature; gpu_metrics->temperature_soc = metrics.SocTemperature;
@@ -1311,6 +1349,8 @@ static ssize_t renoir_get_gpu_metrics(struct smu_context *smu, gpu_metrics->current_l3clk[1 ] = metrics.L3Frequency[1 ]; gpu_metrics->throttle_status = metrics.ThrottlerStatus; + gpu_metrics->indep_throttle_status = +renoir_get_indep_throttler_status (metrics.ThrottlerStatus); gpu_metrics->fan_pwm = metrics.FanPwm;
@@ -1318,7 +1358,7 @@ static ssize_t renoir_get_gpu_metrics(struct smu_context *smu, *table = (void *)gpu_metrics; -return sizeof (struct gpu_metrics_v2_1 ); +return sizeof (struct gpu_metrics_v2_2 ); }static int renoir_gfx_state_change_set (struct smu_context *smu,uint32_t state)
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH v2 8/8 drm/amd/pm: Add aldebaran throttler translation
In reply to Graham SiderPerform dependent to independent throttle status translation for aldebaran.
--- .../drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 46 +++++++++++++++++-- 1 file changed, 41 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c +41 -5
@@ -213,7 +213,7 @@ static int aldebaran_tables_init(struct smu_context *smu)return -ENOMEM ; smu_table->metrics_time =0 ; - smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v1_2 ); + smu_table->gpu_metrics_table_size =sizeof (struct gpu_metrics_v1_3 ); smu_table->gpu_metrics_table =kzalloc (smu_table->gpu_metrics_table_size,GFP_KERNEL );if (!smu_table->gpu_metrics_table) {kfree (smu_table->metrics_table);
@@ -517,6 +517,40 @@ static int aldebaran_freqs_in_same_level(int32_t frequency1,return (abs (frequency1 - frequency2) <=EPSILON ); } +static uint64_t aldebaran_get_indep_throttler_status ( +uint32_t dep_status) +{ +if (dep_status ==0 ) +return 0 ; + +uint64_t indep_status =0 ; + + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_PPT0_BIT ,THROTTLER_PPT0_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_PPT1_BIT ,THROTTLER_PPT1_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TDC_GFX_BIT ,THROTTLER_TDC_GFX_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TDC_SOC_BIT ,THROTTLER_TDC_SOC_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TDC_MEM_BIT ,THROTTLER_TDC_HBM_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_GPU_BIT ,THROTTLER_TEMP_GPU_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_MEM_BIT ,THROTTLER_TEMP_MEM_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_VR_GFX_BIT ,THROTTLER_TEMP_VR_GFX_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_VR_SOC_BIT ,THROTTLER_TEMP_VR_SOC_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_TEMP_VR_MEM_BIT ,THROTTLER_TEMP_VR_MEM_BIT ); + indep_status |=smu_u64_throttler_bit (dep_status, +SMU_THROTTLER_APCC_BIT ,THROTTLER_APCC_BIT ); + +return indep_status; +} +static int aldebaran_get_smu_metrics_data (struct smu_context *smu,MetricsMember_t member,uint32_t *value)
@@ -1713,8 +1747,8 @@ static ssize_t aldebaran_get_gpu_metrics(struct smu_context *smu, void **table) {struct smu_table_context *smu_table = &smu->smu_table; -struct gpu_metrics_v1_2 *gpu_metrics = - (struct gpu_metrics_v1_2 *)smu_table->gpu_metrics_table; +struct gpu_metrics_v1_3 *gpu_metrics = + (struct gpu_metrics_v1_3 *)smu_table->gpu_metrics_table;SmuMetrics_t metrics;int i, ret =0 ;
@@ -1724,7 +1758,7 @@ static ssize_t aldebaran_get_gpu_metrics(struct smu_context *smu,if (ret)return ret; -smu_cmn_init_soft_gpu_metrics (gpu_metrics,1 ,2 ); +smu_cmn_init_soft_gpu_metrics (gpu_metrics,1 ,3 ); gpu_metrics->temperature_edge = metrics.TemperatureEdge; gpu_metrics->temperature_hotspot = metrics.TemperatureHotspot;
@@ -1755,6 +1789,8 @@ static ssize_t aldebaran_get_gpu_metrics(struct smu_context *smu, gpu_metrics->current_dclk0 = metrics.CurrClock[PPCLK_DCLK ]; gpu_metrics->throttle_status = metrics.ThrottlerStatus; + gpu_metrics->indep_throttle_status = +aldebaran_get_indep_throttler_status (metrics.ThrottlerStatus); gpu_metrics->current_fan_speed =0 ;
@@ -1776,7 +1812,7 @@ static ssize_t aldebaran_get_gpu_metrics(struct smu_context *smu, *table = (void *)gpu_metrics; -return sizeof (struct gpu_metrics_v1_2 ); +return sizeof (struct gpu_metrics_v1_3 ); }static int aldebaran_mode2_reset (struct smu_context *smu)
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[Public]
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Graham Sider
Sent: Saturday, May 29, 2021 1:28 AM
To: [email protected]
Cc: Kasiviswanathan, Harish <[email protected]>; Sider, Graham <[email protected]>; Sakhnovitch, Elena (Elen) <[email protected]>
Subject: [PATCH v2 1/8] drm/amd/pm: Add u64 throttler status field to gpu_metrics
This patch piggybacks off the gpu_metrics_v1_3 bump and adds a new ASIC independant u64 throttler status field (indep_throttle_status).
Similarly bumps gpu_metrics_v2 version (to v2_2) to add field. The alternative to adding this new field would be to overwrite the original u32 throttle_status (would still require a version bump for gpu_metrics_v2). The benefit to adding a new field is that we can allocate 16 bits to each "type" of throttler information and have more leeway for adding additional throttler bits in the future.
--- .../gpu/drm/amd/include/kgd_pp_interface.h | 58 ++++++++++++++++++- drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 3 + 2 files changed, 60 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/include/kgd_pp_interface.h +4 -1
@@ -577,7 +577,7 @@ struct gpu_metrics_v1_3 {uint16_t current_vclk1;uint16_t current_dclk1; -/* Throttle status */ +/* Throttle status (ASIC dependant) */ uint32_t throttle_status;/* Fans */
@@ -602,6 +602,9 @@ struct gpu_metrics_v1_3 {uint16_t voltage_gfx;uint16_t voltage_mem; +/* Throttle status (ASIC independant) */ +uint64_t indep_throttle_status; +
< > Placement of this field here followed by uint16_t padding tells that member alignment is broken. Align the new member to 64-bit boundary.
uint16_t padding1;
};
@@ -709,4 +712,57 @@ struct gpu_metrics_v2_1 {
uint16_t padding[3];
};
+struct gpu_metrics_v2_2 {
+ struct metrics_table_header common_header;
+
+ /* Temperature */
+ uint16_t temperature_gfx; // gfx temperature on APUs
+ uint16_t temperature_soc; // soc temperature on APUs
+ uint16_t temperature_core[8]; // CPU core temperature on APUs
+ uint16_t temperature_l3[2];
+
+ /* Utilization */
+ uint16_t average_gfx_activity;
+ uint16_t average_mm_activity; // UVD or VCN
+
+ /* Driver attached timestamp (in ns) */
+ uint64_t system_clock_counter;
+
+ /* Power/Energy */
+ uint16_t average_socket_power; // dGPU + APU power on A + A platform
+ uint16_t average_cpu_power;
+ uint16_t average_soc_power;
+ uint16_t average_gfx_power;
+ uint16_t average_core_power[8]; // CPU core power on APUs
+
+ /* Average clocks */
+ uint16_t average_gfxclk_frequency;
+ uint16_t average_socclk_frequency;
+ uint16_t average_uclk_frequency;
+ uint16_t average_fclk_frequency;
+ uint16_t average_vclk_frequency;
+ uint16_t average_dclk_frequency;
+
+ /* Current clocks */
+ uint16_t current_gfxclk;
+ uint16_t current_socclk;
+ uint16_t current_uclk;
+ uint16_t current_fclk;
+ uint16_t current_vclk;
+ uint16_t current_dclk;
+ uint16_t current_coreclk[8]; // CPU core clocks
+ uint16_t current_l3clk[2];
+
+ /* Throttle status (ASIC dependant) */
+ uint32_t throttle_status;
+
+ /* Fans */
+ uint16_t fan_pwm;
+
+ /* Throttle status (ASIC independant) */
+ uint64_t indep_throttle_status;
< > Same alignment issue here as well.
Thanks,
Lijo
+ uint16_t padding[3];
+};
+
#endif
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c +3 -0
@@ -773,6 +773,9 @@ void smu_cmn_init_soft_gpu_metrics(void *table, uint8_t frev, uint8_t crev)case METRICS_VERSION (2 ,1 ): structure_size =sizeof (struct gpu_metrics_v2_1 );break ; +case METRICS_VERSION (2 ,2 ): + structure_size =sizeof (struct gpu_metrics_v2_2 ); +break ;default :return ; }
--
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=04%7C01%7Clijo.lazar%40amd.com%7C7ca262503fb54995e4d808d922135cd7%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637578288831073471%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&sdata=%2B9FPgt9%2FPLNL0N4lvGQMnWny5ER5UnNwdysYGqL%2FzAc%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx