entity-manager, dbus-sensors, x86-power-control patches applicable for bumped revisions

7 files changed, 69 insertions, 59 deletions

diff --git a/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager/0001-Add-ASPOWER1200-Vin-Vout-Pout-thresholds.patch b/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager/0001-Add-ASPOWER1200-Vin-Vout-Pout-thresholds.patch
index 67924e3dea..f610167452 100644
--- a/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager/0001-Add-ASPOWER1200-Vin-Vout-Pout-thresholds.patch
+++ b/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager/0001-Add-ASPOWER1200-Vin-Vout-Pout-thresholds.patch
@@ -1,16 +1,16 @@
-From 192b58a5a143e5db77b1218be240a9f8fca3ccb2 Mon Sep 17 00:00:00 2001
+From 73c08110d5cfa5dc8910f770bb4a0b7ad6282d35 Mon Sep 17 00:00:00 2001
 From: "Evgeny Alekseev (IBS Group)" <ealekseev@ibs.sila.ru>
-Date: Thu, 18 Aug 2022 16:22:08 +0300
+Date: Mon, 5 Sep 2022 12:34:14 +0300
 Subject: [PATCH] Add ASPOWER1200 Vin, Vout, Pout thresholds
 
 ---
- configurations/ASPOWER_U1A-D11200_PSU.json | 42 ++++++++++++++++++++++
+ configurations/aspower_u1a-d11200_psu.json | 42 ++++++++++++++++++++++
  1 file changed, 42 insertions(+)
 
-diff --git a/configurations/ASPOWER_U1A-D11200_PSU.json b/configurations/ASPOWER_U1A-D11200_PSU.json
-index 60aacb5..6dfc717 100644
---- a/configurations/ASPOWER_U1A-D11200_PSU.json
-+++ b/configurations/ASPOWER_U1A-D11200_PSU.json
+diff --git a/configurations/aspower_u1a-d11200_psu.json b/configurations/aspower_u1a-d11200_psu.json
+index 60aacb52..6dfc7172 100644
+--- a/configurations/aspower_u1a-d11200_psu.json
++++ b/configurations/aspower_u1a-d11200_psu.json
 @@ -94,6 +94,20 @@
                  ],
                  "Name": "PSU$ADDRESS % 4 + 1",
@@ -67,3 +67,6 @@ index 60aacb5..6dfc717 100644
                      }
                  ],
                  "Type": "pmbus"
+-- 
+2.35.1
+
diff --git a/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager/0002-Add-PID-Zone-to-AS1200.patch b/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager/0002-Add-PID-Zone-to-AS1200.patch
index 0db70f5c4d..5a63cc0259 100644
--- a/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager/0002-Add-PID-Zone-to-AS1200.patch
+++ b/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager/0002-Add-PID-Zone-to-AS1200.patch
@@ -1,26 +1,29 @@
-From 9ffd62c359705ff1ebda66013c49cb6ef1664c0e Mon Sep 17 00:00:00 2001
+From 135520177f43e72375ae20806e5409062005d9b3 Mon Sep 17 00:00:00 2001
 From: "Evgeny Alekseev (IBS Group)" <ealekseev@ibs.sila.ru>
-Date: Tue, 23 Aug 2022 16:36:39 +0300
+Date: Mon, 5 Sep 2022 12:38:15 +0300
 Subject: [PATCH] Add PID Zone to AS1200
 
 ---
- configurations/ASPOWER_U1A-D11200_PSU.json | 6 ++++++
+ configurations/aspower_u1a-d11200_psu.json | 6 ++++++
  1 file changed, 6 insertions(+)
 
