Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Mellanox] Fix 'sensors.conf' mapping for MSN4600C #4754

Merged
merged 1 commit into from
Jun 12, 2020
Merged

[Mellanox] Fix 'sensors.conf' mapping for MSN4600C #4754

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
192 changes: 94 additions & 98 deletions device/mellanox/x86_64-mlnx_msn4600c-r0/sensors.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,114 +23,114 @@ bus "i2c-15" "i2c-1-mux (chan_id 6)"
bus "i2c-5" "i2c-1-mux (chan_id 4)"
chip "xdpe12284-i2c-*-62"
label in1 "PMIC-1 PSU 12V Rail (in)"
label in2 "PMIC-1 PSU 12V Rail (in)"
ignore in2
label in3 "PMIC-1 ASIC 0.8V VCORE_MAIN Rail (out)"
ignore in4
label temp1 "PMIC-1 Temp 1"
label temp2 "PMIC-1 Temp 2"
label power1 "PMIC-1 ASIC 12V VCORE_MAIN Rail Pwr (in)"
ignore power2
label power3 "PMIC-1 ASIC 12V VCORE_MAIN Rail Pwr (out)"
label power3 "PMIC-1 ASIC 0.8V VCORE_MAIN Rail Pwr (out)"
ignore power4
label curr1 "PMIC-1 ASIC 0.8V VCORE_MAIN Rail Curr (in)"
label curr1 "PMIC-1 ASIC 12V VCORE_MAIN Rail Curr (in)"
ignore curr2
label curr3 "PMIC-1 ASIC 0.8V VCORE_MAIN Rail Curr (out)"
ignore curr4
chip "xdpe12284-i2c-*-64"
label in1 "PMIC-2 PSU 12V Rail (in)"
label in2 "PMIC-2 PSU 12V Rail (in)"
label in3 "PMIC-2 ASIC 1.8V MAIN Rail (out)"
label in4 "PMIC-2 ASIC 1.2V MAIN Rail (out)"
label in1 "PMIC-2 PSU 12V Rail_1 (in)"
label in2 "PMIC-2 PSU 12V Rail_2 (in)"
label in3 "PMIC-2 ASIC 1.8V Rail_1 (out)"
label in4 "PMIC-2 ASIC 1.2V Rail_2 (out)"
label temp1 "PMIC-2 Temp 1"
label temp2 "PMIC-2 Temp 2"
label power1 "PMIC-2 ASIC 1.8V MAIN Rail Pwr (in)"
label power2 "PMIC-2 ASIC 1.2V MAIN Rail Pwr (in)"
label power3 "PMIC-2 ASIC 1.8V MAIN Rail Pwr (out)"
label power4 "PMIC-2 ASIC 1.2V MAIN Rail Pwr (out)"
label curr1 "PMIC-2 ASIC 1.8V MAIN Rail Curr (in)"
label curr2 "PMIC-2 ASIC 1.2V MAIN Rail Curr (in)"
label curr3 "PMIC-2 ASIC 1.8V MAIN Rail Curr (out)"
label curr4 "PMIC-2 ASIC 1.2V MAIN Rail Curr (out)"
label power1 "PMIC-2 ASIC 12V Rail_1 Pwr (in)"
label power2 "PMIC-2 ASIC 12V Rail_2 Pwr (in)"
label power3 "PMIC-2 ASIC 1.8V Rail_1 Pwr (out)"
label power4 "PMIC-2 ASIC 1.2V Rail_2 Pwr (out)"
label curr1 "PMIC-2 ASIC 12V Rail_1 Curr (in)"
label curr2 "PMIC-2 ASIC 12V Rail_2 Curr (in)"
label curr3 "PMIC-2 ASIC 1.8V Rail_1 Curr (out)"
label curr4 "PMIC-2 ASIC 1.2V Rail_2 Curr (out)"
chip "xdpe12284-i2c-*-66"
label in1 "PMIC-3 PSU 12V Rail (in)"
label in2 "PMIC-3 PSU 12V Rail (in)"
label in3 "PMIC-3 ASIC 0.85V MAIN Rail (out)"
label in4 "PMIC-3 ASIC 1.8V MAIN Rail (out)"
label in1 "PMIC-3 PSU 12V Rail_1 (in)"
label in2 "PMIC-3 PSU 12V Rail_2 (in)"
label in3 "PMIC-3 ASIC 0.85V Rail_1 T0_1 (out)"
label in4 "PMIC-3 ASIC 1.8V Rail_2 T0_1 (out)"
label temp1 "PMIC-3 Temp 1"
label temp2 "PMIC-3 Temp 2"
label power1 "PMIC-3 ASIC 12V MAIN Rail Pwr (in)"
label power2 "PMIC-3 ASIC 12V MAIN Rail Pwr (in)"
label power3 "PMIC-3 ASIC 0.85V MAIN Rail Pwr (out)"
label power4 "PMIC-3 ASIC 1.8V MAIN Rail Pwr (out)"
label curr1 "PMIC-3 ASIC 12V MAIN Rail Curr (in)"
label curr2 "PMIC-3 ASIC 12V MAIN Rail Curr (in)"
label curr3 "PMIC-3 ASIC 0.85V MAIN Rail Curr (out)"
label curr4 "PMIC-3 ASIC 1.8V MAIN Rail Curr (out)"
label power1 "PMIC-3 ASIC 12V Rail_1 Pwr (in)"
label power2 "PMIC-3 ASIC 12V Rail_2 Pwr (in)"
label power3 "PMIC-3 ASIC 0.85V Rail_1 T0_1 Pwr (out)"
label power4 "PMIC-3 ASIC 1.8V Rail_2 T0_1 Pwr (out)"
label curr1 "PMIC-3 ASIC 12V Rail_1 Curr (in)"
label curr2 "PMIC-3 ASIC 12V Rail_2 Curr (in)"
label curr3 "PMIC-3 ASIC 0.85V Rail_1 T0_1 Curr (out)"
label curr4 "PMIC-3 ASIC 1.8V Rail_2 T0_1 Curr (out)"
chip "xdpe12284-i2c-*-68"
label in1 "PMIC-4 PSU 12V Rail (in)"
label in2 "PMIC-4 PSU 12V Rail (in)"
label in3 "PMIC-4 ASIC 0.85V VCORE_T6_7 Rail (out)"
label in4 "PMIC-4 ASIC 1.8V T6_7 Rail (out)"
label in1 "PMIC-4 PSU 12V Rail_1 (in)"
label in2 "PMIC-4 PSU 12V Rail_2 (in)"
label in3 "PMIC-4 ASIC 0.85V Rail_1 T2_3 (out)"
label in4 "PMIC-4 ASIC 1.8V Rail_2 T2_3 (out)"
label temp1 "PMIC-4 Temp 1"
label temp2 "PMIC-4 Temp 2"
label power1 "PMIC-4 ASIC 0.85V VCORE_T6_7 Rail Pwr (in)"
label power2 "PMIC-4 ASIC 1.8V T6_7 Rail Pwr (in)"
label power3 "PMIC-4 ASIC 0.85V VCORE_T6_7 Rail Pwr (out)"
label power4 "PMIC-4 ASIC 1.8V T6_7 Rail Pwr (out)"
label curr1 "PMIC-4 ASIC 0.85V VCORE_T6_7 Rail Curr (in)"
label curr2 "PMIC-4 ASIC 1.8V T6_7 Rail Curr (in)"
label curr3 "PMIC-4 ASIC 0.85V VCORE_T6_7 Rail Curr (out)"
label curr4 "PMIC-4 ASIC 1.8V T6_7 Rail Curr (out)"
label power1 "PMIC-4 ASIC 12V Rail_1 Pwr (in)"
label power2 "PMIC-4 ASIC 12V Rail_2 Pwr (in)"
label power3 "PMIC-4 ASIC 0.85V Rail_1 T2_3 Pwr (out)"
label power4 "PMIC-4 ASIC 1.8V Rail_2 T2_3 Pwr (out)"
label curr1 "PMIC-4 ASIC 12V Rail_1 Curr (in)"
label curr2 "PMIC-4 ASIC 12V Rail_2 Curr (in)"
label curr3 "PMIC-4 ASIC 0.85V Rail_1 T2_3 Curr (out)"
label curr4 "PMIC-4 ASIC 1.8V Rail_2 T2_3 Curr (out)"
chip "xdpe12284-i2c-*-6a"
label in1 "PMIC-5 PSU 12V Rail (in)"
label in2 "PMIC-5 PSU 12V Rail (in)"
label in3 "PMIC-5 ASIC 0.85V VCORE_T6_7 Rail (out)"
label in4 "PMIC-5 ASIC 1.8V T6_7 Rail (out)"
label in1 "PMIC-5 PSU 12V Rail_1 (in)"
label in2 "PMIC-5 PSU 12V Rail_2 (in)"
label in3 "PMIC-5 ASIC 0.85V Rail_1 T4_5 (out)"
label in4 "PMIC-5 ASIC 1.8V Rail_2 T4_5 (out)"
label temp1 "PMIC-5 Temp 1"
label temp2 "PMIC-5 Temp 2"
label power1 "PMIC-5 ASIC 0.85V VCORE_T6_7 Rail Pwr (in)"
label power2 "PMIC-5 ASIC 1.8V T6_7 Rail Pwr (in)"
label power3 "PMIC-5 ASIC 0.85V VCORE_T6_7 Rail Pwr (out)"
label power4 "PMIC-5 ASIC 1.8V T6_7 Rail Pwr (out)"
label curr1 "PMIC-5 ASIC 0.85V VCORE_T6_7 Rail Curr (in)"
label curr2 "PMIC-5 ASIC 1.8V T6_7 Rail Curr (in)"
label curr3 "PMIC-5 ASIC 0.85V VCORE_T6_7 Rail Curr (out)"
label curr4 "PMIC-5 ASIC 1.8V T6_7 Rail Curr (out)"
label power1 "PMIC-5 ASIC 12V Rail_1 Pwr (in)"
label power2 "PMIC-5 ASIC 12V Rail_2 Pwr (in)"
label power3 "PMIC-5 ASIC 0.85V Rail_1 T4_5 Pwr (out)"
label power4 "PMIC-5 ASIC 1.8V Rail_2 T4_5 Pwr (out)"
label curr1 "PMIC-5 ASIC 12V Rail_1 Curr (in)"
label curr2 "PMIC-5 ASIC 12V Rail_2 Curr (in)"
label curr3 "PMIC-5 ASIC 0.85V Rail_1 T4_5 Curr (out)"
label curr4 "PMIC-5 ASIC 1.8V Rail_2 T4_5 Curr (out)"
chip "xdpe12284-i2c-*-6c"
label in1 "PMIC-6 PSU 12V Rail (in)"
label in2 "PMIC-6 PSU 12V Rail (in)"
label in3 "PMIC-6 ASIC 0.85V VCORE_T6_7 Rail (out)"
label in4 "PMIC-6 ASIC 1.8V T6_7 Rail (out)"
label in1 "PMIC-6 PSU 12V Rail_1 (in)"
label in2 "PMIC-6 PSU 12V Rail_2 (in)"
label in3 "PMIC-6 ASIC 0.85V Rail_1 T6_7 (out)"
label in4 "PMIC-6 ASIC 1.8V Rail_2 T6_7 (out)"
label temp1 "PMIC-6 Temp 1"
label temp2 "PMIC-6 Temp 2"
label power1 "PMIC-6 ASIC 0.85V VCORE_T6_7 Rail Pwr (in)"
label power2 "PMIC-6 ASIC 1.8V T6_7 Rail Pwr (in)"
label power3 "PMIC-6 ASIC 0.85V VCORE_T6_7 Rail Pwr (out)"
label power4 "PMIC-6 ASIC 1.8V T6_7 Rail Pwr (out)"
label curr1 "PMIC-6 ASIC 0.85V VCORE_T6_7 Rail Curr (in)"
label curr2 "PMIC-6 ASIC 1.8V T6_7 Rail Curr (in)"
label curr3 "PMIC-6 ASIC 0.85V VCORE_T6_7 Rail Curr (out)"
label curr4 "PMIC-6 ASIC 1.8V T6_7 Rail Curr (out)"
label power1 "PMIC-6 ASIC 12V Rail_1 Pwr (in)"
label power2 "PMIC-6 ASIC 12V Rail_2 Pwr (in)"
label power3 "PMIC-6 ASIC 0.85V Rail_1 T6_7 Pwr (out)"
label power4 "PMIC-6 ASIC 1.8V Rail_2 T6_7 Pwr (out)"
label curr1 "PMIC-6 ASIC 12V Rail_1 Curr (in)"
label curr2 "PMIC-6 ASIC 12V Rail_2 Curr (in)"
label curr3 "PMIC-6 ASIC 0.85V Rail_1 T6_7 Curr (out)"
label curr4 "PMIC-6 ASIC 1.8V Rail_2 T6_7 Curr (out)"
chip "xdpe12284-i2c-*-6e"
label in1 "PMIC-7 PSU 12V Rail (in)"
label in2 "PMIC-7 PSU 12V Rail (in)"
label in3 "PMIC-7 ASIC 1.2V VCORE_T6_7 Rail (out)"
label in4 "PMIC-7 ASIC 1.2V T6_7 Rail (out)"
label in1 "PMIC-7 PSU 12V Rail_1 (in)"
label in2 "PMIC-7 PSU 12V Rail_2 (in)"
label in3 "PMIC-7 ASIC 1.2V Rail_1 T0_3 (out)"
label in4 "PMIC-7 ASIC 1.2V Rail_2 T4_7 (out)"
label temp1 "PMIC-7 Temp 1"
label temp2 "PMIC-7 Temp 2"
label power1 "PMIC-7 ASIC 0.85V VCORE_T6_7 Rail Pwr (in)"
label power2 "PMIC-7 ASIC 1.8V T6_7 Rail Pwr (in)"
label power3 "PMIC-7 ASIC 0.85V VCORE_T6_7 Rail Pwr (out)"
label power4 "PMIC-7 ASIC 1.8V T6_7 Rail Pwr (out)"
label curr1 "PMIC-7 ASIC 0.85V VCORE_T6_7 Rail Curr (in)"
label curr2 "PMIC-7 ASIC 1.8V T6_7 Rail Curr (in)"
label curr3 "PMIC-7 ASIC 0.85V VCORE_T6_7 Rail Curr (out)"
label curr4 "PMIC-7 ASIC 1.8V T6_7 Rail Curr (out)"
label power1 "PMIC-7 ASIC 12V Rail_1 Pwr (in)"
label power2 "PMIC-7 ASIC 12V Rail_2 Pwr (in)"
label power3 "PMIC-7 ASIC 1.2V Rail_1 T0_3 Pwr (out)"
label power4 "PMIC-7 ASIC 1.2V Rail_2 T4_7 Pwr (out)"
label curr1 "PMIC-7 ASIC 12V Rail_1 Curr (in)"
label curr2 "PMIC-7 ASIC 12V Rail_2 Curr (in)"
label curr3 "PMIC-7 ASIC 1.2V Rail_1 T0_3 Curr (out)"
label curr4 "PMIC-7 ASIC 1.2V Rail_2 T4_7 Curr (out)"

