Remove cmdSetAssetInfo command
Since the asset information command word (0x00) is no longer used,
this commit deletes the functions related to it.
Change-Id: I9569afeaa3af2711b2ac2853d58dc845b649f7bb
Signed-off-by: George Liu <liuxiwei@ieisystem.com>
diff --git a/src/asset_info.cpp b/src/asset_info.cpp
deleted file mode 100644
index c9149c9..0000000
--- a/src/asset_info.cpp
+++ /dev/null
@@ -1,207 +0,0 @@
-#include "config.h"
-
-#include "types.hpp"
-
-#include <ipmid/api.hpp>
-#include <ipmid/utils.hpp>
-#include <phosphor-logging/lg2.hpp>
-#include <sdbusplus/bus.hpp>
-
-#include <optional>
-
-namespace
-{
-constexpr auto FIRMWARE_TYPE_OFFSET = 0;
-constexpr auto FIRMWARE_TYPE_SIZE = 1;
-constexpr auto FIRMWARE_VERSION_OFFSET =
- FIRMWARE_TYPE_OFFSET + FIRMWARE_TYPE_SIZE;
-constexpr auto FIRMWARE_VERSION_SIZE = 15;
-constexpr auto FIRMWARE_BUILDTIME_OFFSET =
- FIRMWARE_VERSION_OFFSET + FIRMWARE_VERSION_SIZE;
-constexpr auto FIRMWARE_BUILDTIME_SIZE = 20;
-constexpr auto FIRMWARE_MIN_SIZE = FIRMWARE_BUILDTIME_OFFSET;
-
-static_assert(FIRMWARE_VERSION_OFFSET == 1);
-static_assert(FIRMWARE_BUILDTIME_OFFSET == 16);
-} // namespace
-
-namespace ipmi
-{
-
-static void registerOEMFunctions() __attribute__((constructor));
-
-struct AssetInfoHeader
-{
- uint8_t rwFlag;
- uint8_t deviceType;
- uint8_t infoType;
- uint8_t maskAllPresentLen;
- uint8_t enableStatus;
- uint8_t maskPresent;
- uint8_t maskAllPresent;
- uint8_t allInfoDone;
- uint16_t totalMessageLen;
-} __attribute__((packed));
-
-enum class bios_version_devname
-{
- BIOS = 0,
- ME = 1,
- IE = 2,
- PCH = 3,
- BOARD = 4,
- MRC = 5,
- CUSTOM_ID = 6,
- PCH_STEPPING = 7,
-};
-
-constexpr std::array<std::string_view, 8> bios_devname{
- "BIOS", "ME", "IE", "PCH", "BOARD", "MRC", "CUSTOM_ID", "PCH_STEPPING",
-};
-
-struct ParsedAssetInfo
-{
- uint8_t rwFlag;
- uint8_t deviceType;
- uint8_t infoType;
- uint8_t maskAllPresentLen;
- std::vector<uint8_t> enableStatus;
- std::vector<uint8_t> maskPresent;
- std::vector<uint8_t> maskAllPresent;
- uint8_t allInfoDone;
- uint16_t totalMessageLen;
- std::vector<uint8_t> data;
-};
-
-void dumpAssetInfo(const ParsedAssetInfo& info)
-{
- fprintf(stderr,
- "AssetInfo: rw %d, deviceType 0x%02x, infoType 0x%02x, "
- "maskAllPresentLen %u\n",
- info.rwFlag, info.deviceType, info.infoType,
- info.maskAllPresentLen);
- fprintf(stderr, "enableStatus ");
- for (const auto& d : info.enableStatus)
- {
- fprintf(stderr, "0x%02x ", d);
- }
- fprintf(stderr, "\nmaskPresent ");
- for (const auto& d : info.maskPresent)
- {
- fprintf(stderr, "0x%02x ", d);
- }
- fprintf(stderr, "\nmaskAllPresent ");
- for (const auto& d : info.maskAllPresent)
- {
- fprintf(stderr, "0x%02x ", d);
- }
- fprintf(stderr, "\nallInfoDone %d, totalMessageLen %u\n", info.allInfoDone,
- info.totalMessageLen);
- fprintf(stderr, "data: ");
- for (const auto& d : info.data)
- {
- fprintf(stderr, "0x%02x ", d);
- }
- fprintf(stderr, "\n");
-}
-
-std::optional<ParsedAssetInfo> parseAssetInfo(const AssetInfoHeader* h)
-{
- auto len = h->maskAllPresentLen;
- if (len == 0)
- {
- // This is invalid
- return {};
- }
-
- ParsedAssetInfo info;
- info.rwFlag = h->rwFlag;
- info.deviceType = h->deviceType;
- info.infoType = h->infoType;
- info.maskAllPresentLen = len;
- info.enableStatus.resize(len);
- info.maskPresent.resize(len);
- info.maskAllPresent.resize(len);
- const uint8_t* p = &h->enableStatus;
- memcpy(info.enableStatus.data(), p, len);
- p += len;
- memcpy(info.maskPresent.data(), p, len);
- p += len;
- memcpy(info.maskAllPresent.data(), p, len);
- p += len;
- info.allInfoDone = *p++;
- info.totalMessageLen = *reinterpret_cast<const uint16_t*>(p);
- p += sizeof(uint16_t);
- auto dataLen = info.totalMessageLen - (sizeof(AssetInfoHeader) + 3 * len);
- info.data.resize(dataLen);
- memcpy(info.data.data(), p, dataLen);
-
- // dumpAssetInfo(info);
- return info;
-}
-
-void parseBIOSInfo(const std::vector<uint8_t>& data)
-{
- if (data.size() < FIRMWARE_MIN_SIZE)
- {
- return;
- }
- bios_version_devname dev = static_cast<bios_version_devname>(data[0]);
- std::string version{data.data() + FIRMWARE_VERSION_OFFSET,
- data.data() + FIRMWARE_VERSION_SIZE};
- std::string buildTime;
- if (dev == bios_version_devname::BIOS)
- {
- buildTime.assign(reinterpret_cast<const char*>(
- data.data() + FIRMWARE_BUILDTIME_OFFSET),
- FIRMWARE_BUILDTIME_SIZE);
-
- try
- {
- // Set BIOS version
- std::shared_ptr<sdbusplus::asio::connection> dbus = getSdBus();
- auto service = getService(*dbus, VERSION_IFACE, BIOS_OBJPATH);
- setDbusProperty(*dbus, service, BIOS_OBJPATH, VERSION_IFACE,
- VERSION, version);
- }
- catch (const std::exception& e)
- {
- lg2::error("Failed to set BIOS version: {VERSION}, error: {ERROR}",
- "VERSION", version, "ERROR", e);
- }
- }
-
- printf("Dev %s, version %s, build time %s\n",
- bios_devname[static_cast<int>(dev)].data(), version.c_str(),
- buildTime.c_str());
-}
-
-ipmi_ret_t ipmiOemIEIAssetInfo(
- ipmi_netfn_t /* netfn */, ipmi_cmd_t /* cmd */, ipmi_request_t request,
- ipmi_response_t /* response */, ipmi_data_len_t /* data_len */,
- ipmi_context_t /* context */)
-{
- auto header = reinterpret_cast<AssetInfoHeader*>(request);
-
- auto info = parseAssetInfo(header);
- auto deviceType = info->deviceType;
- if (deviceType != 0x05)
- {
- lg2::info("Device type ({DEVICE_TYPE}) not supported yet",
- "DEVICE_TYPE", deviceType);
- return ipmi::ccUnspecifiedError;
- }
-
- // For now we only support BIOS type
- parseBIOSInfo(info->data);
-
- return ipmi::ccSuccess;
-}
-
-void registerOEMFunctions(void)
-{
- ipmi_register_callback(netFnIEI, iei::cmdSetAssetInfo, nullptr,
- ipmiOemIEIAssetInfo, SYSTEM_INTERFACE);
-}
-
-} // namespace ipmi
diff --git a/src/meson.build b/src/meson.build
index 8120234..3df0ce3 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -4,7 +4,7 @@
so_version = '0.1.0'
-sources = ['asset_info.cpp', 'firmware_version.cpp', 'power.cpp', 'utils.cpp']
+sources = ['firmware_version.cpp', 'power.cpp', 'utils.cpp']
deps = [
phosphor_dbus_interfaces_dep,
diff --git a/src/types.hpp b/src/types.hpp
index b181250..71bce8c 100644
--- a/src/types.hpp
+++ b/src/types.hpp
@@ -10,7 +10,6 @@
namespace iei
{
-constexpr ipmi::Cmd cmdSetAssetInfo = 0x01;
constexpr ipmi::Cmd cmdGetFWVersion = 0x03;
// power