Change PSU json to support more PSU Sensor
Change 750W, 1100W, 1300W PSU json file to support PSU power input
current output and temperature sensors.
Tested By:
New property Name and Threshold properties pin, iout1, temp1 show
correctly in entity-manager dbus interface on 750W, 1100W and 1300W
PSU.
Change-Id: I1e1e37bfd0e3ba27949bcc528ef2a44b0ffc32df
Signed-off-by: Cheng C Yang <cheng.c.yang@linux.intel.com>
diff --git a/configurations/Delta DPS-750XB PSU.json b/configurations/Delta DPS-750XB PSU.json
index 390b772..76b8194 100644
--- a/configurations/Delta DPS-750XB PSU.json
+++ b/configurations/Delta DPS-750XB PSU.json
@@ -2,9 +2,122 @@
{
"Exposes": [
{
+ "Address": "0x5a",
+ "Bus": "$bus",
+ "Name": "PSU3",
+ "Thresholds" : [
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 954.5
+ },
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 900
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 112
+ },
+ {
+ "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": 62
+ }
+ ],
+ "Type": "pmbus"
+ },
+ {
+ "Address": "$address",
+ "Bus": "$bus",
+ "Name": "Delta DPS-750XB PSU FRU",
+ "Type": "EEPROM"
+ }
+ ],
+ "Name": "Delta DPS-750XB PSU 3",
+ "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'DPS-750XB A', 'ADDRESS': 82})",
+ "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": "0x59",
"Bus": "$bus",
- "Name": "Delta DPS-750XB PSU Device",
+ "Name": "PSU2",
+ "Thresholds" : [
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 954.5
+ },
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 900
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 112
+ },
+ {
+ "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": 62
+ }
+ ],
"Type": "pmbus"
},
{
@@ -29,7 +142,51 @@
{
"Address": "0x58",
"Bus": "$bus",
- "Name": "Delta DPS-750XB PSU Device",
+ "Name": "PSU1",
+ "Thresholds" : [
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 954.5
+ },
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 900
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 112
+ },
+ {
+ "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": 62
+ }
+ ],
"Type": "pmbus"
},
{
@@ -49,4 +206,4 @@
"SerialNumber": "$BOARD_SERIAL_NUMBER"
}
}
-]
\ No newline at end of file
+]
diff --git a/configurations/Flextronics S-1100ADU00-201 PSU.json b/configurations/Flextronics S-1100ADU00-201 PSU.json
index d62e59a..9a14520 100644
--- a/configurations/Flextronics S-1100ADU00-201 PSU.json
+++ b/configurations/Flextronics S-1100ADU00-201 PSU.json
@@ -2,6 +2,75 @@
{
"Exposes": [
{
+ "Address": "0x5a",
+ "Bus": "$bus",
+ "Name": "PSU3",
+ "Thresholds" : [
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 1516.5
+ },
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 1364.8
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 125
+ },
+ {
+ "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": 62
+ }
+ ],
+ "Type": "pmbus"
+ },
+ {
+ "Address": "$address",
+ "Bus": "$bus",
+ "Name": "Flextronics S-1100ADU00-201 PSU FRU",
+ "Type": "EEPROM"
+ }
+ ],
+ "Name": "Flextronics S-1100ADU00-201 PSU 3",
+ "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'S-1100ADU00-201', 'ADDRESS': 82})",
+ "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": "0x59",
"Bus": "$bus",
"Name": "PSU2",
@@ -11,14 +80,42 @@
"Label": "pin",
"Name": "upper critical",
"Severity": 1,
- "Value": 2149
+ "Value": 1516.5
},
{
"Direction": "greater than",
"Label": "pin",
"Name": "upper non critical",
"Severity": 0,
- "Value": 1951
+ "Value": 1364.8
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 125
+ },
+ {
+ "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": 62
}
],
"Type": "pmbus"
@@ -52,14 +149,42 @@
"Label": "pin",
"Name": "upper critical",
"Severity": 1,
- "Value": 2149
+ "Value": 1516.5
},
{
"Direction": "greater than",
"Label": "pin",
"Name": "upper non critical",
"Severity": 0,
- "Value": 1951
+ "Value": 1364.8
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 125
+ },
+ {
+ "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": 62
}
],
"Type": "pmbus"
diff --git a/configurations/PSSF132202A.json b/configurations/PSSF132202A.json
index 067894d..4471887 100644
--- a/configurations/PSSF132202A.json
+++ b/configurations/PSSF132202A.json
@@ -2,9 +2,123 @@
{
"Exposes": [
{
+ "Address": "0x5a",
+ "Bus": "$bus",
+ "Name": "PSU3",
+ "Thresholds" : [
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 1648.4
+ },
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 1536.3
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 115
+ },
+ {
+ "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": 62
+ }
+ ],
+ "Type": "pmbus"
+ },
+ {
+ "Address": "$address",
+ "Bus": "$bus",
+ "Name": "Solum 1300W PSU 3 FRU",
+ "Type": "EEPROM"
+ }
+ ],
+ "Name": "Solum 1300W PSU 3",
+ "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'PSSF132202A', '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": "0x59",
"Bus": "$bus",
- "Name": "Solum 1300W PSU 2 Device",
+ "Name": "PSU2",
+ "Thresholds" : [
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 1648.4
+ },
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 1536.3
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 115
+ },
+ {
+ "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": 62
+ }
+ ],
"Type": "pmbus"
},
{
@@ -29,7 +143,51 @@
{
"Address": "0x58",
"Bus": "$bus",
- "Name": "Solum 1300W PSU 1 Device",
+ "Name": "PSU1",
+ "Thresholds" : [
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 1648.4
+ },
+ {
+ "Direction": "greater than",
+ "Label": "pin",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 1536.3
+ },
+ {
+ "Direction": "greater than",
+ "Label": "iout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 115
+ },
+ {
+ "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": 62
+ }
+ ],
"Type": "pmbus"
},
{
@@ -49,4 +207,4 @@
"SerialNumber": "$PRODUCT_SERIAL_NUMBER"
}
}
-]
\ No newline at end of file
+]