configuration: system1: Fix fan indexing problem
The dual rotor fans are indexed by 1 rotor for each fan, followed by the
second rotor for those fans.
Also updated several values for the fans:
- PowerState to On, to only flag fault when power is on
- Updated limits for all both fan types (Fans 1-5 are Fans 6-7)
- Updated SetPoints for the PDMs
Tested on system1 hw
Before:
Fan Rotor Present RPM PWM: % Target Zone
--- -------- ------- ----- ------ ------ ----
Fan1 Fan1a_in true 4102 39.22 100% 0 (CECIO)
Fan1 Fan1b_in true 4054
Fan2 Fan2a_in true 4032 39.22 100% 0 (CECIO)
Fan2 Fan2b_in true 4089
Fan3 Fan3a_in true 4040 39.22 100% 0 (CECIO)
Fan3 Fan3b_in true 0
Fan4 Fan4a_in true 0 39.22 100% 0 (CECIO)
Fan4 Fan4b_in true 0
Fan5 Fan5a_in true 0 39.22 100% 0 (CECIO)
Fan5 Fan5b_in true 0
Fan6 Fan6_in false 0 39.22 100% 1 (NVME)
Fan7 Fan7_in false 0 39.22 100% 1 (NVME)
After: Fan Rotor Present RPM PWM: % Target Zone
--- -------- ------- ----- ------ ------ ----
Fan1 Fan1a_in true 3972 39.22 100% 0 (CECIO)
Fan1 Fan1b_in true 0
Fan2 Fan2a_in true 4002 39.22 100% 0 (CECIO)
Fan2 Fan2b_in true 0
Fan3 Fan3a_in true 4054 39.22 100% 0 (CECIO)
Fan3 Fan3b_in true 0
Fan4 Fan4a_in true 4027 39.22 100% 0 (CECIO)
Fan4 Fan4b_in true 0
Fan5 Fan5a_in true 4054 39.22 100% 0 (CECIO)
Fan5 Fan5b_in true 0
Fan6 Fan6_in false 0 39.22 100% 1 (NVME)
Fan7 Fan7_in false 0 39.22 100% 1 (NVME)
Change-Id: Iee747f9b22099719f5d90296c5154b047b74880c
Signed-off-by: Chris Cain <cjcain@us.ibm.com>
diff --git a/configurations/system1_chassis.json b/configurations/system1_chassis.json
index 33c6863..1628c8c 100644
--- a/configurations/system1_chassis.json
+++ b/configurations/system1_chassis.json
@@ -5,9 +5,9 @@
"BindConnector": "Fan1 connector",
"Bus": 6,
"Index": 0,
- "MaxReading": 36200,
+ "MaxReading": 14500,
"Name": "Fan1a_in",
- "PowerState": "Always",
+ "PowerState": "On",
"Presence": {
"MonitorType": "Polling",
"PinName": "FAN0_PRESENCE_R_N",
@@ -24,7 +24,7 @@
"Direction": "less than",
"Name": "lower non critical",
"Severity": 0,
- "Value": 1800
+ "Value": 4000
},
{
"Direction": "greater than",
@@ -36,7 +36,7 @@
"Direction": "greater than",
"Name": "upper non critical",
"Severity": 0,
- "Value": 28960
+ "Value": 15000
}
],
"Type": "I2CFan"
@@ -45,10 +45,10 @@
"Address": "0x52",
"BindConnector": "Fan1 connector",
"Bus": 6,
- "Index": 1,
- "MaxReading": 0,
+ "Index": 5,
+ "MaxReading": 14500,
"Name": "Fan1b_in",
- "PowerState": "Always",
+ "PowerState": "On",
"Presence": {
"MonitorType": "Polling",
"PinName": "FAN0_PRESENCE_R_N",
@@ -65,7 +65,7 @@
"Direction": "less than",
"Name": "lower non critical",
"Severity": 0,
- "Value": 1800
+ "Value": 4000
},
{
"Direction": "greater than",
@@ -77,7 +77,7 @@
"Direction": "greater than",
"Name": "upper non critical",
"Severity": 0,
- "Value": 28960
+ "Value": 15000
}
],
"Type": "I2CFan"
@@ -86,10 +86,10 @@
"Address": "0x52",
"BindConnector": "Fan2 connector",
"Bus": 6,
- "Index": 2,
- "MaxReading": 0,
+ "Index": 1,
+ "MaxReading": 14500,
"Name": "Fan2a_in",
- "PowerState": "Always",
+ "PowerState": "On",
"Presence": {
"MonitorType": "Polling",
"PinName": "FAN1_PRESENCE_R_N",
@@ -106,7 +106,7 @@
"Direction": "less than",
"Name": "lower non critical",
"Severity": 0,
- "Value": 1800
+ "Value": 4000
},
{
"Direction": "greater than",
@@ -118,7 +118,7 @@
"Direction": "greater than",
"Name": "upper non critical",
"Severity": 0,
- "Value": 28960
+ "Value": 15000
}
],
"Type": "I2CFan"
@@ -127,136 +127,13 @@
"Address": "0x52",
"BindConnector": "Fan2 connector",
"Bus": 6,
- "Index": 3,
- "MaxReading": 0,
- "Name": "Fan2b_in",
- "PowerState": "Always",
- "Presence": {
- "MonitorType": "Polling",
- "PinName": "FAN1_PRESENCE_R_N",
- "Polarity": "Low"
- },
- "Thresholds": [
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 0
- },
- {
- "Direction": "less than",
- "Name": "lower non critical",
- "Severity": 0,
- "Value": 1800
- },
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 36200
- },
- {
- "Direction": "greater than",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 28960
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x52",
- "BindConnector": "Fan3 connector",
- "Bus": 6,
- "Index": 4,
- "MaxReading": 0,
- "Name": "Fan3a_in",
- "PowerState": "Always",
- "Presence": {
- "MonitorType": "Polling",
- "PinName": "FAN2_PRESENCE_R_N",
- "Polarity": "Low"
- },
- "Thresholds": [
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 0
- },
- {
- "Direction": "less than",
- "Name": "lower non critical",
- "Severity": 0,
- "Value": 1800
- },
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 36200
- },
- {
- "Direction": "greater than",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 28960
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x52",
- "BindConnector": "Fan3 connector",
- "Bus": 6,
- "Index": 5,
- "MaxReading": 0,
- "Name": "Fan3b_in",
- "PowerState": "Always",
- "Presence": {
- "MonitorType": "Polling",
- "PinName": "FAN2_PRESENCE_R_N",
- "Polarity": "Low"
- },
- "Thresholds": [
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 0
- },
- {
- "Direction": "less than",
- "Name": "lower non critical",
- "Severity": 0,
- "Value": 1800
- },
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 36200
- },
- {
- "Direction": "greater than",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 28960
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x52",
- "BindConnector": "Fan4 connector",
- "Bus": 6,
"Index": 6,
- "MaxReading": 0,
- "Name": "Fan4a_in",
- "PowerState": "Always",
+ "MaxReading": 14500,
+ "Name": "Fan2b_in",
+ "PowerState": "On",
"Presence": {
"MonitorType": "Polling",
- "PinName": "FAN3_PRESENCE_R_N",
+ "PinName": "FAN1_PRESENCE_R_N",
"Polarity": "Low"
},
"Thresholds": [
@@ -270,7 +147,7 @@
"Direction": "less than",
"Name": "lower non critical",
"Severity": 0,
- "Value": 1800
+ "Value": 4000
},
{
"Direction": "greater than",
@@ -282,7 +159,89 @@
"Direction": "greater than",
"Name": "upper non critical",
"Severity": 0,
- "Value": 28960
+ "Value": 15000
+ }
+ ],
+ "Type": "I2CFan"
+ },
+ {
+ "Address": "0x52",
+ "BindConnector": "Fan3 connector",
+ "Bus": 6,
+ "Index": 2,
+ "MaxReading": 14500,
+ "Name": "Fan3a_in",
+ "PowerState": "On",
+ "Presence": {
+ "MonitorType": "Polling",
+ "PinName": "FAN2_PRESENCE_R_N",
+ "Polarity": "Low"
+ },
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 4000
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 36200
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 15000
+ }
+ ],
+ "Type": "I2CFan"
+ },
+ {
+ "Address": "0x52",
+ "BindConnector": "Fan3 connector",
+ "Bus": 6,
+ "Index": 7,
+ "MaxReading": 14500,
+ "Name": "Fan3b_in",
+ "PowerState": "On",
+ "Presence": {
+ "MonitorType": "Polling",
+ "PinName": "FAN2_PRESENCE_R_N",
+ "Polarity": "Low"
+ },
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 4000
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 36200
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 15000
}
],
"Type": "I2CFan"
@@ -291,10 +250,10 @@
"Address": "0x52",
"BindConnector": "Fan4 connector",
"Bus": 6,
- "Index": 7,
- "MaxReading": 0,
- "Name": "Fan4b_in",
- "PowerState": "Always",
+ "Index": 3,
+ "MaxReading": 14500,
+ "Name": "Fan4a_in",
+ "PowerState": "On",
"Presence": {
"MonitorType": "Polling",
"PinName": "FAN3_PRESENCE_R_N",
@@ -311,7 +270,7 @@
"Direction": "less than",
"Name": "lower non critical",
"Severity": 0,
- "Value": 1800
+ "Value": 4000
},
{
"Direction": "greater than",
@@ -323,7 +282,48 @@
"Direction": "greater than",
"Name": "upper non critical",
"Severity": 0,
- "Value": 28960
+ "Value": 15000
+ }
+ ],
+ "Type": "I2CFan"
+ },
+ {
+ "Address": "0x52",
+ "BindConnector": "Fan4 connector",
+ "Bus": 6,
+ "Index": 8,
+ "MaxReading": 14500,
+ "Name": "Fan4b_in",
+ "PowerState": "On",
+ "Presence": {
+ "MonitorType": "Polling",
+ "PinName": "FAN3_PRESENCE_R_N",
+ "Polarity": "Low"
+ },
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 4000
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 36200
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 15000
}
],
"Type": "I2CFan"
@@ -332,10 +332,10 @@
"Address": "0x52",
"BindConnector": "Fan5 connector",
"Bus": 6,
- "Index": 8,
- "MaxReading": 0,
+ "Index": 4,
+ "MaxReading": 14500,
"Name": "Fan5a_in",
- "PowerState": "Always",
+ "PowerState": "On",
"Presence": {
"MonitorType": "Polling",
"PinName": "FAN4_PRESENCE_R_N",
@@ -352,7 +352,7 @@
"Direction": "less than",
"Name": "lower non critical",
"Severity": 0,
- "Value": 1800
+ "Value": 4000
},
{
"Direction": "greater than",
@@ -364,7 +364,7 @@
"Direction": "greater than",
"Name": "upper non critical",
"Severity": 0,
- "Value": 28960
+ "Value": 15000
}
],
"Type": "I2CFan"
@@ -374,9 +374,9 @@
"BindConnector": "Fan5 connector",
"Bus": 6,
"Index": 9,
- "MaxReading": 0,
+ "MaxReading": 14500,
"Name": "Fan5b_in",
- "PowerState": "Always",
+ "PowerState": "On",
"Presence": {
"MonitorType": "Polling",
"PinName": "FAN4_PRESENCE_R_N",
@@ -393,7 +393,7 @@
"Direction": "less than",
"Name": "lower non critical",
"Severity": 0,
- "Value": 1800
+ "Value": 4000
},
{
"Direction": "greater than",
@@ -405,7 +405,7 @@
"Direction": "greater than",
"Name": "upper non critical",
"Severity": 0,
- "Value": 28960
+ "Value": 15000
}
],
"Type": "I2CFan"
@@ -415,9 +415,9 @@
"BindConnector": "Fan6 connector",
"Bus": 6,
"Index": 0,
- "MaxReading": 0,
+ "MaxReading": 25000,
"Name": "Fan6_in",
- "PowerState": "Always",
+ "PowerState": "On",
"Presence": {
"MonitorType": "Polling",
"PinName": "FAN5_PRESENCE_N",
@@ -446,7 +446,7 @@
"Direction": "greater than",
"Name": "upper non critical",
"Severity": 0,
- "Value": 28960
+ "Value": 27000
}
],
"Type": "I2CFan"
@@ -456,9 +456,9 @@
"BindConnector": "Fan7 connector",
"Bus": 6,
"Index": 1,
- "MaxReading": 0,
+ "MaxReading": 25000,
"Name": "Fan7_in",
- "PowerState": "Always",
+ "PowerState": "On",
"Presence": {
"MonitorType": "Polling",
"PinName": "FAN6_PRESENCE_N",
@@ -487,7 +487,7 @@
"Direction": "greater than",
"Name": "upper non critical",
"Severity": 0,
- "Value": 28960
+ "Value": 27000
}
],
"Type": "I2CFan"
@@ -512,7 +512,7 @@
],
"PCoefficient": 0.0026,
"PositiveHysteresis": 0,
- "SetPoint": 70,
+ "SetPoint": 60,
"SlewNeg": 0,
"SlewPos": 0,
"Type": "Pid",
@@ -540,7 +540,7 @@
],
"PCoefficient": 0.0026,
"PositiveHysteresis": 0,
- "SetPoint": 70,
+ "SetPoint": 60,
"SlewNeg": 0,
"SlewPos": 0,
"Type": "Pid",
@@ -568,7 +568,7 @@
],
"PCoefficient": 0.0026,
"PositiveHysteresis": 0,
- "SetPoint": 70,
+ "SetPoint": 60,
"SlewNeg": 0,
"SlewPos": 0,
"Type": "Pid",
@@ -596,7 +596,7 @@
],
"PCoefficient": 0.0026,
"PositiveHysteresis": 0,
- "SetPoint": 70,
+ "SetPoint": 60,
"SlewNeg": 0,
"SlewPos": 0,
"Type": "Pid",
@@ -624,7 +624,7 @@
],
"PCoefficient": 0.0026,
"PositiveHysteresis": 0,
- "SetPoint": 70,
+ "SetPoint": 60,
"SlewNeg": 0,
"SlewPos": 0,
"Type": "Pid",
@@ -651,7 +651,7 @@
],
"PCoefficient": 0.0026,
"PositiveHysteresis": 0,
- "SetPoint": 70,
+ "SetPoint": 40,
"SlewNeg": 0,
"SlewPos": 0,
"Type": "Pid",
@@ -678,7 +678,7 @@
],
"PCoefficient": 0.0026,
"PositiveHysteresis": 0,
- "SetPoint": 70,
+ "SetPoint": 40,
"SlewNeg": 0,
"SlewPos": 0,
"Type": "Pid",
@@ -723,7 +723,8 @@
"ILimitMin": 2500,
"Inputs": [
"Ambient 0 Temp",
- "Ambient 1 Temp"
+ "Ambient 1 Temp",
+ "Ambient 2 Temp"
],
"Name": "Ambient Temperature",
"NegativeHysteresis": 0,