IBS:Fix ipmi SDR command

9 files changed, 703 insertions, 1 deletions

diff --git a/meta-ibs/meta-common/recipes-ibs/ipmi/intel-ipmi-oem/0001-Allow-Sensor-Commands.patch b/meta-ibs/meta-common/recipes-ibs/ipmi/intel-ipmi-oem/0001-Allow-Sensor-Commands.patch
new file mode 100644
index 0000000000..82a59e6f46
--- /dev/null
+++ b/meta-ibs/meta-common/recipes-ibs/ipmi/intel-ipmi-oem/0001-Allow-Sensor-Commands.patch
@@ -0,0 +1,28 @@
+From c04699247fee93a780c5f5ae3484434c54b70264 Mon Sep 17 00:00:00 2001
+From: "Evgeny Alekseev (IBS Group)" <ealekseev@ibs.sila.ru>
+Date: Mon, 5 Sep 2022 16:15:45 +0300
+Subject: [PATCH] Allow Sensor Commands
+
+---
+ ipmi-whitelist.conf | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/ipmi-whitelist.conf b/ipmi-whitelist.conf
+index 7e07fc0..dbe8240 100644
+--- a/ipmi-whitelist.conf
++++ b/ipmi-whitelist.conf
+@@ -148,7 +148,13 @@
+ 0x0c:0x20:0x7f7f   //<Transport>:<SOL Activating>
+ 0x0c:0x21:0x7f7f   //<Transport>:<Set SOL Configuration Parameters>
+ 0x0c:0x22:0xffff   //<Transport>:<Get SOL Configuration Parameters>
+-0x2c:0x1f:0xff7f   //<Group Extension>:<Get CPU PECI Package Config Data>
++0x2c:0x00:0xffff   //<Group Extension>:<Group Extension Command>
++0x2c:0x01:0xffff   //<Group Extension>:<Get DCMI Capabilities>
++0x2c:0x02:0xffff   //<Group Extension>:<Get Power Reading>
++0x2c:0x03:0xffff   //<Group Extension>:<Get Power Limit>
++0x2c:0x06:0xffff   //<Group Extension>:<Get Asset Tag>
++0x2c:0x07:0xffff   //<Group Extension>:<Get Sensor Info>
++0x2c:0x10:0xffff   //<Group Extension>:<Get Temperature Readings>
+ 0x2c:0x20:0xff7f   //<Group Extension>:<Get MDR Data Region Status>
+ 0x2c:0x21:0x7f7f   //<Group Extension>:<Get MDR Region Update Complete>
+ 0x2c:0x22:0xff7f   //<Group Extension>:<Read MDR Region>
diff --git a/meta-ibs/meta-common/recipes-ibs/ipmi/intel-ipmi-oem/0002-Fix-Min-Max-and-HealthMon-SDR.patch b/meta-ibs/meta-common/recipes-ibs/ipmi/intel-ipmi-oem/0002-Fix-Min-Max-and-HealthMon-SDR.patch
new file mode 100644
index 0000000000..d35603878e
--- /dev/null
+++ b/meta-ibs/meta-common/recipes-ibs/ipmi/intel-ipmi-oem/0002-Fix-Min-Max-and-HealthMon-SDR.patch
@@ -0,0 +1,57 @@
+From 328e90a4e557f86e488e92174ca9a78eada2ee50 Mon Sep 17 00:00:00 2001
+From: "Evgeny Alekseev (IBS Group)" <ealekseev@ibs.sila.ru>
+Date: Mon, 5 Sep 2022 16:19:16 +0300
+Subject: [PATCH] Fix Min Max and HealthMon SDR
+
+---
+ src/sensorcommands.cpp | 13 ++++++++++++-
+ 1 file changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/src/sensorcommands.cpp b/src/sensorcommands.cpp
+index 91a83b8..eed86f7 100644
+--- a/src/sensorcommands.cpp
++++ b/src/sensorcommands.cpp
+@@ -192,6 +192,7 @@ static void getSensorMaxMin(const SensorMap& sensorMap, double& max,
+         {
+             min = std::visit(VariantToDoubleVisitor(), minMap->second);
+         }
++        return;
+     }
+     if (critical != sensorMap.end())
+     {
+@@ -207,6 +208,7 @@ static void getSensorMaxMin(const SensorMap& sensorMap, double& max,
+             double value = std::visit(VariantToDoubleVisitor(), upper->second);
+             max = std::max(value, max);
+         }
++        return;
+     }
+     if (warning != sensorMap.end())
+     {
+@@ -224,6 +226,7 @@ static void getSensorMaxMin(const SensorMap& sensorMap, double& max,
+             max = std::max(value, max);
+         }
+     }
++    return;
+ }
+ 
+ static bool getSensorMap(boost::asio::yield_context yield,
+@@ -253,10 +256,18 @@ static bool getSensorMap(boost::asio::yield_context yield,
+             yield, ec, sensorConnection.c_str(), "/",
+             "org.freedesktop.DBus.ObjectManager", "GetManagedObjects");
+         if (ec)
++        {
++            ec.clear();
++            managedObjects = dbus->yield_method_call<ManagedObjectType>(
++            yield, ec, sensorConnection.c_str(), "/xyz/openbmc_project/sensors",
++            "org.freedesktop.DBus.ObjectManager", "GetManagedObjects");
++            
++        }
++        if(ec)
+         {
+             phosphor::logging::log<phosphor::logging::level::ERR>(
+                 "GetMangagedObjects for getSensorMap failed",
+-                phosphor::logging::entry("ERROR=%s", ec.message().c_str()));
++                phosphor::logging::entry("ERROR=%s, PATH=%s, S_CONN=%s", ec.message().c_str(), sensorPath.c_str(), sensorConnection.c_str()));
+ 
+             return false;
+         }
diff --git a/meta-ibs/meta-common/recipes-ibs/ipmi/intel-ipmi-oem_%.bbappend b/meta-ibs/meta-common/recipes-ibs/ipmi/intel-ipmi-oem_%.bbappend
new file mode 100644
index 0000000000..fabb25efbf
--- /dev/null
+++ b/meta-ibs/meta-common/recipes-ibs/ipmi/intel-ipmi-oem_%.bbappend
@@ -0,0 +1,4 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://0001-Allow-Sensor-Commands.patch file://0002-Fix-Min-Max-and-HealthMon-SDR.patch"
+
diff --git a/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager/0003-Add-Ipmi-Decorator-To-Schemas.patch b/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager/0003-Add-Ipmi-Decorator-To-Schemas.patch
new file mode 100644
index 0000000000..ddf79310b2
--- /dev/null
+++ b/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager/0003-Add-Ipmi-Decorator-To-Schemas.patch
@@ -0,0 +1,62 @@
+From 90cabb1c710968c938955fb1f9adcc05ca5bf3e3 Mon Sep 17 00:00:00 2001
+From: "Evgeny Alekseev (IBS Group)" <ealekseev@ibs.sila.ru>
+Date: Tue, 6 Sep 2022 09:17:13 +0300
+Subject: [PATCH] Add Ipmi Decorator To Schemas
+
+---
+ schemas/global.json       |  3 +++
+ schemas/openbmc-dbus.json | 20 ++++++++++++++++++--
+ 2 files changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/schemas/global.json b/schemas/global.json
+index 4151cc8..260249d 100644
+--- a/schemas/global.json
++++ b/schemas/global.json
+@@ -146,6 +146,9 @@
+                 "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
+                     "$ref": "openbmc-dbus.json#/definitions/xyz/openbmc_project/Inventory/Decorator/AssetTag"
+                 },
++                "xyz.openbmc_project.Inventory.Decorator.Ipmi": {
++                    "$ref": "openbmc-dbus.json#/definitions/xyz/openbmc_project/Inventory/Decorator/Ipmi"
++                },
+                 "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {
+                     "$ref": "openbmc-dbus.json#/definitions/xyz/openbmc_project/Inventory/Item/Board/Motherboard"
+                 },
+diff --git a/schemas/openbmc-dbus.json b/schemas/openbmc-dbus.json
+index 8190b08..5d91ffa 100644
+--- a/schemas/openbmc-dbus.json
++++ b/schemas/openbmc-dbus.json
+@@ -41,9 +41,25 @@
+                                 "AssetTag"
+                             ],
+                             "type": "object"
++                        },
++                        "Ipmi": {
++                            "additionalProperties": false,
++                            "properties": {
++                                "EntityId": {
++                                    "type": "string"
++                                },
++                                "EntityInstance": {
++                                    "type": "string"
++                                }
++                            },
++                            "required": [
++                                "EntityId",
++                                "EntityInstance"
++                            ],
++                            "type": "object"
+                         }
+                     },
+-                    "Item": {
++                        "Item": {
+                         "Board": {
+                             "Motherboard": {
+                                 "additionalProperties": false,
+@@ -75,4 +91,4 @@
+             }
+         }
+     }
+-}
++}
+\ No newline at end of file
diff --git a/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager/0004-AS1200-JSON-Add-Thresholds-and-IPMI.patch b/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager/0004-AS1200-JSON-Add-Thresholds-and-IPMI.patch
new file mode 100644
index 0000000000..ba8df592df
--- /dev/null
+++ b/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager/0004-AS1200-JSON-Add-Thresholds-and-IPMI.patch
@@ -0,0 +1,171 @@
+From 97cb0db7eb678ce5b7aff84f19c0e4c7e021834e Mon Sep 17 00:00:00 2001
+From: "Evgeny Alekseev (IBS Group)" <ealekseev@ibs.sila.ru>
+Date: Tue, 6 Sep 2022 09:17:51 +0300
+Subject: [PATCH] AS1200 JSON Add Thresholds and IPMI
+
+---
+ configurations/ASPOWER_U1A-D11200_PSU.json | 102 ++++++++++++++++++++-
+ 1 file changed, 101 insertions(+), 1 deletion(-)
+
+diff --git a/configurations/ASPOWER_U1A-D11200_PSU.json b/configurations/ASPOWER_U1A-D11200_PSU.json
+index 02dc389..3651983 100644
+--- a/configurations/ASPOWER_U1A-D11200_PSU.json
++++ b/configurations/ASPOWER_U1A-D11200_PSU.json
+@@ -100,6 +100,20 @@
+                 ],
+                 "Name": "PSU$ADDRESS % 4 + 1",
+                 "Thresholds": [
++                    {
++                        "Direction": "less than",
++                        "Label": "pout1",
++                        "Name": "lower critical",
++                        "Severity": 1,
++                        "Value": 0
++                    },
++                    {
++                        "Direction": "less than",
++                        "Label": "pout1",
++                        "Name": "lower non critical",
++                        "Severity": 0,
++                        "Value": 0
++                    },
+                     {
+                         "Direction": "greater than",
+                         "Label": "pout1",
+@@ -115,6 +129,20 @@
+                         "Value": 1150
+                     },
+                     {
++                        "Direction": "less than",
++                        "Label": "pin",
++                        "Name": "lower critical",
++                        "Severity": 1,
++                        "Value": 0
++                    },
++                    {
++                        "Direction": "less than",
++                        "Label": "pin",
++                        "Name": "lower non critical",
++                        "Severity": 0,
++                        "Value": 0
++                    },
++{
+                         "Direction": "greater than",
+                         "Label": "pin",
+                         "Name": "upper critical",
+@@ -128,7 +156,21 @@
+                         "Severity": 0,
+                         "Value": 1150
+                     },
++                    {
++                        "Direction": "less than",
++                        "Label": "iout1",
++                        "Name": "lower critical",
++                        "Severity": 1,
++                        "Value": 0
++                    },
+                     {
++                        "Direction": "greater than",
++                        "Label": "iout1",
++                        "Name": "lower non critical",
++                        "Severity": 0,
++                        "Value": 0
++                    },
++{
+                         "Direction": "greater than",
+                         "Label": "iout1",
+                         "Name": "upper critical",
+@@ -142,6 +184,20 @@
+                         "Severity": 0,
+                         "Value": 105
+                     },
++                    {
++                        "Direction": "less than",
++                        "Label": "temp1",
++                        "Name": "lower critical",
++                        "Severity": 1,
++                        "Value": 0
++                    },
++                    {
++                        "Direction": "less than",
++                        "Label": "temp1",
++                        "Name": "lower non critical",
++                        "Severity": 0,
++                        "Value": 0
++                    },
+                     {
+                         "Direction": "greater than",
+                         "Label": "temp1",
+@@ -156,6 +212,20 @@
+                         "Severity": 0,
+                         "Value": 60
+                     },
++                    {
++                        "Direction": "less than",
++                        "Label": "vout1",
++                        "Name": "lower critical",
++                        "Severity": 1,
++                        "Value": 0
++                    },
++                    {
++                        "Direction": "less than",
++                        "Label": "vout1",
++                        "Name": "lower non critical",
++                        "Severity": 0,
++                        "Value": 0
++                    },
+                     {
+                         "Direction": "greater than",
+                         "Label": "vout1",
+@@ -170,6 +240,20 @@
+                         "Severity": 0,
+                         "Value": 13
+                     },
++                    {
++                        "Direction": "less than",
++                        "Label": "vin",
++                        "Name": "lower critical",
++                        "Severity": 1,
++                        "Value": 210
++                    },
++                    {
++                        "Direction": "less than",
++                        "Label": "vin",
++                        "Name": "lower non critical",
++                        "Severity": 0,
++                        "Value": 220
++                    },
+                     {
+                         "Direction": "greater than",
+                         "Label": "vin",
+@@ -186,6 +270,18 @@
+                     }
+                 ],
+                 "Type": "pmbus"
++            },
++            {
++                "Name" : "PSU$ADDRESS % 4 + 1 Output Current",
++                "EntityId": "0x01",
++                "EntityInstance": "$ADDRESS % 4 + 4"
++
++            },
++            {
++                "Name" : "PSU$ADDRESS % 4 + 1 Input Current",
++                "EntityId": "0x01",
++                "EntityInstance": "$ADDRESS % 4 + 6"
++
+             }
+         ],
+         "Name": "ASPOWER 1200W PSU $ADDRESS % 4 + 1",
+@@ -196,6 +292,10 @@
+             "Model": "$PRODUCT_PRODUCT_NAME",
+             "PartNumber": "$PRODUCT_PART_NUMBER",
+             "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
+-        }
++        },
++    "xyz.openbmc_project.Inventory.Decorator.Ipmi": {
++    "EntityId": "0x0A",
++    "EntityInstance": "$ADDRESS % 4 + 1"
++    }
+     }
+ ]
diff --git a/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager_git.bbappend b/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend
index ddd1ea35cb..385b058157 100644
--- a/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager_git.bbappend
+++ b/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager_%.bbappend
@@ -2,5 +2,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI += "file://0001-Add-ASPOWER1200-Vin-Vout-Pout-thresholds.patch \
             file://0002-Add-PID-Zone-to-AS1200.patch \
+            file://0003-Add-Ipmi-Decorator-To-Schemas.patch \
+	        file://0004-AS1200-JSON-Add-Thresholds-and-IPMI.patch \
             "
 
