Skip to content

[Mellanox] Fix 'sensors.conf' mapping for MSN4700 #4511

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.

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

Merged
merged 2 commits into from
May 7, 2020
Merged
Changes from all commits
Commits
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
170 changes: 103 additions & 67 deletions device/mellanox/x86_64-mlnx_msn4700-r0/sensors.conf
Original file line number Diff line number Diff line change
Expand Up @@ -21,99 +21,135 @@ bus "i2c-15" "i2c-1-mux (chan_id 6)"

# Power controllers
bus "i2c-5" "i2c-1-mux (chan_id 4)"
chip "tps53679-i2c-*-62"
label in1 "PMIC-1 PSU 12V Rail (in)"
label in2 "PMIC-1 ASIC 0.8V VCORE_MAIN Rail (out)"
ignore in3
chip "xdpe12284-i2c-*-62"
label in1 "PMIC-1 PSU 12V Rail (in1)"
label in2 "PMIC-1 PSU 12V Rail (in2)"
label in3 "PMIC-1 ASIC 0.85V VCORE_T6_7 Rail (out)"
label in4 "PMIC-1 ASIC 1.8V T6_7 Rail (out)"
label temp1 "PMIC-1 Temp 1"
label temp2 "PMIC-1 Temp 2"
label power1 "PMIC-1 ASIC 0.8V VCORE_MAIN Rail Pwr (out)"
ignore power2
label curr1 "PMIC-1 ASIC 0.8V VCORE_MAIN Rail Curr (out)"
ignore curr2
chip "tps53679-i2c-*-64"
label in1 "PMIC-2 PSU 12V Rail (in)"
label in2 "PMIC-2 ASIC 1.8V MAIN Rail (out)"
compute in2 (1.5)*@, @/(1.5)
label in3 "PMIC-2 ASIC 1.2V MAIN Rail (out)"
label power1 "PMIC-1 ASIC 0.85V VCORE_T6_7 Rail Pwr (in)"
label power2 "PMIC-1 ASIC 1.8V T6_7 Rail Pwr (in)"
label power3 "PMIC-1 ASIC 0.85V VCORE_T6_7 Rail Pwr (out)"
label power4 "PMIC-1 ASIC 1.8V T6_7 Rail Pwr (out)"
label curr1 "PMIC-1 ASIC 0.85V VCORE_T6_7 Rail Curr (in)"
label curr2 "PMIC-1 ASIC 1.8V T6_7 Rail Curr (in)"
label curr3 "PMIC-1 ASIC 0.85V VCORE_T6_7 Rail Curr (out)"
label curr4 "PMIC-1 ASIC 1.8V T6_7 Rail Curr (out)"
chip "xdpe12284-i2c-*-64"
label in1 "PMIC-2 PSU 12V Rail (in1)"
label in2 "PMIC-2 PSU 12V Rail (in2)"
label in3 "PMIC-2 ASIC 0.85V VCORE_T6_7 Rail (out)"
label in4 "PMIC-2 ASIC 1.8V T6_7 Rail (out)"
label temp1 "PMIC-2 Temp 1"
label temp2 "PMIC-2 Temp 2"
label power1 "PMIC-2 ASIC 1.8V MAIN Rail Pwr (out)"
label power2 "PMIC-2 ASIC 1.2V MAIN Rail Pwr (out)"
label curr1 "PMIC-2 ASIC 1.8V MAIN Rail Curr (out)"
label curr2 "PMIC-2 ASIC 1.2V MAIN Rail Curr (out)"
chip "tps53679-i2c-*-66"
label in1 "PMIC-3 PSU 12V Rail (in)"
label in2 "PMIC-3 ASIC 0.85V VCORE_T0_1 Rail (out)"
label in3 "PMIC-3 ASIC 1.8V T0_1 Rail (out)"
label power1 "PMIC-2 ASIC 0.85V VCORE_T6_7 Rail Pwr (in)"
label power2 "PMIC-2 ASIC 1.8V T6_7 Rail Pwr (in)"
label power3 "PMIC-2 ASIC 0.85V VCORE_T6_7 Rail Pwr (out)"
label power4 "PMIC-2 ASIC 1.8V T6_7 Rail Pwr (out)"
label curr1 "PMIC-2 ASIC 0.85V VCORE_T6_7 Rail Curr (in)"
label curr2 "PMIC-2 ASIC 1.8V T6_7 Rail Curr (in)"
label curr3 "PMIC-2 ASIC 0.85V VCORE_T6_7 Rail Curr (out)"
label curr4 "PMIC-2 ASIC 1.8V T6_7 Rail Curr (out)"
chip "xdpe12284-i2c-*-66"
label in1 "PMIC-3 PSU 12V Rail (in1)"
label in2 "PMIC-3 PSU 12V Rail (in2)"
label in3 "PMIC-3 ASIC 0.85V VCORE_T6_7 Rail (out)"
label in4 "PMIC-3 ASIC 1.8V T6_7 Rail (out)"
label temp1 "PMIC-3 Temp 1"
label temp2 "PMIC-3 Temp 2"
label power1 "PMIC-3 ASIC 0.85V VCORE_T0_1 Rail Pwr (out)"
label power2 "PMIC-3 ASIC 1.8V T0_1 Rail Pwr (out)"
label curr1 "PMIC-3 ASIC 0.85V VCORE_T0_1 Rail Curr (out)"
label curr2 "PMIC-3 ASIC 1.8V T0_1 Rail Curr (out)"
chip "tps53679-i2c-*-68"
label in1 "PMIC-4 PSU 12V Rail (in)"
label in2 "PMIC-4 ASIC 0.85V VCORE_T2_3 Rail (out)"
label in3 "PMIC-4 ASIC 1.8V T2_3 Rail (out)"
label power1 "PMIC-3 ASIC 0.85V VCORE_T6_7 Rail Pwr (in)"
label power2 "PMIC-3 ASIC 1.8V T6_7 Rail Pwr (in)"
label power3 "PMIC-3 ASIC 0.85V VCORE_T6_7 Rail Pwr (out)"
label power4 "PMIC-3 ASIC 1.8V T6_7 Rail Pwr (out)"
label curr1 "PMIC-3 ASIC 0.85V VCORE_T6_7 Rail Curr (in)"
label curr2 "PMIC-3 ASIC 1.8V T6_7 Rail Curr (in)"
label curr3 "PMIC-3 ASIC 0.85V VCORE_T6_7 Rail Curr (out)"
label curr4 "PMIC-3 ASIC 1.8V T6_7 Rail Curr (out)"
chip "xdpe12284-i2c-*-68"
label in1 "PMIC-4 PSU 12V Rail (in1)"
label in2 "PMIC-4 PSU 12V Rail (in2)"
label in3 "PMIC-4 ASIC 0.85V VCORE_T6_7 Rail (out)"
label in4 "PMIC-4 ASIC 1.8V T6_7 Rail (out)"
label temp1 "PMIC-4 Temp 1"
label temp2 "PMIC-4 Temp 2"
label power1 "PMIC-4 ASIC 0.85V VCORE_T2_3 Rail Pwr (out)"
label power2 "PMIC-4 ASIC 1.8V T2_3 Rail Pwr (out)"
label curr1 "PMIC-4 ASIC 0.85V VCORE_T2_3 Rail Curr (out)"
label curr2 "PMIC-4 ASIC 1.8V T2_3 Rail Curr (out)"
chip "tps53679-i2c-*-6a"
label in1 "PMIC-5 PSU 12V Rail (in)"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@shlomibitton why PSU 12V rail has gone?