-diff --git a/configurations/ASPOWER_U1A-D11200_PSU.json b/configurations/ASPOWER_U1A-D11200_PSU.json
-index 6dfc717..02dc389 100644
---- a/configurations/ASPOWER_U1A-D11200_PSU.json
-+++ b/configurations/ASPOWER_U1A-D11200_PSU.json
+diff --git a/configurations/aspower_u1a-d11200_psu.json b/configurations/aspower_u1a-d11200_psu.json
+index 6dfc7172..8c300470 100644
+--- a/configurations/aspower_u1a-d11200_psu.json
++++ b/configurations/aspower_u1a-d11200_psu.json
 @@ -79,6 +79,12 @@
                      "PSU"
                  ]
              },
 +            {
-+            "FailSafePercent": 100,
-+            "MinThermalOutput": 10,
-+            "Name": "PSU",
-+            "Type": "Pid.Zone"
++                "FailSafePercent": 100,
++                "MinThermalOutput": 10,
++                "Name": "PSU",
++                "Type": "Pid.Zone"
 +            },
              {
                  "Address": "$ADDRESS % 4 + 88",
                  "Bus": "$bus",
+-- 
+2.35.1
+
diff --git a/meta-ibs/meta-common/recipes-phosphor/sensors/dbus-sensors/0001-Add-All-Thresholds-to-CPUSensors.patch b/meta-ibs/meta-common/recipes-phosphor/sensors/dbus-sensors/0001-Add-All-Thresholds-to-CPUSensors.patch
index 004439ef21..70115081cd 100644
--- a/meta-ibs/meta-common/recipes-phosphor/sensors/dbus-sensors/0001-Add-All-Thresholds-to-CPUSensors.patch
+++ b/meta-ibs/meta-common/recipes-phosphor/sensors/dbus-sensors/0001-Add-All-Thresholds-to-CPUSensors.patch
@@ -28,7 +28,7 @@ index 5fa82aa..6c707b9 100644
 +            thresholdVector.emplace_back(std::get<1>(th2add), std::get<2>(th2add), std::get<2>(th2add)==Direction::HIGH?1000000:-1.0); 
 +        }
 +    }
-+    
++
      return true;
  }
  
diff --git a/meta-ibs/meta-common/recipes-phosphor/sensors/dbus-sensors/0002-PSU-Remove-Error-Reset-On-Read-Failure.patch b/meta-ibs/meta-common/recipes-phosphor/sensors/dbus-sensors/0002-PSU-Remove-Error-Reset-On-Read-Failure.patch
index 752758e2b6..3e6afa9783 100644
--- a/meta-ibs/meta-common/recipes-phosphor/sensors/dbus-sensors/0002-PSU-Remove-Error-Reset-On-Read-Failure.patch
+++ b/meta-ibs/meta-common/recipes-phosphor/sensors/dbus-sensors/0002-PSU-Remove-Error-Reset-On-Read-Failure.patch
@@ -1,31 +1,33 @@
-From 7f5a6b3310987d371e5a9d76da78552756ef8cda Mon Sep 17 00:00:00 2001
+From 78bf8ab62ea0387ea5ffbdb2b13ea97c88ae946f Mon Sep 17 00:00:00 2001
 From: "Evgeny Alekseev (IBS Group)" <ealekseev@ibs.sila.ru>
-Date: Mon, 29 Aug 2022 17:12:46 +0300
+Date: Mon, 5 Sep 2022 12:06:41 +0300
 Subject: [PATCH] PSU Remove Error Reset On Read Failure
 
 ---
- src/PSUEvent.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ src/PSUEvent.cpp | 3 ---
+ 1 file changed, 3 deletions(-)
 
 diff --git a/src/PSUEvent.cpp b/src/PSUEvent.cpp
-index 7813741..0c60510 100644
+index 8c83d064..b9f62bfb 100644
 --- a/src/PSUEvent.cpp
 +++ b/src/PSUEvent.cpp
