configurations: harma: remove fan power sensors
remove fan power sensors and update fan threshold.
1. FAN CPLD does not implement FAN power_W monitor feature due to
CPLD cell count limitation.
2. BMC can get FAN voltage(V) and current(A)
3. The FAN Power(W) is not default feature.
Testing:
root@bmc:~# curl -k -u root:0penBmc -X GET https://localhost/.../
{
"@odata.id": "/...",
"@odata.type": "#SensorCollection.SensorCollection",
"Description": "Collection of Sensors for this Chassis",
"Members": [
{
"@odata.id": "/.../current_FAN_BP0_FAN0_CURR_A"
},
{
"@odata.id": "/.../current_FAN_BP0_FAN1_CURR_A"
},
{
"@odata.id": "/.../current_FAN_BP0_FAN2_CURR_A"
},
{
"@odata.id": "/.../current_FAN_BP0_FAN3_CURR_A"
},
{
"@odata.id": "/.../fanpwm_FAN_BP0_FAN_PWM"
},
{
"@odata.id": "/.../fantach_FAN_BP0_FAN0_TACH_IL_SPEED_RPM"
},
{
"@odata.id": "/.../fantach_FAN_BP0_FAN0_TACH_OL_SPEED_RPM"
},
{
"@odata.id": "/.../fantach_FAN_BP0_FAN1_TACH_IL_SPEED_RPM"
},
{
"@odata.id": "/.../fantach_FAN_BP0_FAN1_TACH_OL_SPEED_RPM"
},
{
"@odata.id": "/.../fantach_FAN_BP0_FAN2_TACH_IL_SPEED_RPM"
},
{
"@odata.id": "/.../fantach_FAN_BP0_FAN2_TACH_OL_SPEED_RPM"
},
{
"@odata.id": "/.../fantach_FAN_BP0_FAN3_TACH_IL_SPEED_RPM"
},
{
"@odata.id": "/.../fantach_FAN_BP0_FAN3_TACH_OL_SPEED_RPM"
},
{
"@odata.id": "/.../voltage_FAN_BP0_FAN0_VOLT_V"
},
{
"@odata.id": "/.../voltage_FAN_BP0_FAN1_VOLT_V"
},
{
"@odata.id": "/.../voltage_FAN_BP0_FAN2_VOLT_V"
},
{
"@odata.id": "/.../voltage_FAN_BP0_FAN3_VOLT_V"
}
],
"Members@odata.count": 17,
"Name": "Sensors"
}
Change-Id: Icd3ff037960bc641381c6383a76979863c3396c7
Signed-off-by: Daniel Hsu <Daniel-Hsu@quantatw.com>
diff --git a/configurations/harma_fanboard.json b/configurations/harma_fanboard.json
index 6bdd4c6..db4a4f3 100644
--- a/configurations/harma_fanboard.json
+++ b/configurations/harma_fanboard.json
@@ -246,8 +246,7 @@
"Bus": 2,
"Labels": [
"in1",
- "curr1",
- "power1"
+ "curr1"
],
"Name": "FAN_BP0_FAN0",
"Thresholds": [
@@ -256,35 +255,33 @@
"Label": "in1",
"Name": "lower critical",
"Severity": 1,
- "Value": 54.6
+ "Value": 48.45
},
{
"Direction": "greater than",
"Label": "in1",
"Name": "upper critical",
"Severity": 1,
- "Value": 55.8
+ "Value": 53.35
},
{
"Direction": "greater than",
"Label": "curr1",
"Name": "upper critical",
"Severity": 1,
- "Value": 1.19
+ "Value": 2.88
}
],
"Type": "INA238",
"curr1_Name": "FAN_BP0_FAN0_CURR_A",
- "in1_Name": "FAN_BP0_FAN0_VOLT_V",
- "power1_Name": "FAN_BP0_FAN0_PWR_W"
+ "in1_Name": "FAN_BP0_FAN0_VOLT_V"
},
{
"Address": "0x41",
"Bus": 2,
"Labels": [
"in1",
- "curr1",
- "power1"
+ "curr1"
],
"Name": "FAN_BP0_FAN1",
"Thresholds": [
@@ -293,35 +290,33 @@
"Label": "in1",
"Name": "lower critical",
"Severity": 1,
- "Value": 54.6
+ "Value": 48.45
},
{
"Direction": "greater than",
"Label": "in1",
"Name": "upper critical",
"Severity": 1,
- "Value": 55.8
+ "Value": 53.35
},
{
"Direction": "greater than",
"Label": "curr1",
"Name": "upper critical",
"Severity": 1,
- "Value": 1.13
+ "Value": 2.88
}
],
"Type": "INA238",
"curr1_Name": "FAN_BP0_FAN1_CURR_A",
- "in1_Name": "FAN_BP0_FAN1_VOLT_V",
- "power1_Name": "FAN_BP0_FAN1_PWR_W"
+ "in1_Name": "FAN_BP0_FAN1_VOLT_V"
},
{
"Address": "0x44",
"Bus": 2,
"Labels": [
"in1",
- "curr1",
- "power1"
+ "curr1"
],
"Name": "FAN_BP0_FAN2",
"Thresholds": [
@@ -330,35 +325,33 @@
"Label": "in1",
"Name": "lower critical",
"Severity": 1,
- "Value": 54.6
+ "Value": 48.45
},
{
"Direction": "greater than",
"Label": "in1",
"Name": "upper critical",
"Severity": 1,
- "Value": 55.8
+ "Value": 53.35
},
{
"Direction": "greater than",
"Label": "curr1",
"Name": "upper critical",
"Severity": 1,
- "Value": 1.13
+ "Value": 2.88
}
],
"Type": "INA238",
"curr1_Name": "FAN_BP0_FAN2_CURR_A",
- "in1_Name": "FAN_BP0_FAN2_VOLT_V",
- "power1_Name": "FAN_BP0_FAN2_PWR_W"
+ "in1_Name": "FAN_BP0_FAN2_VOLT_V"
},
{
"Address": "0x45",
"Bus": 2,
"Labels": [
"in1",
- "curr1",
- "power1"
+ "curr1"
],
"Name": "FAN_BP0_FAN3",
"Thresholds": [
@@ -367,27 +360,26 @@
"Label": "in1",
"Name": "lower critical",
"Severity": 1,
- "Value": 54.6
+ "Value": 48.45
},
{
"Direction": "greater than",
"Label": "in1",
"Name": "upper critical",
"Severity": 1,
- "Value": 55.8
+ "Value": 53.35
},
{
"Direction": "greater than",
"Label": "curr1",
"Name": "upper critical",
"Severity": 1,
- "Value": 1.15
+ "Value": 2.88
}
],
"Type": "INA238",
"curr1_Name": "FAN_BP0_FAN3_CURR_A",
- "in1_Name": "FAN_BP0_FAN3_VOLT_V",
- "power1_Name": "FAN_BP0_FAN3_PWR_W"
+ "in1_Name": "FAN_BP0_FAN3_VOLT_V"
}
],
"Name": "Harma Fan Board 0",
@@ -641,8 +633,7 @@
"Bus": 0,
"Labels": [
"in1",
- "curr1",
- "power1"
+ "curr1"
],
"Name": "FAN_BP1_FAN0",
"Thresholds": [
@@ -651,35 +642,33 @@
"Label": "in1",
"Name": "lower critical",
"Severity": 1,
- "Value": 54.6
+ "Value": 48.45
},
{
"Direction": "greater than",
"Label": "in1",
"Name": "upper critical",
"Severity": 1,
- "Value": 55.8
+ "Value": 53.35
},
{
"Direction": "greater than",
"Label": "curr1",
"Name": "upper critical",
"Severity": 1,
- "Value": 1.19
+ "Value": 2.88
}
],
"Type": "INA238",
"curr1_Name": "FAN_BP1_FAN0_CURR_A",
- "in1_Name": "FAN_BP1_FAN0_VOLT_V",
- "power1_Name": "FAN_BP1_FAN0_PWR_W"
+ "in1_Name": "FAN_BP1_FAN0_VOLT_V"
},
{
"Address": "0x41",
"Bus": 0,
"Labels": [
"in1",
- "curr1",
- "power1"
+ "curr1"
],
"Name": "FAN_BP1_FAN1",
"Thresholds": [
@@ -688,35 +677,33 @@
"Label": "in1",
"Name": "lower critical",
"Severity": 1,
- "Value": 54.6
+ "Value": 48.45
},
{
"Direction": "greater than",
"Label": "in1",
"Name": "upper critical",
"Severity": 1,
- "Value": 55.8
+ "Value": 53.35
},
{
"Direction": "greater than",
"Label": "curr1",
"Name": "upper critical",
"Severity": 1,
- "Value": 1.13
+ "Value": 2.88
}
],
"Type": "INA238",
"curr1_Name": "FAN_BP1_FAN1_CURR_A",
- "in1_Name": "FAN_BP1_FAN1_VOLT_V",
- "power1_Name": "FAN_BP1_FAN1_PWR_W"
+ "in1_Name": "FAN_BP1_FAN1_VOLT_V"
},
{
"Address": "0x44",
"Bus": 0,
"Labels": [
"in1",
- "curr1",
- "power1"
+ "curr1"
],
"Name": "FAN_BP1_FAN2",
"Thresholds": [
@@ -725,35 +712,33 @@
"Label": "in1",
"Name": "lower critical",
"Severity": 1,
- "Value": 54.6
+ "Value": 48.45
},
{
"Direction": "greater than",
"Label": "in1",
"Name": "upper critical",
"Severity": 1,
- "Value": 55.8
+ "Value": 53.35
},
{
"Direction": "greater than",
"Label": "curr1",
"Name": "upper critical",
"Severity": 1,
- "Value": 1.13
+ "Value": 2.88
}
],
"Type": "INA238",
"curr1_Name": "FAN_BP1_FAN2_CURR_A",
- "in1_Name": "FAN_BP1_FAN2_VOLT_V",
- "power1_Name": "FAN_BP1_FAN2_PWR_W"
+ "in1_Name": "FAN_BP1_FAN2_VOLT_V"
},
{
"Address": "0x45",
"Bus": 0,
"Labels": [
"in1",
- "curr1",
- "power1"
+ "curr1"
],
"Name": "FAN_BP1_FAN3",
"Thresholds": [
@@ -762,27 +747,26 @@
"Label": "in1",
"Name": "lower critical",
"Severity": 1,
- "Value": 54.6
+ "Value": 48.45
},
{
"Direction": "greater than",
"Label": "in1",
"Name": "upper critical",
"Severity": 1,
- "Value": 55.8
+ "Value": 53.35
},
{
"Direction": "greater than",
"Label": "curr1",
"Name": "upper critical",
"Severity": 1,
- "Value": 1.15
+ "Value": 2.88
}
],
"Type": "INA238",
"curr1_Name": "FAN_BP1_FAN3_CURR_A",
- "in1_Name": "FAN_BP1_FAN3_VOLT_V",
- "power1_Name": "FAN_BP1_FAN3_PWR_W"
+ "in1_Name": "FAN_BP1_FAN3_VOLT_V"
}
],
"Name": "Harma Fan Board 1",