Add config of sensors and FSC for more PSUs.
Add configuration of sensors and FSC to entity-manager json files for
Solum 1600W, IS162F22 1600W, 2100W, 2130W Power Supplies.
Tested By:
Insert Solum 1600W, IS162F22 1600W, 2100W and 2130W PSU to system one
by one, after a bmc reboot, the PSU information should be exposed in
entity-manager D-Bus interface. And run ipmitool sensor list, all PSU
related sensors should show valid values.
Signed-off-by: Cheng C Yang <cheng.c.yang@linux.intel.com>
Change-Id: If9b1d984b77a7992bd1f5131dc1acdeeec7a9212
diff --git a/configurations/PSSF162205A.json b/configurations/PSSF162205A.json
index 7808b41..965c5ce 100644
--- a/configurations/PSSF162205A.json
+++ b/configurations/PSSF162205A.json
@@ -4,13 +4,104 @@
{
"Address": "$address",
"Bus": "$bus",
- "Name": "Solum 1600W PSU 3 FRU",
+ "Name": "Solum 1600W PSU FRU",
"Type": "EEPROM"
},
{
- "Address": "0x60",
+ "Class": "fan",
+ "FFGainCoefficient": 0.01,
+ "FFOffCoefficient": 0.0,
+ "ICoefficient": 0.0,
+ "ILimitMax": 0.0,
+ "ILimitMin": 0.0,
+ "Inputs": [
+ "PSU3 Fan Speed 1"
+ ],
+ "Name": "PSU3 Fan 1",
+ "NegativeHysteresis": 2.0,
+ "OutLimitMax": 100.0,
+ "OutLimitMin": 30.0,
+ "Outputs": [
+ "Pwm PSU3 Fan 1"
+ ],
+ "PCoefficient": 0.0,
+ "PositiveHysteresis": 0.0,
+ "SlewNeg": 0.0,
+ "SlewPos": 0.0,
+ "Type": "Pid",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
+ "Class": "Floor",
+ "Inputs": [
+ "PSU3 Temperature"
+ ],
+ "Name": "PSU3 LCC",
+ "NegativeHysteresis": 2,
+ "Output": [
+ 40.0,
+ 100.0
+ ],
+ "PositiveHysteresis": 0,
+ "Reading": [
+ 30.0,
+ 65.0
+ ],
+ "Type": "Stepwise",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
+ "Address": "0x5a",
"Bus": "$bus",
- "Name": "Solum 1600W PSU 3 Device",
+ "Name": "PSU3",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 2149.5
+ },
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 1951.6
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 122
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 100
+ },
+ {
+ "Direction": "greater than",
+ "Label": "temp1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 78
+ },
+ {
+ "Direction": "greater than",
+ "Label": "temp1",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 73
+ }
+ ],
"Type": "pmbus"
}
],
@@ -29,13 +120,104 @@
{
"Address": "$address",
"Bus": "$bus",
- "Name": "Solum 1600W PSU 2 FRU",
+ "Name": "Solum 1600W PSU FRU",
"Type": "EEPROM"
},
{
+ "Class": "fan",
+ "FFGainCoefficient": 0.01,
+ "FFOffCoefficient": 0.0,
+ "ICoefficient": 0.0,
+ "ILimitMax": 0.0,
+ "ILimitMin": 0.0,
+ "Inputs": [
+ "PSU2 Fan Speed 1"
+ ],
+ "Name": "PSU2 Fan 1",
+ "NegativeHysteresis": 2.0,
+ "OutLimitMax": 100.0,
+ "OutLimitMin": 30.0,
+ "Outputs": [
+ "Pwm PSU2 Fan 1"
+ ],
+ "PCoefficient": 0.0,
+ "PositiveHysteresis": 0.0,
+ "SlewNeg": 0.0,
+ "SlewPos": 0.0,
+ "Type": "Pid",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
+ "Class": "Floor",
+ "Inputs": [
+ "PSU2 Temperature"
+ ],
+ "Name": "PSU2 LCC",
+ "NegativeHysteresis": 2,
+ "Output": [
+ 40.0,
+ 100.0
+ ],
+ "PositiveHysteresis": 0,
+ "Reading": [
+ 30.0,
+ 65.0
+ ],
+ "Type": "Stepwise",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
"Address": "0x59",
"Bus": "$bus",
- "Name": "Solum 1600W PSU 2 Device",
+ "Name": "PSU2",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 2149.5
+ },
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 1951.6
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 122
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 100
+ },
+ {
+ "Direction": "greater than",
+ "Label": "temp1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 78
+ },
+ {
+ "Direction": "greater than",
+ "Label": "temp1",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 73
+ }
+ ],
"Type": "pmbus"
}
],
@@ -54,13 +236,104 @@
{
"Address": "$address",
"Bus": "$bus",
- "Name": "Solum 1600W PSU 1 FRU",
+ "Name": "Solum 1600W PSU FRU",
"Type": "EEPROM"
},
{
+ "Class": "fan",
+ "FFGainCoefficient": 0.01,
+ "FFOffCoefficient": 0.0,
+ "ICoefficient": 0.0,
+ "ILimitMax": 0.0,
+ "ILimitMin": 0.0,
+ "Inputs": [
+ "PSU1 Fan Speed 1"
+ ],
+ "Name": "PSU1 Fan 1",
+ "NegativeHysteresis": 2.0,
+ "OutLimitMax": 100.0,
+ "OutLimitMin": 30.0,
+ "Outputs": [
+ "Pwm PSU1 Fan 1"
+ ],
+ "PCoefficient": 0.0,
+ "PositiveHysteresis": 0.0,
+ "SlewNeg": 0.0,
+ "SlewPos": 0.0,
+ "Type": "Pid",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
+ "Class": "Floor",
+ "Inputs": [
+ "PSU1 Temperature"
+ ],
+ "Name": "PSU1 LCC",
+ "NegativeHysteresis": 2,
+ "Output": [
+ 40.0,
+ 100.0
+ ],
+ "PositiveHysteresis": 0,
+ "Reading": [
+ 30.0,
+ 65.0
+ ],
+ "Type": "Stepwise",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
"Address": "0x58",
"Bus": "$bus",
- "Name": "Solum 1600W PSU 1 Device",
+ "Name": "PSU1",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 2149.5
+ },
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 1951.6
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 122
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 100
+ },
+ {
+ "Direction": "greater than",
+ "Label": "temp1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 78
+ },
+ {
+ "Direction": "greater than",
+ "Label": "temp1",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 73
+ }
+ ],
"Type": "pmbus"
}
],
@@ -74,4 +347,4 @@
"SerialNumber": "$PRODUCT_SERIAL_NUMBER"
}
}
-]
\ No newline at end of file
+]
diff --git a/configurations/PSSF212201A.json b/configurations/PSSF212201A.json
index d108ddd..23421fe 100644
--- a/configurations/PSSF212201A.json
+++ b/configurations/PSSF212201A.json
@@ -4,13 +4,104 @@
{
"Address": "$address",
"Bus": "$bus",
- "Name": "Solum 2100W PSU 3 FRU",
+ "Name": "Solum 2100W PSU FRU",
"Type": "EEPROM"
},
{
- "Address": "0x60",
+ "Class": "fan",
+ "FFGainCoefficient": 0.01,
+ "FFOffCoefficient": 0.0,
+ "ICoefficient": 0.0,
+ "ILimitMax": 0.0,
+ "ILimitMin": 0.0,
+ "Inputs": [
+ "PSU3 Fan Speed 1"
+ ],
+ "Name": "PSU3 Fan 1",
+ "NegativeHysteresis": 2.0,
+ "OutLimitMax": 100.0,
+ "OutLimitMin": 30.0,
+ "Outputs": [
+ "Pwm PSU3 Fan 1"
+ ],
+ "PCoefficient": 0.0,
+ "PositiveHysteresis": 0.0,
+ "SlewNeg": 0.0,
+ "SlewPos": 0.0,
+ "Type": "Pid",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
+ "Class": "Floor",
+ "Inputs": [
+ "PSU3 Temperature"
+ ],
+ "Name": "PSU3 LCC",
+ "NegativeHysteresis": 2,
+ "Output": [
+ 40.0,
+ 100.0
+ ],
+ "PositiveHysteresis": 0,
+ "Reading": [
+ 30.0,
+ 65.0
+ ],
+ "Type": "Stepwise",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
+ "Address": "0x5a",
"Bus": "$bus",
- "Name": "Solum 2100W PSU 3 Device",
+ "Name": "PSU3",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 2769.2
+ },
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 2558.2
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 117
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 100
+ },
+ {
+ "Direction": "greater than",
+ "Label": "temp1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 65
+ },
+ {
+ "Direction": "greater than",
+ "Label": "temp1",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 60
+ }
+ ],
"Type": "pmbus"
}
],
@@ -29,13 +120,104 @@
{
"Address": "$address",
"Bus": "$bus",
- "Name": "Solum 2100W PSU 2 FRU",
+ "Name": "Solum 2100W PSU FRU",
"Type": "EEPROM"
},
{
+ "Class": "fan",
+ "FFGainCoefficient": 0.01,
+ "FFOffCoefficient": 0.0,
+ "ICoefficient": 0.0,
+ "ILimitMax": 0.0,
+ "ILimitMin": 0.0,
+ "Inputs": [
+ "PSU2 Fan Speed 1"
+ ],
+ "Name": "PSU2 Fan 1",
+ "NegativeHysteresis": 2.0,
+ "OutLimitMax": 100.0,
+ "OutLimitMin": 30.0,
+ "Outputs": [
+ "Pwm PSU2 Fan 1"
+ ],
+ "PCoefficient": 0.0,
+ "PositiveHysteresis": 0.0,
+ "SlewNeg": 0.0,
+ "SlewPos": 0.0,
+ "Type": "Pid",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
+ "Class": "Floor",
+ "Inputs": [
+ "PSU2 Temperature"
+ ],
+ "Name": "PSU2 LCC",
+ "NegativeHysteresis": 2,
+ "Output": [
+ 40.0,
+ 100.0
+ ],
+ "PositiveHysteresis": 0,
+ "Reading": [
+ 30.0,
+ 65.0
+ ],
+ "Type": "Stepwise",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
"Address": "0x59",
"Bus": "$bus",
- "Name": "Solum 2100W PSU 2 Device",
+ "Name": "PSU2",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 2769.2
+ },
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 2558.2
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 117
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 100
+ },
+ {
+ "Direction": "greater than",
+ "Label": "temp1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 65
+ },
+ {
+ "Direction": "greater than",
+ "Label": "temp1",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 60
+ }
+ ],
"Type": "pmbus"
}
],
@@ -54,13 +236,104 @@
{
"Address": "$address",
"Bus": "$bus",
- "Name": "Solum 2100W PSU 1 FRU",
+ "Name": "Solum 2100W PSU FRU",
"Type": "EEPROM"
},
{
+ "Class": "fan",
+ "FFGainCoefficient": 0.01,
+ "FFOffCoefficient": 0.0,
+ "ICoefficient": 0.0,
+ "ILimitMax": 0.0,
+ "ILimitMin": 0.0,
+ "Inputs": [
+ "PSU1 Fan Speed 1"
+ ],
+ "Name": "PSU1 Fan 1",
+ "NegativeHysteresis": 2.0,
+ "OutLimitMax": 100.0,
+ "OutLimitMin": 30.0,
+ "Outputs": [
+ "Pwm PSU1 Fan 1"
+ ],
+ "PCoefficient": 0.0,
+ "PositiveHysteresis": 0.0,
+ "SlewNeg": 0.0,
+ "SlewPos": 0.0,
+ "Type": "Pid",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
+ "Class": "Floor",
+ "Inputs": [
+ "PSU1 Temperature"
+ ],
+ "Name": "PSU1 LCC",
+ "NegativeHysteresis": 2,
+ "Output": [
+ 40.0,
+ 100.0
+ ],
+ "PositiveHysteresis": 0,
+ "Reading": [
+ 30.0,
+ 65.0
+ ],
+ "Type": "Stepwise",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
"Address": "0x58",
"Bus": "$bus",
- "Name": "Solum 2100W PSU 1 Device",
+ "Name": "PSU1",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 2769.2
+ },
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 2558.2
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 117
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 100
+ },
+ {
+ "Direction": "greater than",
+ "Label": "temp1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 65
+ },
+ {
+ "Direction": "greater than",
+ "Label": "temp1",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 60
+ }
+ ],
"Type": "pmbus"
}
],
@@ -74,4 +347,4 @@
"SerialNumber": "$PRODUCT_SERIAL_NUMBER"
}
}
-]
\ No newline at end of file
+]
diff --git a/configurations/PSSF222201A.json b/configurations/PSSF222201A.json
new file mode 100644
index 0000000..035fe03
--- /dev/null
+++ b/configurations/PSSF222201A.json
@@ -0,0 +1,350 @@
+[
+ {
+ "Exposes": [
+ {
+ "Address": "$address",
+ "Bus": "$bus",
+ "Name": "Solum 2130W PSU FRU",
+ "Type": "EEPROM"
+ },
+ {
+ "Class": "fan",
+ "FFGainCoefficient": 0.01,
+ "FFOffCoefficient": 0.0,
+ "ICoefficient": 0.0,
+ "ILimitMax": 0.0,
+ "ILimitMin": 0.0,
+ "Inputs": [
+ "PSU3 Fan Speed 1"
+ ],
+ "Name": "PSU3 Fan 1",
+ "NegativeHysteresis": 2.0,
+ "OutLimitMax": 100.0,
+ "OutLimitMin": 30.0,
+ "Outputs": [
+ "Pwm PSU3 Fan 1"
+ ],
+ "PCoefficient": 0.0,
+ "PositiveHysteresis": 0.0,
+ "SlewNeg": 0.0,
+ "SlewPos": 0.0,
+ "Type": "Pid",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
+ "Class": "Floor",
+ "Inputs": [
+ "PSU3 Temperature"
+ ],
+ "Name": "PSU3 LCC",
+ "NegativeHysteresis": 2,
+ "Output": [
+ 40.0,
+ 100.0
+ ],
+ "PositiveHysteresis": 0,
+ "Reading": [
+ 30.0,
+ 65.0
+ ],
+ "Type": "Stepwise",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
+ "Address": "0x5a",
+ "Bus": "$bus",
+ "Name": "PSU3",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 2769.2
+ },
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 2558.2
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 117
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 100
+ },
+ {
+ "Direction": "greater than",
+ "Label": "temp1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 65
+ },
+ {
+ "Direction": "greater than",
+ "Label": "temp1",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 60
+ }
+ ],
+ "Type": "pmbus"
+ }
+ ],
+ "Name": "Solum 2130W PSU 3",
+ "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF222201A', 'ADDRESS': 82})",
+ "Type": "PowerSupply",
+ "xyz.openbmc_project.Inventory.Decorator.Asset": {
+ "Manufacturer": "$PRODUCT_MANUFACTURER",
+ "Model": "$PRODUCT_PRODUCT_NAME",
+ "PartNumber": "$PRODUCT_PART_NUMBER",
+ "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
+ }
+ },
+ {
+ "Exposes": [
+ {
+ "Address": "$address",
+ "Bus": "$bus",
+ "Name": "Solum 2130W PSU FRU",
+ "Type": "EEPROM"
+ },
+ {
+ "Class": "fan",
+ "FFGainCoefficient": 0.01,
+ "FFOffCoefficient": 0.0,
+ "ICoefficient": 0.0,
+ "ILimitMax": 0.0,
+ "ILimitMin": 0.0,
+ "Inputs": [
+ "PSU2 Fan Speed 1"
+ ],
+ "Name": "PSU2 Fan 1",
+ "NegativeHysteresis": 2.0,
+ "OutLimitMax": 100.0,
+ "OutLimitMin": 30.0,
+ "Outputs": [
+ "Pwm PSU2 Fan 1"
+ ],
+ "PCoefficient": 0.0,
+ "PositiveHysteresis": 0.0,
+ "SlewNeg": 0.0,
+ "SlewPos": 0.0,
+ "Type": "Pid",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
+ "Class": "Floor",
+ "Inputs": [
+ "PSU2 Temperature"
+ ],
+ "Name": "PSU2 LCC",
+ "NegativeHysteresis": 2,
+ "Output": [
+ 40.0,
+ 100.0
+ ],
+ "PositiveHysteresis": 0,
+ "Reading": [
+ 30.0,
+ 65.0
+ ],
+ "Type": "Stepwise",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
+ "Address": "0x59",
+ "Bus": "$bus",
+ "Name": "PSU2",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 2769.2
+ },
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 2558.2
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 117
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 100
+ },
+ {
+ "Direction": "greater than",
+ "Label": "temp1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 65
+ },
+ {
+ "Direction": "greater than",
+ "Label": "temp1",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 60
+ }
+ ],
+ "Type": "pmbus"
+ }
+ ],
+ "Name": "Solum 2130W PSU 2",
+ "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF222201A', 'ADDRESS': 81})",
+ "Type": "PowerSupply",
+ "xyz.openbmc_project.Inventory.Decorator.Asset": {
+ "Manufacturer": "$PRODUCT_MANUFACTURER",
+ "Model": "$PRODUCT_PRODUCT_NAME",
+ "PartNumber": "$PRODUCT_PART_NUMBER",
+ "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
+ }
+ },
+ {
+ "Exposes": [
+ {
+ "Address": "$address",
+ "Bus": "$bus",
+ "Name": "Solum 2130W PSU FRU",
+ "Type": "EEPROM"
+ },
+ {
+ "Class": "fan",
+ "FFGainCoefficient": 0.01,
+ "FFOffCoefficient": 0.0,
+ "ICoefficient": 0.0,
+ "ILimitMax": 0.0,
+ "ILimitMin": 0.0,
+ "Inputs": [
+ "PSU1 Fan Speed 1"
+ ],
+ "Name": "PSU1 Fan 1",
+ "NegativeHysteresis": 2.0,
+ "OutLimitMax": 100.0,
+ "OutLimitMin": 30.0,
+ "Outputs": [
+ "Pwm PSU1 Fan 1"
+ ],
+ "PCoefficient": 0.0,
+ "PositiveHysteresis": 0.0,
+ "SlewNeg": 0.0,
+ "SlewPos": 0.0,
+ "Type": "Pid",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
+ "Class": "Floor",
+ "Inputs": [
+ "PSU1 Temperature"
+ ],
+ "Name": "PSU1 LCC",
+ "NegativeHysteresis": 2,
+ "Output": [
+ 40.0,
+ 100.0
+ ],
+ "PositiveHysteresis": 0,
+ "Reading": [
+ 30.0,
+ 65.0
+ ],
+ "Type": "Stepwise",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
+ "Address": "0x58",
+ "Bus": "$bus",
+ "Name": "PSU1",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 2769.2
+ },
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 2558.2
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 117
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 100
+ },
+ {
+ "Direction": "greater than",
+ "Label": "temp1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 65
+ },
+ {
+ "Direction": "greater than",
+ "Label": "temp1",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 60
+ }
+ ],
+ "Type": "pmbus"
+ }
+ ],
+ "Name": "Solum 2130W PSU 1",
+ "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF222201A', 'ADDRESS': 80})",
+ "Type": "PowerSupply",
+ "xyz.openbmc_project.Inventory.Decorator.Asset": {
+ "Manufacturer": "$PRODUCT_MANUFACTURER",
+ "Model": "$PRODUCT_PRODUCT_NAME",
+ "PartNumber": "$PRODUCT_PART_NUMBER",
+ "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
+ }
+ }
+]
diff --git a/configurations/SOLUM_PSSF162202_PSU.json b/configurations/SOLUM_PSSF162202_PSU.json
index 11ebfab..6572002 100644
--- a/configurations/SOLUM_PSSF162202_PSU.json
+++ b/configurations/SOLUM_PSSF162202_PSU.json
@@ -8,28 +8,105 @@
"Type": "EEPROM"
},
{
- "Address": "0x59",
- "Bus": "$bus",
- "Index": 0,
- "Name": "PS 1 Fan 1",
- "Type": "I2CFan"
+ "Class": "fan",
+ "FFGainCoefficient": 0.01,
+ "FFOffCoefficient": 0.0,
+ "ICoefficient": 0.0,
+ "ILimitMax": 0.0,
+ "ILimitMin": 0.0,
+ "Inputs": [
+ "PSU3 Fan Speed 1"
+ ],
+ "Name": "PSU3 Fan 1",
+ "NegativeHysteresis": 2.0,
+ "OutLimitMax": 100.0,
+ "OutLimitMin": 30.0,
+ "Outputs": [
+ "Pwm PSU3 Fan 1"
+ ],
+ "PCoefficient": 0.0,
+ "PositiveHysteresis": 0.0,
+ "SlewNeg": 0.0,
+ "SlewPos": 0.0,
+ "Type": "Pid",
+ "Zones": [
+ "PSU"
+ ]
},
{
- "Address": "0x59",
- "Bus": "$bus",
- "Index": 1,
- "Name": "PS 1 Fan 2",
- "Type": "I2CFan"
+ "Class": "Floor",
+ "Inputs": [
+ "PSU3 Temperature"
+ ],
+ "Name": "PSU3 LCC",
+ "NegativeHysteresis": 2,
+ "Output": [
+ 40.0,
+ 100.0
+ ],
+ "PositiveHysteresis": 0,
+ "Reading": [
+ 30.0,
+ 65.0
+ ],
+ "Type": "Stepwise",
+ "Zones": [
+ "PSU"
+ ]
},
{
- "Address": "0x59",
+ "Address": "0x5a",
"Bus": "$bus",
- "Name": "SOLUM CO IS162F22 PSU Device",
+ "Name": "PSU3",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 2149.5
+ },
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 1951.6
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 122
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 100
+ },
+ {
+ "Direction": "greater than",
+ "Label": "temp1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 78
+ },
+ {
+ "Direction": "greater than",
+ "Label": "temp1",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 73
+ }
+ ],
"Type": "pmbus"
}
],
- "Name": "SOLUM CO IS162F22 PSU 2",
- "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'IS162F22', 'ADDRESS': 81})",
+ "Name": "SOLUM CO IS162F22 PSU 3",
+ "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'IS162F22*', 'ADDRESS': 82})",
"Type": "PowerSupply",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"Manufacturer": "$BOARD_MANUFACTURER",
@@ -47,23 +124,216 @@
"Type": "EEPROM"
},
{
- "Address": "0x58",
+ "Class": "fan",
+ "FFGainCoefficient": 0.01,
+ "FFOffCoefficient": 0.0,
+ "ICoefficient": 0.0,
+ "ILimitMax": 0.0,
+ "ILimitMin": 0.0,
+ "Inputs": [
+ "PSU2 Fan Speed 1"
+ ],
+ "Name": "PSU2 Fan 1",
+ "NegativeHysteresis": 2.0,
+ "OutLimitMax": 100.0,
+ "OutLimitMin": 30.0,
+ "Outputs": [
+ "Pwm PSU2 Fan 1"
+ ],
+ "PCoefficient": 0.0,
+ "PositiveHysteresis": 0.0,
+ "SlewNeg": 0.0,
+ "SlewPos": 0.0,
+ "Type": "Pid",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
+ "Class": "Floor",
+ "Inputs": [
+ "PSU2 Temperature"
+ ],
+ "Name": "PSU2 LCC",
+ "NegativeHysteresis": 2,
+ "Output": [
+ 40.0,
+ 100.0
+ ],
+ "PositiveHysteresis": 0,
+ "Reading": [
+ 30.0,
+ 65.0
+ ],
+ "Type": "Stepwise",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
+ "Address": "0x59",
"Bus": "$bus",
- "Index": 0,
- "Name": "PS 2 Fan 1",
- "Type": "I2CFan"
+ "Name": "PSU2",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 2149.5
+ },
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 1951.6
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 122
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 100
+ },
+ {
+ "Direction": "greater than",
+ "Label": "temp1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 78
+ },
+ {
+ "Direction": "greater than",
+ "Label": "temp1",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 73
+ }
+ ],
+ "Type": "pmbus"
+ }
+ ],
+ "Name": "SOLUM CO IS162F22 PSU 2",
+ "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'IS162F22*', 'ADDRESS': 81})",
+ "Type": "PowerSupply",
+ "xyz.openbmc_project.Inventory.Decorator.Asset": {
+ "Manufacturer": "$BOARD_MANUFACTURER",
+ "Model": "$BOARD_PRODUCT_NAME",
+ "PartNumber": "$BOARD_PART_NUMBER",
+ "SerialNumber": "$BOARD_SERIAL_NUMBER"
+ }
+ },
+ {
+ "Exposes": [
+ {
+ "Address": "$address",
+ "Bus": "$bus",
+ "Name": "SOLUM CO IS162F22 PSU FRU",
+ "Type": "EEPROM"
+ },
+ {
+ "Class": "fan",
+ "FFGainCoefficient": 0.01,
+ "FFOffCoefficient": 0.0,
+ "ICoefficient": 0.0,
+ "ILimitMax": 0.0,
+ "ILimitMin": 0.0,
+ "Inputs": [
+ "PSU1 Fan Speed 1"
+ ],
+ "Name": "PSU1 Fan 1",
+ "NegativeHysteresis": 2.0,
+ "OutLimitMax": 100.0,
+ "OutLimitMin": 30.0,
+ "Outputs": [
+ "Pwm PSU1 Fan 1"
+ ],
+ "PCoefficient": 0.0,
+ "PositiveHysteresis": 0.0,
+ "SlewNeg": 0.0,
+ "SlewPos": 0.0,
+ "Type": "Pid",
+ "Zones": [
+ "PSU"
+ ]
+ },
+ {
+ "Class": "Floor",
+ "Inputs": [
+ "PSU1 Temperature"
+ ],
+ "Name": "PSU1 LCC",
+ "NegativeHysteresis": 2,
+ "Output": [
+ 40.0,
+ 100.0
+ ],
+ "PositiveHysteresis": 0,
+ "Reading": [
+ 30.0,
+ 65.0
+ ],
+ "Type": "Stepwise",
+ "Zones": [
+ "PSU"
+ ]
},
{
"Address": "0x58",
"Bus": "$bus",
- "Index": 1,
- "Name": "PS 2 Fan 2",
- "Type": "I2CFan"
- },
- {
- "Address": "0x58",
- "Bus": "$bus",
- "Name": "SOLUM CO IS162F22 PSU Device",
+ "Name": "PSU1",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 2149.5
+ },
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 1951.6
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 122
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 100
+ },
+ {
+ "Direction": "greater than",
+ "Label": "temp1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 78
+ },
+ {
+ "Direction": "greater than",
+ "Label": "temp1",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 73
+ }
+ ],
"Type": "pmbus"
}
],