diff options
author | Evgeny Alekseev (IBS Group) <ealekseev@ibs.sila.ru> | 2022-06-16 08:57:33 +0300 |
---|---|---|
committer | Evgeny Alekseev (IBS Group) <ealekseev@ibs.sila.ru> | 2022-06-16 09:02:25 +0300 |
commit | 149738329e87749ea4738992cbc0bce7a5dc6f80 (patch) | |
tree | 210f6485c688930a20adc42b1852af4513cb2e93 /meta-ibs | |
parent | a2af3144cdd9cad2b8b749189c17267b4b02b2e3 (diff) | |
download | openbmc-149738329e87749ea4738992cbc0bce7a5dc6f80.tar.xz |
[Mod,Add]SILA-Baseboard.json mv fans=>SILA_Fans.* CPUS=>SILA_CPUs.*
Removed Fans and CPUs from baseboard file because they now will be in
separate files: SILA-CPUs.json and SILA-Fans.json.
So, two mentioned files were added.
Diffstat (limited to 'meta-ibs')
3 files changed, 318 insertions, 166 deletions
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 index 1a30fbbbe9..74fb64eaba 100644 --- 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 @@ -505,148 +505,24 @@ "Type": "HostCpuUtilization" }, { - "LED": "fan1_fault", - "Name": "1U System Fan connector 1", - "Pwm": 0, - "Status": "disabled", + "C1": 92.16, + "C2": 107.52, + "MaxCFM": 17.5, + "Name": "System Airflow", + "TachMaxPercent": 100, + "TachMinPercent": 20, "Tachs": [ - 0, - 1 + "Fan CPU1b", + "Fan 0", + "Fan chassis 1", + "Fan chassis 2", + "Fan chassis 3", + "Fan chassis 4", + "Fan CPU1a", + "Fan CPU2a", + "Fan CPU2b" ], - "Type": "IntelFanConnector" - }, - { - "LED": "fan2_fault", - "Name": "1U System Fan connector 2", - "Pwm": 1, - "Status": "disabled", - "Tachs": [ - 2, - 3 - ], - "Type": "IntelFanConnector" - }, - { - "LED": "fan3_fault", - "Name": "1U System Fan connector 3", - "Pwm": 2, - "Status": "disabled", - "Tachs": [ - 4, - 5 - ], - "Type": "IntelFanConnector" - }, - { - "LED": "fan4_fault", - "Name": "1U System Fan connector 4", - "Pwm": 3, - "Status": "disabled", - "Tachs": [ - 6, - 7 - ], - "Type": "IntelFanConnector" - }, - { - "LED": "fan5_fault", - "Name": "1U System Fan connector 5", - "Pwm": 4, - "Status": "disabled", - "Tachs": [ - 8, - 9 - ], - "Type": "IntelFanConnector" - }, - { - "LED": "fan6_fault", - "Name": "1U System Fan connector 6", - "Pwm": 5, - "Status": "disabled", - "Tachs": [ - 10, - 11 - ], - "Type": "IntelFanConnector" - }, - { - "LED": "fan1_fault", - "Name": "2U System Fan connector 1", - "Pwm": 0, - "Status": "disabled", - "Tachs": [ - 0 - ], - "Type": "IntelFanConnector" - }, - { - "LED": "fan2_fault", - "Name": "2U System Fan connector 2", - "Pwm": 1, - "Status": "disabled", - "Tachs": [ - 2 - ], - "Type": "IntelFanConnector" - }, - { - "LED": "fan3_fault", - "Name": "2U System Fan connector 3", - "Pwm": 2, - "Status": "disabled", - "Tachs": [ - 4 - ], - "Type": "IntelFanConnector" - }, - { - "LED": "fan4_fault", - "Name": "2U System Fan connector 4", - "Pwm": 3, - "Status": "disabled", - "Tachs": [ - 6 - ], - "Type": "IntelFanConnector" - }, - { - "LED": "fan5_fault", - "Name": "2U System Fan connector 5", - "Pwm": 4, - "Status": "disabled", - "Tachs": [ - 8 - ], - "Type": "IntelFanConnector" - }, - { - "LED": "fan6_fault", - "Name": "2U System Fan connector 6", - "Pwm": 5, - "Status": "disabled", - "Tachs": [ - 10 - ], - "Type": "IntelFanConnector" - }, - { - "Name": "CPU 1 Fan Connector", - "Pwm": 7, - "Status": "disabled", - "Tachs": [ - 13 - ], - "Type": "IntelFanConnector" - }, - { - "Name": "CPU 2 Fan Connector", - "Pwm": 8, - "Status": "disabled", - "Tachs": [ - 14 - ], - "Type": "IntelFanConnector" + "Type": "CFMSensor" }, { "Name": "Node Manager Sensor", @@ -1143,32 +1019,6 @@ } ], "Type": "TMP75" - }, - { - "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 Baseboard", 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 new file mode 100644 index 0000000000..47a400ee0c --- /dev/null +++ b/meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-CPUs.json @@ -0,0 +1,39 @@ +{ + "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 new file mode 100644 index 0000000000..a055a59556 --- /dev/null +++ b/meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-Fans.json @@ -0,0 +1,263 @@ +{ + "Exposes": [ + { + "Connector": { + "Pwm": 0, + "Tachs": [0] + }, + "Index": 0, + "Name": "Fan CPU1b", + "Description": "J2K3", + "Type": "AspeedFan" + }, + { + "Connector": { + "Pwm": 1, + "Tachs": [1] + }, + "Index": 1, + "Name": "Fan 0", + "Description": "J3K6", + "Type": "AspeedFan" + }, + { + "Connector": { + "Pwm": 2, + "Tachs": [2] + }, + "Index": 2, + "Name": "Fan chassis 2", + "Description": "J3K4", + "Type": "AspeedFan" + }, + { + "Connector": { + "Pwm": 3, + "Tachs": [3] + }, + "Index": 3, + "Name": "Fan chassis 1", + "Description": "J3K2", + "Type": "AspeedFan" + }, + { + "Connector": { + "Pwm": 4, + "Tachs": [4] + }, + "Index": 4, + "Name": "Fan chassis 3", + "Description": "J4K3", + "Type": "AspeedFan" + }, + { + "Connector": { + "Pwm": 5, + "Tachs": [5] + }, + "Index": 5, + "Name": "Fan chassis 4", + "Description": "J4K4", + "Type": "AspeedFan" + }, + { + "Connector": { + "Pwm": 6, + "Tachs": [8] + }, + "Index": 6, + "Name": "Fan CPU1a", + "Description": "J6K1", + "Type": "AspeedFan" + }, + { + "Connector": { + "Pwm": 7, + "Tachs": [6] + }, + "Index": 7, + "Name": "Fan CPU2a", + "Description": "J6A1", + "Type": "AspeedFan" + }, + { + "Connector": { + "Pwm": 7, + "Tachs": [7] + }, + "Index": 8, + "Name": "Fan CPU2b", + "Description": "J8A1", + "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": {} +} |