[PATCH 2/2] drm/amd/pm: enable MACO support for SMU 13.0.0

[Alex Deucher]

On Fri, Jun 10, 2022 at 2:26 AM Evan Quan <evan.quan at amd.com> wrote:
>
> Enable BAMACO reset support for SMU 13.0.0.
>
> Signed-off-by: Evan Quan <evan.quan at amd.com>
> Change-Id: I67696671c216790a0b6d5b84f7d4b430d734ac3c
> --
> v1->v2:
>   - maximum code sharing around smu13.0.0 and smu13.0.7
> ---
>  .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c    |  3 +-
>  .../drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c  |  3 ++
>  .../drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c  | 52 +------------------
>  3 files changed, 7 insertions(+), 51 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
> index fba0b87d01fb..f18f9605e586 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c
> @@ -2271,7 +2271,8 @@ int smu_v13_0_baco_set_state(struct smu_context *smu,
>         if (state == SMU_BACO_STATE_ENTER) {
>                 ret = smu_cmn_send_smc_msg_with_param(smu,
>                                                       SMU_MSG_EnterBaco,
> -                                                     0,
> +                                                     smu_baco->maco_support ?
> +                                                     BACO_SEQ_BAMACO : BACO_SEQ_BACO,
>                                                       NULL);
>         } else {
>                 ret = smu_cmn_send_smc_msg(smu,
> diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
> index 495713e4ebd4..6fb2b072a730 100644
> --- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
> +++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
> @@ -325,6 +325,9 @@ static int smu_v13_0_0_check_powerplay_table(struct smu_context *smu)
>             powerplay_table->platform_caps & SMU_13_0_0_PP_PLATFORM_CAP_MACO)
>                 smu_baco->platform_support = true;

Not really related to this patch, but is
SMU_13_0_0_PP_PLATFORM_CAP_MACO really used to determine with the
platform supports BACO in general?  Is this right?  I don't see how we
would ever end up using plain BACO.

This patch is:
Reviewed-by: Alex Deucher <alexander.deucher at amd.com>


>
> +       if (powerplay_table->platform_caps & SMU_13_0_0_PP_PLATFORM_CAP_MACO)
> +               smu_baco->maco_support = true;
> +
>         table_context->thermal_controller_type =
>                 powerplay_table->thermal_controller_type;
>
> 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 693bb6bda350..96ae5ff8e19e 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
> @@ -1551,54 +1551,6 @@ 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;
> -
> -       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,
> @@ -1653,8 +1605,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_7_baco_set_state,
> -       .baco_enter = smu_v13_0_7_baco_enter,
> +       .baco_set_state = smu_v13_0_baco_set_state,
> +       .baco_enter = smu_v13_0_baco_enter,
>         .baco_exit = smu_v13_0_baco_exit,
>         .set_mp1_state = smu_cmn_set_mp1_state,
>  };
> --
> 2.29.0
>