On 1/15/2025 3:18 PM, Jesse.zhang@xxxxxxx wrote:
> From: "Jesse.zhang@xxxxxxx" <Jesse.zhang@xxxxxxx>
>
> This patch refactors the firmware version checks in `smu_v13_0_6_reset_sdma`
> to support multiple SMU programs with different firmware version thresholds.
>
> V2: return -EOPNOTSUPP for unspported pmfw
>
> Suggested-by: Lazar Lijo <Lijo.Lazar@xxxxxxx>
> Signed-off-by: Jesse Zhang <jesse.zhang@xxxxxxx>
> ---
> .../drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 23 ++++++++++++++-----
> 1 file changed, 17 insertions(+), 6 deletions(-)
>
> 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 650aa9d0548a..f68282238303 100644
> --- 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
> @@ -2745,12 +2745,23 @@ static int smu_v13_0_6_reset_sdma(struct smu_context *smu, uint32_t inst_mask)
> {
> struct amdgpu_device *adev = smu->adev;
> int ret = 0;
> -
> - /* the message is only valid on SMU 13.0.6 with pmfw 85.121.00 and above */
> - if ((adev->flags & AMD_IS_APU) ||
> - amdgpu_ip_version(adev, MP1_HWIP, 0) != IP_VERSION(13, 0, 6) ||
> - smu->smc_fw_version < 0x00557900)
> - return 0;
> + uint32_t smu_program;
> +
> + smu_program = (smu->smc_fw_version >> 24) & 0xff;
> + /* the message is only valid on SMU 13.0.6 with these pmfw and above */
> + if (amdgpu_ip_version(adev, MP1_HWIP, 0) != IP_VERSION(13, 0, 6) ||
> + ((smu_program == 0) && (smu->smc_fw_version < 0x00557900)) ||
> + ((smu_program == 4) && (smu->smc_fw_version < 0x4557000)) ||
> + ((smu_program == 5) && (smu->smc_fw_version < 0x5551200)) ||
Missed to check this last time -
Note that this won't work as this FW version is not used with IP version
13.0.6.
It will return always return unsupported for program 5 because of this
check - amdgpu_ip_version(adev, MP1_HWIP, 0) != IP_VERSION(13, 0, 6)
Thanks,
Lijo
> + ((smu_program == 7) && (smu->smc_fw_version < 0x7550700))) {
> + dev_err(smu->adev->dev,
> + "ResetSDMA not supported: SMU program %u requires PMFW >= 0x%x\n"
> + "Current PMFW version: 0x%x\n",smu_program,
> + smu_program == 0 ? 0x00557900 : smu_program == 4 ? 0x4557000 :
> + smu_program == 5 ? 0x5551200 : smu_program == 7 ? 0x7550700 : 0,
> + smu->smc_fw_version);
> + return -EOPNOTSUPP;
> + }
>
> ret = smu_cmn_send_smc_msg_with_param(smu,
> SMU_MSG_ResetSDMA, inst_mask, NULL);