-@@ -202,7 +202,7 @@ void PSUSubEvent::setupRead(void)
+@@ -191,8 +191,6 @@ void PSUSubEvent::setupRead(void)
+ {
      if (!readingStateGood(readState))
      {
-         // Deassert the event
+-        // Deassert the event
 -        updateValue(0);
-+        
          restartRead();
          return;
      }
-@@ -275,7 +275,7 @@ void PSUSubEvent::handleResponse(const boost::system::error_code& err)
+@@ -278,7 +276,6 @@ void PSUSubEvent::handleResponse(const boost::system::error_code& err,
          {
              std::cerr << "Failure to read event at " << path << "\n";
          }
 -        updateValue(0);
-+        
          errCount++;
      }
-     lseek(fd, 0, SEEK_SET);
+     restartRead();
+-- 
+2.35.1
+
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/network/phosphor-network/0002-Added-check-of-sync-status-with-NTP-servers.patch b/meta-ibs/meta-cp2-5422/recipes-phosphor/network/phosphor-network/0002-Added-check-of-sync-status-with-NTP-servers.patch
index 0b18b594ba..11ae185d20 100644
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/network/phosphor-network/0002-Added-check-of-sync-status-with-NTP-servers.patch
+++ b/meta-ibs/meta-cp2-5422/recipes-phosphor/network/phosphor-network/0002-Added-check-of-sync-status-with-NTP-servers.patch
@@ -1,6 +1,6 @@
-From e4492d4f1e29731db6ac278ecb121cb47a8e204f Mon Sep 17 00:00:00 2001
+From 1ab29ac7531a82daf500279b4dc8b71d309f48ca Mon Sep 17 00:00:00 2001
 From: Nikita Kosenkov <NKosenkov@IBS.RU>
-Date: Tue, 23 Aug 2022 10:00:35 +0300
+Date: Mon, 5 Sep 2022 11:47:06 +0300
 Subject: [PATCH] Added check of synchronization status with NTP servers
 
 This functionality provides users with an additional log
@@ -12,17 +12,19 @@ then we consider that it was not possible
 to obtain the IP address of the NTP server.
 
 Similarly, 'timedatectl show-timesync --property ServerAddress --value'.
+
+Signed-off-by: Andrey V.Kosteltsev <AKosteltsev@IBS.RU>
 ---
  src/network_manager_main.cpp | 115 ++++++++++++++++++++++++++++++++++-
  src/types.hpp                |   4 ++
  2 files changed, 116 insertions(+), 3 deletions(-)
 
 diff --git a/src/network_manager_main.cpp b/src/network_manager_main.cpp
-index 349c2ea..5d47c0c 100644
+index fa4efe5c..5d691613 100644
 --- a/src/network_manager_main.cpp
 +++ b/src/network_manager_main.cpp
-@@ -6,11 +6,13 @@
- #include "watch.hpp"
+@@ -5,11 +5,13 @@
+ #include "types.hpp"
  
  #include <linux/netlink.h>
 +#include <systemd/sd-journal.h>
@@ -35,15 +37,15 @@ index 349c2ea..5d47c0c 100644
  #ifdef SYNC_MAC_FROM_INVENTORY
  #include <nlohmann/json.hpp>
  #endif
-@@ -49,6 +51,7 @@ namespace network
+@@ -48,6 +50,7 @@ namespace network
  std::unique_ptr<phosphor::network::Manager> manager = nullptr;
  std::unique_ptr<Timer> refreshObjectTimer = nullptr;
  std::unique_ptr<Timer> reloadTimer = nullptr;
 +std::unique_ptr<Timer> checkNtpSyncStatusTimer = nullptr;
  
  #ifdef SYNC_MAC_FROM_INVENTORY
- std::unique_ptr<sdbusplus::bus::match::match> EthInterfaceMatch = nullptr;
-@@ -230,17 +233,66 @@ void watchEthernetInterface(sdbusplus::bus::bus& bus,
+ std::unique_ptr<sdbusplus::bus::match_t> EthInterfaceMatch = nullptr;
+@@ -229,17 +232,66 @@ void watchEthernetInterface(sdbusplus::bus_t& bus,
          }
      }
  }
@@ -113,7 +115,7 @@ index 349c2ea..5d47c0c 100644
      }
  }
  
-@@ -254,12 +306,67 @@ void reloadNetworkd()
+@@ -253,12 +305,67 @@ void reloadNetworkd()
      }
  }
  
@@ -151,7 +153,7 @@ index 349c2ea..5d47c0c 100644
 +    if(getProperty("ServerAddress", propServerAddress))
 +    {
 +        auto serverAddress = std::get<ServerAddress>(propServerAddress);
-+        
++
 +        // get first value from "ServerAddress property (iay)"
 +        // using this parameter, you can understand whether
 +        // it was possible to resolve the NTP address
@@ -181,7 +183,7 @@ index 349c2ea..5d47c0c 100644
  }
  
  } // namespace network
-@@ -329,6 +436,8 @@ int main(int /*argc*/, char** /*argv*/)
+@@ -309,6 +416,8 @@ int main(int /*argc*/, char** /*argv*/)
      phosphor::network::watchEthernetInterface(bus, configJson);
  #endif
  
@@ -191,12 +193,12 @@ index 349c2ea..5d47c0c 100644
      // This is intentionally deferred, to ensure that systemd-networkd is
      // fully configured.
 diff --git a/src/types.hpp b/src/types.hpp
-index 69a314d..0de7a3f 100644
+index 2e27298d..b69997fd 100644
 --- a/src/types.hpp
 +++ b/src/types.hpp
-@@ -34,6 +34,10 @@ constexpr auto reloadTimeout = 3s;
- // configuration takes 3-4 sec after systemd-networkd restart.
- constexpr auto refreshTimeout = reloadTimeout + 7s;
+@@ -28,6 +28,10 @@ constexpr auto reloadTimeout = 3s;
+ // configuration takes 3-4 sec to reconfigure at most.
+ constexpr auto refreshTimeout = 4s;
  
 +// check the synchronization status
 +// after updating the list of NTP servers after 60 seconds
