configuration: ventura: support 2nd source board
There are two sources of RMC/Fan board on the ventura platform. To
distinguish between them, the FRU field (Board Custom Data 4) is used to
apply the appropriate configuration.
Addtionallyy, the old name of "ventura_rmc" and "ventura_fanboard" have
been change to the name which is follow the naming conventions used in
Catalina.
Change-Id: I94ecbb2ba9599faee31dab7ebede81156e69e458
Signed-off-by: Yang Chen <yang.chen@quantatw.com>
diff --git a/configurations/meson.build b/configurations/meson.build
index ad6be56..f673bd6 100644
--- a/configurations/meson.build
+++ b/configurations/meson.build
@@ -92,10 +92,12 @@
'meta/minerva_sitv.json',
'meta/terminus_2x100g_nic_tsff.json',
'meta/twinlake.json',
- 'meta/ventura_fanboard.json',
+ 'meta/ventura_fanboard_adc_max.json',
+ 'meta/ventura_fanboard_adc_tic.json',
'meta/ventura_ioboard.json',
'meta/ventura_ledboard.json',
- 'meta/ventura_rmc.json',
+ 'meta/ventura_rmc_hsc_ltc_fsc_max_p24vsen_ina_gndsen_ina_p12vbrick_delta.json',
+ 'meta/ventura_rmc_hsc_xdp_fsc_nct_p24vsen_isl_gndsen_isl_p12vbrick_flex.json',
'meta/ventura_scm.json',
'meta/yosemite4.json',
'meta/yosemite4_chassis.json',
diff --git a/configurations/meta/ventura_fanboard.json b/configurations/meta/ventura_fanboard_adc_max.json
similarity index 91%
copy from configurations/meta/ventura_fanboard.json
copy to configurations/meta/ventura_fanboard_adc_max.json
index 1e8ccad..ad97d94 100644
--- a/configurations/meta/ventura_fanboard.json
+++ b/configurations/meta/ventura_fanboard_adc_max.json
@@ -2,57 +2,7 @@
{
"Exposes": [
{
- "Address": "0x1f",
- "Bus": "$bus",
- "Labels": [
- "in0",
- "in1",
- "in2",
- "in3"
- ],
- "Name": "FAN_ADC",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Label": "in0",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 13.6
- },
- {
- "Direction": "less than",
- "Label": "in0",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 10.5
- },
- {
- "Direction": "greater than",
- "Label": "in2",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 13.6
- },
- {
- "Direction": "less than",
- "Label": "in2",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 10.5
- }
- ],
- "Type": "ADC128D818",
- "in0_Name": "FCB_0_FAN_0_VOLT_V",
- "in0_Scale": 166.667,
- "in1_Name": "FCB_0_FAN_0_CURR_A",
- "in1_Scale": 464,
- "in2_Name": "FCB_0_FAN_1_VOLT_V",
- "in2_Scale": 166.667,
- "in3_Name": "FCB_0_FAN_1_CURR_A",
- "in3_Scale": 464
- },
- {
- "Address": "0x20",
+ "Address": "0x23",
"Bus": "18",
"Connector": {
"Name": "FCB_0_FAN0_TACH_OL",
@@ -82,7 +32,7 @@
"Type": "I2CFan"
},
{
- "Address": "0x20",
+ "Address": "0x23",
"Bus": "18",
"Connector": {
"Name": "FCB_0_FAN0_TACH_IL",
@@ -112,7 +62,7 @@
"Type": "I2CFan"
},
{
- "Address": "0x20",
+ "Address": "0x23",
"Bus": "18",
"Connector": {
"Name": "FCB_0_FAN1_TACH_OL",
@@ -142,7 +92,7 @@
"Type": "I2CFan"
},
{
- "Address": "0x20",
+ "Address": "0x23",
"Bus": "18",
"Connector": {
"Name": "FCB_0_FAN1_TACH_IL",
@@ -170,30 +120,9 @@
}
],
"Type": "I2CFan"
- }
- ],
- "Name": "Ventura Fan Board 0",
- "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Ventura FAN Board', 'BUS': 16})",
- "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"
- },
- "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
- "AssetTag": "$PRODUCT_ASSET_TAG"
- },
- "xyz.openbmc_project.Inventory.Decorator.Revision": {
- "Version": "$PRODUCT_VERSION"
- }
- },
- {
- "Exposes": [
+ },
{
- "Address": "0x1f",
+ "Address": "0x35",
"Bus": "$bus",
"Labels": [
"in0",
@@ -232,18 +161,45 @@
"Value": 10.5
}
],
- "Type": "ADC128D818",
- "in0_Name": "FCB_1_FAN_2_VOLT_V",
- "in0_Scale": 166.667,
- "in1_Name": "FCB_1_FAN_2_CURR_A",
+ "Type": "MAX11617",
+ "in0_Max": 18,
+ "in0_Name": "FCB_0_FAN_0_VOLT_V",
+ "in0_Scale": 133.262,
+ "in1_Name": "FCB_0_FAN_0_CURR_A",
"in1_Scale": 464,
- "in2_Name": "FCB_1_FAN_3_VOLT_V",
- "in2_Scale": 166.667,
- "in3_Name": "FCB_1_FAN_3_CURR_A",
+ "in2_Max": 18,
+ "in2_Name": "FCB_0_FAN_1_VOLT_V",
+ "in2_Scale": 133.262,
+ "in3_Name": "FCB_0_FAN_1_CURR_A",
"in3_Scale": 464
- },
+ }
+ ],
+ "Name": "Ventura Fan Board 0",
+ "Probe": [
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Ventura FAN Board', 'BUS': 16})",
+ "AND",
+ "xyz.openbmc_project.FruDevice({'BOARD_INFO_AM4': 'adc-max'})"
+ ],
+ "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"
+ },
+ "xyz.openbmc_project.Inventory.Decorator.AssetTag": {
+ "AssetTag": "$PRODUCT_ASSET_TAG"
+ },
+ "xyz.openbmc_project.Inventory.Decorator.Revision": {
+ "Version": "$PRODUCT_VERSION"
+ }
+ },
+ {
+ "Exposes": [
{
- "Address": "0x20",
+ "Address": "0x23",
"Bus": "18",
"Connector": {
"Name": "FCB_1_FAN2_TACH_OL",
@@ -273,7 +229,7 @@
"Type": "I2CFan"
},
{
- "Address": "0x20",
+ "Address": "0x23",
"Bus": "18",
"Connector": {
"Name": "FCB_1_FAN2_TACH_IL",
@@ -303,7 +259,7 @@
"Type": "I2CFan"
},
{
- "Address": "0x20",
+ "Address": "0x23",
"Bus": "18",
"Connector": {
"Name": "FCB_1_FAN3_TACH_OL",
@@ -333,7 +289,7 @@
"Type": "I2CFan"
},
{
- "Address": "0x20",
+ "Address": "0x23",
"Bus": "18",
"Connector": {
"Name": "FCB_1_FAN3_TACH_IL",
@@ -361,10 +317,66 @@
}
],
"Type": "I2CFan"
+ },
+ {
+ "Address": "0x35",
+ "Bus": "$bus",
+ "Labels": [
+ "in0",
+ "in1",
+ "in2",
+ "in3"
+ ],
+ "Name": "FAN_ADC",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Label": "in0",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 13.6
+ },
+ {
+ "Direction": "less than",
+ "Label": "in0",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 10.5
+ },
+ {
+ "Direction": "greater than",
+ "Label": "in2",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 13.6
+ },
+ {
+ "Direction": "less than",
+ "Label": "in2",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 10.5
+ }
+ ],
+ "Type": "MAX11617",
+ "in0_Max": 18,
+ "in0_Name": "FCB_1_FAN_2_VOLT_V",
+ "in0_Scale": 133.262,
+ "in1_Name": "FCB_1_FAN_2_CURR_A",
+ "in1_Scale": 464,
+ "in2_Max": 18,
+ "in2_Name": "FCB_1_FAN_3_VOLT_V",
+ "in2_Scale": 133.262,
+ "in3_Name": "FCB_1_FAN_3_CURR_A",
+ "in3_Scale": 464
}
],
"Name": "Ventura Fan Board 1",
- "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Ventura FAN Board', 'BUS': 17})",
+ "Probe": [
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Ventura FAN Board', 'BUS': 17})",
+ "AND",
+ "xyz.openbmc_project.FruDevice({'BOARD_INFO_AM4': 'adc-max'})"
+ ],
"Type": "Board",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"BuildDate": "$BOARD_MANUFACTURE_DATE",
diff --git a/configurations/meta/ventura_fanboard.json b/configurations/meta/ventura_fanboard_adc_tic.json
similarity index 96%
rename from configurations/meta/ventura_fanboard.json
rename to configurations/meta/ventura_fanboard_adc_tic.json
index 1e8ccad..525e095 100644
--- a/configurations/meta/ventura_fanboard.json
+++ b/configurations/meta/ventura_fanboard_adc_tic.json
@@ -173,7 +173,11 @@
}
],
"Name": "Ventura Fan Board 0",
- "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Ventura FAN Board', 'BUS': 16})",
+ "Probe": [
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Ventura FAN Board', 'BUS': 16})",
+ "AND",
+ "xyz.openbmc_project.FruDevice({'BOARD_INFO_AM4': 'adc-tic'})"
+ ],
"Type": "Board",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"BuildDate": "$BOARD_MANUFACTURE_DATE",
@@ -364,7 +368,11 @@
}
],
"Name": "Ventura Fan Board 1",
- "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Ventura FAN Board', 'BUS': 17})",
+ "Probe": [
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Ventura FAN Board', 'BUS': 17})",
+ "AND",
+ "xyz.openbmc_project.FruDevice({'BOARD_INFO_AM4': 'adc-tic'})"
+ ],
"Type": "Board",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"BuildDate": "$BOARD_MANUFACTURE_DATE",
diff --git a/configurations/meta/ventura_rmc.json b/configurations/meta/ventura_rmc_hsc_ltc_fsc_max_p24vsen_ina_gndsen_ina_p12vbrick_delta.json
similarity index 89%
rename from configurations/meta/ventura_rmc.json
rename to configurations/meta/ventura_rmc_hsc_ltc_fsc_max_p24vsen_ina_gndsen_ina_p12vbrick_delta.json
index 4152836..6b1ca80 100644
--- a/configurations/meta/ventura_rmc.json
+++ b/configurations/meta/ventura_rmc_hsc_ltc_fsc_max_p24vsen_ina_gndsen_ina_p12vbrick_delta.json
@@ -34,9 +34,13 @@
],
"Type": "INA230",
"curr1_Name": "RMC_M12_P24V_CURR_A",
+ "curr1_Offset": 0.0008,
+ "curr1_Scale": 99.3147283742,
"in1_Max": 36,
"in1_Name": "RMC_M12_P24V_VOLT_V",
- "power1_Name": "RMC_M12_P24V_PWR_W"
+ "power1_Name": "RMC_M12_P24V_PWR_W",
+ "power1_Offset": 0.0007,
+ "power1_Scale": 298089.247920828
},
{
"Address": "0x45",
@@ -72,9 +76,13 @@
],
"Type": "INA230",
"curr1_Name": "RMC_RJ14_P24V_CURR_A",
+ "curr1_Offset": 0.0006,
+ "curr1_Scale": 98.7459267305,
"in1_Max": 36,
"in1_Name": "RMC_RJ14_P24V_VOLT_V",
- "power1_Name": "RMC_RJ14_P24V_PWR_W"
+ "power1_Name": "RMC_RJ14_P24V_PWR_W",
+ "power1_Offset": 0.0008,
+ "power1_Scale": 98570.724494825
},
{
"Address": "0x41",
@@ -93,7 +101,10 @@
}
],
"Type": "INA238",
- "in0_Name": "RMC_MEDUSA_RETURN_VDROP_V"
+ "in0_Max": 1,
+ "in0_Min": -1,
+ "in0_Name": "RMC_MEDUSA_RETURN_VDROP_V",
+ "in0_Scale": 953.0162965787
},
{
"Address": "0x43",
@@ -112,7 +123,10 @@
}
],
"Type": "INA238",
- "in0_Name": "RMC_MEDUSA_POSITIVE_VDROP_V"
+ "in0_Max": 1,
+ "in0_Min": -1,
+ "in0_Name": "RMC_MEDUSA_POSITIVE_VDROP_V",
+ "in0_Scale": 936.1542782251
},
{
"Address": "0x44",
@@ -259,7 +273,11 @@
}
],
"Name": "Ventura RMC",
- "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Ventura RMC'})",
+ "Probe": [
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Ventura RMC'})",
+ "AND",
+ "xyz.openbmc_project.FruDevice({'BOARD_INFO_AM4': 'hsc-ltc fsc-max p24vsen-ina gndsen-ina p12vbrick-delta'})"
+ ],
"Type": "Board",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"BuildDate": "$BOARD_MANUFACTURE_DATE",
diff --git a/configurations/meta/ventura_rmc.json b/configurations/meta/ventura_rmc_hsc_xdp_fsc_nct_p24vsen_isl_gndsen_isl_p12vbrick_flex.json
similarity index 86%
copy from configurations/meta/ventura_rmc.json
copy to configurations/meta/ventura_rmc_hsc_xdp_fsc_nct_p24vsen_isl_gndsen_isl_p12vbrick_flex.json
index 4152836..682d141 100644
--- a/configurations/meta/ventura_rmc.json
+++ b/configurations/meta/ventura_rmc_hsc_xdp_fsc_nct_p24vsen_isl_gndsen_isl_p12vbrick_flex.json
@@ -4,7 +4,7 @@
"Address": "0x40",
"Bus": 10,
"Labels": [
- "in1",
+ "in0",
"curr1",
"power1"
],
@@ -32,17 +32,20 @@
"Value": 144
}
],
- "Type": "INA230",
+ "Type": "ISL28022",
"curr1_Name": "RMC_M12_P24V_CURR_A",
- "in1_Max": 36,
+ "curr1_Offset": 0.0015,
+ "curr1_Scale": 103.8152089281,
"in1_Name": "RMC_M12_P24V_VOLT_V",
- "power1_Name": "RMC_M12_P24V_PWR_W"
+ "power1_Name": "RMC_M12_P24V_PWR_W",
+ "power1_Offset": 0.0015,
+ "power1_Scale": 105944.829230178
},
{
"Address": "0x45",
"Bus": 10,
"Labels": [
- "in1",
+ "in0",
"curr1",
"power1"
],
@@ -70,17 +73,20 @@
"Value": 105.6
}
],
- "Type": "INA230",
+ "Type": "ISL28022",
"curr1_Name": "RMC_RJ14_P24V_CURR_A",
- "in1_Max": 36,
+ "curr1_Offset": -0.0003,
+ "curr1_Scale": 104.4004802422,
"in1_Name": "RMC_RJ14_P24V_VOLT_V",
- "power1_Name": "RMC_RJ14_P24V_PWR_W"
+ "power1_Name": "RMC_RJ14_P24V_PWR_W",
+ "power1_Offset": -0.0161,
+ "power1_Scale": 106195.160155576
},
{
"Address": "0x41",
"Bus": 10,
"Labels": [
- "in0"
+ "in1"
],
"Name": "RMC_MEDUSA_RETURN",
"Thresholds": [
@@ -92,14 +98,17 @@
"Value": 200
}
],
- "Type": "INA238",
- "in0_Name": "RMC_MEDUSA_RETURN_VDROP_V"
+ "Type": "ISL28022",
+ "in1_Max": 1,
+ "in1_Min": -1,
+ "in1_Name": "RMC_MEDUSA_RETURN_VDROP_V",
+ "in1_Scale": 953.7434430138
},
{
"Address": "0x43",
"Bus": 10,
"Labels": [
- "in0"
+ "in1"
],
"Name": "RMC_MEDUSA_POSITIVE",
"Thresholds": [
@@ -111,11 +120,34 @@
"Value": 200
}
],
- "Type": "INA238",
- "in0_Name": "RMC_MEDUSA_POSITIVE_VDROP_V"
+ "Type": "ISL28022",
+ "in1_Max": 1,
+ "in1_Min": -1,
+ "in1_Name": "RMC_MEDUSA_POSITIVE_VDROP_V",
+ "in1_Scale": 925.2405625463
},
{
- "Address": "0x44",
+ "Address": "0x4f",
+ "Bus": 5,
+ "Name": "RMC_TEMP_C",
+ "Thresholds": [
+ {
+ "Direction": "greater than",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 45
+ },
+ {
+ "Direction": "less than",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0
+ }
+ ],
+ "Type": "TMP75"
+ },
+ {
+ "Address": "0x14",
"Bus": 10,
"Labels": [
"iout1",
@@ -169,40 +201,14 @@
"Value": 580
}
],
- "Type": "LTC4287",
+ "Type": "XDP710",
"iout1_Name": "RMC_HSC_CURR_A",
- "iout1_Offset": -0.16125,
- "iout1_Scale": 3327.366,
"pin_Name": "RMC_HSC_PWR_W",
- "pin_Offset": -0.16125,
- "pin_Scale": 3327366.257,
"temp1_Name": "RMC_HSC_TEMP_C",
- "vin_Max": 76,
"vin_Name": "RMC_HSC_VIN_VOLT_V",
- "vout1_Max": 18,
"vout1_Name": "RMC_HSC_VOUT_VOLT_V"
},
{
- "Address": "0x4f",
- "Bus": 5,
- "Name": "RMC_TEMP_C",
- "Thresholds": [
- {
- "Direction": "greater than",
- "Name": "upper critical",
- "Severity": 1,
- "Value": 45
- },
- {
- "Direction": "less than",
- "Name": "lower critical",
- "Severity": 1,
- "Value": 0
- }
- ],
- "Type": "TMP75"
- },
- {
"Address": "0x69",
"Bus": 10,
"Labels": [
@@ -252,14 +258,16 @@
"Type": "pmbus",
"iout1_Name": "RMC_BRICK_CURR_A",
"temp1_Name": "RMC_BRICK_TEMP_C",
- "vin_Max": 76,
"vin_Name": "RMC_BRICK_INPUT_VOLT_V",
- "vout1_Max": 18,
"vout1_Name": "RMC_BRICK_OUTPUT_VOLT_V"
}
],
"Name": "Ventura RMC",
- "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Ventura RMC'})",
+ "Probe": [
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Ventura RMC'})",
+ "AND",
+ "xyz.openbmc_project.FruDevice({'BOARD_INFO_AM4': 'hsc-xdp fsc-nct p24vsen-isl gndsen-isl p12vbrick-flex'})"
+ ],
"Type": "Board",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"BuildDate": "$BOARD_MANUFACTURE_DATE",