From 76202e16f8ab80774060fe0d36f31a8e667ed691 Mon Sep 17 00:00:00 2001 From: Kumar Thangavel Date: Wed, 17 Feb 2021 13:06:10 +0530 Subject: Add Airflow virtual sensor support Added support in the machine layer for Airflow sensor as virtual sensor. TESTED : Built Facebook YosemiteV2 images and loaded on the target hardware. Verified the airflow sensor values in the phosphor-virtual-sensor dbus objects. Signed-off-by: Kumar Thangavel Change-Id: I46b377cc119a31f76286ba2d03f14764f578283f --- .../packagegroups/packagegroup-fb-apps.bb | 1 + .../tiogapass/tiogapass_sensor_config.json | 46 +++++++++++++++++++ .../yosemitev2/yosemitev2_sensor_config.json | 51 ++++++++++++++++++++++ .../sensors/phosphor-virtual-sensor_%.bbappend | 11 +++++ 4 files changed, 109 insertions(+) create mode 100644 meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/tiogapass/tiogapass_sensor_config.json create mode 100644 meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/yosemitev2/yosemitev2_sensor_config.json create mode 100644 meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend (limited to 'meta-facebook') diff --git a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb index 86fac887c7..b2ec84b653 100644 --- a/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb +++ b/meta-facebook/recipes-fb/packagegroups/packagegroup-fb-apps.bb @@ -52,4 +52,5 @@ RDEPENDS_${PN}-system = " \ ipmitool \ phosphor-post-code-manager \ phosphor-host-postd \ + phosphor-virtual-sensor \ " diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/tiogapass/tiogapass_sensor_config.json b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/tiogapass/tiogapass_sensor_config.json new file mode 100644 index 0000000000..a394faef81 --- /dev/null +++ b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/tiogapass/tiogapass_sensor_config.json @@ -0,0 +1,46 @@ +[ + { + "Desc" : + { + "Name" : "Virtual_Inlet_Temp", + "SensorType" : "temperature" + }, + "Threshold" : + { + "CriticalHigh": 90, + "CriticalLow": 20, + "WarningHigh": 70, + "WarningLow": 30 + }, + "Params": + { + "ConstParam" : + [ + { + "ParamName" : "P1", + "Value" : 1.1 + } + ], + "DbusParam" : + [ + { + "ParamName" : "P2", + "Desc" : + { + "Name" : "MB_INLET_TEMP", + "SensorType" : "temperature" + } + }, + { + "ParamName" : "P3", + "Desc" : + { + "Name" : "MB_FAN0_TACH", + "SensorType" : "fan_tach" + } + } + ] + }, + "Expression" : "P1 * (P2 + 5 - P3 * 0.01)" + } +] diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/yosemitev2/yosemitev2_sensor_config.json b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/yosemitev2/yosemitev2_sensor_config.json new file mode 100644 index 0000000000..c56712dbdd --- /dev/null +++ b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor/yosemitev2/yosemitev2_sensor_config.json @@ -0,0 +1,51 @@ +[ + { + "Desc" : + { + "Name" : "Virtual_CFM_Sensor", + "SensorType" : "airflow" + }, + "Threshold" : + { + "CriticalHigh": 40, + "CriticalLow": 10, + "WarningHigh": 30, + "WarningLow": 15 + }, + "Params": + { + "ConstParam" : + [ + { + "ParamName" : "P1", + "Value" : 0.00565 + }, + { + "ParamName" : "P2", + "Value" : 3.7427 + } + ], + "DbusParam" : + [ + { + "ParamName" : "P3", + "Desc" : + { + "Name" : "SP_FAN0_TACH", + "SensorType" : "fan_tach" + } + }, + { + "ParamName" : "P4", + "Desc" : + { + "Name" : "SP_FAN1_TACH", + "SensorType" : "fan_tach" + } + } + ] + }, + "Expression" : "(P3 * P1) + (P4 * P1) - P2" + } +] + diff --git a/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend new file mode 100644 index 0000000000..94650bab6a --- /dev/null +++ b/meta-facebook/recipes-phosphor/sensors/phosphor-virtual-sensor_%.bbappend @@ -0,0 +1,11 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}/${MACHINE}:" + +SRC_URI_append = " file://${MACHINE}_sensor_config.json" + +do_install_append() { + + install -d ${D}/usr/share/phosphor-virtual-sensor + + install -m 0644 -D ${WORKDIR}/${MACHINE}_sensor_config.json \ + ${D}/usr/share/phosphor-virtual-sensor/virtual_sensor_config.json +} -- cgit v1.2.3