IBS:pid-control config move 2 entity-managerMV-PID2EntityManager

5 files changed, 286 insertions, 376 deletions

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
new file mode 100644
index 0000000000..0db70f5c4d
--- /dev/null
+++ b/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager/0002-Add-PID-Zone-to-AS1200.patch
@@ -0,0 +1,26 @@
+From 9ffd62c359705ff1ebda66013c49cb6ef1664c0e 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
+Subject: [PATCH] Add PID Zone to AS1200
+
+---
+ 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
+@@ -79,6 +79,12 @@
+                     "PSU"
+                 ]
+             },
++            {
++            "FailSafePercent": 100,
++            "MinThermalOutput": 10,
++            "Name": "PSU",
++            "Type": "Pid.Zone"
++            },
+             {
+                 "Address": "$ADDRESS % 4 + 88",
+                 "Bus": "$bus",
diff --git a/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager_git.bbappend b/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager_git.bbappend
index b63574bbfe..ddd1ea35cb 100644
--- a/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager_git.bbappend
+++ b/meta-ibs/meta-common/recipes-phosphor/configuration/entity-manager_git.bbappend
@@ -1,4 +1,6 @@
 FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
 
-SRC_URI += "file://0001-Add-ASPOWER1200-Vin-Vout-Pout-thresholds.patch"
+SRC_URI += "file://0001-Add-ASPOWER1200-Vin-Vout-Pout-thresholds.patch \
+            file://0002-Add-PID-Zone-to-AS1200.patch \
+            "
 
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 96b3df5773..cdc59f88fd 100644
--- 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
@@ -62,13 +62,13 @@
                         "Direction": "greater than",
                         "Name": "upper critical",
                         "Severity": 1,
-                        "Value": 12000
+                        "Value": 14630
                     },
                     {
                         "Direction": "greater than",
                         "Name": "upper non critical",
                         "Severity": 0,
-                        "Value": 11000
+                        "Value": 14630
                     },
                     {
                         "Direction": "less than",
@@ -100,13 +100,13 @@
                         "Direction": "greater than",
                         "Name": "upper critical",
                         "Severity": 1,
-                        "Value": 12000
+                        "Value": 14630
                     },
                     {
                         "Direction": "greater than",
                         "Name": "upper non critical",
                         "Severity": 0,
-                        "Value": 11000
+                        "Value": 14630
                     },
                     {
                         "Direction": "less than",
@@ -138,13 +138,13 @@
                         "Direction": "greater than",
                         "Name": "upper critical",
                         "Severity": 1,
-                        "Value": 12000
+                        "Value": 14630
                     },
                     {
                         "Direction": "greater than",
                         "Name": "upper non critical",
                         "Severity": 0,
-                        "Value": 11000
+                        "Value": 14630
                     },
                     {
                         "Direction": "less than",
@@ -176,13 +176,13 @@
                         "Direction": "greater than",
                         "Name": "upper critical",
                         "Severity": 1,
-                        "Value": 8000
+                        "Value": 14630
                     },
                     {
                         "Direction": "greater than",
                         "Name": "upper non critical",
                         "Severity": 0,
-                        "Value": 7000
+                        "Value": 14630
                     },
                     {
                         "Direction": "less than",
@@ -214,13 +214,13 @@
                         "Direction": "greater than",
                         "Name": "upper critical",
                         "Severity": 1,
-                        "Value": 8000
+                        "Value": 14630
                     },
                     {
                         "Direction": "greater than",
                         "Name": "upper non critical",
                         "Severity": 0,
-                        "Value": 7000
+                        "Value": 14630
                     },
                     {
                         "Direction": "less than",
@@ -237,6 +237,253 @@
                 ]
             },
             {
+            "Class": "fan",
+            "FFGainCoefficient": 1.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": 0.0,
+            "ILimitMax": 0.0,
+            "ILimitMin": 0.0,
+            "Inputs": [
+                "System Fan 1"               
+            ],
+            "Name": "System Fan 1 Sensor",
+            "NegativeHysteresis": 0.0,
+            "OutLimitMax": 100.0,
+            "OutLimitMin": 10.0,
+            "Outputs": [
+                "Pwm_1"
+            ],
+            "PCoefficient": 0.0,
+            "PositiveHysteresis": 0.0,
+            "SlewNeg": 0.0,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "SysFan1Zone"
+            ]
+        },
+        {
+            "Class": "fan",
+            "FFGainCoefficient": 1.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": 0.0,
+            "ILimitMax": 0.0,
+            "ILimitMin": 0.0,
+            "Inputs": [
+                "System Fan 2"               
+            ],
+            "Name": "System Fan 2 Sensor",
+            "NegativeHysteresis": 0.0,
+            "OutLimitMax": 100.0,
+            "OutLimitMin": 10.0,
+            "Outputs": [
+                "Pwm_5"
+            ],
+            "PCoefficient": 0.0,
+            "PositiveHysteresis": 0.0,
+            "SlewNeg": 0.0,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "SysFan2Zone"
+            ]
+        },
+        {
+            "Class": "fan",
+            "FFGainCoefficient": 1.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": 0.0,
+            "ILimitMax": 0.0,
+            "ILimitMin": 0.0,
+            "Inputs": [
+                "System Fan 3"               
+            ],
+            "Name": "System Fan 3 Sensor",
+            "NegativeHysteresis": 0.0,
+            "OutLimitMax": 100.0,
+            "OutLimitMin": 10.0,
+            "Outputs": [
+                "Pwm_6"
+            ],
+            "PCoefficient": 0.0,
+            "PositiveHysteresis": 0.0,
+            "SlewNeg": 0.0,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "SysFan3Zone"
+            ]
+        },
+        {
+            "Class": "fan",
+            "FFGainCoefficient": 1.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": 0.0,
+            "ILimitMax": 0.0,
+            "ILimitMin": 0.0,
+            "Inputs": [
+                "CPU1 Fan"               
+            ],
+            "Name": "CPU Fan 1 Sensor",
+            "NegativeHysteresis": 0.0,
+            "OutLimitMax": 100.0,
+            "OutLimitMin": 10.0,
+            "Outputs": [
+                "Pwm_7"
+            ],
+            "PCoefficient": 0.0,
+            "PositiveHysteresis": 0.0,
+            "SlewNeg": 0.0,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "CPUFan1Zone"
+            ]
+        },
+        {
+            "Class": "fan",
+            "FFGainCoefficient": 1.0,
+            "FFOffCoefficient": 0.0,
+            "ICoefficient": 0.0,
+            "ILimitMax": 0.0,
+            "ILimitMin": 0.0,
+            "Inputs": [
+                "CPU2 Fan"               
+            ],
+            "Name": "CPU Fan 2 Sensor",
+            "NegativeHysteresis": 0.0,
+            "OutLimitMax": 100.0,
+            "OutLimitMin": 10.0,
+            "Outputs": [
+                "Pwm_8"
+            ],
+            "PCoefficient": 0.0,
+            "PositiveHysteresis": 0.0,
+            "SlewNeg": 0.0,
+            "SlewPos": 0.0,
+            "Type": "Pid",
+            "Zones": [
+                "CPUFan2Zone"
+            ]
+        },            
+        {
+            "FailSafePercent": 100,
+            "MinThermalOutput": 10,
+            "Name": "SysFan1Zone",
+            "Type": "Pid.Zone"
+        },
+        {
+            "FailSafePercent": 100,
+            "MinThermalOutput": 10,
+            "Name": "SysFan2Zone",
+            "Type": "Pid.Zone"
+        },
+        {
+            "FailSafePercent": 100,
+            "MinThermalOutput": 10,
+            "Name": "SysFan3Zone",
+            "Type": "Pid.Zone"
+        },
+        {
+            "FailSafePercent": 100,
+            "MinThermalOutput": 10,
+            "Name": "CPUFan1Zone",
+            "Type": "Pid.Zone"
+        },
+        {
+            "FailSafePercent": 100,
+            "MinThermalOutput": 10,
+            "Name": "CPUFan2Zone",
+            "Type": "Pid.Zone"
+        },
+        {
+            "Class": "temp",
+            "Inputs": [
+                "BMC_Temp", "CPUs_Temp", "PCH___M_2_Temp"
+            ],
+            "Name": "Zone 1 Step Controller",
+            "NegativeHysteresis": 0,
+            "Output": [
+                20.0,
+                35.0,
+                50.0,
+                65.0,
+                80.0,
+                100.0
+            ],
+            "PositiveHysteresis": 0,
+            "Reading": [
+                15.0,
+                25.0,
+                35.0,
+                40.0,
+                45.0,
+                50.0
+            ],
+            "Type": "Stepwise",
+            "Zones": [
+                "SysFan1Zone", "SysFan2Zone", "SysFan3Zone"             
+            ]
+        },
+        {
+            "Class": "temp",
+            "Inputs": [
+                "Die_CPU1"
+            ],
+            "Name": "CPU Zone 1 Step Controller",
+            "NegativeHysteresis": 0,
+            "Output": [
+                20.0,
+                35.0,
+                50.0,
+                65.0,
+                80.0,
+                100.0
+            ],
+            "PositiveHysteresis": 0,
+            "Reading": [
+                15.0,
+                25.0,
+                35.0,
+                40.0,
+                45.0,
+                50.0
+            ],
+            "Type": "Stepwise",
+            "Zones": [
+                "CPUFan1Zone"             
+            ]
+        },
+        {
+            "Class": "temp",
+            "Inputs": [
+                "Die_CPU2"
+            ],
+            "Name": "CPU Zone 2 Step Controller",
+            "NegativeHysteresis": 0,
+            "Output": [
+                20.0,
+                35.0,
+                50.0,
+                65.0,
+                80.0,
+                100.0
+            ],
+            "PositiveHysteresis": 0,
+            "Reading": [
+                15.0,
+                25.0,
+                35.0,
+                40.0,
+                45.0,
+                50.0
+            ],
+            "Type": "Stepwise",
+            "Zones": [
+                "CPUFan2Zone"             
+            ]
+        },
+        {
                 "Address": "0x4f",
                 "Bus": 6,
                 "Name": "Right side of the board Temp",
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/fans/phosphor-pid-control/config.json b/meta-ibs/meta-cp2-5422/recipes-phosphor/fans/phosphor-pid-control/config.json
deleted file mode 100644
index 640e569852..0000000000
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/fans/phosphor-pid-control/config.json
+++ /dev/null
@@ -1,356 +0,0 @@
-{
-    "sensors" : [
-        {
-            "name": "System_Fan_1",
-            "type": "fan",
-            "readPath": "/xyz/openbmc_project/sensors/fan_tach/System_Fan_1",
-            "writePath": "/sys/class/hwmon/hwmon0/pwm1",
-            "min": 0,
-            "max": 255
-        },
-         {
-            "name": "System_Fan_2",
-            "type": "fan",
-            "readPath": "/xyz/openbmc_project/sensors/fan_tach/System_Fan_2",
-            "writePath": "/sys/class/hwmon/hwmon0/pwm5",
-            "min": 0,
-            "max": 255
-        },
-        {
-            "name": "System_Fan_3",
-            "type": "fan",
-            "readPath": "/xyz/openbmc_project/sensors/fan_tach/System_Fan_3",
-            "writePath": "/sys/class/hwmon/hwmon0/pwm6",
-            "min": 0,
-            "max": 255
-        },
-        {
-            "name": "CPU1_Fan",
-            "type": "fan",
-            "readPath": "/xyz/openbmc_project/sensors/fan_tach/CPU1_Fan",
-            "writePath": "/sys/class/hwmon/hwmon0/pwm7",
-            "min": 0,
-            "max": 255
-        },
-        {
-            "name": "CPU2_Fan",
-            "type": "fan",
-            "readPath": "/xyz/openbmc_project/sensors/fan_tach/CPU2_Fan",
-            "writePath": "/sys/class/hwmon/hwmon0/pwm8",
-            "min": 0,
-            "max": 255
-        },
-
-        {
-            "name": "BMC_Temp",
-            "type": "temp",
-            "readPath": "/xyz/openbmc_project/sensors/temperature/BMC_Temp",
-            "writePath": "",
-            "min": 0,
-            "max": 0,
-            "ignoreDbusMinMax": true,
-            "timeout": 0
-        },
-        {
-            "name": "PCH___M_2_Temp",
-            "type": "temp",
-            "readPath": "/xyz/openbmc_project/sensors/temperature/PCH___M_2_Temp",
-            "writePath": "",
-            "min": 0,
-            "max": 0,
-            "ignoreDbusMinMax": true,
-            "timeout": 0
-        },
-        {
-            "name": "CPUs_Temp",
-            "type": "temp",
-            "readPath": "/xyz/openbmc_project/sensors/temperature/CPUs_Temp",
-            "writePath": "",
-            "min": 0,
-            "max": 0,
-            "ignoreDbusMinMax": true,
-            "timeout": 0
-        },
-        {
-            "name": "Die_CPU1",
-            "type": "temp",
-            "readPath": "/xyz/openbmc_project/sensors/temperature/Die_CPU1",
-            "writePath": "",
-            "min": 0,
-            "max": 0,
-            "ignoreDbusMinMax": true,
-            "timeout": 0,
-            "unavailableAsFailed": false
-        },
-        {
-            "name": "Die_CPU2",
-            "type": "temp",
-            "readPath": "/xyz/openbmc_project/sensors/temperature/Die_CPU2",
-            "writePath": "",
-            "min": 0,
-            "max": 0,
-            "ignoreDbusMinMax": true,
-            "timeout": 0,
-            "unavailableAsFailed": false
-        }
-
-
-    ],
-    "zones" : [
-        {
-            "id": 0,
-            "minThermalOutput": 30.0,
-            "failsafePercent": 100.0,
-            "pids": [
-                {
-                    "name": "system_fans",
-                    "type": "fan",
-                    "inputs": ["System_Fan_1", "System_Fan_2", "System_Fan_3"],
-                    "setpoint": 40.0,
-                    "pid": {
-                        "samplePeriod": 1.0,
-                        "proportionalCoeff": 0.0,
-                        "integralCoeff": 0.0,
-                        "feedFwdOffsetCoeff": 0.0,
-                        "feedFwdGainCoeff": 1.0,
-                        "integralLimit_min": 0.0,
-                        "integralLimit_max": 0.0,
-                        "outLim_min": 3.0,
-                        "outLim_max": 100.0,
-                        "slewNeg": 0.0,
-                        "slewPos": 0.0
-                    }
-                },
-
-                {
-                    "name": "system_temp",
-                    "type": "stepwise",
-                    "inputs": [
-                     "BMC_Temp", "CPUs_Temp", "PCH___M_2_Temp"                    
-		    ],
-                    "setpoint": 30.0,
-                    "pid": {
-                        "samplePeriod": 1.0,
-                        "positiveHysteresis": 0.0,
-                        "negativeHysteresis": 0.0,
-                        "isCeiling": false,
-                        "reading": {
-                            "0": 25,
-                            "1": 26,
-                            "2": 27,
-                            "3": 28,
-                            "4": 29,
-                            "5": 30,
-                            "6": 31,
-                            "7": 32,
-                            "8": 33,
-                            "9": 34,
-                            "10": 35,
-                            "11": 36,
-                            "12": 37,
-                            "13": 38,
-                            "14": 39,
-                            "15": 40,
-                            "16": 42,
-                            "17": 44,
-                            "18": 45,
-                            "19": 50
-                        },
-                        "output": {
-                            "0": 10,
-                            "1": 12,
-                            "2": 14,
-                            "3": 16,
-                            "4": 18,
-                            "5": 20,
-                            "6": 25,
-                            "7": 30,
-                            "8": 40,
-                            "9": 50,
-                            "10": 60,
-                            "11": 73,
-                            "12": 76,
-                            "13": 79,
-                            "14": 82,
-                            "15": 86,
-                            "16": 90,
-                            "17": 93,
-                            "18": 95,
-                            "19": 100
-                        }
-                    }
-                }                
-            ]
-        },
-        {
-            "id": 1,
-            "minThermalOutput": 30.0,
-            "failsafePercent": 100.0,
-            "pids": [
-                {
-                    "name": "cpu1",
-                    "type": "fan",
-                    "inputs": ["CPU1_Fan"],
-                    "setpoint": 40.0,
-                    "pid": {
-                        "samplePeriod": 1.0,
-                        "proportionalCoeff": 0.0,
-                        "integralCoeff": 0.0,
-                        "feedFwdOffsetCoeff": 0.0,
-                        "feedFwdGainCoeff": 1.0,
-                        "integralLimit_min": 0.0,
-                        "integralLimit_max": 0.0,
-                        "outLim_min": 3.0,
-                        "outLim_max": 100.0,
-                        "slewNeg": 0.0,
-                        "slewPos": 0.0
-                    }
-                },
-
-                {
-                    "name": "system_temp",
-                    "type": "stepwise",
-                    "inputs": [
-                     "Die_CPU1"
-		    ],
-                    "setpoint": 30.0,
-                    "pid": {
-                        "samplePeriod": 1.0,
-                        "positiveHysteresis": 0.0,
-                        "negativeHysteresis": 0.0,
-                        "isCeiling": false,
-                        "reading": {
-                            "0": 25,
-                            "1": 26,
-                            "2": 27,
-                            "3": 28,
-                            "4": 29,
-                            "5": 30,
-                            "6": 31,
-                            "7": 32,
-                            "8": 33,
-                            "9": 34,
-                            "10": 35,
-                            "11": 36,
-                            "12": 37,
-                            "13": 38,
-                            "14": 39,
-                            "15": 40,
-                            "16": 42,
-                            "17": 44,
-                            "18": 45,
-                            "19": 50
-                        },
-                        "output": {
-                            "0": 10,
-                            "1": 12,
-                            "2": 14,
-                            "3": 16,
-                            "4": 18,
-                            "5": 20,
-                            "6": 25,
-                            "7": 30,
-                            "8": 40,
-                            "9": 50,
-                            "10": 60,
-                            "11": 73,
-                            "12": 76,
-                            "13": 79,
-                            "14": 82,
-                            "15": 86,
-                            "16": 90,
-                            "17": 93,
-                            "18": 95,
-                            "19": 100
-                        }
-                    }
-                }                
-            ]
-        },
-        {
-            "id": 2,
-            "minThermalOutput": 30.0,
-            "failsafePercent": 100.0,
-            "pids": [
-                {
-                    "name": "cpu2",
-                    "type": "fan",
-                    "inputs": ["CPU2_Fan"],
-                    "setpoint": 40.0,
-                    "pid": {
-                        "samplePeriod": 1.0,
-                        "proportionalCoeff": 0.0,
-                        "integralCoeff": 0.0,
-                        "feedFwdOffsetCoeff": 0.0,
-                        "feedFwdGainCoeff": 1.0,
-                        "integralLimit_min": 0.0,
-                        "integralLimit_max": 0.0,
-                        "outLim_min": 3.0,
-                        "outLim_max": 100.0,
-                        "slewNeg": 0.0,
-                        "slewPos": 0.0
-                    }
-                },
-
-                {
-                    "name": "system_temp",
-                    "type": "stepwise",
-                    "inputs": [
-                     "Die_CPU2"
-		    ],
-                    "setpoint": 30.0,
-                    "pid": {
-                        "samplePeriod": 1.0,
-                        "positiveHysteresis": 0.0,
-                        "negativeHysteresis": 0.0,
-                        "isCeiling": false,
-                        "reading": {
-                            "0": 25,
-                            "1": 26,
-                            "2": 27,
-                            "3": 28,
-                            "4": 29,
-                            "5": 30,
-                            "6": 31,
-                            "7": 32,
-                            "8": 33,
-                            "9": 34,
-                            "10": 35,
-                            "11": 36,
-                            "12": 37,
-                            "13": 38,
-                            "14": 39,
-                            "15": 40,
-                            "16": 42,
-                            "17": 44,
-                            "18": 45,
-                            "19": 50
-                        },
-                        "output": {
-                            "0": 10,
-                            "1": 12,
-                            "2": 14,
-                            "3": 16,
-                            "4": 18,
-                            "5": 20,
-                            "6": 25,
-                            "7": 30,
-                            "8": 40,
-                            "9": 50,
-                            "10": 60,
-                            "11": 73,
-                            "12": 76,
-                            "13": 79,
-                            "14": 82,
-                            "15": 86,
-                            "16": 90,
-                            "17": 93,
-                            "18": 95,
-                            "19": 100
-                        }
-                    }
-                }                
-            ]
-        }
-    ]
-}
diff --git a/meta-ibs/meta-cp2-5422/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-ibs/meta-cp2-5422/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
deleted file mode 100644
index 4a54fb0786..0000000000
--- a/meta-ibs/meta-cp2-5422/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
+++ /dev/null
@@ -1,9 +0,0 @@
-FILESEXTRAPATHS:append := ":${THISDIR}/${PN}"
-SRC_URI:append = " file://config.json"
-
-FILES:${PN}:append = " ${datadir}/swampd/config.json"
-
-do_install:append() {
-     install -d ${D}/usr/share/swampd
-     install -m 0444 ${WORKDIR}/config.json ${D}/usr/share/swampd/.
-}