meta-bletchley: phosphor-pid-control: remove fan configuration
Move fan configuration to EM.
This commit relies on the commit listed below:
https://gerrit.openbmc.org/c/openbmc/entity-manager/+/59525
Signed-off-by: Potin Lai <potin.lai@quantatw.com>
Change-Id: Ie04abd9b64af8270ee74d764fd687d83daf67676
diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/fans/phosphor-pid-control/config.json b/meta-facebook/meta-bletchley/recipes-phosphor/fans/phosphor-pid-control/config.json
deleted file mode 100644
index 049429f..0000000
--- a/meta-facebook/meta-bletchley/recipes-phosphor/fans/phosphor-pid-control/config.json
+++ /dev/null
@@ -1,345 +0,0 @@
-{
- "version": "R06",
- "sensors": [
- {
- "name": "FAN0_TACH_IL",
- "type": "fan",
- "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN0_TACH_IL",
- "writePath": "/sys/devices/platform/ahb/ahb:apb/1e610000.pwm_tach/1e610000.pwm_tach:pwm/consumer:platform:pwm-fan0/consumer/hwmon/**/pwm1",
- "min": 0,
- "max": 255
- },
- {
- "name": "FAN0_TACH_OL",
- "type": "fan",
- "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN0_TACH_OL",
- "min": 0,
- "max": 255
- },
- {
- "name": "FAN1_TACH_IL",
- "type": "fan",
- "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN1_TACH_IL",
- "writePath": "/sys/devices/platform/ahb/ahb:apb/1e610000.pwm_tach/1e610000.pwm_tach:pwm/consumer:platform:pwm-fan1/consumer/hwmon/**/pwm1",
- "min": 0,
- "max": 255
- },
- {
- "name": "FAN1_TACH_OL",
- "type": "fan",
- "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN1_TACH_OL",
- "min": 0,
- "max": 255
- },
- {
- "name": "FAN2_TACH_IL",
- "type": "fan",
- "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN2_TACH_IL",
- "writePath": "/sys/devices/platform/ahb/ahb:apb/1e610000.pwm_tach/1e610000.pwm_tach:pwm/consumer:platform:pwm-fan2/consumer/hwmon/**/pwm1",
- "min": 0,
- "max": 255
- },
- {
- "name": "FAN2_TACH_OL",
- "type": "fan",
- "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN2_TACH_OL",
- "min": 0,
- "max": 255
- },
- {
- "name": "FAN3_TACH_IL",
- "type": "fan",
- "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN3_TACH_IL",
- "writePath": "/sys/devices/platform/ahb/ahb:apb/1e610000.pwm_tach/1e610000.pwm_tach:pwm/consumer:platform:pwm-fan3/consumer/hwmon/**/pwm1",
- "min": 0,
- "max": 255
- },
- {
- "name": "FAN3_TACH_OL",
- "type": "fan",
- "readPath": "/xyz/openbmc_project/sensors/fan_tach/FAN3_TACH_OL",
- "min": 0,
- "max": 255
- },
- {
- "name": "Virtual_Inlet_Temp",
- "type": "temp",
- "readPath": "/xyz/openbmc_project/sensors/temperature/Virtual_Inlet_Temp",
- "writePath": "",
- "min": 0,
- "max": 0,
- "ignoreDbusMinMax": true,
- "timeout": 0
- },
- {
- "name": "MB_U19_THERM_LOCAL",
- "type": "temp",
- "readPath": "/xyz/openbmc_project/sensors/temperature/MB_U19_THERM_LOCAL",
- "writePath": "",
- "min": 0,
- "max": 0,
- "ignoreDbusMinMax": true,
- "timeout": 0
- },
- {
- "name": "MB_U402_THERM_LOCAL",
- "type": "temp",
- "readPath": "/xyz/openbmc_project/sensors/temperature/MB_U402_THERM_LOCAL",
- "writePath": "",
- "min": 0,
- "max": 0,
- "ignoreDbusMinMax": true,
- "timeout": 0
- },
- {
- "name": "SLED1_THERM_LOCAL",
- "type": "temp",
- "readPath": "/xyz/openbmc_project/sensors/temperature/SLED1_THERM_LOCAL",
- "writePath": "",
- "min": 0,
- "max": 0,
- "ignoreDbusMinMax": true,
- "timeout": 0
- },
- {
- "name": "SLED2_THERM_LOCAL",
- "type": "temp",
- "readPath": "/xyz/openbmc_project/sensors/temperature/SLED2_THERM_LOCAL",
- "writePath": "",
- "min": 0,
- "max": 0,
- "ignoreDbusMinMax": true,
- "timeout": 0
- },
- {
- "name": "SLED3_THERM_LOCAL",
- "type": "temp",
- "readPath": "/xyz/openbmc_project/sensors/temperature/SLED3_THERM_LOCAL",
- "writePath": "",
- "min": 0,
- "max": 0,
- "ignoreDbusMinMax": true,
- "timeout": 0
- },
- {
- "name": "SLED4_THERM_LOCAL",
- "type": "temp",
- "readPath": "/xyz/openbmc_project/sensors/temperature/SLED4_THERM_LOCAL",
- "writePath": "",
- "min": 0,
- "max": 0,
- "ignoreDbusMinMax": true,
- "timeout": 0
- },
- {
- "name": "SLED5_THERM_LOCAL",
- "type": "temp",
- "readPath": "/xyz/openbmc_project/sensors/temperature/SLED5_THERM_LOCAL",
- "writePath": "",
- "min": 0,
- "max": 0,
- "ignoreDbusMinMax": true,
- "timeout": 0
- },
- {
- "name": "SLED6_THERM_LOCAL",
- "type": "temp",
- "readPath": "/xyz/openbmc_project/sensors/temperature/SLED6_THERM_LOCAL",
- "writePath": "",
- "min": 0,
- "max": 0,
- "ignoreDbusMinMax": true,
- "timeout": 0
- }
- ],
- "zones": [
- {
- "id": 1,
- "minThermalOutput": 20.0,
- "failsafePercent": 80.0,
- "pids": [
- {
- "name": "fan_tachs",
- "type": "fan",
- "inputs": [
- "FAN0_TACH_IL",
- "FAN0_TACH_OL",
- "FAN1_TACH_IL",
- "FAN1_TACH_OL",
- "FAN2_TACH_IL",
- "FAN2_TACH_OL",
- "FAN3_TACH_IL",
- "FAN3_TACH_OL"
- ],
- "setpoint": 0.0,
- "pid": {
- "samplePeriod": 1.0,
- "proportionalCoeff": 0.0,
- "integralCoeff": 0.0,
- "feedFwdOffsetCoeff": 0.0,
- "feedFwdGainCoeff": 1.0,
- "integralLimit_min": 0.0,
- "integralLimit_max": 0.0,
- "outLim_min": 0.0,
- "outLim_max": 100.0,
- "slewNeg": 0.0,
- "slewPos": 0.0
- }
- },
- {
- "name": "inlet_Temp",
- "type": "stepwise",
- "inputs": [
- "Virtual_Inlet_Temp"
- ],
- "setpoint": 10.0,
- "pid": {
- "samplePeriod": 1.0,
- "positiveHysteresis": 0.0,
- "negativeHysteresis": 0.0,
- "isCeiling": false,
- "reading": {
- "0": 15.0,
- "1": 20.0,
- "2": 22.0,
- "3": 24.0,
- "4": 26.0,
- "5": 28.0,
- "6": 30.0,
- "7": 31.0,
- "8": 32.0,
- "9": 33.0,
- "10": 34.0,
- "11": 35.0,
- "12": 36.0,
- "13": 37.0,
- "14": 38.0,
- "15": 39.0,
- "16": 40.0
- },
- "output": {
- "0": 20.0,
- "1": 23.0,
- "2": 28.0,
- "3": 30.0,
- "4": 31.0,
- "5": 32.0,
- "6": 35.0,
- "7": 36.0,
- "8": 37.0,
- "9": 38.0,
- "10": 39.0,
- "11": 40.0,
- "12": 43.0,
- "13": 45.0,
- "14": 47.0,
- "15": 50.0,
- "16": 80.0
- }
- }
- },
- {
- "name": "switch_temp",
- "type": "stepwise",
- "inputs": [
- "MB_U402_THERM_LOCAL"
- ],
- "setpoint": 45.0,
- "pid": {
- "samplePeriod": 1.0,
- "positiveHysteresis": 0.0,
- "negativeHysteresis": 0.0,
- "isCeiling": false,
- "reading": {
- "0": 48.0,
- "1": 49.0,
- "2": 50.0,
- "3": 51.0,
- "4": 52.0
- },
- "output": {
- "0": 0.0,
- "1": 15.0,
- "2": 20.0,
- "3": 25.0,
- "4": 40.0
- }
- }
- },
- {
- "name": "retimer_temp",
- "type": "stepwise",
- "inputs": [
- "MB_U19_THERM_LOCAL"
- ],
- "setpoint": 45.0,
- "pid": {
- "samplePeriod": 1.0,
- "positiveHysteresis": 0.0,
- "negativeHysteresis": 0.0,
- "isCeiling": false,
- "reading": {
- "0": 39.0,
- "1": 40.0,
- "2": 43.0,
- "3": 44.0,
- "4": 45.0,
- "5": 46.0,
- "6": 47.0,
- "7": 48.0,
- "8": 49.0
- },
- "output": {
- "0": 0.0,
- "1": 20.0,
- "2": 40.0,
- "3": 42.0,
- "4": 44.0,
- "5": 46.0,
- "6": 48.0,
- "7": 50.0,
- "8": 80.0
- }
- }
- },
- {
- "name": "SLED_THERM_LOCAL",
- "type": "stepwise",
- "inputs": [
- "SLED1_THERM_LOCAL",
- "SLED2_THERM_LOCAL",
- "SLED3_THERM_LOCAL",
- "SLED4_THERM_LOCAL",
- "SLED5_THERM_LOCAL",
- "SLED6_THERM_LOCAL"
- ],
- "setpoint": 35.0,
- "pid": {
- "samplePeriod": 1.0,
- "positiveHysteresis": 0.0,
- "negativeHysteresis": 0.0,
- "isCeiling": false,
- "reading": {
- "0": 29.0,
- "1": 30.0,
- "2": 35.0,
- "3": 47.0,
- "4": 48.0,
- "5": 49.0,
- "6": 50.0
- },
- "output": {
- "0": 0.0,
- "1": 20.0,
- "2": 20.0,
- "3": 45.0,
- "4": 46.0,
- "5": 47.0,
- "6": 50.0
- }
- }
- }
- ]
- }
- ]
-}
diff --git a/meta-facebook/meta-bletchley/recipes-phosphor/fans/phosphor-pid-control_%.bbappend b/meta-facebook/meta-bletchley/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
index 8d23a1c..8b63026 100644
--- a/meta-facebook/meta-bletchley/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
+++ b/meta-facebook/meta-bletchley/recipes-phosphor/fans/phosphor-pid-control_%.bbappend
@@ -1,9 +1,6 @@
FILESEXTRAPATHS:prepend:bletchley := "${THISDIR}/${PN}:"
-SRC_URI:append:bletchley = " \
- file://config.json \
- "
-FILES:${PN}:append:bletchley = " ${datadir}/swampd/config.json"
+FILES:${PN}:append:bletchley = " ${datadir}/swampd"
FILES:${PN}:append:bletchley = " ${systemd_system_unitdir}/phosphor-pid-control.service.d/*.conf"
do_install:append:bletchley() {
@@ -16,5 +13,4 @@
echo "After=phosphor-virtual-sensor.service" >> ${override_file}
install -d ${D}${datadir}/swampd
- install -m 0644 -D ${WORKDIR}/config.json ${D}${datadir}/swampd/
}