commit 07574006faefed727c8db2da3fa86740b3bdd31f
author Johnathan Mantey <johnathanx.mantey@intel.com> Tue Dec 13 14:52:54 2022 -0800
committer Vernon Mauery <vernon.mauery@linux.intel.com> Fri Jan 27 19:00:42 2023 +0000
tree 2f0d1942cc7019e5d2a1632a4b68105528b4e894
parent 6224dec4a92aa4924cb6f75c2646096fb9466f28

Match FRU I2C bus address size to phosphor-host-ipmid definition

The entity-manager and phosphor-host-ipmid changed the D-Bus signature
of the I2C bus number variable from 8-bit to 16-bit. This change
caused a mismatch in intel-ipmi-oem, which kept the 8-bit signature.

Tested:
Issued busctl FruDeviceManager calls changing the signature from
yy to qy
Issued 'ipmitool fru' commands and confirmed the FRU contents in the
system were displayed.

Change-Id: I83d4a339f4be4c686db35256bf3b574cd34bdb29
Signed-off-by: Johnathan Mantey <johnathanx.mantey@intel.com>

src/storagecommands.cpp

diff --git a/src/storagecommands.cpp b/src/storagecommands.cpp
index 4a9038d..96e2d2b 100644
--- a/src/storagecommands.cpp
+++ b/src/storagecommands.cpp
@@ -109,11 +109,11 @@
 constexpr static const uint8_t deassertionEvent = 0x80;
 
 static std::vector<uint8_t> fruCache;
-static uint8_t cacheBus = 0xFF;
+static uint16_t cacheBus = 0xFFFF;
 static uint8_t cacheAddr = 0XFF;
 static uint8_t lastDevId = 0xFF;
 
-static uint8_t writeBus = 0xFF;
+static uint16_t writeBus = 0xFFFF;
 static uint8_t writeAddr = 0XFF;
 
 std::unique_ptr<phosphor::Timer> writeTimer = nullptr;
@@ -123,7 +123,7 @@
 
 // we unfortunately have to build a map of hashes in case there is a
 // collision to verify our dev-id
-boost::container::flat_map<uint8_t, std::pair<uint8_t, uint8_t>> deviceHashes;
+boost::container::flat_map<uint8_t, std::pair<uint16_t, uint8_t>> deviceHashes;
 // Map devId to Object Path
 boost::container::flat_map<uint8_t, std::string> devicePath;
 
@@ -131,7 +131,7 @@
 
 bool writeFru()
 {
-    if (writeBus == 0xFF && writeAddr == 0xFF)
+    if (writeBus == 0xFFFF && writeAddr == 0xFF)
     {
         return true;
     }
@@ -151,7 +151,7 @@
             "error writing fru");
         return false;
     }
-    writeBus = 0xFF;
+    writeBus = 0xFFFF;
     writeAddr = 0xFF;
     return true;
 }
@@ -188,7 +188,7 @@
             continue;
         }
 
-        uint8_t fruBus = std::get<uint32_t>(busFind->second);
+        uint16_t fruBus = std::get<uint32_t>(busFind->second);
         uint8_t fruAddr = std::get<uint32_t>(addrFind->second);
         auto chassisFind = fruIface->second.find("CHASSIS_TYPE");
         std::string chassisType;
@@ -207,7 +207,7 @@
                 fruHash = 1;
             }
         }
-        std::pair<uint8_t, uint8_t> newDev(fruBus, fruAddr);
+        std::pair<uint16_t, uint8_t> newDev(fruBus, fruAddr);
 
         bool emplacePassed = false;
         while (!emplacePassed)
@@ -350,7 +350,7 @@
         phosphor::logging::log<phosphor::logging::level::ERR>(
             "Couldn't get raw fru",
             phosphor::logging::entry("ERROR=%s", ec.message().c_str()));
-        cacheBus = 0xFF;
+        cacheBus = 0xFFFF;
         cacheAddr = 0xFF;
         return ipmi::ccResponseError;
     }
@@ -638,7 +638,7 @@
         return IPMI_CC_INVALID_FIELD_REQUEST;
     }
     auto device = deviceHashes.begin() + index;
-    uint8_t& bus = device->second.first;
+    uint16_t& bus = device->second.first;
     uint8_t& address = device->second.second;
 
     boost::container::flat_map<std::string, DbusVariant>* fruData = nullptr;