Skip to content

Commit 393a089

Browse files
pabloyangWWmeta-codesync[bot]
pabloyangWW
authored and
meta-codesync[bot]
committed
fbgc: fbgc2: Modify sensor thresholds and fix sensor names
Summary: # Description - Update HDD temperature threshold from 61°C to 60°C - Correct PTB voltage and current sensor thresholds according to hardware specifications - dpb thresholds are taken from expander - Fix server DIMM sensor naming from DIMMA0/DIMMA4 to DIMMA2/DIMMA3/DIMMA6/DIMMA7 # Motivation - Match ours latest sensor table X-link: https://github.com/facebookexternal/openbmc.wiwynn/pull/3490 Test Plan: - Verify all HDD temperature sensors report correct threshold (60°C) - Verify PTB sensors show updated thresholds - Verify server DIMM sensor names are correctly displayed - Check all sensors report ok status within normal operating range Log: root@bmc-oob:~# sensor-util dpb --threshold | grep HDD | grep TEMP HDD_SMART_TEMP_00 (0x60) : 36.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_01 (0x61) : 37.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_02 (0x62) : 37.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_03 (0x63) : 37.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_04 (0x64) : 37.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_05 (0x65) : 36.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_06 (0x66) : 36.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_07 (0x67) : 37.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_08 (0x68) : 37.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_09 (0x69) : 37.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_10 (0x6A) : 37.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_11 (0x6B) : 36.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_12 (0x6C) : 36.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_13 (0x6D) : 36.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_14 (0x6E) : 36.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_15 (0x6F) : 36.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_16 (0x70) : 36.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_17 (0x71) : 36.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_18 (0x72) : 36.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_19 (0x73) : 36.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_20 (0x74) : 36.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_21 (0x75) : 36.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_22 (0x76) : 36.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_23 (0x77) : 36.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_24 (0x78) : 35.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_25 (0x79) : 35.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_26 (0x7A) : 35.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_27 (0x7B) : 35.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_28 (0x7C) : 35.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_29 (0x7D) : 35.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_30 (0x7E) : 35.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_31 (0x7F) : 35.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_32 (0x80) : 35.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_33 (0x81) : 35.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_34 (0x82) : 35.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA HDD_SMART_TEMP_35 (0x83) : 35.000 C | (ok) | UCR: 60.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA root@bmc-oob:~# sensor-util dpb --threshold | grep PTB PTB_P48V_AUX (0xDC) : 50.660 Volts | (ok) | UCR: 52.800 | UNC: NA | UNR: NA | LCR: 43.200 | LNC: NA | LNR: NA PTB_P12V_PU2_DC_MODULE (0xDD) : 12.230 Volts | (ok) | UCR: 13.200 | UNC: NA | UNR: NA | LCR: 10.800 | LNC: NA | LNR: NA PTB_P12V_PU3_DC_MODULE (0xDE) : 12.220 Volts | (ok) | UCR: 13.200 | UNC: NA | UNR: NA | LCR: 10.800 | LNC: NA | LNR: NA PTB_U19_ADC_MONITOR (0xDF) : 62.900 Volts | (ucr) | UCR: 52.800 | UNC: NA | UNR: NA | LCR: 43.200 | LNC: NA | LNR: NA PTB_U20_ADC_MONITOR (0xE0) : 191.760 Volts | (ok) | UCR: NA | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA PTB_P48V_AUX_Current (0xE1) : 8.550 Amps | (ok) | UCR: 165.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA PTB_P12V_PU2_DC_MODULE_Current (0xE2) : 33.500 Amps | (ok) | UCR: 41.250 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA PTB_P12V_PU3_DC_MODULE_Current (0xE3) : 35.500 Amps | (ok) | UCR: 41.250 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA PTB_P48V_AUX_Power (0xE4) : 433.000 Watts | (ok) | UCR: NA | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA PTB_P12V_PU2_DC_MODULE_Power (0xE5) : 433.000 Watts | (ok) | UCR: NA | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA PTB_P12V_PU3_DC_MODULE_Power (0xE6) : 433.000 Watts | (ok) | UCR: NA | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA root@bmc-oob:~# sensor-util server --threshold | grep DIMM | grep TEMP MB_DIMMA2_TEMP_C (0x6) : 33.000 C | (ok) | UCR: 85.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA MB_DIMMA3_TEMP_C (0x7) : 33.000 C | (ok) | UCR: 85.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA MB_DIMMA6_TEMP_C (0xA) : 33.000 C | (ok) | UCR: 85.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA MB_DIMMA7_TEMP_C (0xB) : 33.000 C | (ok) | UCR: 85.000 | UNC: NA | UNR: NA | LCR: NA | LNC: NA | LNR: NA root@bmc-oob:~# sensor-util server --threshold | grep DIMM | grep PWR MB_VR_DIMMA2_PMIC_PWR_W (0x40) : 0.560 Watts | (ok) | UCR: 32.200 | UNC: 31.500 | UNR: NA | LCR: NA | LNC: NA | LNR: NA MB_VR_DIMMA3_PMIC_PWR_W (0x41) : 0.980 Watts | (ok) | UCR: 32.200 | UNC: 31.500 | UNR: NA | LCR: NA | LNC: NA | LNR: NA MB_VR_DIMMA6_PMIC_PWR_W (0x42) : 0.420 Watts | (ok) | UCR: 32.200 | UNC: 31.500 | UNR: NA | LCR: NA | LNC: NA | LNR: NA MB_VR_DIMMA7_PMIC_PWR_W (0x43) : 0.840 Watts | (ok) | UCR: 32.200 | UNC: 31.500 | UNR: NA | LCR: NA | LNC: NA | LNR: NA Reviewed By: waffle2k Differential Revision: D90217684 fbshipit-source-id: fb3702be12e889aad5b6d5b18c27b5c7bf5160a5
1 parent 80da032 commit 393a089

