diff options
author | Thang Q. Nguyen <thang@os.amperecomputing.com> | 2022-06-28 01:26:51 +0300 |
---|---|---|
committer | Thang Q. Nguyen <thang@os.amperecomputing.com> | 2023-11-13 04:53:02 +0300 |
commit | e53901c5abac9e92255aa4c0967af7769704fd1b (patch) | |
tree | a76eb261162a16044e6cbacde65fcdb9ff0af38e | |
parent | feeda1fe83be29488f7d25b7fef7926e766c5496 (diff) | |
download | openbmc-e53901c5abac9e92255aa4c0967af7769704fd1b.tar.xz |
meta-ampere: mtmitchell: update on-board sensors
Add front backplane and other on-board sensors that are available on the
Mt.Mitchell DVT board.
This commit also updates virtual sensor expression using sumIgnoreNaN
and maxIgnoreNaN functions to better handle nan values
Tested:
1. Run 'ipmitool sdr list' and check for sensor report
2. Check sensor report from Redfish and WebUI
Signed-off-by: Thang Q. Nguyen <thang@os.amperecomputing.com>
Change-Id: Ia2a221929026141dbd6a2482f4017be7fe2026cc
2 files changed, 197 insertions, 11 deletions
diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/configuration/mtmitchell-yaml-config/mtmitchell-ipmi-sensors.yaml b/meta-ampere/meta-mitchell/recipes-phosphor/configuration/mtmitchell-yaml-config/mtmitchell-ipmi-sensors.yaml index d2773ccd20..911fd1f906 100644 --- a/meta-ampere/meta-mitchell/recipes-phosphor/configuration/mtmitchell-yaml-config/mtmitchell-ipmi-sensors.yaml +++ b/meta-ampere/meta-mitchell/recipes-phosphor/configuration/mtmitchell-yaml-config/mtmitchell-ipmi-sensors.yaml @@ -35,6 +35,11 @@ <<: *TEMP_DEFAULTS entityInstance: 5 path: /xyz/openbmc_project/sensors/temperature/PcieZoneTemp2 +6: + <<: *TEMP_DEFAULTS + entityID: 0x37 + entityInstance: 1 + path: /xyz/openbmc_project/sensors/temperature/InletTemp 7: <<: *TEMP_DEFAULTS entityID: 0x37 @@ -60,6 +65,19 @@ entityID: 0x1e entityInstance: 1 path: /xyz/openbmc_project/sensors/temperature/NVMeM2_MaxTemp +12: + <<: *TEMP_DEFAULTS + entityInstance: 12 + path: /xyz/openbmc_project/sensors/temperature/NVMeFBP_MaxTemp +13: + <<: *TEMP_DEFAULTS + entityID: 0x37 + entityInstance: 5 + path: /xyz/openbmc_project/sensors/temperature/SysInletTemp +14: + <<: *TEMP_DEFAULTS + entityInstance: 14 + path: /xyz/openbmc_project/sensors/temperature/FrontBP_MaxTemp 16: <<: *TEMP_DEFAULTS entityID: 0x1e diff --git a/meta-ampere/meta-mitchell/recipes-phosphor/sensors/phosphor-virtual-sensor/mtmitchell_virtual_sensor_config.json b/meta-ampere/meta-mitchell/recipes-phosphor/sensors/phosphor-virtual-sensor/mtmitchell_virtual_sensor_config.json index c846a9187a..1579f9ed9c 100644 --- a/meta-ampere/meta-mitchell/recipes-phosphor/sensors/phosphor-virtual-sensor/mtmitchell_virtual_sensor_config.json +++ b/meta-ampere/meta-mitchell/recipes-phosphor/sensors/phosphor-virtual-sensor/mtmitchell_virtual_sensor_config.json @@ -2,6 +2,13 @@ { "Desc": { + "Config": "D-Bus", + "Type": "Maximum" + } + }, + { + "Desc": + { "Name": "total_power", "SensorType": "power" }, @@ -43,7 +50,7 @@ } ] }, - "Expression": "(P0 == P0) ? ((P1 == P1) ? P0+P1 : P0 ) : P1" + "Expression": "sumIgnoreNaN(P0, P1)" }, { "Desc": @@ -90,11 +97,11 @@ } ] }, - "Expression": "(P0 + P1) >= 0 ? (P0 + P1) / 2 : NULL" + "Expression": "sumIgnoreNaN(P0, P1) / 2" }, { "Desc":{ - "Name":"NVMeM2_MaxTemp", + "Name":"NVMeFBP_MaxTemp", "SensorType":"temperature" }, "Threshold" : @@ -119,29 +126,183 @@ { "ParamName": "n0", "Desc": { - "Name": "m2nvme0", + "Name": "nvme0", "SensorType": "temperature" } }, { "ParamName": "n1", "Desc": { - "Name": "m2nvme1", + "Name": "nvme1", + "SensorType": "temperature" + } + }, + { + "ParamName": "n2", + "Desc": { + "Name": "nvme2", + "SensorType": "temperature" + } + }, + { + "ParamName": "n3", + "Desc": { + "Name": "nvme3", + "SensorType": "temperature" + } + }, + { + "ParamName": "n4", + "Desc": { + "Name": "nvme4", + "SensorType": "temperature" + } + }, + { + "ParamName": "n5", + "Desc": { + "Name": "nvme5", + "SensorType": "temperature" + } + }, + { + "ParamName": "n6", + "Desc": { + "Name": "nvme6", + "SensorType": "temperature" + } + }, + { + "ParamName": "n7", + "Desc": { + "Name": "nvme7", + "SensorType": "temperature" + } + }, + { + "ParamName": "n8", + "Desc": { + "Name": "nvme8", + "SensorType": "temperature" + } + }, + { + "ParamName": "n9", + "Desc": { + "Name": "nvme9", + "SensorType": "temperature" + } + }, + { + "ParamName": "n10", + "Desc": { + "Name": "nvme10", + "SensorType": "temperature" + } + }, + { + "ParamName": "n11", + "Desc": { + "Name": "nvme11", + "SensorType": "temperature" + } + }, + { + "ParamName": "n12", + "Desc": { + "Name": "nvme12", + "SensorType": "temperature" + } + }, + { + "ParamName": "n13", + "Desc": { + "Name": "nvme13", + "SensorType": "temperature" + } + }, + { + "ParamName": "n14", + "Desc": { + "Name": "nvme14", + "SensorType": "temperature" + } + }, + { + "ParamName": "n15", + "Desc": { + "Name": "nvme15", + "SensorType": "temperature" + } + }, + { + "ParamName": "n16", + "Desc": { + "Name": "nvme16", + "SensorType": "temperature" + } + }, + { + "ParamName": "n17", + "Desc": { + "Name": "nvme17", + "SensorType": "temperature" + } + }, + { + "ParamName": "n18", + "Desc": { + "Name": "nvme18", + "SensorType": "temperature" + } + }, + { + "ParamName": "n19", + "Desc": { + "Name": "nvme19", + "SensorType": "temperature" + } + }, + { + "ParamName": "n20", + "Desc": { + "Name": "nvme20", + "SensorType": "temperature" + } + }, + { + "ParamName": "n21", + "Desc": { + "Name": "nvme21", + "SensorType": "temperature" + } + }, + { + "ParamName": "n22", + "Desc": { + "Name": "nvme22", + "SensorType": "temperature" + } + }, + { + "ParamName": "n23", + "Desc": { + "Name": "nvme23", "SensorType": "temperature" } } ] }, - "Expression": "max((n0 == n0) ? n0 : 0,(n1 == n1) ? n1 : 0)" + "Expression": "maxIgnoreNaN(n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16, n17, n18, n19, n20, n21, n22, n23)" }, { "Desc":{ - "Name":"OCP_MaxTemp", + "Name":"FrontBP_MaxTemp", "SensorType":"temperature" }, "Threshold" : { - "CriticalHigh": 105 + "CriticalHigh": 70 }, "Associations": [ @@ -161,19 +322,26 @@ { "ParamName": "n1", "Desc": { - "Name": "OCP1_Temp", + "Name": "FrontBPTemp1", "SensorType": "temperature" } }, { "ParamName": "n2", "Desc": { - "Name": "OCP2_Temp", + "Name": "FrontBPTemp2", + "SensorType": "temperature" + } + }, + { + "ParamName": "n3", + "Desc": { + "Name": "FrontBPTemp3", "SensorType": "temperature" } } ] }, - "Expression": "max((n1 == n1) ? n1 : 0,(n2 == n2) ? n2 : 0)" + "Expression": "maxIgnoreNaN(n1, n2, n3)" } ] |