meta-bletchley: phosphor-pid-control: update fan config R04
update fan config base on thermal team's request (FSC_R04)
Signed-off-by: Potin Lai <potin.lai@quantatw.com>
Change-Id: I46fd7d8527eb41f697cb6c999f59b04c67b2da62
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
index 8ba3e22..c15686c 100644
--- 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
@@ -1,5 +1,5 @@
{
- "version": "R02",
+ "version": "R04",
"sensors": [
{
"name": "FAN0_TACH_IL",
@@ -90,13 +90,73 @@
"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": 0.0,
- "failsafePercent": 75.0,
+ "failsafePercent": 80.0,
"pids": [
{
"name": "fan_tachs",
@@ -135,44 +195,46 @@
"setpoint": 10.0,
"pid": {
"samplePeriod": 1.0,
- "positiveHysteresis": 1.0,
- "negativeHysteresis": 3.0,
+ "positiveHysteresis": 0.0,
+ "negativeHysteresis": 0.0,
"isCeiling": false,
"reading": {
- "0": 10.0,
- "1": 15.0,
- "2": 17.0,
- "3": 18.0,
- "4": 20.0,
- "5": 21.0,
- "6": 23.0,
- "7": 25.0,
- "8": 26.0,
- "9": 28.0,
- "10": 30.0,
- "11": 31.0,
- "12": 33.0,
- "13": 35.0,
- "14": 37.0,
- "15": 40.0
+ "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": 15.0,
- "1": 15.0,
- "2": 15.0,
- "3": 15.0,
- "4": 15.0,
- "5": 15.0,
- "6": 15.0,
- "7": 20.0,
- "8": 20.0,
- "9": 20.0,
- "10": 25.0,
- "11": 25.0,
- "12": 25.0,
- "13": 30.0,
- "14": 30.0,
- "15": 30.0
+ "0": 25.0,
+ "1": 25.0,
+ "2": 28.0,
+ "3": 30.0,
+ "4": 31.0,
+ "5": 32.0,
+ "6": 35.0,
+ "7": 37.0,
+ "8": 38.0,
+ "9": 39.0,
+ "10": 40.0,
+ "11": 42.0,
+ "12": 43.0,
+ "13": 45.0,
+ "14": 47.0,
+ "15": 50.0,
+ "16": 80.0
}
}
},
@@ -185,18 +247,20 @@
"setpoint": 45.0,
"pid": {
"samplePeriod": 1.0,
- "positiveHysteresis": 1.0,
- "negativeHysteresis": 1.0,
+ "positiveHysteresis": 0.0,
+ "negativeHysteresis": 0.0,
"isCeiling": false,
"reading": {
"0": 49.0,
"1": 50.0,
- "2": 51.0
+ "2": 51.0,
+ "3": 52.0
},
"output": {
"0": 15.0,
"1": 20.0,
- "2": 25.0
+ "2": 25.0,
+ "3": 40.0
}
}
},
@@ -209,26 +273,63 @@
"setpoint": 45.0,
"pid": {
"samplePeriod": 1.0,
- "positiveHysteresis": 1.0,
- "negativeHysteresis": 1.0,
+ "positiveHysteresis": 0.0,
+ "negativeHysteresis": 0.0,
"isCeiling": false,
"reading": {
- "0": 49.0,
- "1": 50.0,
- "2": 51.0,
- "3": 52.0,
- "4": 53.0,
- "5": 54.0,
- "6": 55.0
+ "0": 40.0,
+ "1": 43.0,
+ "2": 44.0,
+ "3": 45.0,
+ "4": 46.0,
+ "5": 47.0,
+ "6": 48.0,
+ "7": 49.0
},
"output": {
- "0": 19.0,
+ "0": 20.0,
+ "1": 40.0,
+ "2": 42.0,
+ "3": 44.0,
+ "4": 46.0,
+ "5": 48.0,
+ "6": 50.0,
+ "7": 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": 30.0,
+ "1": 35.0,
+ "2": 47.0,
+ "3": 48.0,
+ "4": 49.0,
+ "5": 50.0
+ },
+ "output": {
+ "0": 20.0,
"1": 20.0,
- "2": 21.0,
- "3": 22.0,
- "4": 23.0,
- "5": 24.0,
- "6": 25.0
+ "2": 45.0,
+ "3": 46.0,
+ "4": 47.0,
+ "5": 50.0
}
}
}