From a3cf1eaa6c14463386dcc2eb944cbb3c71e231a5 Mon Sep 17 00:00:00 2001 From: "Evgeny Alekseev (IBS Group)" Date: Wed, 22 Jun 2022 14:14:36 +0300 Subject: [Mod]entity-manager combine all jsons to one. --- .../entity-manager/SILA-Baseboard.json | 885 --------------------- .../entity-manager/SILA-Baseboard_full.json | 790 ++++++++++++++++++ .../configuration/entity-manager/SILA-CPUs.json | 39 - .../configuration/entity-manager/SILA-Fans.json | 243 ------ 4 files changed, 790 insertions(+), 1167 deletions(-) delete mode 100644 meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-Baseboard.json create mode 100644 meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-Baseboard_full.json delete mode 100644 meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-CPUs.json delete mode 100644 meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-Fans.json diff --git a/meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-Baseboard.json b/meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-Baseboard.json deleted file mode 100644 index 9081fd84fa..0000000000 --- a/meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-Baseboard.json +++ /dev/null @@ -1,885 +0,0 @@ -{ - "Exposes": [ - { - "Index": 0, - "Name": "Baseboard 12Volt", - "PowerState": "On", - "ScaleFactor": 0.118, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 13.494 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 13.101 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 10.945 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 10.616 - } - ], - "Type": "ADC" - }, - { - "Index": 3, - "Name": "P105_PCH_AUX", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.139 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.106 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 0.995 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0.966 - } - ], - "Type": "ADC" - }, - { - "Index": 5, - "Name": "P5V_STBY_PSU", - "ScaleFactor": 0.270, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 5.49 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 5.245 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 4.75 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 4.5 - } - ], - "Type": "ADC" - }, - { - "Index": 6, - "Name": "P1V8_PCH", - "ScaleFactor": 0.767, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.961 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.904 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.699 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.648 - } - ], - "Type": "ADC" - }, - { - "Index": 1, - "Name": "P3V3", - "PowerState": "On", - "ScaleFactor": 0.429, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 3.647 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 3.541 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 3.066 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 2.974 - } - ], - "Type": "ADC" - }, - { - "CPURequired": 1, - "Index": 8, - "Name": "PVCCIN_CPU1", - "PowerState": "On", - "ScaleFactor": 0.767, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 2.151 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 2.088 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.418 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.376 - } - ], - "Type": "ADC" - }, - { - "CPURequired": 2, - "Index": 9, - "Name": "PVCCIN_CPU2", - "PowerState": "On", - "ScaleFactor": 0.767, - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 2.151 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 2.088 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.418 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.376 - } - ], - "Type": "ADC" - }, - { - "CPURequired": 1, - "Index": 14, - "Name": "PVCCIO_CPU1", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.19 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.155 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 0.752 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0.729 - } - ], - "Type": "ADC" - }, - { - "CPURequired": 2, - "Index": 15, - "Name": "PVCCIO_CPU2", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.19 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.155 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 0.752 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0.729 - } - ], - "Type": "ADC" - }, - { - "CPURequired": 1, - "Index": 10, - "Name": "PVDQ_ABC_CPU1", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.301 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.263 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.138 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.104 - } - ], - "Type": "ADC" - }, - { - "CPURequired": 2, - "Index": 12, - "Name": "PVDQ_ABC_CPU2", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.301 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.263 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.138 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.104 - } - ], - "Type": "ADC" - }, - { - "CPURequired": 1, - "Index": 11, - "Name": "PVDQ_DEF_CPU1", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.301 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.263 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.138 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.104 - } - ], - "Type": "ADC" - }, - { - "CPURequired": 2, - "Index": 13, - "Name": "PVDQ_DEF_CPU2", - "PowerState": "On", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.301 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.263 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 1.138 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1.104 - } - ], - "Type": "ADC" - }, - { - "Index": 2, - "Name": "PVNN_PCH_AUX", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 1.081 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 1.049 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 0.807 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0.783 - } - ], - "Type": "ADC" - }, - { - "Name": "Host CPU Utilization", - "Polling": { - "AveragingPeriod": 3000, - "Interval": 1000 - }, - "Type": "HostCpuUtilization" - }, - { - "Name": "Node Manager Sensor", - "Type": "NMSensor" - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -4.64, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "BMC Temp" - ], - "Name": "BMC Temp", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 80.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Zone 1", - "Zone 2", - "Zone 3" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -4.64, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "DIMM [ABC]\\d+ CPU1" - ], - "Name": "CPU1 DIMM ABC", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": -15.0, - "SetPointOffset": "WarningHigh", - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Zone 2", - "Zone 3", - "Zone 4" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -4.64, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "DIMM [DEF]\\d+ CPU1" - ], - "Name": "CPU1 DIMM DEF", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": -15.0, - "SetPointOffset": "WarningHigh", - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Zone 1", - "Zone 2" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -4.64, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "DIMM [ABC]\\d+ CPU2" - ], - "Name": "CPU2 DIMM ABC", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": -15.0, - "SetPointOffset": "WarningHigh", - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Zone 5", - "Zone 6", - "PSU" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -4.64, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "DIMM [DEF]\\d+ CPU2" - ], - "Name": "CPU2 DIMM DEF", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": -15.0, - "SetPointOffset": "WarningHigh", - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Zone 3", - "Zone 4", - "Zone 5" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -4.64, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "DTS CPU1" - ], - "Name": "DTS CPU1", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": -25.0, - "SetPointOffset": "WarningHigh", - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Zone 1", - "Zone 2", - "Zone 3" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -4.64, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "DTS CPU2" - ], - "Name": "DTS CPU2", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": -25.0, - "SetPointOffset": "WarningHigh", - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Zone 4", - "Zone 5", - "Zone 6", - "PSU" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -8.8, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "Left Rear Temp" - ], - "Name": "Left Rear Temp", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 55.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Zone 4", - "Zone 5", - "Zone 6" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -8.8, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "Right Rear Board" - ], - "Name": "Right Rear Board", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 55.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Zone 1", - "Zone 2", - "Zone 3" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -4.64, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "SSB Temp" - ], - "Name": "SSB Temp", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 76.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Zone 2", - "Zone 3", - "Zone 4" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -8.8, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "VR 1 Temp" - ], - "Name": "VR 1 Temp", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 90.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Zone 1", - "Zone 2", - "Zone 3" - ] - }, - { - "Class": "temp", - "FFGainCoefficient": 0.0, - "FFOffCoefficient": 0.0, - "ICoefficient": -8.8, - "ILimitMax": 100, - "ILimitMin": 30, - "Inputs": [ - "VR 2 Temp" - ], - "Name": "VR 2 Temp", - "NegativeHysteresis": 5.0, - "OutLimitMax": 100, - "OutLimitMin": 30, - "Outputs": [], - "PCoefficient": -0.15, - "PositiveHysteresis": 0.0, - "SetPoint": 90.0, - "SlewNeg": -1, - "SlewPos": 0.0, - "Type": "Pid", - "Zones": [ - "Zone 4", - "Zone 5", - "Zone 6", - "PSU" - ] - }, - { - "Address": "0x4A", - "Bus": 6, - "Name": "BMC Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP75" - }, - { - "Address": "0x4B", - "Bus": 6, - "Name": "VR 2 Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP75" - } - ], - "Name": "SILA Baseboard", - "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'CP.*'})", - "Type": "Board", - "xyz.openbmc_project.Inventory.Decorator.Asset": { - "Manufacturer": "$BOARD_MANUFACTURER", - "Model": "$BOARD_PRODUCT_NAME", - "PartNumber": "$BOARD_PART_NUMBER", - "SerialNumber": "$BOARD_SERIAL_NUMBER" - }, - "xyz.openbmc_project.Inventory.Decorator.AssetTag": { - "AssetTag": "$PRODUCT_ASSET_TAG" - }, - "xyz.openbmc_project.Inventory.Item.Board.Motherboard": { - "ProductId": 123 - }, - "xyz.openbmc_project.Inventory.Item.System": {} -} diff --git a/meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-Baseboard_full.json b/meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-Baseboard_full.json new file mode 100644 index 0000000000..6b78bad555 --- /dev/null +++ b/meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-Baseboard_full.json @@ -0,0 +1,790 @@ +{ + "Exposes": [ + { + "Address": 48, + "Bus": 0, + "CpuID": 1, + "Name": "CPU 1", + "PresenceGpio": [ + { + "Name": "CPU1_PRESENCE", + "Polarity": "Low" + } + ], + "Type": "XeonCPU" + }, + { + "Address": 49, + "Bus": 0, + "CpuID": 2, + "Name": "CPU 2", + "PresenceGpio": [ + { + "Name": "CPU2_PRESENCE", + "Polarity": "Low" + } + ], + "Type": "XeonCPU" + }, + { + "C1": 92.16, + "C2": 107.52, + "MaxCFM": 17.5, + "Name": "System Airflow", + "TachMaxPercent": 100, + "TachMinPercent": 20, + "Tachs": [ + "System Fan 1", + "", + "", + "", + "System Fan 2", + "System Fan 3", + "CPU2 Fan", + "", + "CPU1 Fan" + ], + "Type": "CFMSensor" + }, + { + "Connector": { + "Pwm": 0, + "Tachs": [ + 0 + ] + }, + "Description": "J2K3", + "Index": 0, + "Name": "System Fan 1", + "Type": "AspeedFan" + }, + { + "Connector": { + "Pwm": 4, + "Tachs": [ + 4 + ] + }, + "Description": "J4K3", + "Index": 4, + "Name": "System Fan 2", + "Type": "AspeedFan" + }, + { + "Connector": { + "Pwm": 5, + "Tachs": [ + 5 + ] + }, + "Description": "J4K4", + "Index": 5, + "Name": "System Fan 3", + "Type": "AspeedFan" + }, + { + "Connector": { + "Pwm": 6, + "Tachs": [ + 8 + ] + }, + "Description": "J6K1", + "Index": 6, + "Name": "CPU1 Fan", + "Type": "AspeedFan" + }, + { + "Connector": { + "Pwm": 7, + "Tachs": [ + 6 + ] + }, + "Description": "J6A1", + "Index": 7, + "Name": "CPU2 Fan", + "Type": "AspeedFan" + }, + { + "Address": 79, + "Bus": 6, + "Name": "Right side of the board Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP75" + }, + { + "Address": 72, + "Bus": 6, + "Name": "PCH & M.2 Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": -1 + } + ], + "Type": "TMP75" + }, + { + "Address": 77, + "Bus": 6, + "Name": "Inlet BRD Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP75" + }, + { + "Address": 73, + "Bus": 6, + "Name": "CPUs Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1 + } + ], + "Type": "TMP75" + }, + { + "Index": 0, + "Name": "Baseboard 12Volt", + "PowerState": "On", + "ScaleFactor": 0.118, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 13.494 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 13.101 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 10.945 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 10.616 + } + ], + "Type": "ADC" + }, + { + "Index": 3, + "Name": "P105_PCH_AUX", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.139 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.106 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.995 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.966 + } + ], + "Type": "ADC" + }, + { + "Index": 5, + "Name": "P5V_STBY_PSU", + "ScaleFactor": 0.27, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 5.49 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 5.245 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 4.75 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 4.5 + } + ], + "Type": "ADC" + }, + { + "Index": 6, + "Name": "P1V8_PCH", + "ScaleFactor": 0.767, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.961 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.904 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.699 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.648 + } + ], + "Type": "ADC" + }, + { + "Index": 1, + "Name": "P3V3", + "PowerState": "On", + "ScaleFactor": 0.429, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 3.647 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 3.541 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 3.066 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 2.974 + } + ], + "Type": "ADC" + }, + { + "CPURequired": 1, + "Index": 8, + "Name": "PVCCIN_CPU1", + "PowerState": "On", + "ScaleFactor": 0.767, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 2.151 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 2.088 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.418 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.376 + } + ], + "Type": "ADC" + }, + { + "CPURequired": 2, + "Index": 9, + "Name": "PVCCIN_CPU2", + "PowerState": "On", + "ScaleFactor": 0.767, + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 2.151 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 2.088 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.418 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.376 + } + ], + "Type": "ADC" + }, + { + "CPURequired": 1, + "Index": 14, + "Name": "PVCCIO_CPU1", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.19 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.155 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.752 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.729 + } + ], + "Type": "ADC" + }, + { + "CPURequired": 2, + "Index": 15, + "Name": "PVCCIO_CPU2", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.19 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.155 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.752 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.729 + } + ], + "Type": "ADC" + }, + { + "CPURequired": 1, + "Index": 10, + "Name": "PVDQ_ABC_CPU1", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.301 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.263 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.138 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.104 + } + ], + "Type": "ADC" + }, + { + "CPURequired": 2, + "Index": 12, + "Name": "PVDQ_ABC_CPU2", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.301 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.263 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.138 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.104 + } + ], + "Type": "ADC" + }, + { + "CPURequired": 1, + "Index": 11, + "Name": "PVDQ_DEF_CPU1", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.301 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.263 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.138 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.104 + } + ], + "Type": "ADC" + }, + { + "CPURequired": 2, + "Index": 13, + "Name": "PVDQ_DEF_CPU2", + "PowerState": "On", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.301 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.263 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 1.138 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 1.104 + } + ], + "Type": "ADC" + }, + { + "Index": 2, + "Name": "PVNN_PCH_AUX", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 1.081 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 1.049 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 0.807 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0.783 + } + ], + "Type": "ADC" + }, + { + "Name": "Host CPU Utilization", + "Polling": { + "AveragingPeriod": 3000, + "Interval": 1000 + }, + "Type": "HostCpuUtilization" + }, + { + "Name": "Node Manager Sensor", + "Type": "NMSensor" + }, + + { + "Address": "0x4e", + "Bus": 6, + "Name": "BMC Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP75" + }, + { + "Address": 75, + "Bus": 6, + "Name": "VR 2 Temp", + "Thresholds": [ + { + "Direction": "greater than", + "Name": "upper critical", + "Severity": 1, + "Value": 115 + }, + { + "Direction": "greater than", + "Name": "upper non critical", + "Severity": 0, + "Value": 110 + }, + { + "Direction": "less than", + "Name": "lower non critical", + "Severity": 0, + "Value": 5 + }, + { + "Direction": "less than", + "Name": "lower critical", + "Severity": 1, + "Value": 0 + } + ], + "Type": "TMP75" + } + ], + "Name": "SILA Baseboard", + "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'CP.*'})", + "Type": "Board", + "xyz.openbmc_project.Inventory.Decorator.Asset": { + "Manufacturer": "SILA LLC", + "Model": "CP2-5422", + "PartNumber": "..........", + "SerialNumber": "............" + }, + "xyz.openbmc_project.Inventory.Decorator.AssetTag": { + "AssetTag": ".................BMC" + }, + "xyz.openbmc_project.Inventory.Item.Board.Motherboard": { + "ProductId": 123 + }, + "xyz.openbmc_project.Inventory.Item.System": {} + } + diff --git a/meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-CPUs.json b/meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-CPUs.json deleted file mode 100644 index 47a400ee0c..0000000000 --- a/meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-CPUs.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "Exposes": [ - { - "Address": "0x30", - "Bus": 0, - "CpuID": 1, - "Name": "CPU 1", - "PresenceGpio": [ - { - "Name": "CPU1_PRESENCE", - "Polarity": "Low" - } - ], - "Type": "XeonCPU" - }, - { - "Address": "0x31", - "Bus": 0, - "CpuID": 2, - "Name": "CPU 2", - "PresenceGpio": [ - { - "Name": "CPU2_PRESENCE", - "Polarity": "Low" - } - ], - "Type": "XeonCPU" - } - ], - "Name": "SILA CPUs", - "Probe": [ - "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'CP.*'})" - ], - "Type": "Board", - "xyz.openbmc_project.Inventory.Decorator.Asset": {}, - "xyz.openbmc_project.Inventory.Decorator.AssetTag": {}, - "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {}, - "xyz.openbmc_project.Inventory.Item.System": {} -} diff --git a/meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-Fans.json b/meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-Fans.json deleted file mode 100644 index 758ad66c7a..0000000000 --- a/meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-Fans.json +++ /dev/null @@ -1,243 +0,0 @@ -{ - "Exposes": [ - { - "C1": 92.16, - "C2": 107.52, - "MaxCFM": 17.5, - "Name": "System Airflow", - "TachMaxPercent": 100, - "TachMinPercent": 20, - "Tachs": [ - "System Fan 1", - "", - "", - "", - "System Fan 2", - "System Fan 3", - "CPU2 Fan", - "", - "CPU1 Fan" - ], - "Type": "CFMSensor" - }, - { - "Connector": { - "Pwm": 0, - "Tachs": [0] - }, - "Index": 0, - "Name": "System Fan 1", - "Description": "J2K3", - "Type": "AspeedFan" - }, - { - "Connector": { - "Pwm": 4, - "Tachs": [4] - }, - "Index": 4, - "Name": "System Fan 2", - "Description": "J4K3", - "Type": "AspeedFan" - }, - { - "Connector": { - "Pwm": 5, - "Tachs": [5] - }, - "Index": 5, - "Name": "System Fan 3", - "Description": "J4K4", - "Type": "AspeedFan" - }, - { - "Connector": { - "Pwm": 6, - "Tachs": [8] - }, - "Index": 6, - "Name": "CPU1 Fan", - "Description": "J6K1", - "Type": "AspeedFan" - }, - { - "Connector": { - "Pwm": 7, - "Tachs": [6] - }, - "Index": 7, - "Name": "CPU2 Fan", - "Description": "J6A1", - "Type": "AspeedFan" - }, - { - "Address": "0x4e", - "Bus": 6, - "Name": "BMC Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": -1 - } - ], - "Type": "TMP75" - }, - { - "Address": "0x4f", - "Bus": 6, - "Name": "Right side of the board Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP75" - }, - { - "Address": "0x48", - "Bus": 6, - "Name": "PCH & M.2 Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": -1 - } - ], - "Type": "TMP75" - }, - { - "Address": "0x4d", - "Bus": 6, - "Name": "Inlet BRD Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "TMP75" - }, - { - "Address": "0x49", - "Bus": 6, - "Name": "CPUs Temp", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 115 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 110 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 1 - } - ], - "Type": "TMP75" - } - ], - "Name": "SILA Fans", - "Probe": [ - "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'CP.*'})" - ], - "Type": "Board", - "xyz.openbmc_project.Inventory.Decorator.Asset": {}, - "xyz.openbmc_project.Inventory.Decorator.AssetTag": {}, - "xyz.openbmc_project.Inventory.Item.Board.Motherboard": {}, - "xyz.openbmc_project.Inventory.Item.System": {} -} -- cgit v1.2.3