diff --git a/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control/0002-x86-power-control-added-check-BMC-restart-cause.patch b/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control/0002-x86-power-control-added-check-BMC-restart-cause.patch
index 33fee916b2..071f03b17d 100644
--- a/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control/0002-x86-power-control-added-check-BMC-restart-cause.patch
+++ b/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control/0002-x86-power-control-added-check-BMC-restart-cause.patch
@@ -1,15 +1,14 @@
-From 4a2780f77c5b1fb21cc89aa7437f22c66f51c3c3 Mon Sep 17 00:00:00 2001
+From 13ac03633b728059c73245b72c46c60b75fa66ec Mon Sep 17 00:00:00 2001
 From: Nikita Kosenkov <NKosenkov@IBS.RU>
-Date: Thu, 16 Jun 2022 09:38:54 +0300
+Date: Mon, 5 Sep 2022 12:23:18 +0300
 Subject: [PATCH] x86-power-control: added check BMC restart cause for AlwaysOn
- policy
 
 ---
  src/power_control.cpp | 81 +++++++++++++++++++++++++++++++++++++++++--
  1 file changed, 79 insertions(+), 2 deletions(-)
 
 diff --git a/src/power_control.cpp b/src/power_control.cpp
-index 05aa45c..5535415 100644
+index 910c369..690622a 100644
 --- a/src/power_control.cpp
 +++ b/src/power_control.cpp
 @@ -31,6 +31,7 @@
@@ -20,11 +19,11 @@ index 05aa45c..5535415 100644
  
  namespace power_control
  {
-@@ -857,6 +858,74 @@ void PersistentState::saveState()
+@@ -902,6 +903,74 @@ void PersistentState::saveState()
      appStateStream << stateData.dump(indentationSize);
  }
  
-+enum class BMCRestartCause 
++enum class BMCRestartCause
 +{
 +    power = 1,  // After cold BMC boot
 +    watchdog,   // After warm BMC reboot
@@ -32,7 +31,7 @@ index 05aa45c..5535415 100644
 +};
 +
 +BMCRestartCause getBmcRestartCause()
-+{    
++{
 +    // U-boot write restart cause to bootargs
 +    std::string cmdlineFilePath{"/proc/cmdline"};
 +    std::ifstream cmdlineFile{cmdlineFilePath};
@@ -43,7 +42,7 @@ index 05aa45c..5535415 100644
 +
 +        return BMCRestartCause::unknown;
 +    }
-+        
++
 +    // Read cmd line from file
 +    std::stringstream cmdlineBuffer;
 +    cmdlineBuffer << cmdlineFile.rdbuf();
@@ -93,9 +92,9 @@ index 05aa45c..5535415 100644
 +}
 +
  static constexpr char const* setingsService = "xyz.openbmc_project.Settings";
- static constexpr char const* powerRestorePolicyObject =
-     "/xyz/openbmc_project/control/host0/power_restore_policy";
-@@ -1084,7 +1153,8 @@ void PowerRestoreController::invoke()
+ static constexpr char const* powerRestorePolicyIface =
+     "xyz.openbmc_project.Control.Power.RestorePolicy";
+@@ -1129,7 +1198,8 @@ void PowerRestoreController::invoke()
          "xyz.openbmc_project.Control.Power.RestorePolicy.Policy.AlwaysOn")
      {
          sendPowerControlEvent(Event::powerOnRequest);
@@ -105,7 +104,7 @@ index 05aa45c..5535415 100644
      }
      else if (powerRestorePolicy ==
               "xyz.openbmc_project.Control.Power.RestorePolicy.Policy.Restore")
-@@ -2773,10 +2843,17 @@ int main(int argc, char* argv[])
+@@ -2827,10 +2897,17 @@ int main(int argc, char* argv[])
          }
      }
      // Check if we need to start the Power Restore policy
@@ -113,13 +112,13 @@ index 05aa45c..5535415 100644
 +    // and check BMC restart cause and if the BMC is after
 +    // a cold boot, then start power restore policy
 +    if ((powerState != PowerState::on) &&
-+	(getBmcRestartCause() == BMCRestartCause::power))
++        (getBmcRestartCause() == BMCRestartCause::power))
      {
          powerRestore.run();
      }
 +    else
 +    {
-+	lg2::info("Skip power restore policy.");
++        lg2::info("Skip power restore policy.");
 +    }
  
      if (nmiOutLine)
diff --git a/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control_%.bbappend
index 68c3a20729..d0be09cd0e 100644
--- a/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control_%.bbappend
+++ b/meta-ibs/meta-cp2-5422/recipes-x86/chassis/x86-power-control_%.bbappend
@@ -1,4 +1,5 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
 SRC_URI:append = " \
     file://power-config-host0.json \
     file://0001-support-host-boot-progress.patch \