[PATCH] drm/amdgpu: Report Missing MES Firmware Versions with Sysfs

[Russell, Kent]

[AMD Official Use Only - General]

> -----Original Message-----
> From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> On Behalf Of Ori
> Messinger
> Sent: Friday, July 28, 2023 12:00 PM
> To: amd-gfx at lists.freedesktop.org
> Cc: Messinger, Ori <Ori.Messinger at amd.com>
> Subject: [PATCH] drm/amdgpu: Report Missing MES Firmware Versions with Sysfs
>
> Added missing MES firmware versions to the 'fw_version' sysfs directory,
> they should now exist as a files named "mes_fw_version" and
> "mes_kiq_fw_version"
> found at:
>
> /sys/class/drm/cardX/device/fw_version/mes_fw_version
> /sys/class/drm/cardX/device/fw_version/mes_kiq_fw_version
> Where X is the card number, and the version is displayed in hexadecimal.
>
> Signed-off-by: Ori Messinger <ori.messinger at amd.com>
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 13 ++++++++-----
>  1 file changed, 8 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> index 16807ff96dc9..6a15a84ecfcd 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c
> @@ -703,6 +703,8 @@ FW_VERSION_ATTR(sdma_fw_version, 0444,
> sdma.instance[0].fw_version);
>  FW_VERSION_ATTR(sdma2_fw_version, 0444, sdma.instance[1].fw_version);
>  FW_VERSION_ATTR(vcn_fw_version, 0444, vcn.fw_version);
>  FW_VERSION_ATTR(dmcu_fw_version, 0444, dm.dmcu_fw_version);
> +FW_VERSION_ATTR(mes_fw_version, 0444, mes.sched_version &
> AMDGPU_MES_VERSION_MASK);
> +FW_VERSION_ATTR(mes_kiq_fw_version, 0444, mes.kiq_version &
> AMDGPU_MES_VERSION_MASK);
>
>  static struct attribute *fw_attrs[] = {
>       &dev_attr_vce_fw_version.attr, &dev_attr_uvd_fw_version.attr,
> @@ -711,11 +713,12 @@ static struct attribute *fw_attrs[] = {
>       &dev_attr_rlc_fw_version.attr, &dev_attr_rlc_srlc_fw_version.attr,
>       &dev_attr_rlc_srlg_fw_version.attr, &dev_attr_rlc_srls_fw_version.attr,
>       &dev_attr_mec_fw_version.attr, &dev_attr_mec2_fw_version.attr,
> -     &dev_attr_sos_fw_version.attr, &dev_attr_asd_fw_version.attr,
> -     &dev_attr_ta_ras_fw_version.attr, &dev_attr_ta_xgmi_fw_version.attr,
> -     &dev_attr_smc_fw_version.attr, &dev_attr_sdma_fw_version.attr,
> -     &dev_attr_sdma2_fw_version.attr, &dev_attr_vcn_fw_version.attr,
> -     &dev_attr_dmcu_fw_version.attr, &dev_attr_imu_fw_version.attr,

Why did the order change here?

 Kent

> +     &dev_attr_imu_fw_version.attr, &dev_attr_sos_fw_version.attr,
> +     &dev_attr_asd_fw_version.attr, &dev_attr_ta_ras_fw_version.attr,
> +     &dev_attr_ta_xgmi_fw_version.attr, &dev_attr_smc_fw_version.attr,
> +     &dev_attr_sdma_fw_version.attr, &dev_attr_sdma2_fw_version.attr,
> +     &dev_attr_vcn_fw_version.attr, &dev_attr_dmcu_fw_version.attr,
> +     &dev_attr_mes_fw_version.attr, &dev_attr_mes_kiq_fw_version.attr,
>       NULL
>  };
>
> --
> 2.25.1