From 8670119f3af54477dfb758ccefe15fe45c3932a7 Mon Sep 17 00:00:00 2001 From: "Evgeny Alekseev (IBS Group)" Date: Thu, 8 Sep 2022 15:58:06 +0300 Subject: IBS: Allow System IPMI Iface to Manage Network --- .../0001-Allow-Sensor-Commands.patch | 28 ------- .../0001-Fix-Min-Max-and-HealthMon-SDR.patch | 57 +++++++++++++++ .../0002-Fix-Min-Max-and-HealthMon-SDR.patch | 57 --------------- .../recipes-ibs/ipmi/intel-ipmi-oem_%.bbappend | 4 - .../recipes-ibs/ipmi/intel-ipmi-oem_git.bb | 2 + .../0003-Allow-Sensor-Commands.patch | 28 +++++++ ...-Allow-System-IPMI-Interface-Network-Mgmt.patch | 85 ++++++++++++++++++++++ .../recipes-ibs/ipmi/intel-ipmi-oem_%.bbappend | 4 +- 8 files changed, 175 insertions(+), 90 deletions(-) delete mode 100644 meta-ibs/meta-common/recipes-ibs/ipmi/intel-ipmi-oem/0001-Allow-Sensor-Commands.patch create mode 100644 meta-ibs/meta-common/recipes-ibs/ipmi/intel-ipmi-oem/0001-Fix-Min-Max-and-HealthMon-SDR.patch delete mode 100644 meta-ibs/meta-common/recipes-ibs/ipmi/intel-ipmi-oem/0002-Fix-Min-Max-and-HealthMon-SDR.patch delete mode 100644 meta-ibs/meta-common/recipes-ibs/ipmi/intel-ipmi-oem_%.bbappend create mode 100644 meta-ibs/meta-cp2-5422/recipes-ibs/ipmi/intel-ipmi-oem/0003-Allow-Sensor-Commands.patch create mode 100644 meta-ibs/meta-cp2-5422/recipes-ibs/ipmi/intel-ipmi-oem/0004-Allow-System-IPMI-Interface-Network-Mgmt.patch 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 deleted file mode 100644 index 82a59e6f46..0000000000 --- a/meta-ibs/meta-common/recipes-ibs/ipmi/intel-ipmi-oem/0001-Allow-Sensor-Commands.patch +++ /dev/null @@ -1,28 +0,0 @@ -From c04699247fee93a780c5f5ae3484434c54b70264 Mon Sep 17 00:00:00 2001 -From: "Evgeny Alekseev (IBS Group)" -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 //: - 0x0c:0x21:0x7f7f //: - 0x0c:0x22:0xffff //: --0x2c:0x1f:0xff7f //: -+0x2c:0x00:0xffff //: -+0x2c:0x01:0xffff //: -+0x2c:0x02:0xffff //: -+0x2c:0x03:0xffff //: -+0x2c:0x06:0xffff //: -+0x2c:0x07:0xffff //: -+0x2c:0x10:0xffff //: - 0x2c:0x20:0xff7f //: - 0x2c:0x21:0x7f7f //: - 0x2c:0x22:0xff7f //: diff --git a/meta-ibs/meta-common/recipes-ibs/ipmi/intel-ipmi-oem/0001-Fix-Min-Max-and-HealthMon-SDR.patch b/meta-ibs/meta-common/recipes-ibs/ipmi/intel-ipmi-oem/0001-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/0001-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)" +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( ++ yield, ec, sensorConnection.c_str(), "/xyz/openbmc_project/sensors", ++ "org.freedesktop.DBus.ObjectManager", "GetManagedObjects"); ++ ++ } ++ if(ec) + { + phosphor::logging::log( + "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/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 deleted file mode 100644 index d35603878e..0000000000 --- a/meta-ibs/meta-common/recipes-ibs/ipmi/intel-ipmi-oem/0002-Fix-Min-Max-and-HealthMon-SDR.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 328e90a4e557f86e488e92174ca9a78eada2ee50 Mon Sep 17 00:00:00 2001 -From: "Evgeny Alekseev (IBS Group)" -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( -+ yield, ec, sensorConnection.c_str(), "/xyz/openbmc_project/sensors", -+ "org.freedesktop.DBus.ObjectManager", "GetManagedObjects"); -+ -+ } -+ if(ec) - { - phosphor::logging::log( - "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 deleted file mode 100644 index fabb25efbf..0000000000 --- a/meta-ibs/meta-common/recipes-ibs/ipmi/intel-ipmi-oem_%.bbappend +++ /dev/null @@ -1,4 +0,0 @@ -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-ibs/ipmi/intel-ipmi-oem_git.bb b/meta-ibs/meta-common/recipes-ibs/ipmi/intel-ipmi-oem_git.bb index 87a30b895c..29a7a47add 100644 --- a/meta-ibs/meta-common/recipes-ibs/ipmi/intel-ipmi-oem_git.bb +++ b/meta-ibs/meta-common/recipes-ibs/ipmi/intel-ipmi-oem_git.bb @@ -1,3 +1,4 @@ +FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" SUMMARY = "Intel OEM IPMI commands" DESCRIPTION = "Intel OEM IPMI commands" @@ -5,6 +6,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=a6a4edad4aed50f39a66d098d74b265b" SRC_URI = "git://github.com/openbmc/intel-ipmi-oem;branch=master;protocol=https" +SRC_URI += "file://0001-Fix-Min-Max-and-HealthMon-SDR.patch" SRCREV = "429b085783f258da89d5c5b2979ba7030aef4d2b" S = "${WORKDIR}/git" diff --git a/meta-ibs/meta-cp2-5422/recipes-ibs/ipmi/intel-ipmi-oem/0003-Allow-Sensor-Commands.patch b/meta-ibs/meta-cp2-5422/recipes-ibs/ipmi/intel-ipmi-oem/0003-Allow-Sensor-Commands.patch new file mode 100644 index 0000000000..82a59e6f46 --- /dev/null +++ b/meta-ibs/meta-cp2-5422/recipes-ibs/ipmi/intel-ipmi-oem/0003-Allow-Sensor-Commands.patch @@ -0,0 +1,28 @@ +From c04699247fee93a780c5f5ae3484434c54b70264 Mon Sep 17 00:00:00 2001 +From: "Evgeny Alekseev (IBS Group)" +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 //: + 0x0c:0x21:0x7f7f //: + 0x0c:0x22:0xffff //: +-0x2c:0x1f:0xff7f //: ++0x2c:0x00:0xffff //: ++0x2c:0x01:0xffff //: ++0x2c:0x02:0xffff //: ++0x2c:0x03:0xffff //: ++0x2c:0x06:0xffff //: ++0x2c:0x07:0xffff //: ++0x2c:0x10:0xffff //: + 0x2c:0x20:0xff7f //: + 0x2c:0x21:0x7f7f //: + 0x2c:0x22:0xff7f //: diff --git a/meta-ibs/meta-cp2-5422/recipes-ibs/ipmi/intel-ipmi-oem/0004-Allow-System-IPMI-Interface-Network-Mgmt.patch b/meta-ibs/meta-cp2-5422/recipes-ibs/ipmi/intel-ipmi-oem/0004-Allow-System-IPMI-Interface-Network-Mgmt.patch new file mode 100644 index 0000000000..71da6b9346 --- /dev/null +++ b/meta-ibs/meta-cp2-5422/recipes-ibs/ipmi/intel-ipmi-oem/0004-Allow-System-IPMI-Interface-Network-Mgmt.patch @@ -0,0 +1,85 @@ +From 2aad1a63e1c79d6feb446e297b6d28460565e090 Mon Sep 17 00:00:00 2001 +From: "Evgeny Alekseev (IBS Group)" +Date: Thu, 8 Sep 2022 15:27:35 +0300 +Subject: [PATCH] Allow System IPMI Interface Network Mgmt + +--- + ipmi-whitelist.conf | 58 ++++++++++++++++++++++----------------------- + 1 file changed, 29 insertions(+), 29 deletions(-) + +diff --git a/ipmi-whitelist.conf b/ipmi-whitelist.conf +index dbe8240..4dea509 100644 +--- a/ipmi-whitelist.conf ++++ b/ipmi-whitelist.conf +@@ -129,24 +129,24 @@ + 0x0a:0x5b:0x7f7f //: + 0x0a:0x5c:0xff7f //: + 0x0a:0x5d:0x7f7f //: +-0x0c:0x01:0x7f7f //: +-0x0c:0x02:0xff7f //: +-0x0c:0x03:0x7f7f //: +-0x0c:0x04:0xff7f //: +-0x0c:0x10:0x7f7f //:<7et Serial Modem Configuration> +-0x0c:0x11:0xff7f //: +-0x0c:0x12:0x7f7f //: +-0x0c:0x14:0x7f7f //: +-0x0c:0x15:0x7f7f //: +-0x0c:0x16:0x7f7f //: +-0x0c:0x17:0x7f7f //: +-0x0c:0x18:0x7f7f //: +-0x0c:0x19:0x7f7f //: +-0x0c:0x1a:0x7f7f //: +-0x0c:0x1b:0x7f7f //: +-0x0c:0x1c:0x7f7f //: +-0x0c:0x20:0x7f7f //: +-0x0c:0x21:0x7f7f //: ++0x0c:0x01:0xffff //: ++0x0c:0x02:0xffff //: ++0x0c:0x03:0xffff //: ++0x0c:0x04:0xffff //: ++0x0c:0x10:0xffff //:<7et Serial Modem Configuration> ++0x0c:0x11:0xffff //: ++0x0c:0x12:0xffff //: ++0x0c:0x14:0xffff //: ++0x0c:0x15:0xffff //: ++0x0c:0x16:0xffff //: ++0x0c:0x17:0xffff //: ++0x0c:0x18:0xffff //: ++0x0c:0x19:0xffff //: ++0x0c:0x1a:0xffff //: ++0x0c:0x1b:0xffff //: ++0x0c:0x1c:0xffff //: ++0x0c:0x20:0xffff //: ++0x0c:0x21:0xffff //: + 0x0c:0x22:0xffff //: + 0x2c:0x00:0xffff //: + 0x2c:0x01:0xffff //: +@@ -155,17 +155,17 @@ + 0x2c:0x06:0xffff //: + 0x2c:0x07:0xffff //: + 0x2c:0x10:0xffff //: +-0x2c:0x20:0xff7f //: +-0x2c:0x21:0x7f7f //: +-0x2c:0x22:0xff7f //: +-0x2c:0x23:0x7f7f //: +-0x2c:0x24:0x7f7f //: +-0x2c:0x25:0xff7f //: +-0x2c:0x26:0x7f7f //: +-0x2c:0x29:0xff7f //: +-0x2c:0x30:0x7f7f //: +-0x2c:0x31:0x7f7f //: +-0x2c:0x37:0xff7f //: ++0x2c:0x20:0xffff //: ++0x2c:0x21:0xffff //: ++0x2c:0x22:0xffff //: ++0x2c:0x23:0xffff //: ++0x2c:0x24:0xffff //: ++0x2c:0x25:0xffff //: ++0x2c:0x26:0xffff //: ++0x2c:0x29:0xffff //: ++0x2c:0x30:0xffff //: ++0x2c:0x31:0xffff //: ++0x2c:0x37:0xffff //: + 0x2e:0xC0:0x7f7f //: + 0x2e:0xC1:0x7f7f //: + 0x2e:0xC2:0xff7f //: diff --git a/meta-ibs/meta-cp2-5422/recipes-ibs/ipmi/intel-ipmi-oem_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-ibs/ipmi/intel-ipmi-oem_%.bbappend index 243790d8f2..a8a86e2995 100644 --- a/meta-ibs/meta-cp2-5422/recipes-ibs/ipmi/intel-ipmi-oem_%.bbappend +++ b/meta-ibs/meta-cp2-5422/recipes-ibs/ipmi/intel-ipmi-oem_%.bbappend @@ -5,4 +5,6 @@ EXTRA_OECMAKE +=" -DMDR_V1_SUPPORT=1" SRC_URI += "\ file://0001-Rikor-smbios-mdrv1-support.patch \ file://0002-Additional-chenges-for-support-Rikor-BIOS.patch \ - " \ No newline at end of file + file://0003-Allow-Sensor-Commands.patch \ + file://0004-Allow-System-IPMI-Interface-Network-Mgmt.patch \ + " -- cgit v1.2.3