commit f079e8361b3222f24919f81ec99dfda894c36bb3
author Josh Lehan <krellan@google.com> Tue Sep 19 15:52:52 2023 -0700
committer Zhikui Ren <zhikui.ren@intel.com> Wed Sep 27 01:23:27 2023 +0000
tree a0992f1b256ac8affabff528267d0ef2e4d04fa0
parent 6076d2c30a4bb4bedc56a3d7d87236f447a3abdc

Initialize first byte in IPMI cache file

In the IPMI cache file, the first byte of this file was always
essentially random, because it was in a structure that had this field
uninitialized. Fixing it, by arbitrarily choosing the value 0x01.

Added a new constant "mdrDirVersion" for this, and also added a similar
constant for "smbiosDirVersion" (which was being initialized, but to a
magic number directly in the code, not a constant).

Tested: Cache files now appear consistently.

Change-Id: I1f13ae973965b1a7105e2ac054ae30c52f45e2a9
Signed-off-by: Josh Lehan <krellan@google.com>

include/mdrv2.hpp

diff --git a/include/mdrv2.hpp b/include/mdrv2.hpp
index 65890ed..c2cf038 100644
--- a/include/mdrv2.hpp
+++ b/include/mdrv2.hpp
@@ -79,7 +79,7 @@
                                  smbiosPath, smbiosInterfaceName))
     {
         smbiosDir.agentVersion = smbiosAgentVersion;
-        smbiosDir.dirVersion = 1;
+        smbiosDir.dirVersion = smbiosDirVersion;
         smbiosDir.dirEntries = 1;
         directoryEntries(smbiosDir.dirEntries);
         smbiosDir.status = 1;

include/smbios_mdrv2.hpp

diff --git a/include/smbios_mdrv2.hpp b/include/smbios_mdrv2.hpp
index 0b4638a..e77abf4 100644
--- a/include/smbios_mdrv2.hpp
+++ b/include/smbios_mdrv2.hpp
@@ -32,10 +32,12 @@
 constexpr uint32_t mdr2SMSize = 0x00100000;
 constexpr uint32_t mdr2SMBaseAddress = 0x9FF00000;
 
+constexpr uint8_t mdrDirVersion = 1;
 constexpr uint8_t mdrTypeII = 2;
 
 constexpr uint8_t mdr2Version = 2;
 constexpr uint8_t smbiosAgentVersion = 1;
+constexpr uint8_t smbiosDirVersion = 1;
 
 constexpr uint32_t pageMask = 0xf000;
 constexpr int smbiosDirIndex = 0;

src/smbios-ipmi-blobs/handler.cpp

diff --git a/src/smbios-ipmi-blobs/handler.cpp b/src/smbios-ipmi-blobs/handler.cpp
index 4b1841f..3763762 100644
--- a/src/smbios-ipmi-blobs/handler.cpp
+++ b/src/smbios-ipmi-blobs/handler.cpp
@@ -192,6 +192,7 @@
     blobPtr->state &= ~blobs::StateFlags::commit_error;
 
     MDRSMBIOSHeader mdrHdr;
+    mdrHdr.dirVer = mdrDirVersion;
     mdrHdr.mdrType = mdrTypeII;
     mdrHdr.timestamp = std::time(nullptr);
     mdrHdr.dataSize = blobPtr->buffer.size();