Skip to content

Commit b4747a8

Browse files
yuazhemssonicbld
yuazhe
authored and
mssonicbld
committed
[Mellanox] Fix 4600c sensors.conf inverted psu number designation (sonic-net#18722)
- Why I did it This PR is used to standardize several sensors.conf psu section I. Fix 4600/4600c inverted psu number designation II. Fix 5600 second psu miss set_power_cap label III. Standardized comments - How to verify it check sensors command output Signed-off-by: Yuanzhe, Liu <[email protected]>
1 parent 2a351f6 commit b4747a8

File tree

6 files changed

+51
-50
lines changed

6 files changed

+51
-50
lines changed

‎device/mellanox/x86_64-mlnx_msn2010-r0/sensors.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ bus "i2c-7" "i2c-1-mux (chan_id 6)"
1515
chip "lm75-i2c-*-4b"
1616
label temp1 "Ambient Fan Side Temp (air intake)"
1717

18-
# Power supplies
18+
# Power controllers
1919
bus "i2c-5" "i2c-1-mux (chan_id 4)"
2020
chip "tps53679-i2c-*-70"
2121
label in1 "PMIC-1 PSU 12V Rail (in1)"

‎device/mellanox/x86_64-mlnx_msn4600-r0/sensors.conf

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -162,20 +162,6 @@ bus "i2c-15" "i2c-1-mux (chan_id 6)"
162162
# Power supplies
163163
bus "i2c-4" "i2c-1-mux (chan_id 3)"
164164
chip "dps460-i2c-*-58"
165-
label in1 "PSU-1(L) 220V Rail (in)"
166-
ignore in2
167-
label in3 "PSU-1(L) 12V Rail (out)"
168-
label fan1 "PSU-1(L) Fan 1"
169-
ignore fan2
170-
ignore fan3
171-
label temp1 "PSU-1(L) Temp 1"
172-
label temp2 "PSU-1(L) Temp 2"
173-
label temp3 "PSU-1(L) Temp 3"
174-
label power1 "PSU-1(L) 220V Rail Pwr (in)"
175-
label power2 "PSU-1(L) 12V Rail Pwr (out)"
176-
label curr1 "PSU-1(L) 220V Rail Curr (in)"
177-
label curr2 "PSU-1(L) 12V Rail Curr (out)"
178-
chip "dps460-i2c-*-59"
179165
label in1 "PSU-2(R) 220V Rail (in)"
180166
ignore in2
181167
label in3 "PSU-2(R) 12V Rail (out)"
@@ -189,6 +175,20 @@ bus "i2c-4" "i2c-1-mux (chan_id 3)"
189175
label power2 "PSU-2(R) 12V Rail Pwr (out)"
190176
label curr1 "PSU-2(R) 220V Rail Curr (in)"
191177
label curr2 "PSU-2(R) 12V Rail Curr (out)"
178+
chip "dps460-i2c-*-59"
179+
label in1 "PSU-1(L) 220V Rail (in)"
180+
ignore in2
181+
label in3 "PSU-1(L) 12V Rail (out)"
182+
label fan1 "PSU-1(L) Fan 1"
183+
ignore fan2
184+
ignore fan3
185+
label temp1 "PSU-1(L) Temp 1"
186+
label temp2 "PSU-1(L) Temp 2"
187+
label temp3 "PSU-1(L) Temp 3"
188+
label power1 "PSU-1(L) 220V Rail Pwr (in)"
189+
label power2 "PSU-1(L) 12V Rail Pwr (out)"
190+
label curr1 "PSU-1(L) 220V Rail Curr (in)"
191+
label curr2 "PSU-1(L) 12V Rail Curr (out)"
192192

193193
# Chassis fans
194194
chip "mlxreg_fan-isa-*"

‎device/mellanox/x86_64-mlnx_msn4600c-r0/sensors.conf

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -220,23 +220,6 @@ bus "i2c-15" "i2c-1-mux (chan_id 6)"
220220
# Power supplies
221221
bus "i2c-4" "i2c-1-mux (chan_id 3)"
222222
chip "dps460-i2c-*-58"
223-
label in1 "PSU-1(L) 220V Rail (in)"
224-
ignore in2
225-
label in3 "PSU-1(L) 12V Rail (out)"
226-
label fan1 "PSU-1(L) Fan 1"
227-
ignore fan2
228-
ignore fan3
229-
label temp1 "PSU-1(L) Temp 1"
230-
label temp2 "PSU-1(L) Temp 2"
231-
label temp3 "PSU-1(L) Temp 3"
232-
label power1 "PSU-1(L) 220V Rail Pwr (in)"
233-
label power2 "PSU-1(L) 12V Rail Pwr (out)"
234-
label curr1 "PSU-1(L) 220V Rail Curr (in)"
235-
label curr2 "PSU-1(L) 12V Rail Curr (out)"
236-
set in3_lcrit in3_crit * 0.662
237-
set in3_min in3_crit * 0.745
238-
set in3_max in3_crit * 0.952
239-
chip "dps460-i2c-*-59"
240223
label in1 "PSU-2(R) 220V Rail (in)"
241224
ignore in2
242225
label in3 "PSU-2(R) 12V Rail (out)"
@@ -253,6 +236,23 @@ bus "i2c-4" "i2c-1-mux (chan_id 3)"
253236
set in3_lcrit in3_crit * 0.662
254237
set in3_min in3_crit * 0.745
255238
set in3_max in3_crit * 0.952
239+
chip "dps460-i2c-*-59"
240+
label in1 "PSU-1(L) 220V Rail (in)"
241+
ignore in2
242+
label in3 "PSU-1(L) 12V Rail (out)"
243+
label fan1 "PSU-1(L) Fan 1"
244+
ignore fan2
245+
ignore fan3
246+
label temp1 "PSU-1(L) Temp 1"
247+
label temp2 "PSU-1(L) Temp 2"
248+
label temp3 "PSU-1(L) Temp 3"
249+
label power1 "PSU-1(L) 220V Rail Pwr (in)"
250+
label power2 "PSU-1(L) 12V Rail Pwr (out)"
251+
label curr1 "PSU-1(L) 220V Rail Curr (in)"
252+
label curr2 "PSU-1(L) 12V Rail Curr (out)"
253+
set in3_lcrit in3_crit * 0.662
254+
set in3_min in3_crit * 0.745
255+
set in3_max in3_crit * 0.952
256256

257257
# Chassis fans
258258
chip "mlxreg_fan-isa-*"

‎device/mellanox/x86_64-mlnx_msn4600c-r0/sensors_respin.conf

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -255,23 +255,6 @@ bus "i2c-15" "i2c-1-mux (chan_id 6)"
255255
# Power supplies
256256
bus "i2c-4" "i2c-1-mux (chan_id 3)"
257257
chip "dps460-i2c-*-58"
258-
label in1 "PSU-1(L) 220V Rail (in)"
259-
ignore in2
260-
label in3 "PSU-1(L) 12V Rail (out)"
261-
label fan1 "PSU-1(L) Fan 1"
262-
ignore fan2
263-
ignore fan3
264-
label temp1 "PSU-1(L) Temp 1"
265-
label temp2 "PSU-1(L) Temp 2"
266-
label temp3 "PSU-1(L) Temp 3"
267-
label power1 "PSU-1(L) 220V Rail Pwr (in)"
268-
label power2 "PSU-1(L) 12V Rail Pwr (out)"
269-
label curr1 "PSU-1(L) 220V Rail Curr (in)"
270-
label curr2 "PSU-1(L) 12V Rail Curr (out)"
271-
set in3_lcrit in3_crit * 0.662
272-
set in3_min in3_crit * 0.745
273-
set in3_max in3_crit * 0.952
274-
chip "dps460-i2c-*-59"
275258
label in1 "PSU-2(R) 220V Rail (in)"
276259
ignore in2
277260
label in3 "PSU-2(R) 12V Rail (out)"
@@ -288,6 +271,23 @@ bus "i2c-4" "i2c-1-mux (chan_id 3)"
288271
set in3_lcrit in3_crit * 0.662
289272
set in3_min in3_crit * 0.745
290273
set in3_max in3_crit * 0.952
274+
chip "dps460-i2c-*-59"
275+
label in1 "PSU-1(L) 220V Rail (in)"
276+
ignore in2
277+
label in3 "PSU-1(L) 12V Rail (out)"
278+
label fan1 "PSU-1(L) Fan 1"
279+
ignore fan2
280+
ignore fan3
281+
label temp1 "PSU-1(L) Temp 1"
282+
label temp2 "PSU-1(L) Temp 2"
283+
label temp3 "PSU-1(L) Temp 3"
284+
label power1 "PSU-1(L) 220V Rail Pwr (in)"
285+
label power2 "PSU-1(L) 12V Rail Pwr (out)"
286+
label curr1 "PSU-1(L) 220V Rail Curr (in)"
287+
label curr2 "PSU-1(L) 12V Rail Curr (out)"
288+
set in3_lcrit in3_crit * 0.662
289+
set in3_min in3_crit * 0.745
290+
set in3_max in3_crit * 0.952
291291

292292
# Chassis fans
293293
chip "mlxreg_fan-isa-*"

‎device/mellanox/x86_64-nvidia_sn2201-r0/sensors.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ bus "i2c-8" "i2c-1-mux (chan_id 6)"
130130
label in8 "MONITOR CPU Board V1P8"
131131
label in9 "MONITOR CPU Board V1P24"
132132

133-
# PSU PMBus sensors
133+
# Power supplies
134134
bus "i2c-3" "i2c-1-mux (chan_id 1)"
135135
chip "pmbus-i2c-3-58"
136136
label in1 "PSU-1 220V Rail(in)"

‎device/mellanox/x86_64-nvidia_sn5600-r0/sensors.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,7 @@ chip "dps460-i2c-*-5a"
288288
label power2 "PSU-2(R) 12V Rail Pwr (out)"
289289
label curr1 "PSU-2(R) 220V Rail Curr (in)"
290290
label curr2 "PSU-2(R) 12V Rail Curr (out)"
291+
set power2_cap 0
291292

292293
# Power converters
293294
chip "pmbus-i2c-*-10"

0 commit comments

Comments
 (0)