commit 7acb2d27bcb04030f63da02d33873634343a1bfb
author V-Sanjana <sanjana.v@intel.com> Tue Nov 15 11:13:54 2022 +0530
committer V-Sanjana <sanjana.v@intel.com> Mon Dec 05 10:08:25 2022 +0000
tree a11abbc6a9d4f8893883708882c4c195fdcff9f4
parent 8b7c156e5e092ca22c83f755bcb4d1aecbd1d703

The slot i2c master read write command is updated

The update is to perform read-write operation on the devices behind MUX
in various components like
RISER, HSBP and PCIe slots present in baseboard.

Tested:
The slot i2c command was tested for reading data from HSBP CPLD
present behind baseboard MUX and found to be successful

Signed-off-by: V-Sanjana <sanjana.v@intel.com>
Change-Id: I25ce882fda50f5946ca2acec0290d1c769ab019a

src/manufacturingcommands.cpp

diff --git a/src/manufacturingcommands.cpp b/src/manufacturingcommands.cpp
index 09b6dab..4563662 100644
--- a/src/manufacturingcommands.cpp
+++ b/src/manufacturingcommands.cpp
@@ -35,6 +35,12 @@
     std::chrono::duration_cast<std::chrono::microseconds>(
         std::chrono::seconds(60)); // 1 minute timeout
 
+static constexpr uint8_t bbRiserMux = 0;
+static constexpr uint8_t leftRiserMux = 1;
+static constexpr uint8_t rightRiserMux = 2;
+static constexpr uint8_t pcieMux = 3;
+static constexpr uint8_t hsbpMux = 4;
+
 static constexpr uint8_t slotAddressTypeBus = 0;
 static constexpr uint8_t slotAddressTypeUniqueid = 1;
 static constexpr uint8_t slotI2CMaxReadSize = 35;
@@ -1192,7 +1198,8 @@
 
 /** @brief implements slot master write read IPMI command which can be used
  * for low-level I2C/SMBus write, read or write-read access for PCIE slots
- * @param reserved - skip 6 bit
+ * @param reserved - skip 3 bit
+ * @param muxType - mux type
  * @param addressType - address type
  * @param bbSlotNum - baseboard slot number
  * @param riserSlotNum - riser slot number
@@ -1203,11 +1210,11 @@
  *
  * @returns IPMI completion code plus response data
  */
-ipmi::RspType<std::vector<uint8_t>>
-    appSlotI2CMasterWriteRead(uint6_t reserved, uint2_t addressType,
-                              uint3_t bbSlotNum, uint3_t riserSlotNum,
-                              uint2_t reserved2, uint8_t slaveAddr,
-                              uint8_t readCount, std::vector<uint8_t> writeData)
+
+ipmi::RspType<std::vector<uint8_t>> appSlotI2CMasterWriteRead(
+    uint3_t reserved, uint3_t muxType, uint2_t addressType, uint3_t bbSlotNum,
+    uint3_t riserSlotNum, uint2_t reserved2, uint8_t slaveAddr,
+    uint8_t readCount, std::vector<uint8_t> writeData)
 {
     if (reserved || reserved2)
     {
@@ -1217,11 +1224,35 @@
     std::string i2cBus;
     if (addressType == slotAddressTypeBus)
     {
-        std::string path = "/dev/i2c-mux/Riser_" +
-                           std::to_string(static_cast<uint8_t>(bbSlotNum)) +
-                           "_Mux/Pcie_Slot_" +
-                           std::to_string(static_cast<uint8_t>(riserSlotNum));
-
+        std::string path = "/dev/i2c-mux/";
+        if (muxType == bbRiserMux)
+        {
+            path += "Riser_" + std::to_string(static_cast<uint8_t>(bbSlotNum)) +
+                    "_Mux/Pcie_Slot_" +
+                    std::to_string(static_cast<uint8_t>(riserSlotNum));
+        }
+        else if (muxType == leftRiserMux)
+        {
+            path += "Left_Riser_Mux/Slot_" +
+                    std::to_string(static_cast<uint8_t>(riserSlotNum));
+        }
+        else if (muxType == rightRiserMux)
+        {
+            path += "Right_Riser_Mux/Slot_" +
+                    std::to_string(static_cast<uint8_t>(riserSlotNum));
+        }
+        else if (muxType == pcieMux)
+        {
+            path += "PCIe_Mux/Slot_" +
+                    std::to_string(static_cast<uint8_t>(riserSlotNum));
+        }
+        else if (muxType == hsbpMux)
+        {
+            path += "HSBP_Mux/Slot" +
+                    std::to_string(static_cast<uint8_t>(riserSlotNum));
+        }
+        phosphor::logging::log<phosphor::logging::level::DEBUG>(
+            ("Path is: " + path).c_str());
         if (std::filesystem::exists(path) && std::filesystem::is_symlink(path))
         {
             i2cBus = std::filesystem::read_symlink(path);