meta-quanta: gbs: update thermal config to R03
1. Fan LCT = 3330 RPM
2. Minimum fan duty = 15%
3. NVMe Kp=1250,Ki=12
(From meta-quanta rev: b6ba0ea2d0007b1db640ea9d15d171ab7d79938e)
Signed-off-by: George Hung <george.hung@quantatw.com>
Change-Id: I541dce79aab0b6dc48964cfb0657c19f13f9520f
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config.json b/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config.json
index 7c817d4..d28a182 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config.json
+++ b/meta-quanta/meta-gbs/recipes-phosphor/fans/phosphor-pid-control/config.json
@@ -1,5 +1,5 @@
{
- "version" : "R02",
+ "version": "R03",
"sensors" : [
{
"name": "fan0",
@@ -111,7 +111,9 @@
{
"name": "fan0",
"type": "fan",
- "inputs": ["fan0"],
+ "inputs": [
+ "fan0"
+ ],
"setpoint": 0.0,
"pid": {
"samplePeriod": 0.1,
@@ -121,7 +123,7 @@
"feedFwdGainCoeff": 0.0056,
"integralLimit_min": 0.0,
"integralLimit_max": 0.0,
- "outLim_min": 10.0,
+ "outLim_min": 15.0,
"outLim_max": 100.0,
"slewNeg": 0.0,
"slewPos": 0.0
@@ -130,7 +132,9 @@
{
"name": "fan1",
"type": "fan",
- "inputs": ["fan1"],
+ "inputs": [
+ "fan1"
+ ],
"setpoint": 0.0,
"pid": {
"samplePeriod": 0.1,
@@ -140,7 +144,7 @@
"feedFwdGainCoeff": 0.0056,
"integralLimit_min": 0.0,
"integralLimit_max": 0.0,
- "outLim_min": 10.0,
+ "outLim_min": 15.0,
"outLim_max": 100.0,
"slewNeg": 0.0,
"slewPos": 0.0
@@ -149,7 +153,9 @@
{
"name": "cputemp",
"type": "margin",
- "inputs": ["cputemp"],
+ "inputs": [
+ "cputemp"
+ ],
"setpoint": 10.0,
"pid": {
"samplePeriod": 1.0,
@@ -157,9 +163,9 @@
"integralCoeff": 9.0,
"feedFwdOffsetCoeff": 0.0,
"feedFwdGainCoeff": 0.0,
- "integralLimit_min": 1786.0,
+ "integralLimit_min": 2679.0,
"integralLimit_max": 18000.0,
- "outLim_min": 1786.0,
+ "outLim_min": 2679.0,
"outLim_max": 18000.0,
"slewNeg": 0.0,
"slewPos": 0.0,
@@ -170,7 +176,9 @@
{
"name": "zone0_vr",
"type": "margin",
- "inputs": ["zone0_vr"],
+ "inputs": [
+ "zone0_vr"
+ ],
"setpoint": 10.0,
"pid": {
"samplePeriod": 1.0,
@@ -178,9 +186,9 @@
"integralCoeff": 9.0,
"feedFwdOffsetCoeff": 0.0,
"feedFwdGainCoeff": 0.0,
- "integralLimit_min": 1786.0,
+ "integralLimit_min": 2679.0,
"integralLimit_max": 18000.0,
- "outLim_min": 1786.0,
+ "outLim_min": 2679.0,
"outLim_max": 18000.0,
"slewNeg": 0.0,
"slewPos": 0.0,
@@ -191,7 +199,9 @@
{
"name": "fleeting0",
"type": "margin",
- "inputs": ["fleeting0"],
+ "inputs": [
+ "fleeting0"
+ ],
"setpoint": 10.0,
"pid": {
"samplePeriod": 1.0,
@@ -199,9 +209,9 @@
"integralCoeff": 9.0,
"feedFwdOffsetCoeff": 0.0,
"feedFwdGainCoeff": 0.0,
- "integralLimit_min": 1786.0,
+ "integralLimit_min": 2679.0,
"integralLimit_max": 18000.0,
- "outLim_min": 1786.0,
+ "outLim_min": 2679.0,
"outLim_max": 18000.0,
"slewNeg": 0.0,
"slewPos": 0.0,
@@ -212,7 +222,9 @@
{
"name": "fleeting1",
"type": "margin",
- "inputs": ["fleeting1"],
+ "inputs": [
+ "fleeting1"
+ ],
"setpoint": 10.0,
"pid": {
"samplePeriod": 1.0,
@@ -220,9 +232,9 @@
"integralCoeff": 18.0,
"feedFwdOffsetCoeff": 0.0,
"feedFwdGainCoeff": 0.0,
- "integralLimit_min": 1786.0,
+ "integralLimit_min": 2679.0,
"integralLimit_max": 18000.0,
- "outLim_min": 1786.0,
+ "outLim_min": 2679.0,
"outLim_max": 18000.0,
"slewNeg": 0.0,
"slewPos": 0.0,
@@ -240,7 +252,9 @@
{
"name": "fb_fan0",
"type": "fan",
- "inputs": ["fb_fan0"],
+ "inputs": [
+ "fb_fan0"
+ ],
"setpoint": 0.0,
"pid": {
"samplePeriod": 0.1,
@@ -250,7 +264,7 @@
"feedFwdGainCoeff": 0.0056,
"integralLimit_min": 0.0,
"integralLimit_max": 0.0,
- "outLim_min": 10.0,
+ "outLim_min": 15.0,
"outLim_max": 100.0,
"slewNeg": 0.0,
"slewPos": 0.0
@@ -259,7 +273,9 @@
{
"name": "fb_fan1",
"type": "fan",
- "inputs": ["fb_fan1"],
+ "inputs": [
+ "fb_fan1"
+ ],
"setpoint": 0.0,
"pid": {
"samplePeriod": 0.1,
@@ -269,7 +285,7 @@
"feedFwdGainCoeff": 0.0056,
"integralLimit_min": 0.0,
"integralLimit_max": 0.0,
- "outLim_min": 10.0,
+ "outLim_min": 15.0,
"outLim_max": 100.0,
"slewNeg": 0.0,
"slewPos": 0.0
@@ -278,7 +294,9 @@
{
"name": "fb_fan2",
"type": "fan",
- "inputs": ["fb_fan2"],
+ "inputs": [
+ "fb_fan2"
+ ],
"setpoint": 0.0,
"pid": {
"samplePeriod": 0.1,
@@ -288,7 +306,7 @@
"feedFwdGainCoeff": 0.0056,
"integralLimit_min": 0.0,
"integralLimit_max": 0.0,
- "outLim_min": 10.0,
+ "outLim_min": 15.0,
"outLim_max": 100.0,
"slewNeg": 0.0,
"slewPos": 0.0
@@ -297,17 +315,19 @@
{
"name": "nvme",
"type": "margin",
- "inputs": ["nvme"],
+ "inputs": [
+ "nvme"
+ ],
"setpoint": 10.0,
"pid": {
"samplePeriod": 1.0,
- "proportionalCoeff": 1786.0,
- "integralCoeff": 36.0,
+ "proportionalCoeff": 1250.0,
+ "integralCoeff": 12.0,
"feedFwdOffsetCoeff": 0.0,
"feedFwdGainCoeff": 0.0,
- "integralLimit_min": 1786.0,
+ "integralLimit_min": 2679.0,
"integralLimit_max": 18000.0,
- "outLim_min": 1786.0,
+ "outLim_min": 2679.0,
"outLim_max": 18000.0,
"slewNeg": 0.0,
"slewPos": 0.0,
@@ -318,7 +338,9 @@
{
"name": "p12v_fan",
"type": "margin",
- "inputs": ["p12v_fan"],
+ "inputs": [
+ "p12v_fan"
+ ],
"setpoint": 10.0,
"pid": {
"samplePeriod": 1.0,
@@ -326,9 +348,9 @@
"integralCoeff": 4.0,
"feedFwdOffsetCoeff": 0.0,
"feedFwdGainCoeff": 0.0,
- "integralLimit_min": 1786.0,
+ "integralLimit_min": 2679.0,
"integralLimit_max": 18000.0,
- "outLim_min": 1786.0,
+ "outLim_min": 2679.0,
"outLim_max": 18000.0,
"slewNeg": 0.0,
"slewPos": 0.0,
diff --git a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf
index 1a8fafb..8f4629b 100644
--- a/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf
+++ b/meta-quanta/meta-gbs/recipes-phosphor/sensors/phosphor-hwmon/obmc/hwmon/ahb/apb/pwm-fan-controller@103000.conf
@@ -1,44 +1,44 @@
LABEL_fan1= "fan0"
WARNHI_fan1= "19800"
-WARNLO_fan1= "600"
+WARNLO_fan1= "3330"
CRITHI_fan1= "19800"
-CRITLO_fan1= "600"
+CRITLO_fan1= "3330"
MINVALUE_fan1 = "0"
MAXVALUE_fan1 = "20775"
PWM_TARGET_fan1 = 1
LABEL_fan2= "fan1"
WARNHI_fan2= "19800"
-WARNLO_fan2= "600"
+WARNLO_fan2= "3330"
CRITHI_fan2= "19800"
-CRITLO_fan2= "600"
+CRITLO_fan2= "3330"
MINVALUE_fan2 = "0"
MAXVALUE_fan2 = "20775"
PWM_TARGET_fan2 = 2
LABEL_fan3= "fb_fan0"
WARNHI_fan3= "19800"
-WARNLO_fan3= "600"
+WARNLO_fan3= "3330"
CRITHI_fan3= "19800"
-CRITLO_fan3= "600"
+CRITLO_fan3= "3330"
MINVALUE_fan3 = "0"
MAXVALUE_fan3 = "20775"
PWM_TARGET_fan3 = 3
LABEL_fan4= "fb_fan1"
WARNHI_fan4= "19800"
-WARNLO_fan4= "600"
+WARNLO_fan4= "3330"
CRITHI_fan4= "19800"
-CRITLO_fan4= "600"
+CRITLO_fan4= "3330"
MINVALUE_fan4 = "0"
MAXVALUE_fan4 = "20775"
PWM_TARGET_fan4 = 4
LABEL_fan5= "fb_fan2"
WARNHI_fan5= "19800"
-WARNLO_fan5= "600"
+WARNLO_fan5= "3330"
CRITHI_fan5= "19800"
-CRITLO_fan5= "600"
+CRITLO_fan5= "3330"
MINVALUE_fan5 = "0"
MAXVALUE_fan5 = "20775"
PWM_TARGET_fan5 = 5
diff --git a/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/config-margin.json b/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/config-margin.json
index 5ff103d..c4bdbdd 100644
--- a/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/config-margin.json
+++ b/meta-quanta/meta-gbs/recipes-quanta/fans/read-margin-temp/config-margin.json
@@ -369,25 +369,53 @@
"id": 0,
"zoneSetpoint": 10000,
"target": "/xyz/openbmc_project/extsensors/margin/cputemp",
- "components": ["cputemp"]
+ "components": [
+ "cputemp"
+ ]
},
{
"id": 1,
"zoneSetpoint": 10000,
"target": "/xyz/openbmc_project/extsensors/margin/zone0_vr",
- "components": ["vddcr_cpu", "vddcr_soc", "vddio_abcd", "vddio_efgh", "p12v_mobo", "powerseq_temp"]
+ "components": [
+ "vddcr_cpu",
+ "vddcr_soc",
+ "vddio_abcd",
+ "vddio_efgh",
+ "p12v_mobo",
+ "powerseq_temp"
+ ]
},
{
"id": 2,
"zoneSetpoint": 10000,
"target": "/xyz/openbmc_project/extsensors/margin/nvme",
- "components": ["nvme0", "nvme1", "nvme2", "nvme3", "nvme4", "nvme5", "nvme6", "nvme7", "nvme8", "nvme9", "nvme10", "nvme11", "nvme12", "nvme13", "nvme14", "nvme15"]
+ "components": [
+ "nvme0",
+ "nvme1",
+ "nvme2",
+ "nvme3",
+ "nvme4",
+ "nvme5",
+ "nvme6",
+ "nvme7",
+ "nvme8",
+ "nvme9",
+ "nvme10",
+ "nvme11",
+ "nvme12",
+ "nvme13",
+ "nvme14",
+ "nvme15"
+ ]
},
{
"id": 3,
"zoneSetpoint": 10000,
"target": "/xyz/openbmc_project/extsensors/margin/p12v_fan",
- "components": ["p12v_fan"]
+ "components": [
+ "p12v_fan"
+ ]
}
]
}