IBS: Fix SILABMC-305, rm pwr cpu & DIMM threshlds

4 files changed, 36 insertions, 40 deletions

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
deleted file mode 100644
index 70115081cd..0000000000
--- a/meta-ibs/meta-common/recipes-phosphor/sensors/dbus-sensors/0001-Add-All-Thresholds-to-CPUSensors.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 727b21cec06a5f5ae921dfe6500b94761e00eeb5 Mon Sep 17 00:00:00 2001
-From: "Evgeny Alekseev (IBS Group)" <ealekseev@ibs.sila.ru>
-Date: Thu, 25 Aug 2022 15:18:30 +0300
-Subject: [PATCH] Add All Thresholds to CPUSensors
-
----
- src/Thresholds.cpp | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/src/Thresholds.cpp b/src/Thresholds.cpp
-index 5fa82aa..6c707b9 100644
---- a/src/Thresholds.cpp
-+++ b/src/Thresholds.cpp
-@@ -522,6 +522,20 @@ bool parseThresholdsFromAttr(
-             }
-         }
-     }
-+    for( const auto& th2add : map.at("input") )
-+    {
-+        bool already_has_th=false;
-+        for( const auto &th : thresholdVector)
-+        {
-+            if((th.level == std::get<1>(th2add)) && (th.direction == std::get<2>(th2add)))
-+                already_has_th = true;
-+        }
-+        if(!already_has_th)
-+        {
-+            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/0003-Add-temp-high-thresholds.patch b/meta-ibs/meta-common/recipes-phosphor/sensors/dbus-sensors/0003-Add-temp-high-thresholds.patch
new file mode 100644
index 0000000000..20033f8f45
--- /dev/null
+++ b/meta-ibs/meta-common/recipes-phosphor/sensors/dbus-sensors/0003-Add-temp-high-thresholds.patch
@@ -0,0 +1,30 @@
+From f73c22d90eee5dd18f9f6b84aa19064437f19be3 Mon Sep 17 00:00:00 2001
+From: "Evgeny Alekseev (IBS Group)" <ealekseev@ibs.sila.ru>
+Date: Wed, 12 Oct 2022 17:21:52 +0300
+Subject: [PATCH] Add temp high thresholds
+
+---
+ src/Thresholds.cpp | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+diff --git a/src/Thresholds.cpp b/src/Thresholds.cpp
+index 610e68e..9bc8098 100644
+--- a/src/Thresholds.cpp
++++ b/src/Thresholds.cpp
+@@ -516,6 +516,16 @@ bool parseThresholdsFromAttr(
+                     }
+                     thresholdVector.emplace_back(level, direction, *val);
+                 }
++                else
++                {
++                    if( inputPath.find("temp") != std::string::npos )
++                    {
++                        if(( level == Level::WARNING) && (direction == Direction::HIGH))
++                            thresholdVector.emplace_back(level, direction, 65.0);
++                        if(( level == Level::CRITICAL) && (direction == Direction::HIGH))
++                            thresholdVector.emplace_back(level, direction, 75.0);
++                    }
++                }
+             }
+         }
+     }
diff --git a/meta-ibs/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend b/meta-ibs/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend
new file mode 100644
index 0000000000..acdc527780
--- /dev/null
+++ b/meta-ibs/meta-common/recipes-phosphor/sensors/dbus-sensors_%.bbappend
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
+
+SRC_URI += "file://0002-PSU-Remove-Error-Reset-On-Read-Failure.patch \
+            file://0003-Add-temp-high-thresholds.patch \
+            "
+
diff --git a/meta-ibs/meta-common/recipes-phosphor/sensors/dbus-sensors_git.bbappend b/meta-ibs/meta-common/recipes-phosphor/sensors/dbus-sensors_git.bbappend
deleted file mode 100644
index 1725023ecc..0000000000
--- a/meta-ibs/meta-common/recipes-phosphor/sensors/dbus-sensors_git.bbappend
+++ /dev/null
@@ -1,6 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-
-SRC_URI += " \
-            file://0002-PSU-Remove-Error-Reset-On-Read-Failure.patch \
-            "
-