From 9eaad9eaead2690f4e89806f76bb059d26620b61 Mon Sep 17 00:00:00 2001 From: Ori Messinger Date: Wed, 13 Sep 2023 16:23:57 -0400 Subject: [PATCH] ROCm SMI LIB: Add Missing Firmware Blocks The purpose of this patch is to add the following missing firmware blocks to the SMI LIB: -RSMI_FW_BLOCK_MES -RSMI_FW_BLOCK_MES_KIQ Signed-off-by: Ori Messinger Change-Id: I5d4d37d883878dd02ef8533d4eb8891d54d70630 [ROCm/rocm_smi_lib commit: d44a6ef52307f2926d57edb06d3d4356d12b8254] --- projects/rocm-smi-lib/include/rocm_smi/rocm_smi.h | 2 ++ .../rocm-smi-lib/include/rocm_smi/rocm_smi_device.h | 2 ++ projects/rocm-smi-lib/src/rocm_smi.cc | 2 ++ projects/rocm-smi-lib/src/rocm_smi_device.cc | 10 ++++++++++ projects/rocm-smi-lib/src/rocm_smi_main.cc | 2 ++ .../rocm-smi-lib/tests/rocm_smi_test/test_utils.cc | 2 ++ 6 files changed, 20 insertions(+) diff --git a/projects/rocm-smi-lib/include/rocm_smi/rocm_smi.h b/projects/rocm-smi-lib/include/rocm_smi/rocm_smi.h index 14e4db0d58..6b755ef154 100755 --- a/projects/rocm-smi-lib/include/rocm_smi/rocm_smi.h +++ b/projects/rocm-smi-lib/include/rocm_smi/rocm_smi.h @@ -625,6 +625,8 @@ typedef enum { RSMI_FW_BLOCK_ME, RSMI_FW_BLOCK_MEC, RSMI_FW_BLOCK_MEC2, + RSMI_FW_BLOCK_MES, + RSMI_FW_BLOCK_MES_KIQ, RSMI_FW_BLOCK_PFP, RSMI_FW_BLOCK_RLC, RSMI_FW_BLOCK_RLC_SRLC, diff --git a/projects/rocm-smi-lib/include/rocm_smi/rocm_smi_device.h b/projects/rocm-smi-lib/include/rocm_smi/rocm_smi_device.h index a1b2809457..7a28e1327c 100755 --- a/projects/rocm-smi-lib/include/rocm_smi/rocm_smi_device.h +++ b/projects/rocm-smi-lib/include/rocm_smi/rocm_smi_device.h @@ -146,6 +146,8 @@ enum DevInfoTypes { kDevFwVersionMe, kDevFwVersionMec, kDevFwVersionMec2, + kDevFwVersionMes, + kDevFwVersionMesKiq, kDevFwVersionPfp, kDevFwVersionRlc, kDevFwVersionRlcSrlc, diff --git a/projects/rocm-smi-lib/src/rocm_smi.cc b/projects/rocm-smi-lib/src/rocm_smi.cc index 5fc777f6a8..b05f37dbb8 100755 --- a/projects/rocm-smi-lib/src/rocm_smi.cc +++ b/projects/rocm-smi-lib/src/rocm_smi.cc @@ -1655,6 +1655,8 @@ rsmi_dev_firmware_version_get(uint32_t dv_ind, rsmi_fw_block_t block, { RSMI_FW_BLOCK_ME, amd::smi::kDevFwVersionMe }, { RSMI_FW_BLOCK_MEC, amd::smi::kDevFwVersionMec }, { RSMI_FW_BLOCK_MEC2, amd::smi::kDevFwVersionMec2 }, + { RSMI_FW_BLOCK_MES, amd::smi::kDevFwVersionMes }, + { RSMI_FW_BLOCK_MES_KIQ, amd::smi::kDevFwVersionMesKiq }, { RSMI_FW_BLOCK_PFP, amd::smi::kDevFwVersionPfp }, { RSMI_FW_BLOCK_RLC, amd::smi::kDevFwVersionRlc }, { RSMI_FW_BLOCK_RLC_SRLC, amd::smi::kDevFwVersionRlcSrlc }, diff --git a/projects/rocm-smi-lib/src/rocm_smi_device.cc b/projects/rocm-smi-lib/src/rocm_smi_device.cc index 03a38dc749..12f69dcec0 100755 --- a/projects/rocm-smi-lib/src/rocm_smi_device.cc +++ b/projects/rocm-smi-lib/src/rocm_smi_device.cc @@ -138,6 +138,8 @@ static const char *kDevFwVersionMcFName = "fw_version/mc_fw_version"; static const char *kDevFwVersionMeFName = "fw_version/me_fw_version"; static const char *kDevFwVersionMecFName = "fw_version/mec_fw_version"; static const char *kDevFwVersionMec2FName = "fw_version/mec2_fw_version"; +static const char *kDevFwVersionMesFName = "fw_version/mes_fw_version"; +static const char *kDevFwVersionMesKiqFName = "fw_version/mes_kiq_fw_version"; static const char *kDevFwVersionPfpFName = "fw_version/pfp_fw_version"; static const char *kDevFwVersionRlcFName = "fw_version/rlc_fw_version"; static const char *kDevFwVersionRlcSrlcFName = "fw_version/rlc_srlc_fw_version"; @@ -280,6 +282,8 @@ static const std::map kDevAttribNameMap = { {kDevFwVersionMe, kDevFwVersionMeFName}, {kDevFwVersionMec, kDevFwVersionMecFName}, {kDevFwVersionMec2, kDevFwVersionMec2FName}, + {kDevFwVersionMes, kDevFwVersionMesFName}, + {kDevFwVersionMesKiq, kDevFwVersionMesKiqFName}, {kDevFwVersionPfp, kDevFwVersionPfpFName}, {kDevFwVersionRlc, kDevFwVersionRlcFName}, {kDevFwVersionRlcSrlc, kDevFwVersionRlcSrlcFName}, @@ -343,6 +347,8 @@ static std::map kDevInfoVarTypeToRSMIVariant = { {kDevFwVersionMe, RSMI_FW_BLOCK_ME}, {kDevFwVersionMec, RSMI_FW_BLOCK_MEC}, {kDevFwVersionMec2, RSMI_FW_BLOCK_MEC2}, + {kDevFwVersionMes, RSMI_FW_BLOCK_MES}, + {kDevFwVersionMesKiq, RSMI_FW_BLOCK_MES_KIQ}, {kDevFwVersionPfp, RSMI_FW_BLOCK_PFP}, {kDevFwVersionRlc, RSMI_FW_BLOCK_RLC}, {kDevFwVersionRlcSrlc, RSMI_FW_BLOCK_RLC_SRLC}, @@ -478,6 +484,8 @@ static const std::map kDevFuncDependsMap = { kDevFwVersionMe, kDevFwVersionMec, kDevFwVersionMec2, + kDevFwVersionMes, + kDevFwVersionMesKiq, kDevFwVersionPfp, kDevFwVersionRlc, kDevFwVersionRlcSrlc, @@ -943,6 +951,8 @@ int Device::readDevInfo(DevInfoTypes type, uint64_t *val) { case kDevFwVersionMe: case kDevFwVersionMec: case kDevFwVersionMec2: + case kDevFwVersionMes: + case kDevFwVersionMesKiq: case kDevFwVersionPfp: case kDevFwVersionRlc: case kDevFwVersionRlcSrlc: diff --git a/projects/rocm-smi-lib/src/rocm_smi_main.cc b/projects/rocm-smi-lib/src/rocm_smi_main.cc index 831e382b93..ab0ee435d2 100755 --- a/projects/rocm-smi-lib/src/rocm_smi_main.cc +++ b/projects/rocm-smi-lib/src/rocm_smi_main.cc @@ -129,6 +129,8 @@ amd::smi::RocmSMI::devInfoTypesStrings = { {amd::smi::kDevFwVersionMe, amdSMI + "kDevFwVersionMe"}, {amd::smi::kDevFwVersionMec, amdSMI + "kDevFwVersionMec"}, {amd::smi::kDevFwVersionMec2, amdSMI + "kDevFwVersionMec2"}, + {amd::smi::kDevFwVersionMes, amdSMI + "kDevFwVersionMes"}, + {amd::smi::kDevFwVersionMesKiq, amdSMI + "kDevFwVersionMesKiq"}, {amd::smi::kDevFwVersionPfp, amdSMI + "kDevFwVersionPfp"}, {amd::smi::kDevFwVersionRlc, amdSMI + "kDevFwVersionRlc"}, {amd::smi::kDevFwVersionRlcSrlc, amdSMI + "kDevFwVersionRlcSrlc"}, diff --git a/projects/rocm-smi-lib/tests/rocm_smi_test/test_utils.cc b/projects/rocm-smi-lib/tests/rocm_smi_test/test_utils.cc index c1b9a8de86..d27f185bba 100755 --- a/projects/rocm-smi-lib/tests/rocm_smi_test/test_utils.cc +++ b/projects/rocm-smi-lib/tests/rocm_smi_test/test_utils.cc @@ -56,6 +56,8 @@ static const std::map kDevFWNameMap = { {RSMI_FW_BLOCK_ME, "me"}, {RSMI_FW_BLOCK_MEC, "mec"}, {RSMI_FW_BLOCK_MEC2, "mec2"}, + {RSMI_FW_BLOCK_MES, "mes"}, + {RSMI_FW_BLOCK_MES_KIQ, "mes_kiq"}, {RSMI_FW_BLOCK_PFP, "pfp"}, {RSMI_FW_BLOCK_RLC, "rlc"}, {RSMI_FW_BLOCK_RLC_SRLC, "rlc_srlc"},