drm/amd/pm: Report pldm version and board voltage

Add support to report PLDM firmware version and board voltage on SMU
v13.0.12 SOCs.

Signed-off-by: Lijo Lazar <lijo.lazar@amd.com>
Reviewed-by: Asad Kamal <asad.kamal@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c
index e0d356f93ab064058cba3573d0776c705d8b6466..99663165363e276be39690446e7bee3931fc48ff 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c
@@ -189,6 +189,7 @@ int smu_v13_0_12_get_max_metrics_size(void)
 
 int smu_v13_0_12_setup_driver_pptable(struct smu_context *smu)
 {
+       struct smu_13_0_dpm_context *dpm_context = smu->smu_dpm.dpm_context;
        struct smu_table_context *smu_table = &smu->smu_table;
        StaticMetricsTable_t *static_metrics = (StaticMetricsTable_t *)smu_table->metrics_table;
        struct PPTable_t *pptable =
@@ -237,6 +238,17 @@ int smu_v13_0_12_setup_driver_pptable(struct smu_context *smu)
                if (ret)
                        return ret;
 
+               if (smu_v13_0_6_cap_supported(smu, SMU_CAP(BOARD_VOLTAGE))) {
+                       if (!static_metrics->InputTelemetryVoltageInmV) {
+                               dev_warn(smu->adev->dev, "Invalid board voltage %d\n",
+                                               static_metrics->InputTelemetryVoltageInmV);
+                       }
+                       dpm_context->board_volt = static_metrics->InputTelemetryVoltageInmV;
+               }
+               if (smu_v13_0_6_cap_supported(smu, SMU_CAP(PLDM_VERSION)) &&
+                       static_metrics->pldmVersion[0] != 0xFFFFFFFF)
+                       smu->adev->firmware.pldm_version =
+                               static_metrics->pldmVersion[0];
                pptable->Init = true;
        }
 

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
index f419472fd749279a08b428e0905e28e5a7bb0e2b..3db3ad4bf26cd8a54e2c56d41f6c9fe767674319 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
@@ -345,6 +345,11 @@ static void smu_v13_0_12_init_caps(struct smu_context *smu)
 
        if (fw_ver >= 0x00562500)
                smu_v13_0_6_cap_set(smu, SMU_CAP(HST_LIMIT_METRICS));
+
+       if (fw_ver >= 0x04560100) {
+               smu_v13_0_6_cap_set(smu, SMU_CAP(BOARD_VOLTAGE));
+               smu_v13_0_6_cap_set(smu, SMU_CAP(PLDM_VERSION));
+       }
 }
 
 static void smu_v13_0_6_init_caps(struct smu_context *smu)