From 11e104d7087015607e7fb9e9cfd169393a213a57 Mon Sep 17 00:00:00 2001
From: Yong Li <yong.b.li@linux.intel.com>
Date: Fri, 1 Nov 2019 18:16:50 +0800
Subject: Add the NVME region in smbios V1 table

The regions defined in eps is from 1 to 5,
needs to add NVME as the region 5, to align with the bmc region read command.

Tested:
ipmitool raw 0x3e 0x23 0x05 0x1 0x00 0x00

smbios-mdrv1.service does not restart

Change-Id: I2c4fcf8746ef9b5e00ffc538f569b5714190bd44
Signed-off-by: Yong Li <yong.b.li@linux.intel.com>
---
 services/smbios/include/manager.hpp |  6 +++---
 services/smbios/include/smbios.hpp  | 15 +++++++++++----
 services/smbios/src/smbios-main.cpp | 11 +++++++++--
 3 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/services/smbios/include/manager.hpp b/services/smbios/include/manager.hpp
index 9acaf97..2fb5a2f 100644
--- a/services/smbios/include/manager.hpp
+++ b/services/smbios/include/manager.hpp
@@ -49,7 +49,7 @@ class MDR_V1 : sdbusplus::xyz::openbmc_project::Smbios::server::MDR_V1
         sdbusplus::xyz::openbmc_project::Smbios::server::MDR_V1(bus, path),
         bus(bus)
     {
-        for (uint8_t index = 0; index < 4; index++)
+        for (uint8_t index = 0; index < maxMdrIndex - 1; index++)
         {
             timers[index] = std::make_unique<phosphor::watchdog::Timer>(
                 event, index, [&](uint8_t index) {
@@ -57,7 +57,7 @@ class MDR_V1 : sdbusplus::xyz::openbmc_project::Smbios::server::MDR_V1
                 });
         }
 
-        std::copy(&region[0], &region[3], regionS);
+        std::copy(region, region + maxRegion, regionS);
         if (access(smbiosPath, F_OK) == -1)
         {
             int flag = mkdir(smbiosPath, S_IRWXU);
@@ -112,7 +112,7 @@ class MDR_V1 : sdbusplus::xyz::openbmc_project::Smbios::server::MDR_V1
 
     uint16_t regionUsed(uint16_t value) override;
 
-    static constexpr uint8_t maxRegion = 5;
+    static constexpr uint8_t maxRegion = maxMdrIndex - 1;
 
     struct ManagedDataRegion regionS[maxRegion];
 
diff --git a/services/smbios/include/smbios.hpp b/services/smbios/include/smbios.hpp
index 8a1550f..390ac9a 100644
--- a/services/smbios/include/smbios.hpp
+++ b/services/smbios/include/smbios.hpp
@@ -21,6 +21,8 @@ static constexpr uint16_t mdrSmbiosSize = 32 * 1024;    // 32K
 static constexpr uint16_t mdrAcpiTableSize = 32 * 1024; // 32K
 static constexpr uint16_t mdrMemMappingSize = 8 * 1024; // 8K
 static constexpr uint16_t mdrScsiBootSize = 8 * 1024;   // 8K
+static constexpr uint16_t mdrNvmeSize = 1 * 1024;       // 1K
+
 static constexpr uint16_t smbiosTableStorageSize = 0xffff;
 
 static constexpr uint8_t mdrVersion = 0x11; // MDR version 1.1
@@ -31,17 +33,21 @@ static constexpr const char *mdrType2File = "/etc/smbios/smbios2";
 static constexpr const char *mdrAcpiFile = "/etc/smbios/acpi";
 static constexpr const char *mdrMemMapFile = "/etc/smbios/memmapping";
 static constexpr const char *mdrScsiBootFile = "/etc/smbios/scsiboot";
+static constexpr const char *mdrNvmeFile = "/etc/smbios/nvme";
 
-typedef enum {
+typedef enum
+{
     mdrNone = 0,
     mdrSmbios = 1,
     mdrAcpi = 2,
     mdrMemMap = 3,
     mdrScsiBoot = 4,
-    maxMdrIndex = 5
+    mdrNvme = 5,
+    maxMdrIndex = 6
 } MDRRegionIndex;
 
-typedef enum {
+typedef enum
+{
     regionLockUnlocked = 0,
     regionLockStrict,
     regionLockPreemptable
@@ -82,7 +88,8 @@ static constexpr const char *cpuPath =
 static constexpr const char *systemPath =
     "/xyz/openbmc_project/inventory/system/chassis/motherboard/bios";
 
-typedef enum {
+typedef enum
+{
     biosType = 0,
     systemType = 1,
     baseboardType = 2,
diff --git a/services/smbios/src/smbios-main.cpp b/services/smbios/src/smbios-main.cpp
index 2a9b86b..532163c 100644
--- a/services/smbios/src/smbios-main.cpp
+++ b/services/smbios/src/smbios-main.cpp
@@ -24,8 +24,9 @@ uint8_t mdrSmBiosData[mdrSmbiosSize];
 uint8_t mdrAcpiTable[mdrAcpiTableSize];
 uint8_t mdrMemoryMapping[mdrMemMappingSize];
 uint8_t mdrSCSIBoot[mdrScsiBootSize];
+uint8_t mdrNvmeData[mdrNvmeSize];
 
-struct ManagedDataRegion regionS[4] = {
+struct ManagedDataRegion regionS[] = {
     // SMBIOS table - matching the regionID order
     {mdrType1File,
      mdrSmBiosData,
@@ -54,8 +55,14 @@ struct ManagedDataRegion regionS[4] = {
      0,
      {mdrVersion, mdrScsiBoot, false, 0, regionLockUnlocked, mdrScsiBootSize, 0,
       0},
-     0}
+     0},
 
+    // NVMe table - matching the regionID order
+    {mdrNvmeFile,
+     mdrNvmeData,
+     0,
+     {mdrVersion, mdrNvme, false, 0, regionLockUnlocked, mdrNvmeSize, 0, 0},
+     0},
 };
 
 int main(void)
-- 
cgit v1.2.3