bus "i2c-15" "i2c-1-mux (chan_id 6)"
chip "tps53679-i2c-*-58"
label in1 "PMIC-8 PSU 12V Rail (in)"
label in2 "PMIC-8 PSU 12V Rail (in)"
label in1 "PMIC-8 PSU 12V Rail (in1)"
label in2 "PMIC-8 PSU 12V Rail (in2)"
label in3 "PMIC-8 COMEX 1.8V Rail (out)"
label in4 "PMIC-8 COMEX 1.05V Rail (out)"
label temp1 "PMIC-8 Temp 1"
Expand All @@ -140,8 +140,8 @@ bus "i2c-15" "i2c-1-mux (chan_id 6)"
label curr1 "PMIC-8 COMEX 1.8V Rail Curr (out)"
label curr2 "PMIC-8 COMEX 1.05V Rail Curr (out)"
chip "tps53679-i2c-*-61"
label in1 "PMIC-9 PSU 12V Rail (in)"
label in2 "PMIC-9 PSU 12V Rail (in)"
label in1 "PMIC-9 PSU 12V Rail (in1)"
label in2 "PMIC-9 PSU 12V Rail (in2)"
label in3 "PMIC-9 COMEX 1.2V Rail (out)"
ignore in4
label temp1 "PMIC-9 Temp 1"
Expand All @@ -154,22 +154,8 @@ bus "i2c-15" "i2c-1-mux (chan_id 6)"
# Power supplies
bus "i2c-4" "i2c-1-mux (chan_id 3)"
chip "dps460-i2c-*-58"
label in1 "PSU-2(R) 220V Rail (in)"
label in2 "PSU-2(R) 220V Rail (in)"
label in3 "PSU-2(R) 12V Rail (out)"
label fan1 "PSU-2(R) Fan 1"
ignore fan2
ignore fan3
label temp1 "PSU-2(R) Temp 1"
label temp2 "PSU-2(R) Temp 2"
label temp3 "PSU-2(R) Temp 3"
label power1 "PSU-2(R) 220V Rail Pwr (in)"
label power2 "PSU-2(R) 12V Rail Pwr (out)"
label curr1 "PSU-2(R) 220V Rail Curr (in)"
label curr2 "PSU-2(R) 12V Rail Curr (out)"
chip "dps460-i2c-*-59"
label in1 "PSU-1(L) 220V Rail (in)"
label in2 "PSU-1(L) 220V Rail (in)"
ignore in2
label in3 "PSU-1(L) 12V Rail (out)"
label fan1 "PSU-1(L) Fan 1"
ignore fan2
Expand All @@ -181,13 +167,23 @@ bus "i2c-4" "i2c-1-mux (chan_id 3)"
label power2 "PSU-1(L) 12V Rail Pwr (out)"
label curr1 "PSU-1(L) 220V Rail Curr (in)"
label curr2 "PSU-1(L) 12V Rail Curr (out)"
chip "dps460-i2c-*-59"
label in1 "PSU-2(R) 220V Rail (in)"
ignore in2
label in3 "PSU-2(R) 12V Rail (out)"
label fan1 "PSU-2(R) Fan 1"
ignore fan2
ignore fan3
label temp1 "PSU-2(R) Temp 1"
label temp2 "PSU-2(R) Temp 2"
label temp3 "PSU-2(R) Temp 3"
label power1 "PSU-2(R) 220V Rail Pwr (in)"
label power2 "PSU-2(R) 12V Rail Pwr (out)"
label curr1 "PSU-2(R) 220V Rail Curr (in)"
label curr2 "PSU-2(R) 12V Rail Curr (out)"

# Chassis fans
chip "mlxreg_fan-isa-*"
label fan1 "Chassis Fan Drawer-1"
label fan2 "Chassis Fan Drawer-2"
label fan3 "Chassis Fan Drawer-3"

# Miscellaneous
chip "*-virtual-*"
ignore temp1