configurations: catalina_hdd: Add support for 2nd source board
This commit introduces configuration support for the Catalina HDD 2nd
source board, which utilizes the ISL28022 ADC sensor for monitoring.
For newly built boards, use the `BOARD_INFO_AM4` field to determine the
ADC chip type. For older boards that lack `BOARD_INFO_AM4`, use
`BOARD_PART_NUMBER` to determine the chip type.
- Main source board:
- ADC Chip: INA230
- BOARD_PART_NUMBER: 3FF0NHB0010, 3FF0NHB0030
- BOARD_INFO_AM4: adc-ina
- 2nd source board:
- ADC Chip: ISL28022
- BOARD_PART_NUMBER: 3FF0NHB0020
- BOARD_INFO_AM4: adc-isl
Signed-off-by: Potin Lai <potin.lai@quantatw.com>
Change-Id: Icd7094eb11eaee17dc38e5b8b6c3f0032f08846c
diff --git a/configurations/meson.build b/configurations/meson.build
index 33e78da..49ed86e 100644
--- a/configurations/meson.build
+++ b/configurations/meson.build
@@ -62,7 +62,8 @@
'meta/bletchley_frontpanel.json',
'meta/bmc_storage_module.json',
'meta/catalina_fio.json',
- 'meta/catalina_hdd.json',
+ 'meta/catalina_hdd_adc_ina.json',
+ 'meta/catalina_hdd_adc_isl.json',
'meta/catalina_hdd_nvme.json',
'meta/catalina_osfp.json',
'meta/catalina_pdb_hsc_ltc_fsc_max_vr_delta_gndsen_ina_p12vsen_ina_p12vfan_mps.json',
diff --git a/configurations/meta/catalina_hdd.json b/configurations/meta/catalina_hdd_adc_ina.json
similarity index 82%
rename from configurations/meta/catalina_hdd.json
rename to configurations/meta/catalina_hdd_adc_ina.json
index 84512d0..c16bbab 100644
--- a/configurations/meta/catalina_hdd.json
+++ b/configurations/meta/catalina_hdd_adc_ina.json
@@ -36,8 +36,10 @@
],
"Type": "INA230",
"curr1_Name": "HDDBOARD_SSD0_P12V_CURR_A",
+ "curr1_Scale": 200,
"in1_Name": "HDDBOARD_SSD0_P12V_VOLT_V",
- "power1_Name": "HDDBOARD_SSD0_P12V_PWR_W"
+ "power1_Name": "HDDBOARD_SSD0_P12V_PWR_W",
+ "power1_Scale": 200000
},
{
"Address": "0x44",
@@ -69,13 +71,19 @@
],
"Type": "INA230",
"curr1_Name": "HDDBOARD_SSD2_P12V_CURR_A",
+ "curr1_Scale": 200,
"in1_Name": "HDDBOARD_SSD2_P12V_VOLT_V",
- "power1_Name": "HDDBOARD_SSD2_P12V_PWR_W"
+ "power1_Name": "HDDBOARD_SSD2_P12V_PWR_W",
+ "power1_Scale": 200000
}
],
/* Catalina Hard Disk Drive Carrier Board */
"Name": "Catalina HDD Carrier",
- "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Catalina HDD ', 'BOARD_MANUFACTURER': 'Quanta'})",
+ "Probe": [
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Catalina HDD ', 'BOARD_MANUFACTURER': 'Quanta', 'BOARD_PART_NUMBER': '3FF0NHB00[13]0'})",
+ "OR",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Catalina HDD ', 'BOARD_MANUFACTURER': 'Quanta', 'BOARD_INFO_AM4': 'adc-ina'})"
+ ],
"Type": "Board",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"BuildDate": "$BOARD_MANUFACTURE_DATE",
diff --git a/configurations/meta/catalina_hdd.json b/configurations/meta/catalina_hdd_adc_isl.json
similarity index 72%
copy from configurations/meta/catalina_hdd.json
copy to configurations/meta/catalina_hdd_adc_isl.json
index 84512d0..6590dc5 100644
--- a/configurations/meta/catalina_hdd.json
+++ b/configurations/meta/catalina_hdd_adc_isl.json
@@ -10,7 +10,7 @@
"Address": "0x40",
"Bus": 55,
"Labels": [
- "in1",
+ "in0",
"curr1",
"power1"
],
@@ -20,7 +20,7 @@
{
"Direction": "greater than",
"Hysteresis": 0.272,
- "Label": "in1",
+ "Label": "in0",
"Name": "upper critical",
"Severity": 1,
"Value": 13.6
@@ -28,22 +28,24 @@
{
"Direction": "less than",
"Hysteresis": 0.21,
- "Label": "in1",
+ "Label": "in0",
"Name": "lower critical",
"Severity": 1,
"Value": 10.5
}
],
- "Type": "INA230",
+ "Type": "ISL28022",
"curr1_Name": "HDDBOARD_SSD0_P12V_CURR_A",
- "in1_Name": "HDDBOARD_SSD0_P12V_VOLT_V",
- "power1_Name": "HDDBOARD_SSD0_P12V_PWR_W"
+ "curr1_Scale": 200,
+ "in0_Name": "HDDBOARD_SSD0_P12V_VOLT_V",
+ "power1_Name": "HDDBOARD_SSD0_P12V_PWR_W",
+ "power1_Scale": 200000
},
{
"Address": "0x44",
"Bus": 55,
"Labels": [
- "in1",
+ "in0",
"curr1",
"power1"
],
@@ -53,7 +55,7 @@
{
"Direction": "greater than",
"Hysteresis": 0.272,
- "Label": "in1",
+ "Label": "in0",
"Name": "upper critical",
"Severity": 1,
"Value": 13.6
@@ -61,21 +63,27 @@
{
"Direction": "less than",
"Hysteresis": 0.21,
- "Label": "in1",
+ "Label": "in0",
"Name": "lower critical",
"Severity": 1,
"Value": 10.5
}
],
- "Type": "INA230",
+ "Type": "ISL28022",
"curr1_Name": "HDDBOARD_SSD2_P12V_CURR_A",
- "in1_Name": "HDDBOARD_SSD2_P12V_VOLT_V",
- "power1_Name": "HDDBOARD_SSD2_P12V_PWR_W"
+ "curr1_Scale": 200,
+ "in0_Name": "HDDBOARD_SSD2_P12V_VOLT_V",
+ "power1_Name": "HDDBOARD_SSD2_P12V_PWR_W",
+ "power1_Scale": 200000
}
],
/* Catalina Hard Disk Drive Carrier Board */
"Name": "Catalina HDD Carrier",
- "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Catalina HDD ', 'BOARD_MANUFACTURER': 'Quanta'})",
+ "Probe": [
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Catalina HDD ', 'BOARD_MANUFACTURER': 'Quanta', 'BOARD_PART_NUMBER': '3FF0NHB0020'})",
+ "OR",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Catalina HDD ', 'BOARD_MANUFACTURER': 'Quanta', 'BOARD_INFO_AM4': 'adc-isl'})"
+ ],
"Type": "Board",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"BuildDate": "$BOARD_MANUFACTURE_DATE",