label in2 "PMIC-5 ASIC 0.85V VCORE_T4_5 Rail (out)"
label in3 "PMIC-5 ASIC 1.8V T4_5 Rail (out)"
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)"
chip "xdpe12284-i2c-*-6a"
label in1 "PMIC-5 PSU 12V Rail (in1)"
label in2 "PMIC-5 PSU 12V Rail (in2)"
label in3 "PMIC-5 ASIC 0.85V VCORE_T6_7 Rail (out)"
label in4 "PMIC-5 ASIC 1.8V T6_7 Rail (out)"
label temp1 "PMIC-5 Temp 1"
label temp2 "PMIC-5 Temp 2"
label power1 "PMIC-5 ASIC 0.85V VCORE_T4_5 Rail Pwr (out)"
label power2 "PMIC-5 ASIC 1.8V T4_5 Rail Pwr (out)"
label curr1 "PMIC-5 ASIC 0.85V VCORE_T4_5 Rail Curr (out)"
label curr2 "PMIC-5 ASIC 1.8V T4_5 Rail Curr (out)"
chip "tps53679-i2c-*-6c"
label in1 "PMIC-6 PSU 12V Rail (in)"
label in2 "PMIC-6 ASIC 0.85V VCORE_T6_7 Rail (out)"
label in3 "PMIC-6 ASIC 1.8V T6_7 Rail (out)"
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)"
chip "xdpe12284-i2c-*-6c"
label in1 "PMIC-6 PSU 12V Rail (in1)"
label in2 "PMIC-6 PSU 12V Rail (in2)"
label in3 "PMIC-6 ASIC 0.85V VCORE_T6_7 Rail (out)"
label in4 "PMIC-6 ASIC 1.8V T6_7 Rail (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 (out)"
label power2 "PMIC-6 ASIC 1.8V T6_7 Rail Pwr (out)"
label curr1 "PMIC-6 ASIC 0.85V VCORE_T6_7 Rail Curr (out)"
label curr2 "PMIC-6 ASIC 1.8V T6_7 Rail Curr (out)"
chip "tps53679-i2c-*-6e"
label in1 "PMIC-7 PSU 12V Rail (in)"
label in2 "PMIC-7 ASIC 1.2V T0_3 Rail (out)"
label in3 "PMIC-7 ASIC 1.2V T4_7 Rail (out)"
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)"
chip "xdpe12284-i2c-*-6e"
label in1 "PMIC-7 PSU 12V Rail (in1)"
label in2 "PMIC-7 PSU 12V Rail (in2)"
label in3 "PMIC-7 ASIC 0.85V VCORE_T6_7 Rail (out)"
label in4 "PMIC-7 ASIC 1.8V T6_7 Rail (out)"
label temp1 "PMIC-7 Temp 1"
label temp2 "PMIC-7 Temp 2"
label power1 "PMIC-7 ASIC 1.2V T0_3 Rail Pwr (out)"
label power2 "PMIC-7 ASIC 1.2V T4_7 Rail Pwr (out)"
label curr1 "PMIC-7 ASIC 1.2V T0_3 Rail Curr (out)"
label curr2 "PMIC-7 ASIC 1.2V T4_7 Rail Curr (out)"
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)"

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 COMEX 1.8V Rail (out)"
label in3 "PMIC-8 COMEX 1.05V Rail (out)"
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"
label temp2 "PMIC-8 Temp 2"
label power1 "PMIC-8 COMEX 1.8V Rail Pwr (out)"
label power2 "PMIC-8 COMEX 1.05V Rail Pwr (out)"
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 COMEX 1.2V Rail (out)"
ignore in3
label in1 "PMIC-9 PSU 12V Rail (in1)"
label in2 "PMIC-9 PSU 12V Rail (in2)"
label in3 "PMIC-9 COMEX 1.8V Rail (out)"
label in4 "PMIC-9 COMEX 1.05V Rail (out)"
label temp1 "PMIC-9 Temp 1"
label temp2 "PMIC-9 Temp 2"
label power1 "PMIC-9 COMEX 1.2V Rail Pwr (out)"
ignore power2
label curr1 "PMIC-9 COMEX 1.2V Rail Curr (out)"
ignore curr2
label power1 "PMIC-9 COMEX 1.8V Rail Pwr (out)"
label power2 "PMIC-9 COMEX 1.05V Rail Pwr (out)"
label curr1 "PMIC-9 COMEX 1.8V Rail Curr (out)"
label curr2 "PMIC-9 COMEX 1.05V Rail Curr (out)"

# Power supplies
bus "i2c-4" "i2c-1-mux (chan_id 3)"
Expand Down