diff --git a/meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0002-Fix-Threshold-WarningAlarmLow.patch b/meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0002-Fix-Threshold-WarningAlarmLow.patch
new file mode 100644
index 0000000000..a73305f507
--- /dev/null
+++ b/meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host/0002-Fix-Threshold-WarningAlarmLow.patch
@@ -0,0 +1,22 @@
+From 7b38750f99991fd45ba2d1de36251117b73d3294 Mon Sep 17 00:00:00 2001
+From: "Evgeny Alekseev (IBS Group)" <ealekseev@ibs.sila.ru>
+Date: Mon, 5 Sep 2022 16:35:13 +0300
+Subject: [PATCH] Fix Threshold WarningAlarmLow
+
+---
+ sensordatahandler.hpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/sensordatahandler.hpp b/sensordatahandler.hpp
+index 1cb2b40..ab837bb 100644
+--- a/sensordatahandler.hpp
++++ b/sensordatahandler.hpp
+@@ -325,7 +325,7 @@ GetSensorResponse readingData(const Info& sensorInfo)
+     {
+         warningAlarmLow = std::get<bool>(ipmi::getDbusProperty(
+             bus, service, sensorInfo.sensorPath,
+-            "xyz.openbmc_project.Sensor.Threshold.Warning", "WarningAlarmlow"));
++            "xyz.openbmc_project.Sensor.Threshold.Warning", "WarningAlarmLow"));
+     }
+     catch (const std::exception& e)
+     {
diff --git a/meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend b/meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
index 09a85c8575..ddf101ea0f 100644
--- a/meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
+++ b/meta-ibs/meta-common/recipes-phosphor/ipmi/phosphor-ipmi-host_%.bbappend
@@ -2,6 +2,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
 SRC_URI:append = " \
     file://0001-Added-reset-OneTime-override-properties.patch \
+    file://0002-Fix-Threshold-WarningAlarmLow.patch \
     "
 
 do_install:append:ibs(){
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/configuration/entity-manager/SILA-Baseboard-full.json b/meta-ibs/meta-cp2-5422/recipes-phosphor/configuration/entity-manager/SILA-Baseboard-full.json
index a23f279774..316fe69d7d 100644..100755
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/configuration/entity-manager/SILA-Baseboard-full.json
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/configuration/entity-manager/SILA-Baseboard-full.json
@@ -1113,7 +1113,358 @@
                     }
                 ],
                 "Type": "TMP75"
