configuration: yosemite4: support different fan table for T1 and T2 SD
There are two different types of Sentinel Dome for Yosemite4.
1. T1: It doesn't has Wailua Falls and data drive and has two fewer
DIMMs than T2.
2. T2: It has Wailua Falls.
Check the FRU information to add different fan table for T1 and T2
Sentinel Dome.
TODO:
Thermal team will fine tuen the fan table for both T1 and T2 SD.
Change-Id: I7f0fca02d162d43e1343609410738cd2dbb9ad21
Signed-off-by: Delphine CC Chiu <Delphine_CC_Chiu@wiwynn.com>
diff --git a/configurations/yosemite4_sentineldome.json b/configurations/yosemite4_sentineldome_t1.json
similarity index 78%
copy from configurations/yosemite4_sentineldome.json
copy to configurations/yosemite4_sentineldome_t1.json
index 9d368ee..38ba778 100644
--- a/configurations/yosemite4_sentineldome.json
+++ b/configurations/yosemite4_sentineldome_t1.json
@@ -9,20 +9,17 @@
"ICoefficient": -0.035,
"ILimitMax": 100,
"ILimitMin": -50,
- "InputUnavailableAsFailed": false,
"Inputs": [
"MB_DIMM_A_TEMP_C_5 $bus % 15 * 10",
"MB_DIMM_B_TEMP_C_6 $bus % 15 * 10",
"MB_DIMM_C_TEMP_C_7 $bus % 15 * 10",
"MB_DIMM_D_TEMP_C_8 $bus % 15 * 10",
"MB_DIMM_E_TEMP_C_9 $bus % 15 * 10",
- "MB_DIMM_F_TEMP_C_10 $bus % 15 * 10",
"MB_DIMM_G_TEMP_C_11 $bus % 15 * 10",
"MB_DIMM_H_TEMP_C_12 $bus % 15 * 10",
"MB_DIMM_I_TEMP_C_13 $bus % 15 * 10",
"MB_DIMM_J_TEMP_C_14 $bus % 15 * 10",
- "MB_DIMM_K_TEMP_C_15 $bus % 15 * 10",
- "MB_DIMM_L_TEMP_C_16 $bus % 15 * 10"
+ "MB_DIMM_K_TEMP_C_15 $bus % 15 * 10"
],
"Name": "PID_MB_DIMM $bus % 15 * 10",
"NegativeHysteresis": 2.0,
@@ -99,33 +96,6 @@
"ICoefficient": -0.02,
"ILimitMax": 100,
"ILimitMin": -50,
- "InputUnavailableAsFailed": false,
- "Inputs": [
- "MB_SSD_DATA_TEMP_C_18 $bus % 15 * 10"
- ],
- "Name": "PID_MB_SSD_DATA $bus % 15 * 10",
- "NegativeHysteresis": 2.0,
- "OutLimitMax": 100,
- "OutLimitMin": 0,
- "PCoefficient": -1.5,
- "PositiveHysteresis": 0.0,
- "SetPoint": 68.0,
- "SlewNeg": 0.0,
- "SlewPos": 0.0,
- "Type": "Pid",
- "Zones": [
- "Zone 1"
- ]
- },
- {
- "CheckHysteresisWithSetpoint": true,
- "Class": "temp",
- "DCoefficient": 0.0,
- "FFGainCoefficient": 0.0,
- "FFOffCoefficient": 0.0,
- "ICoefficient": -0.02,
- "ILimitMax": 100,
- "ILimitMin": -50,
"Inputs": [
"MB_VR_CPU0_TEMP_C_19 $bus % 15 * 10",
"MB_VR_SOC_TEMP_C_20 $bus % 15 * 10",
@@ -169,27 +139,6 @@
},
{
"Class": "temp",
- "InputUnavailableAsFailed": false,
- "Inputs": [
- "MB_X8_RETIMER_TEMP_C_24 $bus % 15 * 10",
- "MB_X16_RETIMER_TEMP_C_25 $bus % 15 * 10"
- ],
- "Name": "Stepwise_MB_RETIMER_TEMP $bus % 15 * 10",
- "NegativeHysteresis": 0,
- "Output": [
- 20.0
- ],
- "PositiveHysteresis": 0,
- "Reading": [
- 20.0
- ],
- "Type": "Stepwise",
- "Zones": [
- "Zone 1"
- ]
- },
- {
- "Class": "temp",
"Inputs": [
"Calibrated_MB_FIO_TEMP_C_3 $bus % 15 * 10"
],
@@ -247,20 +196,17 @@
},
{
"Class": "temp",
- "InputUnavailableAsFailed": false,
"Inputs": [
"MB_DIMM_A_TEMP_C_5 $bus % 15 * 10",
"MB_DIMM_B_TEMP_C_6 $bus % 15 * 10",
"MB_DIMM_C_TEMP_C_7 $bus % 15 * 10",
"MB_DIMM_D_TEMP_C_8 $bus % 15 * 10",
"MB_DIMM_E_TEMP_C_9 $bus % 15 * 10",
- "MB_DIMM_F_TEMP_C_10 $bus % 15 * 10",
"MB_DIMM_G_TEMP_C_11 $bus % 15 * 10",
"MB_DIMM_H_TEMP_C_12 $bus % 15 * 10",
"MB_DIMM_I_TEMP_C_13 $bus % 15 * 10",
"MB_DIMM_J_TEMP_C_14 $bus % 15 * 10",
- "MB_DIMM_K_TEMP_C_15 $bus % 15 * 10",
- "MB_DIMM_L_TEMP_C_16 $bus % 15 * 10"
+ "MB_DIMM_K_TEMP_C_15 $bus % 15 * 10"
],
"Name": "Stepwise_MB_DIMM $bus % 15 * 10",
"NegativeHysteresis": 2,
@@ -352,36 +298,6 @@
},
{
"Class": "temp",
- "InputUnavailableAsFailed": false,
- "Inputs": [
- "MB_SSD_DATA_TEMP_C_18 $bus % 15 * 10"
- ],
- "Name": "Stepwise_MB_SSD_DATA $bus % 15 * 10",
- "NegativeHysteresis": 2,
- "Output": [
- 20.0,
- 22.0,
- 24.0,
- 26.0,
- 28.0,
- 30.0
- ],
- "PositiveHysteresis": 0,
- "Reading": [
- 58.0,
- 59.0,
- 60.0,
- 61.0,
- 62.0,
- 63.0
- ],
- "Type": "Stepwise",
- "Zones": [
- "Zone 1"
- ]
- },
- {
- "Class": "temp",
"Inputs": [
"MB_VR_CPU0_TEMP_C_19 $bus % 15 * 10",
"MB_VR_SOC_TEMP_C_20 $bus % 15 * 10",
@@ -414,8 +330,8 @@
]
}
],
- "Name": "Yosemite 4 Sentinel Dome Slot $bus % 15",
- "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Sentinel Dome', 'PRODUCT_PRODUCT_NAME': 'Yosemite V4'})",
+ "Name": "Yosemite 4 Sentinel Dome T1 Slot $bus % 15",
+ "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Sentinel Dome', 'PRODUCT_PRODUCT_NAME': 'Yosemite V4', 'PRODUCT_INFO_AM2': 'Yosemite V4 T1'})",
"Type": "Board",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"Manufacturer": "$PRODUCT_MANUFACTURER",
diff --git a/configurations/yosemite4_sentineldome.json b/configurations/yosemite4_sentineldome_t2.json
similarity index 93%
rename from configurations/yosemite4_sentineldome.json
rename to configurations/yosemite4_sentineldome_t2.json
index 9d368ee..01dba52 100644
--- a/configurations/yosemite4_sentineldome.json
+++ b/configurations/yosemite4_sentineldome_t2.json
@@ -24,6 +24,10 @@
"MB_DIMM_K_TEMP_C_15 $bus % 15 * 10",
"MB_DIMM_L_TEMP_C_16 $bus % 15 * 10"
],
+ "MissingIsAcceptable": [
+ "MB_DIMM_F_TEMP_C_10 $bus % 15 * 10",
+ "MB_DIMM_L_TEMP_C_16 $bus % 15 * 10"
+ ],
"Name": "PID_MB_DIMM $bus % 15 * 10",
"NegativeHysteresis": 2.0,
"OutLimitMax": 100,
@@ -171,8 +175,10 @@
"Class": "temp",
"InputUnavailableAsFailed": false,
"Inputs": [
- "MB_X8_RETIMER_TEMP_C_24 $bus % 15 * 10",
- "MB_X16_RETIMER_TEMP_C_25 $bus % 15 * 10"
+ "MB_X8_RETIMER_TEMP_C_24 $bus % 15 * 10"
+ ],
+ "MissingIsAcceptable": [
+ "MB_X8_RETIMER_TEMP_C_24 $bus % 15 * 10"
],
"Name": "Stepwise_MB_RETIMER_TEMP $bus % 15 * 10",
"NegativeHysteresis": 0,
@@ -262,6 +268,10 @@
"MB_DIMM_K_TEMP_C_15 $bus % 15 * 10",
"MB_DIMM_L_TEMP_C_16 $bus % 15 * 10"
],
+ "MissingIsAcceptable": [
+ "MB_DIMM_F_TEMP_C_10 $bus % 15 * 10",
+ "MB_DIMM_L_TEMP_C_16 $bus % 15 * 10"
+ ],
"Name": "Stepwise_MB_DIMM $bus % 15 * 10",
"NegativeHysteresis": 2,
"Output": [
@@ -414,8 +424,12 @@
]
}
],
- "Name": "Yosemite 4 Sentinel Dome Slot $bus % 15",
- "Probe": "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Sentinel Dome', 'PRODUCT_PRODUCT_NAME': 'Yosemite V4'})",
+ "Name": "Yosemite 4 Sentinel Dome T2 Slot $bus % 15",
+ "Probe": [
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Sentinel Dome', 'PRODUCT_PRODUCT_NAME': 'Yosemite V4', 'PRODUCT_INFO_AM2': 'N/A'})",
+ "OR",
+ "xyz.openbmc_project.FruDevice({'BOARD_PRODUCT_NAME': 'Sentinel Dome', 'PRODUCT_PRODUCT_NAME': 'Yosemite V4', 'PRODUCT_INFO_AM2': 'Yosemite V4 T2.*'})"
+ ],
"Type": "Board",
"xyz.openbmc_project.Inventory.Decorator.Asset": {
"Manufacturer": "$PRODUCT_MANUFACTURER",
diff --git a/meson.build b/meson.build
index c6d5160..8bf7966 100644
--- a/meson.build
+++ b/meson.build
@@ -197,7 +197,8 @@
'yosemite4_fanboard_fsc_max_adc_ti.json',
'yosemite4_fanboard_fsc_max.json',
'yosemite4_fanboard_fsc_nct.json',
- 'yosemite4_sentineldome.json',
+ 'yosemite4_sentineldome_t1.json',
+ 'yosemite4_sentineldome_t2.json',
'yosemite4_floatingfalls.json',
'yosemite4_wailuafalls.json',
'yosemite4.json',