support BAMACO reset on smu_v13_0_7, take BAMACO as a subset of BACO
for the low latency, and it only happens on specific platforms.

Signed-off-by: Kenneth Feng <kenneth.f...@amd.com>
---
 drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h |  1 +
 .../drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c  | 57 ++++++++++++++++++-
 2 files changed, 56 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h 
b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
index 6d51e4340aad..b81c657c7386 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
+++ b/drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h
@@ -432,6 +432,7 @@ struct smu_baco_context
 {
        uint32_t state;
        bool platform_support;
+       bool maco_support;
 };
 
 struct smu_freq_info {
diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c 
b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
index b635c2b4f81c..369e84fef5a6 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
@@ -303,6 +303,8 @@ static int smu_v13_0_7_check_powerplay_table(struct 
smu_context *smu)
        struct smu_13_0_7_powerplay_table *powerplay_table =
                table_context->power_play_table;
        struct smu_baco_context *smu_baco = &smu->smu_baco;
+       PPTable_t *smc_pptable = table_context->driver_pptable;
+       BoardTable_t *BoardTable = &smc_pptable->BoardTable;
 
        if (powerplay_table->platform_caps & 
SMU_13_0_7_PP_PLATFORM_CAP_HARDWAREDC)
                smu->dc_controlled_by_gpio = true;
@@ -311,6 +313,9 @@ static int smu_v13_0_7_check_powerplay_table(struct 
smu_context *smu)
            powerplay_table->platform_caps & SMU_13_0_7_PP_PLATFORM_CAP_MACO)
                smu_baco->platform_support = true;
 
+       if (smu_baco->platform_support && (BoardTable->HsrEnabled || 
BoardTable->VddqOffEnabled))
+               smu_baco->maco_support = true;
+
        table_context->thermal_controller_type =
                powerplay_table->thermal_controller_type;
 
@@ -1537,6 +1542,54 @@ static int smu_v13_0_7_set_power_profile_mode(struct 
smu_context *smu, long *inp
        return ret;
 }
 
+static int smu_v13_0_7_baco_set_state(struct smu_context *smu,
+                            enum smu_baco_state state)
+{
+       struct smu_baco_context *smu_baco = &smu->smu_baco;
+       struct amdgpu_device *adev = smu->adev;
+       bool is_maco_support = smu_baco->maco_support;
+       int ret = 0;
+
+       if (smu_v13_0_baco_get_state(smu) == state)
+               return 0;
+
+       if (state == SMU_BACO_STATE_ENTER) {
+               ret = smu_cmn_send_smc_msg_with_param(smu,
+                                                     SMU_MSG_EnterBaco,
+                                                     (is_maco_support ? 2 : 0),
+                                                     NULL);
+       } else {
+               ret = smu_cmn_send_smc_msg(smu,
+                                          SMU_MSG_ExitBaco,
+                                          NULL);
+               if (ret)
+                       return ret;
+
+               /* clear vbios scratch 6 and 7 for coming asic reinit */
+               WREG32(adev->bios_scratch_reg_offset + 6, 0);
+               WREG32(adev->bios_scratch_reg_offset + 7, 0);
+       }
+
+       if (!ret)
+               smu_baco->state = state;
+
+       return ret;
+}
+
+static int smu_v13_0_7_baco_enter(struct smu_context *smu)
+{
+       int ret = 0;
+
+       ret = smu_v13_0_7_baco_set_state(smu,
+                                      SMU_BACO_STATE_ENTER);
+       if (ret)
+               return ret;
+
+       msleep(10);
+
+       return ret;
+}
+
 static const struct pptable_funcs smu_v13_0_7_ppt_funcs = {
        .get_allowed_feature_mask = smu_v13_0_7_get_allowed_feature_mask,
        .set_default_dpm_table = smu_v13_0_7_set_default_dpm_table,
@@ -1591,8 +1644,8 @@ static const struct pptable_funcs smu_v13_0_7_ppt_funcs = 
{
        .set_pp_feature_mask = smu_cmn_set_pp_feature_mask,
        .baco_is_support = smu_v13_0_baco_is_support,
        .baco_get_state = smu_v13_0_baco_get_state,
-       .baco_set_state = smu_v13_0_baco_set_state,
-       .baco_enter = smu_v13_0_baco_enter,
+       .baco_set_state = smu_v13_0_7_baco_set_state,
+       .baco_enter = smu_v13_0_7_baco_enter,
        .baco_exit = smu_v13_0_baco_exit,
 };
 
-- 
2.25.1

Reply via email to