meta: add bletchley15 configurations
Add bletchley15 config:
1. MAC address used to set board custom field3 at bletchley v1 while
MAC address used to set chassis custom field2 at bletchley v1.5.
If bletchley v1.5 BMC still get MAC address from board custom field3,
BMC can not get MAC address from FRU.
2. bletchley15 has 4 slots while bletchley has 6 slots
Change-Id: I3c145eb201e3379cb8a46026fcb35137bd97a47f
Signed-off-by: Eric Chiang <eric.chiang@quantatw.com>
diff --git a/configurations/meson.build b/configurations/meson.build
index 5e24520..17f625e 100644
--- a/configurations/meson.build
+++ b/configurations/meson.build
@@ -59,6 +59,8 @@
'intel_front_panel.json',
'kudo_bmc.json',
'kudo_motherboard.json',
+ 'meta/bletchley15_baseboard.json',
+ 'meta/bletchley15_chassis.json',
'meta/bletchley_baseboard.json',
'meta/bletchley_chassis.json',
'meta/bletchley_frontpanel.json',
diff --git a/configurations/meta/bletchley15_baseboard.json b/configurations/meta/bletchley15_baseboard.json
new file mode 100644
index 0000000..cdf394c
--- /dev/null
+++ b/configurations/meta/bletchley15_baseboard.json
@@ -0,0 +1,842 @@
+{
+ "Exposes": [
+ {
+ "Index": 0,
+ "Name": "P12V_AUX",
+ "ScaleFactor": 0.11236,
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 12.61
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 11.39
+ }
+ ],
+ "Type": "ADC"
+ },
+ {
+ "Index": 1,
+ "Name": "P3V3_AUX",
+ "ScaleFactor": 0.410678,
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 3.475
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 3.125
+ }
+ ],
+ "Type": "ADC"
+ },
+ {
+ "Index": 2,
+ "Name": "P5V_AUX",
+ "ScaleFactor": 0.271739,
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 5.26
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 4.7
+ }
+ ],
+ "Type": "ADC"
+ },
+ {
+ "BridgeGpio": [
+ {
+ "Name": "BAT_DETECT",
+ "Polarity": "High",
+ "SetupTime": 1
+ }
+ ],
+ "Index": 3,
+ "Name": "P3V_BAT",
+ "PollRate": 86400,
+ "ScaleFactor": 0.332226,
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 3.475
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 1.99
+ }
+ ],
+ "Type": "ADC"
+ },
+ {
+ "Index": 4,
+ "Name": "P2V5_AUX",
+ "ScaleFactor": 0.542005,
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 2.76
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 2.365
+ }
+ ],
+ "Type": "ADC"
+ },
+ {
+ "Index": 5,
+ "Name": "P1V8_AUX",
+ "ScaleFactor": 0.750469,
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 1.9
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 1.7
+ }
+ ],
+ "Type": "ADC"
+ },
+ {
+ "Index": 6,
+ "Name": "P1V2_AUX",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 1.27
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 1.13
+ }
+ ],
+ "Type": "ADC"
+ },
+ {
+ "Index": 7,
+ "Name": "P1V0_AUX",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 1.06
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0.94
+ }
+ ],
+ "Type": "ADC"
+ },
+ {
+ "Index": 8,
+ "Name": "IMON_FAN0",
+ "ScaleFactor": 0.1,
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 15.0
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 10.0
+ }
+ ],
+ "Type": "ADC"
+ },
+ {
+ "Index": 9,
+ "Name": "IMON_FAN1",
+ "ScaleFactor": 0.1,
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 15.0
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 10.0
+ }
+ ],
+ "Type": "ADC"
+ },
+ {
+ "Index": 10,
+ "Name": "IMON_FAN2",
+ "ScaleFactor": 0.1,
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 15.0
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 10.0
+ }
+ ],
+ "Type": "ADC"
+ },
+ {
+ "Index": 11,
+ "Name": "IMON_FAN3",
+ "ScaleFactor": 0.1,
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 15.0
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 10.0
+ }
+ ],
+ "Type": "ADC"
+ },
+ {
+ "Index": 12,
+ "Name": "P12V_FAN0",
+ "ScaleFactor": 0.125,
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 13.2
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 13.0
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 10.8
+ }
+ ],
+ "Type": "ADC"
+ },
+ {
+ "Index": 13,
+ "Name": "P12V_FAN1",
+ "ScaleFactor": 0.125,
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 13.2
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 13.0
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 10.8
+ }
+ ],
+ "Type": "ADC"
+ },
+ {
+ "Index": 14,
+ "Name": "P12V_FAN2",
+ "ScaleFactor": 0.125,
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 13.2
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 13.0
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 10.8
+ }
+ ],
+ "Type": "ADC"
+ },
+ {
+ "Index": 15,
+ "Name": "P12V_FAN3",
+ "ScaleFactor": 0.125,
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 13.2
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 13.0
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 10.8
+ }
+ ],
+ "Type": "ADC"
+ },
+ {
+ "Address": "0x11",
+ "Bus": 12,
+ "Labels": [
+ "vin",
+ "vout1",
+ "iout1",
+ "pin"
+ ],
+ "Name": "P12V_AUX_HSC",
+ "Type": "ADM1278"
+ },
+ {
+ "Address": "0x45",
+ "Bus": 0,
+ "Labels": [
+ "in1",
+ "curr1",
+ "power1"
+ ],
+ "Name": "SLED1_INA230",
+ "Type": "INA230"
+ },
+ {
+ "Address": "0x45",
+ "Bus": 1,
+ "Labels": [
+ "in1",
+ "curr1",
+ "power1"
+ ],
+ "Name": "SLED2_INA230",
+ "Type": "INA230"
+ },
+ {
+ "Address": "0x45",
+ "Bus": 3,
+ "Labels": [
+ "in1",
+ "curr1",
+ "power1"
+ ],
+ "Name": "SLED3_INA230",
+ "Type": "INA230"
+ },
+ {
+ "Address": "0x45",
+ "Bus": 4,
+ "Labels": [
+ "in1",
+ "curr1",
+ "power1"
+ ],
+ "Name": "SLED4_INA230",
+ "Type": "INA230"
+ },
+ {
+ "LED": "fan0_fault",
+ "Name": "System Fan Connector 0",
+ "Pwm": 0,
+ "PwmName": "FAN0_PWM",
+ "Status": "disabled",
+ "Tachs": [
+ 0,
+ 1
+ ],
+ "Type": "IntelFanConnector"
+ },
+ {
+ "LED": "fan1_fault",
+ "Name": "System Fan Connector 1",
+ "Pwm": 1,
+ "PwmName": "FAN1_PWM",
+ "Status": "disabled",
+ "Tachs": [
+ 2,
+ 3
+ ],
+ "Type": "IntelFanConnector"
+ },
+ {
+ "LED": "fan2_fault",
+ "Name": "System Fan Connector 2",
+ "Pwm": 2,
+ "PwmName": "FAN2_PWM",
+ "Status": "disabled",
+ "Tachs": [
+ 4,
+ 5
+ ],
+ "Type": "IntelFanConnector"
+ },
+ {
+ "LED": "fan3_fault",
+ "Name": "System Fan Connector 3",
+ "Pwm": 3,
+ "PwmName": "FAN3_PWM",
+ "Status": "disabled",
+ "Tachs": [
+ 6,
+ 7
+ ],
+ "Type": "IntelFanConnector"
+ },
+ {
+ "Address": "0x40",
+ "Bus": 0,
+ "Labels": [
+ "vin",
+ "vout1",
+ "iout1",
+ "pin"
+ ],
+ "Name": "SLED1_HSC",
+ "Type": "MP5023"
+ },
+ {
+ "Address": "0x40",
+ "Bus": 1,
+ "Labels": [
+ "vin",
+ "vout1",
+ "iout1",
+ "pin"
+ ],
+ "Name": "SLED2_HSC",
+ "Type": "MP5023"
+ },
+ {
+ "Address": "0x40",
+ "Bus": 3,
+ "Labels": [
+ "vin",
+ "vout1",
+ "iout1",
+ "pin"
+ ],
+ "Name": "SLED3_HSC",
+ "Type": "MP5023"
+ },
+ {
+ "Address": "0x40",
+ "Bus": 4,
+ "Labels": [
+ "vin",
+ "vout1",
+ "iout1",
+ "pin"
+ ],
+ "Name": "SLED4_HSC",
+ "Type": "MP5023"
+ },
+ {
+ "Address": "0x4C",
+ "Bus": 12,
+ "Name": "MB_U73_THERM_LOCAL",
+ "Name1": "MB_U73_THERM_REMOTE",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Index": 1,
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 50.0
+ },
+ {
+ "Direction": "greater than",
+ "Index": 1,
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 49.0
+ },
+ {
+ "Direction": "less than",
+ "Index": 1,
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 1
+ },
+ {
+ "Direction": "less than",
+ "Index": 1,
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0
+ },
+ {
+ "Direction": "greater than",
+ "Index": 2,
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 50.0
+ },
+ {
+ "Direction": "greater than",
+ "Index": 2,
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 49.0
+ },
+ {
+ "Direction": "less than",
+ "Index": 2,
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 1
+ },
+ {
+ "Direction": "less than",
+ "Index": 2,
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0
+ }
+ ],
+ "Type": "TMP421"
+ },
+ {
+ "Address": "0x4D",
+ "Bus": 12,
+ "Name": "MB_U72_THERM_LOCAL",
+ "Name1": "MB_U72_THERM_REMOTE",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Index": 1,
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 50.0
+ },
+ {
+ "Direction": "greater than",
+ "Index": 1,
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 49.0
+ },
+ {
+ "Direction": "less than",
+ "Index": 1,
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 1
+ },
+ {
+ "Direction": "less than",
+ "Index": 1,
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0
+ },
+ {
+ "Direction": "greater than",
+ "Index": 2,
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 50.0
+ },
+ {
+ "Direction": "greater than",
+ "Index": 2,
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 49.0
+ },
+ {
+ "Direction": "less than",
+ "Index": 2,
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 1
+ },
+ {
+ "Direction": "less than",
+ "Index": 2,
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0
+ }
+ ],
+ "Type": "TMP421"
+ },
+ {
+ "Address": "0x4F",
+ "Bus": 9,
+ "Name": "MB_U402_THERM_LOCAL",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 55.0
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 54.0
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 1
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0
+ }
+ ],
+ "Type": "TMP421"
+ },
+ {
+ "Address": "0x4F",
+ "Bus": 10,
+ "Name": "MB_U19_THERM_LOCAL",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 49.0
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 48.0
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 1
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0
+ }
+ ],
+ "Type": "TMP421"
+ },
+ {
+ "Address": "0x4F",
+ "Bus": 0,
+ "Name": "SLED1_THERM_LOCAL",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 54.0
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 53.0
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 1
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0
+ }
+ ],
+ "Type": "TMP421"
+ },
+ {
+ "Address": "0x4F",
+ "Bus": 1,
+ "Name": "SLED2_THERM_LOCAL",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 54.0
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 53.0
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 1
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0
+ }
+ ],
+ "Type": "TMP421"
+ },
+ {
+ "Address": "0x4F",
+ "Bus": 3,
+ "Name": "SLED3_THERM_LOCAL",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 54.0
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 53.0
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 1
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0
+ }
+ ],
+ "Type": "TMP421"
+ },
+ {
+ "Address": "0x4F",
+ "Bus": 4,
+ "Name": "SLED4_THERM_LOCAL",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 54.0
+ },
+ {
+ "Direction": "greater than",
+ "Name": "upper non critical",
+ "Severity": 0,
+ "Value": 53.0
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower non critical",
+ "Severity": 0,
+ "Value": 1
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0
+ }
+ ],
+ "Type": "TMP421"
+ }
+ ],
+ "Name": "Bletchley15 Baseboard",
+ "Probe": [
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Bletchley v1.5 Chassis Controller.*', 'BOARD_MANUFACTURER': 'Quanta'})"
+ ],
+ "Type": "Board",
+ "xyz.openbmc_project.Inventory.Decorator.Asset": {
+ "Manufacturer": "$PRODUCT_MANUFACTURER",
+ "Model": "$PRODUCT_PRODUCT_NAME",
+ "PartNumber": "$PRODUCT_PART_NUMBER",
+ "SerialNumber": "$PRODUCT_SERIAL_NUMBER"
+ },
+ "xyz.openbmc_project.Inventory.Item.NetworkInterface": {
+ "MACAddress": "$CHASSIS_INFO_AM2"
+ }
+}
diff --git a/configurations/meta/bletchley15_chassis.json b/configurations/meta/bletchley15_chassis.json
new file mode 100644
index 0000000..c475656
--- /dev/null
+++ b/configurations/meta/bletchley15_chassis.json
@@ -0,0 +1,376 @@
+{
+ "Exposes": [
+ {
+ "BindConnector": "System Fan Connector 0",
+ "Index": 0,
+ "Name": "FAN0_TACH_IL",
+ "PowerState": "Always",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 7920
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 700
+ }
+ ],
+ "Type": "AspeedFan"
+ },
+ {
+ "BindConnector": "System Fan Connector 0",
+ "Index": 1,
+ "Name": "FAN0_TACH_OL",
+ "PowerState": "Always",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 7920
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 700
+ }
+ ],
+ "Type": "AspeedFan"
+ },
+ {
+ "BindConnector": "System Fan Connector 1",
+ "Index": 2,
+ "Name": "FAN1_TACH_IL",
+ "PowerState": "Always",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 7920
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 700
+ }
+ ],
+ "Type": "AspeedFan"
+ },
+ {
+ "BindConnector": "System Fan Connector 1",
+ "Index": 3,
+ "Name": "FAN1_TACH_OL",
+ "PowerState": "Always",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 7920
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 700
+ }
+ ],
+ "Type": "AspeedFan"
+ },
+ {
+ "BindConnector": "System Fan Connector 2",
+ "Index": 4,
+ "Name": "FAN2_TACH_IL",
+ "PowerState": "Always",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 7920
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 700
+ }
+ ],
+ "Type": "AspeedFan"
+ },
+ {
+ "BindConnector": "System Fan Connector 2",
+ "Index": 5,
+ "Name": "FAN2_TACH_OL",
+ "PowerState": "Always",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 7920
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 700
+ }
+ ],
+ "Type": "AspeedFan"
+ },
+ {
+ "BindConnector": "System Fan Connector 3",
+ "Index": 6,
+ "Name": "FAN3_TACH_IL",
+ "PowerState": "Always",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 7920
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 700
+ }
+ ],
+ "Type": "AspeedFan"
+ },
+ {
+ "BindConnector": "System Fan Connector 3",
+ "Index": 7,
+ "Name": "FAN3_TACH_OL",
+ "PowerState": "Always",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 7920
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 700
+ }
+ ],
+ "Type": "AspeedFan"
+ },
+ {
+ "Class": "fan",
+ "FFGainCoefficient": 1.0,
+ "FFOffCoefficient": 0.0,
+ "ICoefficient": 0.0,
+ "ILimitMax": 0.0,
+ "ILimitMin": 0.0,
+ "Inputs": [
+ "FAN0_TACH_IL",
+ "FAN0_TACH_OL",
+ "FAN1_TACH_IL",
+ "FAN1_TACH_OL",
+ "FAN2_TACH_IL",
+ "FAN2_TACH_OL",
+ "FAN3_TACH_IL",
+ "FAN3_TACH_OL"
+ ],
+ "Name": "FAN_TACH",
+ "NegativeHysteresis": 0.0,
+ "OutLimitMax": 100.0,
+ "OutLimitMin": 0.0,
+ "Outputs": [
+ "FAN0_PWM",
+ "FAN0_PWM",
+ "FAN1_PWM",
+ "FAN1_PWM",
+ "FAN2_PWM",
+ "FAN2_PWM",
+ "FAN3_PWM",
+ "FAN3_PWM"
+ ],
+ "PCoefficient": 0.0,
+ "PositiveHysteresis": 0.0,
+ "SlewNeg": 0.0,
+ "SlewPos": 0.0,
+ "Type": "Pid",
+ "Zones": [
+ "Zone0"
+ ]
+ },
+ {
+ "FailSafePercent": 60,
+ "MinThermalOutput": 15,
+ "Name": "Zone0",
+ "Type": "Pid.Zone"
+ },
+ {
+ "Class": "temp",
+ "Inputs": [
+ "Virtual_Inlet_Temp"
+ ],
+ "Name": "inlet_temp",
+ "NegativeHysteresis": 0,
+ "Output": [
+ 27.0,
+ 30.0,
+ 34.0,
+ 37.0,
+ 40.0,
+ 44.0,
+ 45.0,
+ 46.0,
+ 47.0,
+ 48.0,
+ 49.0,
+ 50.0,
+ 50.0,
+ 53.0,
+ 55.0,
+ 60.0,
+ 80.0
+ ],
+ "PositiveHysteresis": 0,
+ "Reading": [
+ 15.0,
+ 20.0,
+ 22.0,
+ 24.0,
+ 26.0,
+ 28.0,
+ 30.0,
+ 31.0,
+ 32.0,
+ 33.0,
+ 34.0,
+ 35.0,
+ 36.0,
+ 37.0,
+ 38.0,
+ 39.0,
+ 40.0
+ ],
+ "Type": "Stepwise",
+ "Zones": [
+ "Zone0"
+ ]
+ },
+ {
+ "Class": "temp",
+ "Inputs": [
+ "MB_U402_THERM_LOCAL"
+ ],
+ "Name": "switch_temp",
+ "NegativeHysteresis": 0,
+ "Output": [
+ 0.0,
+ 15.0,
+ 20.0,
+ 25.0,
+ 40.0
+ ],
+ "PositiveHysteresis": 0,
+ "Reading": [
+ 48.0,
+ 49.0,
+ 50.0,
+ 51.0,
+ 52.0
+ ],
+ "Type": "Stepwise",
+ "Zones": [
+ "Zone0"
+ ]
+ },
+ {
+ "Class": "temp",
+ "Inputs": [
+ "MB_U19_THERM_LOCAL"
+ ],
+ "Name": "retimer_temp",
+ "NegativeHysteresis": 0,
+ "Output": [
+ 0.0,
+ 20.0,
+ 40.0,
+ 42.0,
+ 44.0,
+ 46.0,
+ 48.0,
+ 50.0,
+ 80.0
+ ],
+ "PositiveHysteresis": 0,
+ "Reading": [
+ 35.0,
+ 40.0,
+ 43.0,
+ 44.0,
+ 45.0,
+ 46.0,
+ 47.0,
+ 48.0,
+ 49.0
+ ],
+ "Type": "Stepwise",
+ "Zones": [
+ "Zone0"
+ ]
+ },
+ {
+ "Class": "temp",
+ "Inputs": [
+ "SLED1_THERM_LOCAL",
+ "SLED2_THERM_LOCAL",
+ "SLED3_THERM_LOCAL",
+ "SLED4_THERM_LOCAL"
+ ],
+ "Name": "sled_thermal_local",
+ "NegativeHysteresis": 0,
+ "Output": [
+ 0.0,
+ 20.0,
+ 20.0,
+ 45.0,
+ 46.0,
+ 47.0,
+ 50.0
+ ],
+ "PositiveHysteresis": 0,
+ "Reading": [
+ 29.0,
+ 30.0,
+ 35.0,
+ 47.0,
+ 48.0,
+ 49.0,
+ 50.0
+ ],
+ "Type": "Stepwise",
+ "Zones": [
+ "Zone0"
+ ]
+ }
+ ],
+ "Name": "Bletchley15 Chassis",
+ "Probe": [
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Bletchley v1.5 Chassis Controller.*', 'BOARD_MANUFACTURER': 'Quanta'})"
+ ],
+ "Type": "Chassis",
+ "xyz.openbmc_project.Inventory.Decorator.Asset": {
+ "Manufacturer": "$BOARD_MANUFACTURER",
+ "Model": "$BOARD_PRODUCT_NAME",
+ "PartNumber": "$CHASSIS_PART_NUMBER",
+ "SerialNumber": "$CHASSIS_SERIAL_NUMBER"
+ }
+}
diff --git a/configurations/meta/bletchley_baseboard.json b/configurations/meta/bletchley_baseboard.json
index bdca582..cdfe8f6 100644
--- a/configurations/meta/bletchley_baseboard.json
+++ b/configurations/meta/bletchley_baseboard.json
@@ -947,5 +947,8 @@
"Model": "$PRODUCT_PRODUCT_NAME",
"PartNumber": "$PRODUCT_PART_NUMBER",
"SerialNumber": "$PRODUCT_SERIAL_NUMBER"
+ },
+ "xyz.openbmc_project.Inventory.Item.NetworkInterface": {
+ "MACAddress": "$BOARD_INFO_AM3"
}
}
diff --git a/configurations/meta/bletchley_frontpanel.json b/configurations/meta/bletchley_frontpanel.json
index a6c7f34..40bea39 100644
--- a/configurations/meta/bletchley_frontpanel.json
+++ b/configurations/meta/bletchley_frontpanel.json
@@ -41,8 +41,6 @@
],
"Name": "Bletchley Front Panel Board",
"Probe": [
- "FOUND('Bletchley Baseboard')",
- "AND",
"xyz.openbmc_project.Inventory.Decorator.Asset({'Model': 'Bletchley_FPB_HDC1080'})"
],
"Type": "Board"
@@ -89,8 +87,6 @@
],
"Name": "Bletchley Front Panel Board",
"Probe": [
- "FOUND('Bletchley Baseboard')",
- "AND",
"xyz.openbmc_project.Inventory.Decorator.Asset({'Model': 'Bletchley_FPB_SI7021'})"
],
"Type": "Board"