-            }           
+            },
+            {
+                "Name" : "Right side of the board Temp",
+                "EntityId": "0x1E",
+                "EntityInstance": "20"
+            },
+            {
+                "Name" : "PCH___M_2_Temp",
+                "EntityId": "0x1E",
+                "EntityInstance": "21"
+            },
+            {
+                "Name" : "Dimm Power Cap CPU1",
+                "EntityId": "0x1E",
+                "EntityInstance": "22"
+            },
+            {
+                "Name" : "Dimm Power Cap CPU2",
+                "EntityId": "0x1E",
+                "EntityInstance": "23"
+            },
+            {
+                "Name" : "Die CPU1",
+                "EntityId": "0x1E",
+                "EntityInstance": "24"
+            },
+            {
+                "Name" : "Die CPU2",
+                "EntityId": "0x1E",
+                "EntityInstance": "25"
+            },
+            {
+                "Name" : "DTS CPU1",
+                "EntityId": "0x1E",
+                "EntityInstance": "26"
+            },
+            {
+                "Name" : "DTS CPU2",
+                "EntityId": "0x1E",
+                "EntityInstance": "27"
+            },
+            {
+                "Name" : "Core 0 CPU1",
+                "EntityId": "0x03",
+                "EntityInstance": "28"
+            },
+            {
+                "Name" : "Core 1 CPU1",
+                "EntityId": "0x03",
+                "EntityInstance": "29"
+            },
+            {
+                "Name" : "Core 2 CPU1",
+                "EntityId": "0x03",
+                "EntityInstance": "30"
+            },
+            {
+                "Name" : "Core 3 CPU1",
+                "EntityId": "0x03",
+                "EntityInstance": "31"
+            },
+            {
+                "Name" : "Core 4 CPU1",
+                "EntityId": "0x03",
+                "EntityInstance": "32"
+            },
+            {
+                "Name" : "Core 5 CPU1",
+                "EntityId": "0x03",
+                "EntityInstance": "33"
+            },
+            {
+                "Name" : "Core 6 CPU1",
+                "EntityId": "0x03",
+                "EntityInstance": "34"
+            },
+            {
+                "Name" : "Core 7 CPU1",
+                "EntityId": "0x03",
+                "EntityInstance": "35"
+            },
+            {
+                "Name" : "Core 8 CPU1",
+                "EntityId": "0x03",
+                "EntityInstance": "36"
+            },
+            {
+                "Name" : "Core 9 CPU1",
+                "EntityId": "0x03",
+                "EntityInstance": "37"
+            },
+            {
+                "Name" : "Core 10 CPU1",
+                "EntityId": "0x03",
+                "EntityInstance": "38"
+            },
+            {
+                "Name" : "Core 11 CPU1",
+                "EntityId": "0x03",
+                "EntityInstance": "39"
+            },
+            {
+                "Name" : "Core 12 CPU1",
+                "EntityId": "0x03",
+                "EntityInstance": "40"
+            },
+            {
+                "Name" : "Core 13 CPU1",
+                "EntityId": "0x03",
+                "EntityInstance": "41"
+            },
+            {
+                "Name" : "Core 14 CPU1",
+                "EntityId": "0x03",
+                "EntityInstance": "43"
+            },
+            {
+                "Name" : "Core 15 CPU1",
+                "EntityId": "0x03",
+                "EntityInstance": "43"
+            },
+            {
+                "Name" : "Core 0 CPU2",
+                "EntityId": "0x03",
+                "EntityInstance": "44"
+            },
+            {
+                "Name" : "Core 1 CPU2",
+                "EntityId": "0x03",
+                "EntityInstance": "45"
+            },
+            {
+                "Name" : "Core 2 CPU2",
+                "EntityId": "0x03",
+                "EntityInstance": "46"
+            },
+            {
+                "Name" : "Core 3 CPU2",
+                "EntityId": "0x03",
+                "EntityInstance": "47"
+            },
+            {
+                "Name" : "Core 4 CPU2",
+                "EntityId": "0x03",
+                "EntityInstance": "48"
+            },
+            {
+                "Name" : "Core 5 CPU2",
+                "EntityId": "0x03",
+                "EntityInstance": "49"
+            },
+            {
+                "Name" : "Core 6 CPU2",
+                "EntityId": "0x03",
+                "EntityInstance": "50"
+            },
+            {
+                "Name" : "Core 7 CPU2",
+                "EntityId": "0x03",
+                "EntityInstance": "51"
+            },
+            {
+                "Name" : "Core 8 CPU2",
+                "EntityId": "0x03",
+                "EntityInstance": "52"
+            },
+            {
+                "Name" : "Core 9 CPU2",
+                "EntityId": "0x03",
+                "EntityInstance": "53"
+            },
+            {
+                "Name" : "Core 10 CPU2",
+                "EntityId": "0x03",
+                "EntityInstance": "54"
+            },
+            {
+                "Name" : "Core 11 CPU2",
+                "EntityId": "0x03",
+                "EntityInstance": "55"
+            },
+            {
+                "Name" : "Core 12 CPU2",
+                "EntityId": "0x03",
+                "EntityInstance": "56"
+            },
+            {
+                "Name" : "Core 13 CPU2",
+                "EntityId": "0x03",
+                "EntityInstance": "57"
+            },
+            {
+                "Name" : "Core 14 CPU2",
+                "EntityId": "0x03",
+                "EntityInstance": "58"
+            },
+            {
+                "Name" : "Core 15 CPU2",
+                "EntityId": "0x03",
+                "EntityInstance": "59"
+            },
+            {
+                "Name" : "Pwm 1",
+                "EntityId": "0x1E",
+                "EntityInstance": "60"
+            },
+            {
+                "Name" : "Pwm 2",
+                "EntityId": "0x1E",
+                "EntityInstance": "61"
+            },
+            {
+                "Name" : "Pwm 3",
+                "EntityId": "0x1E",
+                "EntityInstance": "62"
+            },
+            {
+                "Name" : "Pwm 4",
+                "EntityId": "0x1E",
+                "EntityInstance": "63"
+            },
+            {
+                "Name" : "Pwm 5",
+                "EntityId": "0x1E",
+                "EntityInstance": "64"
+            },
+            {
+                "Name" : "Pwm 6",
+                "EntityId": "0x1E",
+                "EntityInstance": "65"
+            },
+            {
+                "Name" : "Pwm 7",
+                "EntityId": "0x1E",
+                "EntityInstance": "66"
+            },
+            {
+                "Name" : "Pwm 8",
+                "EntityId": "0x1E",
+                "EntityInstance": "67"
+            },
+            {
+                "Name" : "Cpu Power Average CPU1",
+                "EntityId": "0x03",
+                "EntityInstance": "68"
+            },
+            {
+                "Name" : "Cpu Power Average CPU2",
+                "EntityId": "0x03",
+                "EntityInstance": "69"
+            },
+            {
+                "Name" : "Cpu_Power_Cap_CPU1",
+                "EntityId": "0x03",
+                "EntityInstance": "70"
+            },
+            {
+                "Name" : "Cpu_Power_Cap_CPU2",
+                "EntityId": "0x03",
+                "EntityInstance": "71"
+            },
+            {
+                "Name" : "Dimm Power Average CPU1",
+                "EntityId": "0x08",
+                "EntityInstance": "72"
+            },
+            {
+                "Name" : "Dimm Power Average CPU2",
+                "EntityId": "0x08",
+                "EntityInstance": "73"
+            },
+            {
+                "Name" : "DIMM A1 CPU1",
+                "EntityId": "0x08",
+                "EntityInstance": "74"
+            },
+            {
+                "Name" : "DIMM A2 CPU1",
+                "EntityId": "0x08",
+                "EntityInstance": "75"
+            },
+            {
+                "Name" : "DIMM B1 CPU1",
+                "EntityId": "0x08",
+                "EntityInstance": "76"
+            },
+            {
+                "Name" : "DIMM C1 CPU1",
+                "EntityId": "0x08",
+                "EntityInstance": "77"
+            },
+            {
+                "Name" : "DIMM D1 CPU1",
+                "EntityId": "0x08",
+                "EntityInstance": "78"
+            },
+            {
+                "Name" : "DIMM D2 CPU1",
+                "EntityId": "0x08",
+                "EntityInstance": "79"
+            },
+            {
+                "Name" : "DIMM E1 CPU1",
+                "EntityId": "0x08",
+                "EntityInstance": "80"
+            },
+            {
+                "Name" : "DIMM F1 CPU1",
+                "EntityId": "0x08",
+                "EntityInstance": "81"
+            },
+            {
+                "Name" : "DIMM A1 CPU2",
+                "EntityId": "0x08",
+                "EntityInstance": "82"
+            },
+            {
+                "Name" : "DIMM A2 CPU2",
+                "EntityId": "0x08",
+                "EntityInstance": "83"
+            },
+            {
+                "Name" : "DIMM B1 CPU2",
+                "EntityId": "0x08",
+                "EntityInstance": "84"
+            },
+            {
+                "Name" : "DIMM C1 CPU2",
+                "EntityId": "0x08",
+                "EntityInstance": "85"
+            },
+            {
+                "Name" : "DIMM D1 CPU2",
+                "EntityId": "0x08",
+                "EntityInstance": "86"
+            },
+            {
+                "Name" : "DIMM D2 CPU2",
+                "EntityId": "0x08",
+                "EntityInstance": "87"
+            },
+            {
+                "Name" : "DIMM E1 CPU2",
+                "EntityId": "0x08",
+                "EntityInstance": "88"
+            },
+            {
+                "Name" : "DIMM F1 CPU2",
+                "EntityId": "0x08",
+                "EntityInstance": "89"
+            }
+
         ],
         "Name": "SILA Baseboard",
         "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'CP.*'})",
@@ -1127,6 +1478,10 @@
     "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
         "AssetTag": "$PRODUCT_ASSET_TAG"
     },
+    "xyz.openbmc_project.Inventory.Decorator.Ipmi": {
+    "EntityId": "0x07",
+    "EntityInstance": 1
+    },
     "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {
         "ProductId": 123
     },