configurations: yosemite5: add RAA and MPS source CXL configuration
Add the initial configuration for RAA and MPS source on CXL board.
This update also renames the original CXL board
configuration file for consistency, ensuring that the EM loads the
correct configuration based on the FRU programmed on the CXL board.
Change-Id: I41dfbe69bd587a4d1305c4544a58eedb7b82f4c0
Signed-off-by: Leo Yang <Leo-Yang@quantatw.com>
diff --git a/configurations/meson.build b/configurations/meson.build
index f3e591c..8835b87 100644
--- a/configurations/meson.build
+++ b/configurations/meson.build
@@ -211,7 +211,8 @@
'meta/yv4/yosemite4_wailuafalls.json',
'meta/yv4/yosemite4n.json',
'meta/yv5/yosemite5_1kw_paddle_board.json',
- 'meta/yv5/yosemite5_cxl_board.json',
+ 'meta/yv5/yosemite5_cxl_board_vr_mps_tchip_stm.json',
+ 'meta/yv5/yosemite5_cxl_board_vr_raa_tchip_tic.json',
'meta/yv5/yosemite5_e1s_expansion_board.json',
'meta/yv5/yosemite5_mb_vr_mps_pvdd18vr_mps_adc_tic_i3chub_rtt.json',
'meta/yv5/yosemite5_mb_vr_rtt_pvdd18vr_mps_adc_tic_i3chub_rtt.json',
diff --git a/configurations/meta/yv5/yosemite5_cxl_board.json b/configurations/meta/yv5/yosemite5_cxl_board_vr_mps_tchip_stm.json
similarity index 88%
rename from configurations/meta/yv5/yosemite5_cxl_board.json
rename to configurations/meta/yv5/yosemite5_cxl_board_vr_mps_tchip_stm.json
index 07c6e65..07db783 100644
--- a/configurations/meta/yv5/yosemite5_cxl_board.json
+++ b/configurations/meta/yv5/yosemite5_cxl_board_vr_mps_tchip_stm.json
@@ -189,6 +189,29 @@
"in7_Name": "CXL_ADC_P1V2_VDD_HA"
},
{
+ "Address": "0x5c",
+ "Bus": 34,
+ "Name": "CXL_EXT_CHIP_TEMP_C",
+ "PowerState": "On",
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Hysteresis": 0.1,
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 5.0
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 2.5,
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 125.0
+ }
+ ],
+ "Type": "EMC1413"
+ },
+ {
"Address": "0x4d",
"Bus": 34,
"Labels": [
@@ -279,63 +302,14 @@
}
],
"Type": "LM75A"
- },
- {
- "Address": "0x61",
- "Bus": 35,
- "FirmwareInfo": {
- "CompatibleHardware": "com.meta.Hardware.Yosemite5.VR.RAA228244_p1v2_vdd_ddr_ch02",
- "VendorIANA": 40981
- },
- "Name": "Yosemite5_CXL_VR_P1V2_VDD_DDR_CH02",
- "Type": "RAA22XGen3p5Firmware"
- },
- {
- "Address": "0x63",
- "Bus": 35,
- "FirmwareInfo": {
- "CompatibleHardware": "com.meta.Hardware.Yosemite5.VR.RAA228244_pvdd_core",
- "VendorIANA": 40981
- },
- "Name": "Yosemite5_CXL_VR_PVDD_CORE",
- "Type": "RAA22XGen3p5Firmware"
- },
- {
- "Address": "0x72",
- "Bus": 35,
- "FirmwareInfo": {
- "CompatibleHardware": "com.meta.Hardware.Yosemite5.VR.RAA228244_p1v2_vdd_ddr_ch13",
- "VendorIANA": 40981
- },
- "Name": "Yosemite5_CXL_VR_P1V2_VDD_DDR_CH13",
- "Type": "RAA22XGen3p5Firmware"
- },
- {
- "Address": "0x4c",
- "Bus": 34,
- "Name": "CXL_EXT_CHIP_TEMP_C",
- "PowerState": "On",
- "Thresholds": [
- {
- "Direction": "less than",
- "Hysteresis": 0.1,
- "Name": "lower critical",
- "Severity": 1,
- "Value": 5.0
- },
- {
- "Direction": "greater than",
- "Hysteresis": 2.5,
- "Name": "upper critical",
- "Severity": 1,
- "Value": 125.0
- }
- ],
- "Type": "TMP432"
}
],
"Name": "Yosemite5 CXL Board",
- "Probe": "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'Yosemite V5 .*', 'BOARD_PRODUCT_NAME': 'Maple Falls', 'BOARD_MANUFACTURER': '(Quanta|Wiwynn)'})",
+ "Probe": [
+ "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'Yosemite V5 .*', 'BOARD_PRODUCT_NAME': 'Maple Falls', 'BOARD_MANUFACTURER': '(Quanta|Wiwynn)'})",
+ "AND",
+ "xyz.openbmc_project.FruDevice({'BOARD_INFO_AM4': 'VR-MPS Tchip-STM'})"
+ ],
"Type": "Board",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"BuildDate": "$BOARD_MANUFACTURE_DATE",
diff --git a/configurations/meta/yv5/yosemite5_cxl_board_vr_raa_tchip_tic.json b/configurations/meta/yv5/yosemite5_cxl_board_vr_raa_tchip_tic.json
new file mode 100644
index 0000000..0463368
--- /dev/null
+++ b/configurations/meta/yv5/yosemite5_cxl_board_vr_raa_tchip_tic.json
@@ -0,0 +1,612 @@
+{
+ "Exposes": [
+ {
+ "Address": "0x1e",
+ "Bus": 34,
+ "Labels": [
+ "in3",
+ "in4",
+ "in5",
+ "in6"
+ ],
+ "Name": "CXL_ADC0",
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Hysteresis": 0.0342,
+ "Label": "in3",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 1.71
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 0.0378,
+ "Label": "in3",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 1.89
+ },
+ {
+ "Direction": "less than",
+ "Hysteresis": 0.0342,
+ "Label": "in4",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 1.71
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 0.0378,
+ "Label": "in4",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 1.89
+ },
+ {
+ "Direction": "less than",
+ "Hysteresis": 0.0627,
+ "Label": "in5",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 3.135
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 0.0693,
+ "Label": "in5",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 3.465
+ },
+ {
+ "Direction": "less than",
+ "Hysteresis": 0.095,
+ "Label": "in6",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 4.75
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 0.105,
+ "Label": "in6",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 5.25
+ }
+ ],
+ "Type": "ADC128D818",
+ "in3_Name": "CXL_ADC_P1V8_VDD_IO_VOLT_V",
+ "in3_PowerState": "On",
+ "in4_Name": "CXL_ADC_P1V8_STBY_VOLT_V",
+ "in5_Name": "CXL_ADC_P3V3_STBY_VOLT_V",
+ "in5_Scale": 500,
+ "in6_Name": "CXL_ADC_P5V_STBY_VOLT_V",
+ "in6_Scale": 281.293
+ },
+ {
+ "Address": "0x1f",
+ "Bus": 34,
+ "Labels": [
+ "in3",
+ "in4",
+ "in5",
+ "in6",
+ "in7"
+ ],
+ "Name": "CXL_ADC1",
+ "PowerState": "On",
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Hysteresis": 0.0114,
+ "Label": "in3",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0.57
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 0.0126,
+ "Label": "in3",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 0.63
+ },
+ {
+ "Direction": "less than",
+ "Hysteresis": 0.0114,
+ "Label": "in4",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0.57
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 0.0126,
+ "Label": "in4",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 0.63
+ },
+ {
+ "Direction": "less than",
+ "Hysteresis": 0.0475,
+ "Label": "in5",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 2.375
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 0.055,
+ "Label": "in5",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 2.75
+ },
+ {
+ "Direction": "less than",
+ "Hysteresis": 0.0475,
+ "Label": "in6",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 2.375
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 0.055,
+ "Label": "in6",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 2.75
+ },
+ {
+ "Direction": "less than",
+ "Hysteresis": 0.0233,
+ "Label": "in7",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 1.167
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 0.0244,
+ "Label": "in7",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 1.221
+ }
+ ],
+ "Type": "ADC128D818",
+ "in3_Name": "CXL_ADC_P0V6_VTT_CH13_VOLT_V",
+ "in4_Name": "CXL_ADC_P0V6_VTT_CH02_VOLT_V",
+ "in5_Name": "CXL_ADC_P2V5_VPP_CH13_VOLT_V",
+ "in5_Scale": 500,
+ "in6_Name": "CXL_ADC_P2V5_VPP_CH02_VOLT_V",
+ "in6_Scale": 500,
+ "in7_Name": "CXL_ADC_P1V2_VDD_HA"
+ },
+ {
+ "Address": "0x4d",
+ "Bus": 34,
+ "Labels": [
+ "in1",
+ "curr1",
+ "power1"
+ ],
+ "Name": "CXL_PMON_P12_STBY",
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Hysteresis": 0.228,
+ "Label": "in1",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 11.4
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 0.252,
+ "Label": "in1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 12.6
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 0.3692,
+ "Label": "curr1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 18.46
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 4.44,
+ "Label": "power1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 222
+ }
+ ],
+ "Type": "INA230",
+ "curr1_Name": "CXL_P12V_STBY_CURR_A",
+ "in1_Name": "CXL_P12V_STBY_VOLT_V",
+ "power1_Name": "CXL_P12V_STBY_PWR_W"
+ },
+ {
+ "Address": "0x4e",
+ "Bus": 34,
+ "Name": "CXL_INLET_TEMP_C",
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Hysteresis": 0.1,
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 5.0
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 1.1,
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 55.0
+ }
+ ],
+ "Type": "LM75A"
+ },
+ {
+ "Address": "0x4a",
+ "Bus": 34,
+ "Name": "CXL_OUTLET_TEMP_C",
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Hysteresis": 0.1,
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 5.0
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 1.5,
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 75.0
+ }
+ ],
+ "Type": "LM75A"
+ },
+ {
+ "Address": "0x63",
+ "Bus": 35,
+ "Labels": [
+ "vout1",
+ "iout1",
+ "pout1",
+ "temp1",
+ "vout2",
+ "iout2",
+ "pout2",
+ "temp2"
+ ],
+ "Name": "CXL_PVDD_CORE",
+ "PowerState": "On",
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Hysteresis": 0.014,
+ "Label": "vout1",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0.7
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 0.0187,
+ "Label": "vout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 0.935
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 0.84,
+ "Label": "iout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 42
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 0.71,
+ "Label": "pout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 35.5
+ },
+ {
+ "Direction": "less than",
+ "Hysteresis": 0.1,
+ "Label": "temp1",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 5
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 2.5,
+ "Label": "temp1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 125
+ },
+ {
+ "Direction": "less than",
+ "Hysteresis": 0.014,
+ "Label": "vout2",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 0.7
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 0.0187,
+ "Label": "vout2",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 0.935
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 0.84,
+ "Label": "iout2",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 42
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 0.71,
+ "Label": "pout2",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 35.5
+ },
+ {
+ "Direction": "less than",
+ "Hysteresis": 0.1,
+ "Label": "temp2",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 5
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 2.5,
+ "Label": "temp2",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 125
+ }
+ ],
+ "Type": "RAA228228",
+ "iout1_Name": "CXL_PVDD_CORE_CURR_A",
+ "iout2_Name": "CXL_P0V75_VDD_DIG_CURR_A",
+ "pout1_Name": "CXL_PVDD_CORE_PWR_W",
+ "pout2_Name": "CXL_P0V75_VDD_DIG_PWR_W",
+ "temp1_Name": "CXL_PVDD_CORE_TEMP_C",
+ "temp2_Name": "CXL_P0V75_VDD_DIG_TEMP_C",
+ "vout1_Name": "CXL_PVDD_CORE_VOLT_V",
+ "vout2_Name": "CXL_P0V75_VDD_DIG_VOLT_V"
+ },
+ {
+ "Address": "0x61",
+ "Bus": 35,
+ "Labels": [
+ "vout1",
+ "iout1",
+ "pout1",
+ "temp1"
+ ],
+ "Name": "CXL_P1V2_VDD_DDR02",
+ "PowerState": "On",
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Hysteresis": 0.0232,
+ "Label": "vout1",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 1.16
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 0.0252,
+ "Label": "vout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 1.26
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 0.7424,
+ "Label": "iout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 37.12
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 0.891,
+ "Label": "pout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 44.55
+ },
+ {
+ "Direction": "less than",
+ "Hysteresis": 0.1,
+ "Label": "temp1",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 5
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 2.5,
+ "Label": "temp1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 125
+ }
+ ],
+ "Type": "RAA228228",
+ "iout1_Name": "CXL_P1V2_VDD_DDR02_CURR_A",
+ "pout1_Name": "CXL_P1V2_VDD_DDR02_PWR_W",
+ "temp1_Name": "CXL_P1V2_VDD_DDR02_TEMP_C",
+ "vout1_Name": "CXL_P1V2_VDD_DDR02_VOLT_V"
+ },
+ {
+ "Address": "0x72",
+ "Bus": 35,
+ "Labels": [
+ "vout1",
+ "iout1",
+ "pout1",
+ "temp1"
+ ],
+ "Name": "P1V2_VDD_DDR_CH13",
+ "PowerState": "On",
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Hysteresis": 0.0232,
+ "Label": "vout1",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 1.16
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 0.0252,
+ "Label": "vout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 1.26
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 0.7424,
+ "Label": "iout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 37.12
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 0.891,
+ "Label": "pout1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 44.55
+ },
+ {
+ "Direction": "less than",
+ "Hysteresis": 0.1,
+ "Label": "temp1",
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 5
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 2.5,
+ "Label": "temp1",
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 125
+ }
+ ],
+ "Type": "RAA228228",
+ "iout1_Name": "CXL_P1V2_VDD_DDR13_CURR_A",
+ "pout1_Name": "CXL_P1V2_VDD_DDR13_PWR_W",
+ "temp1_Name": "CXL_P1V2_VDD_DDR13_TEMP_C",
+ "vout1_Name": "CXL_P1V2_VDD_DDR13_VOLT_V"
+ },
+ {
+ "Address": "0x61",
+ "Bus": 35,
+ "FirmwareInfo": {
+ "CompatibleHardware": "com.meta.Hardware.Yosemite5.VR.RAA228244_p1v2_vdd_ddr_ch02",
+ "VendorIANA": 40981
+ },
+ "Name": "Yosemite5_CXL_VR_P1V2_VDD_DDR_CH02",
+ "Type": "RAA22XGen3p5Firmware"
+ },
+ {
+ "Address": "0x63",
+ "Bus": 35,
+ "FirmwareInfo": {
+ "CompatibleHardware": "com.meta.Hardware.Yosemite5.VR.RAA228244_pvdd_core",
+ "VendorIANA": 40981
+ },
+ "Name": "Yosemite5_CXL_VR_PVDD_CORE",
+ "Type": "RAA22XGen3p5Firmware"
+ },
+ {
+ "Address": "0x72",
+ "Bus": 35,
+ "FirmwareInfo": {
+ "CompatibleHardware": "com.meta.Hardware.Yosemite5.VR.RAA228244_p1v2_vdd_ddr_ch13",
+ "VendorIANA": 40981
+ },
+ "Name": "Yosemite5_CXL_VR_P1V2_VDD_DDR_CH13",
+ "Type": "RAA22XGen3p5Firmware"
+ },
+ {
+ "Address": "0x4c",
+ "Bus": 34,
+ "Name": "CXL_EXT_CHIP_TEMP_C",
+ "PowerState": "On",
+ "Thresholds": [
+ {
+ "Direction": "less than",
+ "Hysteresis": 0.1,
+ "Name": "lower critical",
+ "Severity": 1,
+ "Value": 5.0
+ },
+ {
+ "Direction": "greater than",
+ "Hysteresis": 2.5,
+ "Name": "upper critical",
+ "Severity": 1,
+ "Value": 125.0
+ }
+ ],
+ "Type": "TMP432"
+ }
+ ],
+ "Name": "Yosemite5 CXL Board",
+ "Probe": [
+ "xyz.openbmc_project.FruDevice({'PRODUCT_PRODUCT_NAME': 'Yosemite V5 .*', 'BOARD_PRODUCT_NAME': 'Maple Falls', 'BOARD_MANUFACTURER': '(Quanta|Wiwynn)'})",
+ "AND",
+ "xyz.openbmc_project.FruDevice({'BOARD_INFO_AM4': 'VR-RAA Tchip-TIC'})"
+ ],
+ "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"
+ }
+}