IBS: Allow System IPMI Iface to Manage Network

6 files changed, 90 insertions, 5 deletions

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/0001-Fix-Min-Max-and-HealthMon-SDR.patch
index d35603878e..d35603878e 100644
--- 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/0001-Fix-Min-Max-and-HealthMon-SDR.patch
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-common/recipes-ibs/ipmi/intel-ipmi-oem/0001-Allow-Sensor-Commands.patch b/meta-ibs/meta-cp2-5422/recipes-ibs/ipmi/intel-ipmi-oem/0003-Allow-Sensor-Commands.patch
index 82a59e6f46..82a59e6f46 100644
--- a/meta-ibs/meta-common/recipes-ibs/ipmi/intel-ipmi-oem/0001-Allow-Sensor-Commands.patch
+++ b/meta-ibs/meta-cp2-5422/recipes-ibs/ipmi/intel-ipmi-oem/0003-Allow-Sensor-Commands.patch
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)" <ealekseev@ibs.sila.ru>
+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   //<Storage>:<Set SEL Auxiliary Log Status>
+ 0x0a:0x5c:0xff7f   //<Storage>:<Get SEL Time UTC Offset>
+ 0x0a:0x5d:0x7f7f   //<Storage>:<Set SEL Time UTC Offset>
+-0x0c:0x01:0x7f7f   //<Transport>:<Set LAN Configuration Parameters>
+-0x0c:0x02:0xff7f   //<Transport>:<Get LAN Configuration Parameters>
+-0x0c:0x03:0x7f7f   //<Transport>:<Suspend BMC ARPs>
+-0x0c:0x04:0xff7f   //<Transport>:<Get IPUDPRMCP Statistics>
+-0x0c:0x10:0x7f7f   //<Transport>:<7et Serial Modem Configuration>
+-0x0c:0x11:0xff7f   //<Transport>:<Get Serial Modem Configuration>
+-0x0c:0x12:0x7f7f   //<Transport>:<SM SetSerial Modem Mux>
+-0x0c:0x14:0x7f7f   //<Transport>:<Set PPP UDP Proxy Transmit Data>
+-0x0c:0x15:0x7f7f   //<Transport>:<Get PPP UDP Proxy Transmit Data>
+-0x0c:0x16:0x7f7f   //<Transport>:<Send PPP UDP Proxy Packet>
+-0x0c:0x17:0x7f7f   //<Transport>:<Get PPP UDP Proxy Receive Data>
+-0x0c:0x18:0x7f7f   //<Transport>:<Serial Modem Connection Active>
+-0x0c:0x19:0x7f7f   //<Transport>:<Callback>
+-0x0c:0x1a:0x7f7f   //<Transport>:<Set User Callback Options>
+-0x0c:0x1b:0x7f7f   //<Transport>:<Get User Callback Options>
+-0x0c:0x1c:0x7f7f   //<Transport>:<Set Serial Routing Mux>
+-0x0c:0x20:0x7f7f   //<Transport>:<SOL Activating>
+-0x0c:0x21:0x7f7f   //<Transport>:<Set SOL Configuration Parameters>
++0x0c:0x01:0xffff   //<Transport>:<Set LAN Configuration Parameters>
++0x0c:0x02:0xffff   //<Transport>:<Get LAN Configuration Parameters>
++0x0c:0x03:0xffff   //<Transport>:<Suspend BMC ARPs>
++0x0c:0x04:0xffff   //<Transport>:<Get IPUDPRMCP Statistics>
++0x0c:0x10:0xffff   //<Transport>:<7et Serial Modem Configuration>
++0x0c:0x11:0xffff   //<Transport>:<Get Serial Modem Configuration>
++0x0c:0x12:0xffff   //<Transport>:<SM SetSerial Modem Mux>
++0x0c:0x14:0xffff   //<Transport>:<Set PPP UDP Proxy Transmit Data>
++0x0c:0x15:0xffff   //<Transport>:<Get PPP UDP Proxy Transmit Data>
++0x0c:0x16:0xffff   //<Transport>:<Send PPP UDP Proxy Packet>
++0x0c:0x17:0xffff   //<Transport>:<Get PPP UDP Proxy Receive Data>
++0x0c:0x18:0xffff   //<Transport>:<Serial Modem Connection Active>
++0x0c:0x19:0xffff   //<Transport>:<Callback>
++0x0c:0x1a:0xffff   //<Transport>:<Set User Callback Options>
++0x0c:0x1b:0xffff   //<Transport>:<Get User Callback Options>
++0x0c:0x1c:0xffff   //<Transport>:<Set Serial Routing Mux>
++0x0c:0x20:0xffff   //<Transport>:<SOL Activating>
++0x0c:0x21:0xffff   //<Transport>:<Set SOL Configuration Parameters>
+ 0x0c:0x22:0xffff   //<Transport>:<Get SOL Configuration Parameters>
+ 0x2c:0x00:0xffff   //<Group Extension>:<Group Extension Command>
+ 0x2c:0x01:0xffff   //<Group Extension>:<Get DCMI Capabilities>
+@@ -155,17 +155,17 @@
+ 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>
+-0x2c:0x23:0x7f7f   //<Group Extension>:<Write MDR Region>
+-0x2c:0x24:0x7f7f   //<Group Extension>:<Get MDR Region Lock>
+-0x2c:0x25:0xff7f   //<Group Extension>:<Get System Mode>
+-0x2c:0x26:0x7f7f   //<Group Extension>:<Set System Mode>
+-0x2c:0x29:0xff7f   //<Group Extension>:<Get TPM Configuration>
+-0x2c:0x30:0x7f7f   //<Group Extension>:<Set TPM Configuration>
+-0x2c:0x31:0x7f7f   //<Group Extension>:<TPM Configuration Update Complete>
+-0x2c:0x37:0xff7f   //<Group Extension>:<Read PCIe Cable EEPROM Data>
++0x2c:0x20:0xffff   //<Group Extension>:<Get MDR Data Region Status>
++0x2c:0x21:0xffff   //<Group Extension>:<Get MDR Region Update Complete>
++0x2c:0x22:0xffff   //<Group Extension>:<Read MDR Region>
++0x2c:0x23:0xffff   //<Group Extension>:<Write MDR Region>
++0x2c:0x24:0xffff   //<Group Extension>:<Get MDR Region Lock>
++0x2c:0x25:0xffff   //<Group Extension>:<Get System Mode>
++0x2c:0x26:0xffff   //<Group Extension>:<Set System Mode>
++0x2c:0x29:0xffff   //<Group Extension>:<Get TPM Configuration>
++0x2c:0x30:0xffff   //<Group Extension>:<Set TPM Configuration>
++0x2c:0x31:0xffff   //<Group Extension>:<TPM Configuration Update Complete>
++0x2c:0x37:0xffff   //<Group Extension>:<Read PCIe Cable EEPROM Data>
+ 0x2e:0xC0:0x7f7f   //<Intel OEM>:<Enable/Disable Node Manager Policy Control>
+ 0x2e:0xC1:0x7f7f   //<Intel OEM>:<Set Node Manager Policy>
+ 0x2e:0xC2:0xff7f   //<Intel OEM>:<Get Node Manager Policy>
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 \
+    "