Configurations: meta: minerva_fanboard: Revise the fan board naming
Revise the fan board definition to follow the silkscreen on the rack.
From the back of the rack view:
FCB1 (i2c-16) FCB2 (i2c-17)
┌─────────┬─────────┐ ┌─────────┬─────────┐
│IL:tach0 │IL:tach2 │ │IL:tach0 │IL:tach2 │
│OL:tach1 │OL:tach3 │ │OL:tach1 │OL:tach3 │
│ fan1│ fan2│ │ fan5│ fan6│
├─────────┼─────────┤ ├─────────┼─────────┤
│IL:tach4 │IL:tach6 │ │IL:tach4 │IL:tach6 │
│OL:tach5 │OL:tach7 │ │OL:tach5 │OL:tach7 │
│ fan3│ fan4│ │ fan7│ fan8│
└─────────┴─────────┘ └─────────┴─────────┘
FCB3 (i2c-18) FCB4 (i2c-19)
┌─────────┬─────────┐ ┌─────────┬─────────┐
│IL:tach0 │IL:tach2 │ │IL:tach0 │IL:tach2 │
│OL:tach1 │OL:tach3 │ │OL:tach1 │OL:tach3 │
│ fan9│ fan10│ │ fan13│ fan14│
├─────────┼─────────┤ ├─────────┼─────────┤
│IL:tach4 │IL:tach6 │ │IL:tach4 │IL:tach6 │
│OL:tach5 │OL:tach7 │ │OL:tach5 │OL:tach7 │
│ fan11│ fan12│ │ fan15│ fan16│
└─────────┴─────────┘ └─────────┴─────────┘
FCB5 (i2c-20) FCB6 (i2c-21)
┌─────────┬─────────┐ ┌─────────┬─────────┐
│IL:tach6 │IL:tach4 │ │IL:tach6 │IL:tach4 │
│OL:tach7 │OL:tach5 │ │OL:tach7 │OL:tach5 │
│ fan17│ fan18│ │ fan21│ fan22│
├─────────┼─────────┤ ├─────────┼─────────┤
│IL:tach2 │IL:tach0 │ │IL:tach2 │IL:tach0 │
│OL:tach3 │OL:tach1 │ │OL:tach3 │OL:tach1 │
│ fan19│ fan20│ │ fan23│ fan24│
└─────────┴─────────┘ └─────────┴─────────┘
Change-Id: Ibfd10e24a35e8dd4a9b46ac9a564cbbec8eaf611
Signed-off-by: Yang Chen <yang.chen@quantatw.com>
diff --git a/configurations/minerva_fanboard.json b/configurations/minerva_fanboard.json
index 67a1144..1d62313 100644
--- a/configurations/minerva_fanboard.json
+++ b/configurations/minerva_fanboard.json
@@ -5,15 +5,15 @@
"Address": "0x5e",
"Bus": "$bus",
"Connector": {
- "Name": "FCB_TOP_$bus * -1 + 17 FAN0_TACH_IL",
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_IL",
"Pwm": 2,
- "PwmName": "FCB_TOP_$bus * -1 + 17 FAN_PWM",
+ "PwmName": "FCB_$bus - 15 FAN_PWM",
"Tachs": [
0
]
},
"Index": 0,
- "Name": "FCB_TOP_$bus * -1 + 17 FAN0_TACH_IL_SPEED_RPM",
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_IL_SPEED_RPM",
"PowerState": "Always",
"Thresholds": [
{
@@ -35,15 +35,15 @@
"Address": "0x5e",
"Bus": "$bus",
"Connector": {
- "Name": "FCB_TOP_$bus * -1 + 17 FAN0_TACH_OL",
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_OL",
"Pwm": 2,
- "PwmName": "FCB_TOP_$bus * -1 + 17 FAN_PWM",
+ "PwmName": "FCB_$bus - 15 FAN_PWM",
"Tachs": [
1
]
},
"Index": 1,
- "Name": "FCB_TOP_$bus * -1 + 17 FAN0_TACH_OL_SPEED_RPM",
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_OL_SPEED_RPM",
"PowerState": "Always",
"Thresholds": [
{
@@ -65,15 +65,15 @@
"Address": "0x5e",
"Bus": "$bus",
"Connector": {
- "Name": "FCB_TOP_$bus * -1 + 17 FAN1_TACH_IL",
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_IL",
"Pwm": 2,
- "PwmName": "FCB_TOP_$bus * -1 + 17 FAN_PWM",
+ "PwmName": "FCB_$bus - 15 FAN_PWM",
"Tachs": [
2
]
},
"Index": 2,
- "Name": "FCB_TOP_$bus * -1 + 17 FAN1_TACH_IL_SPEED_RPM",
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_IL_SPEED_RPM",
"PowerState": "Always",
"Thresholds": [
{
@@ -95,15 +95,15 @@
"Address": "0x5e",
"Bus": "$bus",
"Connector": {
- "Name": "FCB_TOP_$bus * -1 + 17 FAN1_TACH_OL",
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_OL",
"Pwm": 2,
- "PwmName": "FCB_TOP_$bus * -1 + 17 FAN_PWM",
+ "PwmName": "FCB_$bus - 15 FAN_PWM",
"Tachs": [
3
]
},
"Index": 3,
- "Name": "FCB_TOP_$bus * -1 + 17 FAN1_TACH_OL_SPEED_RPM",
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_OL_SPEED_RPM",
"PowerState": "Always",
"Thresholds": [
{
@@ -125,15 +125,15 @@
"Address": "0x5e",
"Bus": "$bus",
"Connector": {
- "Name": "FCB_TOP_$bus * -1 + 17 FAN2_TACH_IL",
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_IL",
"Pwm": 2,
- "PwmName": "FCB_TOP_$bus * -1 + 17 FAN_PWM",
+ "PwmName": "FCB_$bus - 15 FAN_PWM",
"Tachs": [
4
]
},
"Index": 4,
- "Name": "FCB_TOP_$bus * -1 + 17 FAN2_TACH_IL_SPEED_RPM",
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_IL_SPEED_RPM",
"PowerState": "Always",
"Thresholds": [
{
@@ -155,15 +155,15 @@
"Address": "0x5e",
"Bus": "$bus",
"Connector": {
- "Name": "FCB_TOP_$bus * -1 + 17 FAN2_TACH_OL",
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_OL",
"Pwm": 2,
- "PwmName": "FCB_TOP_$bus * -1 + 17 FAN_PWM",
+ "PwmName": "FCB_$bus - 15 FAN_PWM",
"Tachs": [
5
]
},
"Index": 5,
- "Name": "FCB_TOP_$bus * -1 + 17 FAN2_TACH_OL_SPEED_RPM",
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_OL_SPEED_RPM",
"PowerState": "Always",
"Thresholds": [
{
@@ -185,15 +185,15 @@
"Address": "0x5e",
"Bus": "$bus",
"Connector": {
- "Name": "FCB_TOP_$bus * -1 + 17 FAN3_TACH_IL",
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_IL",
"Pwm": 2,
- "PwmName": "FCB_TOP_$bus * -1 + 17 FAN_PWM",
+ "PwmName": "FCB_$bus - 15 FAN_PWM",
"Tachs": [
6
]
},
"Index": 6,
- "Name": "FCB_TOP_$bus * -1 + 17 FAN3_TACH_IL_SPEED_RPM",
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_IL_SPEED_RPM",
"PowerState": "Always",
"Thresholds": [
{
@@ -215,15 +215,15 @@
"Address": "0x5e",
"Bus": "$bus",
"Connector": {
- "Name": "FCB_TOP_$bus * -1 + 17 FAN3_TACH_OL",
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_OL",
"Pwm": 2,
- "PwmName": "FCB_TOP_$bus * -1 + 17 FAN_PWM",
+ "PwmName": "FCB_$bus - 15 FAN_PWM",
"Tachs": [
7
]
},
"Index": 7,
- "Name": "FCB_TOP_$bus * -1 + 17 FAN3_TACH_OL_SPEED_RPM",
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_OL_SPEED_RPM",
"PowerState": "Always",
"Thresholds": [
{
@@ -248,7 +248,7 @@
"in1",
"curr1"
],
- "Name": "FCB_TOP_$bus * -1 + 17 FAN0",
+ "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 1",
"Thresholds": [
{
"Direction": "less than",
@@ -273,8 +273,8 @@
}
],
"Type": "INA238",
- "curr1_Name": "FCB_TOP_$bus * -1 + 17 FAN0_CURR_A",
- "in1_Name": "FCB_TOP_$bus * -1 + 17 FAN0_VOLT_V"
+ "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 CURR_A",
+ "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 VOLT_V"
},
{
"Address": "0x41",
@@ -283,7 +283,7 @@
"in1",
"curr1"
],
- "Name": "FCB_TOP_$bus * -1 + 17 FAN1",
+ "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 2",
"Thresholds": [
{
"Direction": "less than",
@@ -308,8 +308,8 @@
}
],
"Type": "INA238",
- "curr1_Name": "FCB_TOP_$bus * -1 + 17 FAN1_CURR_A",
- "in1_Name": "FCB_TOP_$bus * -1 + 17 FAN1_VOLT_V"
+ "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 CURR_A",
+ "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 VOLT_V"
},
{
"Address": "0x44",
@@ -318,7 +318,7 @@
"in1",
"curr1"
],
- "Name": "FCB_TOP_$bus * -1 + 17 FAN2",
+ "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 3",
"Thresholds": [
{
"Direction": "less than",
@@ -343,8 +343,8 @@
}
],
"Type": "INA238",
- "curr1_Name": "FCB_TOP_$bus * -1 + 17 FAN2_CURR_A",
- "in1_Name": "FCB_TOP_$bus * -1 + 17 FAN2_VOLT_V"
+ "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 CURR_A",
+ "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 VOLT_V"
},
{
"Address": "0x45",
@@ -353,7 +353,7 @@
"in1",
"curr1"
],
- "Name": "FCB_TOP_$bus * -1 + 17 FAN3",
+ "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 4",
"Thresholds": [
{
"Direction": "less than",
@@ -378,13 +378,13 @@
}
],
"Type": "INA238",
- "curr1_Name": "FCB_TOP_$bus * -1 + 17 FAN3_CURR_A",
- "in1_Name": "FCB_TOP_$bus * -1 + 17 FAN3_VOLT_V"
+ "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 CURR_A",
+ "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 VOLT_V"
},
{
"Address": "0x4b",
"Bus": "$bus",
- "Name": "FCB_TOP_$bus * -1 + 17 TEMP_C",
+ "Name": "FCB_$bus - 15 TEMP_C",
"Thresholds": [
{
"Direction": "greater than",
@@ -414,439 +414,12 @@
"Type": "TMP75"
}
],
- "Name": "Minerva Top Fan Board $bus * -1 + 17",
+ "Name": "Minerva Fan Board $bus - 15",
"Probe": [
"xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'BUS': 16})",
"OR",
- "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'BUS': 17})"
- ],
- "Type": "Board",
- "xyz.openbmc_project.Inventory.Decorator.Asset": {
- "BuildDate": "$BOARD_MANUFACTURE_DATE",
- "Manufacturer": "$BOARD_MANUFACTURER",
- "Model": "$BOARD_PRODUCT_NAME",
- "PartNumber": "$BOARD_PART_NUMBER",
- "SerialNumber": "$BOARD_SERIAL_NUMBER",
- "SparePartNumber": "$BOARD_INFO_AM1"
- }
- },
- {
- "Exposes": [
- {
- "Address": "0x5e",
- "Bus": "$bus",
- "Connector": {
- "Name": "FCB_MID_$bus * -1 + 19 FAN0_TACH_IL",
- "Pwm": 2,
- "PwmName": "FCB_MID_$bus * -1 + 19 FAN_PWM",
- "Tachs": [
- 0
- ]
- },
- "Index": 0,
- "Name": "FCB_MID_$bus * -1 + 19 FAN0_TACH_IL_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 20000
- },
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 1000
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x5e",
- "Bus": "$bus",
- "Connector": {
- "Name": "FCB_MID_$bus * -1 + 19 FAN0_TACH_OL",
- "Pwm": 2,
- "PwmName": "FCB_MID_$bus * -1 + 19 FAN_PWM",
- "Tachs": [
- 1
- ]
- },
- "Index": 1,
- "Name": "FCB_MID_$bus * -1 + 19 FAN0_TACH_OL_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 20000
- },
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 1000
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x5e",
- "Bus": "$bus",
- "Connector": {
- "Name": "FCB_MID_$bus * -1 + 19 FAN1_TACH_IL",
- "Pwm": 2,
- "PwmName": "FCB_MID_$bus * -1 + 19 FAN_PWM",
- "Tachs": [
- 2
- ]
- },
- "Index": 2,
- "Name": "FCB_MID_$bus * -1 + 19 FAN1_TACH_IL_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 20000
- },
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 1000
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x5e",
- "Bus": "$bus",
- "Connector": {
- "Name": "FCB_MID_$bus * -1 + 19 FAN1_TACH_OL",
- "Pwm": 2,
- "PwmName": "FCB_MID_$bus * -1 + 19 FAN_PWM",
- "Tachs": [
- 3
- ]
- },
- "Index": 3,
- "Name": "FCB_MID_$bus * -1 + 19 FAN1_TACH_OL_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 20000
- },
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 1000
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x5e",
- "Bus": "$bus",
- "Connector": {
- "Name": "FCB_MID_$bus * -1 + 19 FAN2_TACH_IL",
- "Pwm": 2,
- "PwmName": "FCB_MID_$bus * -1 + 19 FAN_PWM",
- "Tachs": [
- 4
- ]
- },
- "Index": 4,
- "Name": "FCB_MID_$bus * -1 + 19 FAN2_TACH_IL_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 20000
- },
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 1000
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x5e",
- "Bus": "$bus",
- "Connector": {
- "Name": "FCB_MID_$bus * -1 + 19 FAN2_TACH_OL",
- "Pwm": 2,
- "PwmName": "FCB_MID_$bus * -1 + 19 FAN_PWM",
- "Tachs": [
- 5
- ]
- },
- "Index": 5,
- "Name": "FCB_MID_$bus * -1 + 19 FAN2_TACH_OL_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 20000
- },
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 1000
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x5e",
- "Bus": "$bus",
- "Connector": {
- "Name": "FCB_MID_$bus * -1 + 19 FAN3_TACH_IL",
- "Pwm": 2,
- "PwmName": "FCB_MID_$bus * -1 + 19 FAN_PWM",
- "Tachs": [
- 6
- ]
- },
- "Index": 6,
- "Name": "FCB_MID_$bus * -1 + 19 FAN3_TACH_IL_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 20000
- },
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 1000
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x5e",
- "Bus": "$bus",
- "Connector": {
- "Name": "FCB_MID_$bus * -1 + 19 FAN3_TACH_OL",
- "Pwm": 2,
- "PwmName": "FCB_MID_$bus * -1 + 19 FAN_PWM",
- "Tachs": [
- 7
- ]
- },
- "Index": 7,
- "Name": "FCB_MID_$bus * -1 + 19 FAN3_TACH_OL_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 20000
- },
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 1000
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x40",
- "Bus": "$bus",
- "Labels": [
- "in1",
- "curr1"
- ],
- "Name": "FCB_MID_$bus * -1 + 19 FAN0",
- "Thresholds": [
- {
- "Direction": "less than",
- "Label": "in1",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 48.45
- },
- {
- "Direction": "greater than",
- "Label": "in1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 53.35
- },
- {
- "Direction": "greater than",
- "Label": "curr1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 1.19
- }
- ],
- "Type": "INA238",
- "curr1_Name": "FCB_MID_$bus * -1 + 19 FAN0_CURR_A",
- "in1_Name": "FCB_MID_$bus * -1 + 19 FAN0_VOLT_V"
- },
- {
- "Address": "0x41",
- "Bus": "$bus",
- "Labels": [
- "in1",
- "curr1"
- ],
- "Name": "FCB_MID_$bus * -1 + 19 FAN1",
- "Thresholds": [
- {
- "Direction": "less than",
- "Label": "in1",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 48.45
- },
- {
- "Direction": "greater than",
- "Label": "in1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 53.35
- },
- {
- "Direction": "greater than",
- "Label": "curr1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 1.13
- }
- ],
- "Type": "INA238",
- "curr1_Name": "FCB_MID_$bus * -1 + 19 FAN1_CURR_A",
- "in1_Name": "FCB_MID_$bus * -1 + 19 FAN1_VOLT_V"
- },
- {
- "Address": "0x44",
- "Bus": "$bus",
- "Labels": [
- "in1",
- "curr1"
- ],
- "Name": "FCB_MID_$bus * -1 + 19 FAN2",
- "Thresholds": [
- {
- "Direction": "less than",
- "Label": "in1",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 48.45
- },
- {
- "Direction": "greater than",
- "Label": "in1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 53.35
- },
- {
- "Direction": "greater than",
- "Label": "curr1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 1.13
- }
- ],
- "Type": "INA238",
- "curr1_Name": "FCB_MID_$bus * -1 + 19 FAN2_CURR_A",
- "in1_Name": "FCB_MID_$bus * -1 + 19 FAN2_VOLT_V"
- },
- {
- "Address": "0x45",
- "Bus": "$bus",
- "Labels": [
- "in1",
- "curr1"
- ],
- "Name": "FCB_MID_$bus * -1 + 19 FAN3",
- "Thresholds": [
- {
- "Direction": "less than",
- "Label": "in1",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 48.45
- },
- {
- "Direction": "greater than",
- "Label": "in1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 53.35
- },
- {
- "Direction": "greater than",
- "Label": "curr1",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 1.15
- }
- ],
- "Type": "INA238",
- "curr1_Name": "FCB_MID_$bus * -1 + 19 FAN3_CURR_A",
- "in1_Name": "FCB_MID_$bus * -1 + 19 FAN3_VOLT_V"
- },
- {
- "Address": "0x4b",
- "Bus": "$bus",
- "Name": "FCB_MID_$bus * -1 + 19 TEMP_C",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 80
- },
- {
- "Direction": "greater than",
- "Name": "upper non critical",
- "Severity": 0,
- "Value": 75
- },
- {
- "Direction": "less than",
- "Name": "lower non critical",
- "Severity": 0,
- "Value": 5
- },
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 0
- }
- ],
- "Type": "TMP75"
- }
- ],
- "Name": "Minerva Middle Fan Board $bus * -1 + 19",
- "Probe": [
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'BUS': 17})",
+ "OR",
"xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'BUS': 18})",
"OR",
"xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'BUS': 19})"
@@ -867,195 +440,15 @@
"Address": "0x5e",
"Bus": "$bus",
"Connector": {
- "Name": "FCB_BOT_$bus * -1 + 21 FAN0_TACH_IL",
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_IL",
"Pwm": 2,
- "PwmName": "FCB_BOT_$bus * -1 + 21 FAN_PWM",
- "Tachs": [
- 0
- ]
- },
- "Index": 0,
- "Name": "FCB_BOT_$bus * -1 + 21 FAN0_TACH_IL_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 20000
- },
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 1000
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x5e",
- "Bus": "$bus",
- "Connector": {
- "Name": "FCB_BOT_$bus * -1 + 21 FAN0_TACH_OL",
- "Pwm": 2,
- "PwmName": "FCB_BOT_$bus * -1 + 21 FAN_PWM",
- "Tachs": [
- 1
- ]
- },
- "Index": 1,
- "Name": "FCB_BOT_$bus * -1 + 21 FAN0_TACH_OL_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 20000
- },
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 1000
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x5e",
- "Bus": "$bus",
- "Connector": {
- "Name": "FCB_BOT_$bus * -1 + 21 FAN1_TACH_IL",
- "Pwm": 2,
- "PwmName": "FCB_BOT_$bus * -1 + 21 FAN_PWM",
- "Tachs": [
- 2
- ]
- },
- "Index": 2,
- "Name": "FCB_BOT_$bus * -1 + 21 FAN1_TACH_IL_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 20000
- },
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 1000
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x5e",
- "Bus": "$bus",
- "Connector": {
- "Name": "FCB_BOT_$bus * -1 + 21 FAN1_TACH_OL",
- "Pwm": 2,
- "PwmName": "FCB_BOT_$bus * -1 + 21 FAN_PWM",
- "Tachs": [
- 3
- ]
- },
- "Index": 3,
- "Name": "FCB_BOT_$bus * -1 + 21 FAN1_TACH_OL_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 20000
- },
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 1000
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x5e",
- "Bus": "$bus",
- "Connector": {
- "Name": "FCB_BOT_$bus * -1 + 21 FAN2_TACH_IL",
- "Pwm": 2,
- "PwmName": "FCB_BOT_$bus * -1 + 21 FAN_PWM",
- "Tachs": [
- 4
- ]
- },
- "Index": 4,
- "Name": "FCB_BOT_$bus * -1 + 21 FAN2_TACH_IL_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 20000
- },
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 1000
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x5e",
- "Bus": "$bus",
- "Connector": {
- "Name": "FCB_BOT_$bus * -1 + 21 FAN2_TACH_OL",
- "Pwm": 2,
- "PwmName": "FCB_BOT_$bus * -1 + 21 FAN_PWM",
- "Tachs": [
- 5
- ]
- },
- "Index": 5,
- "Name": "FCB_BOT_$bus * -1 + 21 FAN2_TACH_OL_SPEED_RPM",
- "PowerState": "Always",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 20000
- },
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 1000
- }
- ],
- "Type": "I2CFan"
- },
- {
- "Address": "0x5e",
- "Bus": "$bus",
- "Connector": {
- "Name": "FCB_BOT_$bus * -1 + 21 FAN3_TACH_IL",
- "Pwm": 2,
- "PwmName": "FCB_BOT_$bus * -1 + 21 FAN_PWM",
+ "PwmName": "FCB_$bus - 15 FAN_PWM",
"Tachs": [
6
]
},
- "Index": 6,
- "Name": "FCB_BOT_$bus * -1 + 21 FAN3_TACH_IL_SPEED_RPM",
+ "Index": 0,
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_IL_SPEED_RPM",
"PowerState": "Always",
"Thresholds": [
{
@@ -1077,15 +470,195 @@
"Address": "0x5e",
"Bus": "$bus",
"Connector": {
- "Name": "FCB_BOT_$bus * -1 + 21 FAN3_TACH_OL",
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_OL",
"Pwm": 2,
- "PwmName": "FCB_BOT_$bus * -1 + 21 FAN_PWM",
+ "PwmName": "FCB_$bus - 15 FAN_PWM",
"Tachs": [
7
]
},
+ "Index": 1,
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 TACH_OL_SPEED_RPM",
+ "PowerState": "Always",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 20000
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 1000
+ }
+ ],
+ "Type": "I2CFan"
+ },
+ {
+ "Address": "0x5e",
+ "Bus": "$bus",
+ "Connector": {
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_IL",
+ "Pwm": 2,
+ "PwmName": "FCB_$bus - 15 FAN_PWM",
+ "Tachs": [
+ 4
+ ]
+ },
+ "Index": 2,
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_IL_SPEED_RPM",
+ "PowerState": "Always",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 20000
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 1000
+ }
+ ],
+ "Type": "I2CFan"
+ },
+ {
+ "Address": "0x5e",
+ "Bus": "$bus",
+ "Connector": {
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_OL",
+ "Pwm": 2,
+ "PwmName": "FCB_$bus - 15 FAN_PWM",
+ "Tachs": [
+ 5
+ ]
+ },
+ "Index": 3,
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 TACH_OL_SPEED_RPM",
+ "PowerState": "Always",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 20000
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 1000
+ }
+ ],
+ "Type": "I2CFan"
+ },
+ {
+ "Address": "0x5e",
+ "Bus": "$bus",
+ "Connector": {
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_IL",
+ "Pwm": 2,
+ "PwmName": "FCB_$bus - 15 FAN_PWM",
+ "Tachs": [
+ 2
+ ]
+ },
+ "Index": 4,
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_IL_SPEED_RPM",
+ "PowerState": "Always",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 20000
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 1000
+ }
+ ],
+ "Type": "I2CFan"
+ },
+ {
+ "Address": "0x5e",
+ "Bus": "$bus",
+ "Connector": {
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_OL",
+ "Pwm": 2,
+ "PwmName": "FCB_$bus - 15 FAN_PWM",
+ "Tachs": [
+ 3
+ ]
+ },
+ "Index": 5,
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 TACH_OL_SPEED_RPM",
+ "PowerState": "Always",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 20000
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 1000
+ }
+ ],
+ "Type": "I2CFan"
+ },
+ {
+ "Address": "0x5e",
+ "Bus": "$bus",
+ "Connector": {
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_IL",
+ "Pwm": 2,
+ "PwmName": "FCB_$bus - 15 FAN_PWM",
+ "Tachs": [
+ 0
+ ]
+ },
+ "Index": 6,
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_IL_SPEED_RPM",
+ "PowerState": "Always",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 20000
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 1000
+ }
+ ],
+ "Type": "I2CFan"
+ },
+ {
+ "Address": "0x5e",
+ "Bus": "$bus",
+ "Connector": {
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_OL",
+ "Pwm": 2,
+ "PwmName": "FCB_$bus - 15 FAN_PWM",
+ "Tachs": [
+ 1
+ ]
+ },
"Index": 7,
- "Name": "FCB_BOT_$bus * -1 + 21 FAN3_TACH_OL_SPEED_RPM",
+ "Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 TACH_OL_SPEED_RPM",
"PowerState": "Always",
"Thresholds": [
{
@@ -1110,7 +683,7 @@
"in1",
"curr1"
],
- "Name": "FCB_BOT_$bus * -1 + 21 FAN0",
+ "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 1",
"Thresholds": [
{
"Direction": "less than",
@@ -1135,8 +708,8 @@
}
],
"Type": "INA238",
- "curr1_Name": "FCB_BOT_$bus * -1 + 21 FAN0_CURR_A",
- "in1_Name": "FCB_BOT_$bus * -1 + 21 FAN0_VOLT_V"
+ "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 CURR_A",
+ "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 1 VOLT_V"
},
{
"Address": "0x41",
@@ -1145,7 +718,7 @@
"in1",
"curr1"
],
- "Name": "FCB_BOT_$bus * -1 + 21 FAN1",
+ "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 2",
"Thresholds": [
{
"Direction": "less than",
@@ -1170,8 +743,8 @@
}
],
"Type": "INA238",
- "curr1_Name": "FCB_BOT_$bus * -1 + 21 FAN1_CURR_A",
- "in1_Name": "FCB_BOT_$bus * -1 + 21 FAN1_VOLT_V"
+ "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 CURR_A",
+ "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 2 VOLT_V"
},
{
"Address": "0x44",
@@ -1180,7 +753,7 @@
"in1",
"curr1"
],
- "Name": "FCB_BOT_$bus * -1 + 21 FAN2",
+ "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 3",
"Thresholds": [
{
"Direction": "less than",
@@ -1205,8 +778,8 @@
}
],
"Type": "INA238",
- "curr1_Name": "FCB_BOT_$bus * -1 + 21 FAN2_CURR_A",
- "in1_Name": "FCB_BOT_$bus * -1 + 21 FAN2_VOLT_V"
+ "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 CURR_A",
+ "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 3 VOLT_V"
},
{
"Address": "0x45",
@@ -1215,7 +788,7 @@
"in1",
"curr1"
],
- "Name": "FCB_BOT_$bus * -1 + 21 FAN3",
+ "Name": "FCB_$bus - 15 FAN_$bus * 4 - 64 + 4",
"Thresholds": [
{
"Direction": "less than",
@@ -1240,13 +813,13 @@
}
],
"Type": "INA238",
- "curr1_Name": "FCB_BOT_$bus * -1 + 21 FAN3_CURR_A",
- "in1_Name": "FCB_BOT_$bus * -1 + 21 FAN3_VOLT_V"
+ "curr1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 CURR_A",
+ "in1_Name": "FCB_$bus - 15 FAN $bus * 4 - 64 + 4 VOLT_V"
},
{
"Address": "0x4b",
"Bus": "$bus",
- "Name": "FCB_BOT_$bus * -1 + 21 TEMP_C",
+ "Name": "FCB_$bus - 15 TEMP_C",
"Thresholds": [
{
"Direction": "greater than",
@@ -1276,7 +849,7 @@
"Type": "TMP75"
}
],
- "Name": "Minerva Bottom Fan Board $bus * -1 + 21",
+ "Name": "Minerva Fan Board $bus - 15",
"Probe": [
"xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Minerva Fan Board.*', 'BUS': 20})",
"OR",