File tree

3 files changed

+61
-65
lines changed

3 files changed

+61
-65
lines changed

‎meta-facebook/meta-grandcanyon/meta-grandcanyon2/recipes-grandcanyon2/fscd/fscd/setup-fan.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,4 +30,4 @@
3030
echo "Setup fan speed... "
3131

3232
#sh /usr/local/bin/setup-fsc-config.sh &
33-
/usr/local/bin/fan-util --set 100
33+
/usr/local/bin/fan-util --set 100

‎meta-facebook/meta-grandcanyon/recipes-grandcanyon/plat-libs/files/pal/pal_sensors.c‎

Lines changed: 51 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -82,78 +82,77 @@ PAL_SENSOR_MAP uic_sensor_map[] = {
8282

8383
#ifdef CONFIG_GRANDCANYON2
8484
PAL_SENSOR_MAP dpb_sensor_map[] = {
85-
[HDD_SMART_TEMP_00] =
86-
{"HDD_SMART_TEMP_00", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
85+
{"HDD_SMART_TEMP_00", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
8786
[HDD_SMART_TEMP_01] =
88-
{"HDD_SMART_TEMP_01", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
87+
{"HDD_SMART_TEMP_01", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
8988
[HDD_SMART_TEMP_02] =
90-
{"HDD_SMART_TEMP_02", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
89+
{"HDD_SMART_TEMP_02", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
9190
[HDD_SMART_TEMP_03] =
92-
{"HDD_SMART_TEMP_03", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
91+
{"HDD_SMART_TEMP_03", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
9392
[HDD_SMART_TEMP_04] =
94-
{"HDD_SMART_TEMP_04", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
93+
{"HDD_SMART_TEMP_04", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
9594
[HDD_SMART_TEMP_05] =
96-
{"HDD_SMART_TEMP_05", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
95+
{"HDD_SMART_TEMP_05", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
9796
[HDD_SMART_TEMP_06] =
98-
{"HDD_SMART_TEMP_06", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
97+
{"HDD_SMART_TEMP_06", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
9998
[HDD_SMART_TEMP_07] =
100-
{"HDD_SMART_TEMP_07", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
99+
{"HDD_SMART_TEMP_07", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
101100
[HDD_SMART_TEMP_08] =
102-
{"HDD_SMART_TEMP_08", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
101+
{"HDD_SMART_TEMP_08", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
103102
[HDD_SMART_TEMP_09] =
104-
{"HDD_SMART_TEMP_09", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
103+
{"HDD_SMART_TEMP_09", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
105104
[HDD_SMART_TEMP_10] =
106-
{"HDD_SMART_TEMP_10", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
105+
{"HDD_SMART_TEMP_10", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
107106
[HDD_SMART_TEMP_11] =
108-
{"HDD_SMART_TEMP_11", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
107+
{"HDD_SMART_TEMP_11", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
109108
[HDD_SMART_TEMP_12] =
110-
{"HDD_SMART_TEMP_12", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
109+
{"HDD_SMART_TEMP_12", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
111110
[HDD_SMART_TEMP_13] =
112-
{"HDD_SMART_TEMP_13", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
111+
{"HDD_SMART_TEMP_13", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
113112
[HDD_SMART_TEMP_14] =
114-
{"HDD_SMART_TEMP_14", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
113+
{"HDD_SMART_TEMP_14", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
115114
[HDD_SMART_TEMP_15] =
116-
{"HDD_SMART_TEMP_15", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
115+
{"HDD_SMART_TEMP_15", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
117116
[HDD_SMART_TEMP_16] =
118-
{"HDD_SMART_TEMP_16", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
117+
{"HDD_SMART_TEMP_16", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
119118
[HDD_SMART_TEMP_17] =
120-
{"HDD_SMART_TEMP_17", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
119+
{"HDD_SMART_TEMP_17", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
121120
[HDD_SMART_TEMP_18] =
122-
{"HDD_SMART_TEMP_18", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
121+
{"HDD_SMART_TEMP_18", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
123122
[HDD_SMART_TEMP_19] =
124-
{"HDD_SMART_TEMP_19", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
123+
{"HDD_SMART_TEMP_19", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
125124
[HDD_SMART_TEMP_20] =
126-
{"HDD_SMART_TEMP_20", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
125+
{"HDD_SMART_TEMP_20", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
127126
[HDD_SMART_TEMP_21] =
128-
{"HDD_SMART_TEMP_21", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
127+
{"HDD_SMART_TEMP_21", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
129128
[HDD_SMART_TEMP_22] =
130-
{"HDD_SMART_TEMP_22", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
129+
{"HDD_SMART_TEMP_22", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
131130
[HDD_SMART_TEMP_23] =
132-
{"HDD_SMART_TEMP_23", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
131+
{"HDD_SMART_TEMP_23", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
133132
[HDD_SMART_TEMP_24] =
134-
{"HDD_SMART_TEMP_24", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
133+
{"HDD_SMART_TEMP_24", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
135134
[HDD_SMART_TEMP_25] =
136-
{"HDD_SMART_TEMP_25", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
135+
{"HDD_SMART_TEMP_25", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
137136
[HDD_SMART_TEMP_26] =
138-
{"HDD_SMART_TEMP_26", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
137+
{"HDD_SMART_TEMP_26", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
139138
[HDD_SMART_TEMP_27] =
140-
{"HDD_SMART_TEMP_27", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
139+
{"HDD_SMART_TEMP_27", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
141140
[HDD_SMART_TEMP_28] =
142-
{"HDD_SMART_TEMP_28", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
141+
{"HDD_SMART_TEMP_28", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
143142
[HDD_SMART_TEMP_29] =
144-
{"HDD_SMART_TEMP_29", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
143+
{"HDD_SMART_TEMP_29", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
145144
[HDD_SMART_TEMP_30] =
146-
{"HDD_SMART_TEMP_30", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
145+
{"HDD_SMART_TEMP_30", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
147146
[HDD_SMART_TEMP_31] =
148-
{"HDD_SMART_TEMP_31", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
147+
{"HDD_SMART_TEMP_31", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
149148
[HDD_SMART_TEMP_32] =
150-
{"HDD_SMART_TEMP_32", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
149+
{"HDD_SMART_TEMP_32", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
151150
[HDD_SMART_TEMP_33] =
152-
{"HDD_SMART_TEMP_33", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
151+
{"HDD_SMART_TEMP_33", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
153152
[HDD_SMART_TEMP_34] =
154-
{"HDD_SMART_TEMP_34", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
153+
{"HDD_SMART_TEMP_34", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
155154
[HDD_SMART_TEMP_35] =
156-
{"HDD_SMART_TEMP_35", EXPANDER, NULL, false, {61, 0, 0, 0, 0, 0, 0, 0}, TEMP},
155+
{"HDD_SMART_TEMP_35", EXPANDER, NULL, false, {60, 0, 0, 0, 0, 0, 0, 0}, TEMP},
157156
[HDD_P5V_SENSE_0] =
158157
{"HDD_P5V_SENSE_0", EXPANDER, NULL, false, {5.5, 0, 0, 4.5, 0, 0, 0, 0}, VOLT},
159158
[HDD_P12V_SENSE_0] =
@@ -323,27 +322,27 @@ PAL_SENSOR_MAP dpb_sensor_map[] = {
323322
[DPB_HSC_PWR] =
324323
{"DPB_HSC_PWR", EXPANDER, NULL, false, {875, 0, 0, 0, 0, 0, 0, 0}, POWER},
325324
[PTB_P48V_AUX] =
326-
{"PTB_P48V_AUX", EXPANDER, NULL, false, {52.8, 0, 0, 36, 0, 0, 0, 0}, VOLT},
325+
{"PTB_P48V_AUX", EXPANDER, NULL, false, {56.7, 0, 0, 45.6, 0, 0, 0, 0}, VOLT},
327326
[PTB_P12V_PU2_DC_MODULE] =
328-
{"PTB_P12V_PU2_DC_MODULE", EXPANDER, NULL, false, {13.2, 0, 0, 10.8, 0, 0, 0, 0}, VOLT},
327+
{"PTB_P12V_PU2_DC_MODULE", EXPANDER, NULL, false, {13, 0, 0, 11.3, 0, 0, 0, 0}, VOLT},
329328
[PTB_P12V_PU3_DC_MODULE] =
330-
{"PTB_P12V_PU3_DC_MODULE", EXPANDER, NULL, false, {13.2, 0, 0, 10.8, 0, 0, 0, 0}, VOLT},
329+
{"PTB_P12V_PU3_DC_MODULE", EXPANDER, NULL, false, {13, 0, 0, 11.3, 0, 0, 0, 0}, VOLT},
331330
[PTB_U19_ADC_MONITOR] =
332-
{"PTB_U19_ADC_MONITOR", EXPANDER, NULL, false, {48, 0, 0, 36, 0, 0, 0, 0}, VOLT},
331+
{"PTB_U19_ADC_MONITOR", EXPANDER, NULL, false, {56.7, 0, 0, 45.6, 0, 0, 0, 0}, VOLT},
333332
[PTB_U20_ADC_MONITOR] =
334-
{"PTB_U20_ADC_MONITOR", EXPANDER, NULL, false, {48, 0, 0, 36, 0, 0, 0, 0}, VOLT},
333+
{"PTB_U20_ADC_MONITOR", EXPANDER, NULL, false, {1, 0, 0, -0.13, 0, 0, 0, 0}, VOLT},
335334
[PTB_P48V_AUX_Current] =
336-
{"PTB_P48V_AUX_Current", EXPANDER, NULL, false, {660, 0, 0, 0, 0, 0, 0, 0}, CURR},
335+
{"PTB_P48V_AUX_Current", EXPANDER, NULL, false, {48, 0, 0, 0, 0, 0, 0, 0}, CURR},
337336
[PTB_P12V_PU2_DC_MODULE_Current] =
338-
{"PTB_P12V_PU2_DC_MODULE_Current", EXPANDER, NULL, false, {165, 0, 0, 0, 0, 0, 0, 0}, CURR},
337+
{"PTB_P12V_PU2_DC_MODULE_Current", EXPANDER, NULL, false, {81.84, 0, 0, 0, 0, 0, 0, 0}, CURR},
339338
[PTB_P12V_PU3_DC_MODULE_Current] =
340-
{"PTB_P12V_PU3_DC_MODULE_Current", EXPANDER, NULL, false, {165, 0, 0, 0, 0, 0, 0, 0}, CURR},
339+
{"PTB_P12V_PU3_DC_MODULE_Current", EXPANDER, NULL, false, {81.84, 0, 0, 0, 0, 0, 0, 0}, CURR},
341340
[PTB_P48V_AUX_Power] =
342-
{"PTB_P48V_AUX_Power", EXPANDER, NULL, false, {8248, 0, 0, 0, 0, 0, 0, 0}, POWER},
341+
{"PTB_P48V_AUX_Power", EXPANDER, NULL, false, {2721.6, 0, 0, 0, 0, 0, 0, 0}, POWER},
343342
[PTB_P12V_PU2_DC_MODULE_Power] =
344-
{"PTB_P12V_PU2_DC_MODULE_Power", EXPANDER, NULL, false, {2062, 0, 0, 0, 0, 0, 0, 0}, POWER},
343+
{"PTB_P12V_PU2_DC_MODULE_Power", EXPANDER, NULL, false, {1063.92, 0, 0, 0, 0, 0, 0, 0}, POWER},
345344
[PTB_P12V_PU3_DC_MODULE_Power] =
346-
{"PTB_P12V_PU3_DC_MODULE_Power", EXPANDER, NULL, false, {2062, 0, 0, 0, 0, 0, 0, 0}, POWER},
345+
{"PTB_P12V_PU3_DC_MODULE_Power", EXPANDER, NULL, false, {1063.92, 0, 0, 0, 0, 0, 0, 0}, POWER},
347346
[FAN_0_FRONT] =
348347
{"FAN_0_FRONT", EXPANDER, NULL, false, {13000, 12700, 0, 800, 700, 0, 0, 0}, FAN},
349348
[FAN_0_REAR] =
@@ -633,7 +632,6 @@ PAL_SENSOR_MAP dpb_sensor_map[] = {
633632
};
634633
#endif
635634

636-
637635
PAL_SENSOR_MAP scc_sensor_map[] = {
638636
[SCC_EXP_TEMP] =
639637
{"SCC_EXP_TEMP", EXPANDER, NULL, false, {95, 0, 0, 0, 0, 0, 0, 0}, TEMP},
@@ -714,10 +712,10 @@ const uint8_t server_sensor_list[] = {
714712
ES_INLET_TEMP,
715713
ES_PCH_TEMP_C,
716714
ES_CPU_TEMP,
717-
ES_DIMMA0_TEMP_C,
718715
ES_DIMMA2_TEMP_C,
719-
ES_DIMMA4_TEMP_C,
716+
ES_DIMMA3_TEMP_C,
720717
ES_DIMMA6_TEMP_C,
718+
ES_DIMMA7_TEMP_C,
721719
ES_E1S_TEMP_C,
722720
ES_HSC_TEMP_C,
723721
ES_VR_VCCIN_TEMP_C,
@@ -756,10 +754,10 @@ const uint8_t server_sensor_list[] = {
756754
ES_VR_EHV_PWR_W,
757755
ES_VR_VCCD_PWR_W,
758756
ES_VR_FAON_PWR_W,
759-
ES_DIMMA0_PWR_W,
760757
ES_DIMMA2_PWR_W,
761-
ES_DIMMA4_PWR_W,
758+
ES_DIMMA3_PWR_W,
762759
ES_DIMMA6_PWR_W,
760+
ES_DIMMA7_PWR_W,
763761
ES_E1S_BOOt_DRIVE_PWR_W,
764762
};
765763
#else
@@ -808,7 +806,6 @@ const uint8_t server_sensor_list[] = {
808806
};
809807
#endif
810808

811-
812809
const uint8_t uic_sensor_list[] = {
813810
UIC_ADC_P12V_DPB,
814811
UIC_ADC_P12V_STBY,

‎meta-facebook/meta-grandcanyon/recipes-grandcanyon/plat-libs/files/pal/pal_sensors.h‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,16 +97,17 @@ enum {
9797
POWER,
9898
FLOW,
9999
};
100+
100101
#ifdef CONFIG_GRANDCANYON2
101102
// Sensors under Emerald Springs (ES)
102103
enum {
103104
ES_INLET_TEMP = 0x01,
104105
ES_PCH_TEMP_C = 0x4,
105106
ES_CPU_TEMP = 0x5,
106-
ES_DIMMA0_TEMP_C = 0x6,
107-
ES_DIMMA2_TEMP_C = 0x7,
108-
ES_DIMMA4_TEMP_C = 0xA,
109-
ES_DIMMA6_TEMP_C = 0xB,
107+
ES_DIMMA2_TEMP_C = 0x6,
108+
ES_DIMMA3_TEMP_C = 0x7,
109+
ES_DIMMA6_TEMP_C = 0xA,
110+
ES_DIMMA7_TEMP_C = 0xB,
110111
ES_E1S_TEMP_C = 0xd,
111112
ES_HSC_TEMP_C = 0xe,
112113
ES_VR_VCCIN_TEMP_C = 0xf,
@@ -145,10 +146,10 @@ enum {
145146
ES_VR_EHV_PWR_W = 0x3d,
146147
ES_VR_VCCD_PWR_W = 0x3e,
147148
ES_VR_FAON_PWR_W = 0x3f,
148-
ES_DIMMA0_PWR_W = 0x40,
149-
ES_DIMMA2_PWR_W = 0x41,
150-
ES_DIMMA4_PWR_W = 0x42,
151-
ES_DIMMA6_PWR_W = 0x43,
149+
ES_DIMMA2_PWR_W = 0x40,
150+
ES_DIMMA3_PWR_W = 0x41,
151+
ES_DIMMA6_PWR_W = 0x42,
152+
ES_DIMMA7_PWR_W = 0x43,
152153
ES_E1S_BOOt_DRIVE_PWR_W = 0x44,
153154
};
154155
#else
@@ -196,9 +197,7 @@ enum {
196197
BS_VR_DIMM_DE_VOLT = 0x28,
197198
BS_VR_DIMM_DE_PWR = 0x29,
198199
};
199-
200200
#endif
201-
202201
// Sensors under User Interface Card (UIC)
203202
enum {
204203
UIC_ADC_P12V_DPB = 0x10,

0 commit comments

Comments
 (0)