diff options
4 files changed, 271 insertions, 605 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 463edea23c..86e5ca2d9f 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 @@ -4,7 +4,7 @@ "Index": 0, "Name": "Baseboard 12Volt", "PowerState": "On", - "ScaleFactor": 0.1124, + "ScaleFactor": 0.118, "Thresholds": [ { "Direction": "greater than", @@ -18,7 +18,7 @@ "Severity": 0, "Value": 13.101 }, - { + { "Direction": "less than", "Name": "lower non critical", "Severity": 0, @@ -66,32 +66,32 @@ }, { "Index": 5, - "Name": "P12V_AUX", - "ScaleFactor": 0.1124, + "Name": "P5V_STBY_PSU", + "ScaleFactor": 0.270, "Thresholds": [ { "Direction": "greater than", "Name": "upper critical", "Severity": 1, - "Value": 13.494 + "Value": 5.49 }, { "Direction": "greater than", "Name": "upper non critical", "Severity": 0, - "Value": 13.101 + "Value": 5.245 }, { "Direction": "less than", "Name": "lower non critical", "Severity": 0, - "Value": 10.945 + "Value": 4.75 }, { "Direction": "less than", "Name": "lower critical", "Severity": 1, - "Value": 10.616 + "Value": 4.5 } ], "Type": "ADC" @@ -99,7 +99,7 @@ { "Index": 6, "Name": "P1V8_PCH", - "ScaleFactor": 0.7505, + "ScaleFactor": 0.767, "Thresholds": [ { "Direction": "greater than", @@ -132,7 +132,7 @@ "Index": 1, "Name": "P3V3", "PowerState": "On", - "ScaleFactor": 0.4107, + "ScaleFactor": 0.429, "Thresholds": [ { "Direction": "greater than", @@ -166,7 +166,7 @@ "Index": 8, "Name": "PVCCIN_CPU1", "PowerState": "On", - "ScaleFactor": 0.7505, + "ScaleFactor": 0.767, "Thresholds": [ { "Direction": "greater than", @@ -200,7 +200,7 @@ "Index": 9, "Name": "PVCCIN_CPU2", "PowerState": "On", - "ScaleFactor": 0.7505, + "ScaleFactor": 0.767, "Thresholds": [ { "Direction": "greater than", @@ -467,478 +467,24 @@ "Type": "HostCpuUtilization" }, { - "LED": "fan1_fault", - "Name": "1U System Fan connector 1", - "Pwm": 0, - "Status": "disabled", - "Tachs": [ - 0, - 1 - ], - "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", + "C1": 92.16, + "C2": 107.52, + "MaxCFM": 17.5, + "Name": "System Airflow", + "TachMaxPercent": 100, + "TachMinPercent": 20, "Tachs": [ - 14 + "Fan CPU1b", + "Fan 0", + "Fan chassis 1", + "Fan chassis 2", + "Fan chassis 3", + "Fan chassis 4", + "Fan CPU1a", + "Fan CPU2a", + "Fan CPU2b" ], - "Type": "IntelFanConnector" - }, - { - "Address": "0x8", - "Class": "METemp", - "Name": "SSB Temp", - "PowerState": "BiosPost", - "Thresholds": [ - { - "Direction": "greater than", - "Name": "upper critical", - "Severity": 1, - "Value": 103 - }, - { - "Direction": "greater than", - "Name": "upper non critical", - "Severity": 0, - "Value": 98 - }, - { - "Direction": "less than", - "Name": "lower non critical", - "Severity": 0, - "Value": 5 - }, - { - "Direction": "less than", - "Name": "lower critical", - "Severity": 1, - "Value": 0 - } - ], - "Type": "IpmbSensor" - }, - { - "Address": "0x7c", - "Class": "PxeBridgeTemp", - "HostSMbusIndex": 3, - "Name": "CPU1 P12V PVCCIO VR 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": "IpmbSensor" - }, - { - "Address": "0x70", - "Class": "PxeBridgeTemp", - "HostSMbusIndex": 3, - "Name": "CPU1 P12V PVCCIN VR 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": "IpmbSensor" - }, - { - "Address": "0x74", - "Class": "PxeBridgeTemp", - "HostSMbusIndex": 3, - "Name": "CPU1 VR Mem ABC 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": "IpmbSensor" - }, - { - "Address": "0x78", - "Class": "PxeBridgeTemp", - "HostSMbusIndex": 3, - "Name": "CPU1 VR Mem DEF 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": "IpmbSensor" - }, - { - "Address": "0x9c", - "Class": "PxeBridgeTemp", - "HostSMbusIndex": 3, - "Name": "CPU2 P12V PVCCIO VR 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": "IpmbSensor" - }, - { - "Address": "0x50", - "Class": "PxeBridgeTemp", - "HostSMbusIndex": 3, - "Name": "CPU2 P12V PVCCIN VR 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": "IpmbSensor" - }, - { - "Address": "0x94", - "Class": "PxeBridgeTemp", - "HostSMbusIndex": 3, - "Name": "CPU2 VR Mem ABC 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": "IpmbSensor" - }, - { - "Address": "0x98", - "Class": "PxeBridgeTemp", - "HostSMbusIndex": 3, - "Name": "CPU2 VR Mem DEF 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": "IpmbSensor" - }, - { - "Address": "0xAC", - "Class": "PxeBridgeTemp", - "HostSMbusIndex": 3, - "Name": "VR P1V05 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": "IpmbSensor" + "Type": "CFMSensor" }, { "Name": "Node Manager Sensor", @@ -1276,39 +822,6 @@ ] }, { - "Address": "0x4D", - "Bus": 6, - "Name": "Right Rear Board Temp", - "Name1": "Right Rear TMP421 Internal 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": "TMP421" - }, - { "Address": "0x4A", "Bus": 6, "Name": "BMC Temp", @@ -1341,70 +854,6 @@ "Type": "TMP75" }, { - "Address": "0x49", - "Bus": 6, - "Name": "Left Rear 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": "VR 1 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", @@ -1435,32 +884,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..d63f803381 --- /dev/null +++ b/meta-ibs/meta-ast2500/recipes-phosphor/configuration/entity-manager/SILA-Fans.json @@ -0,0 +1,203 @@ +{ + "Exposes": [ + { + "Connector": { + "Pwm": 0, + "Tachs": [0] + }, + "Index": 0, + "Name": "Fan CPU1b", + "Description": "J2K3", + "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" + }, + { + "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": {} +} diff --git a/meta-ibs/meta-common/recipes-ibs/packagegroups/packagegroup-ibs-apps.bb b/meta-ibs/meta-common/recipes-ibs/packagegroups/packagegroup-ibs-apps.bb index ddddb8eb4f..88d95bb2b5 100644 --- a/meta-ibs/meta-common/recipes-ibs/packagegroups/packagegroup-ibs-apps.bb +++ b/meta-ibs/meta-common/recipes-ibs/packagegroups/packagegroup-ibs-apps.bb @@ -48,6 +48,7 @@ RDEPENDS:${PN}-system = " \ entity-manager \ intel-ipmi-oem \ phosphor-hostlogger \ + phosphor-power-regulators \ ${PN}-interface \ ${PN}-cli \ " |