[202012] [Mellanox] Add sensor conf file for new version of MSN3700/3…

…700C/4600C platforms (#11358) - Why I did it MSN3700/3700C/4600C have been re-spined, the new HW version of platforms has different sensors, so need to apply the correct sensor.conf for them. - How I did it Add new sensor.conf files for the new re-spined platforms. Enhance the logic of "get_sensors_conf_path" for the related platforms in order to load the correct sensor.conf for each version of platforms. - How to verify it run sensors test on different versions of platforms Signed-off-by: Kebo Liu <kebol@nvidia.com>
sonic-net · Jul 14, 2022 · aa4379d · aa4379d
1 parent 81f200f
commit aa4379d
Show file tree

Hide file tree

Showing 7 changed files with 853 additions and 1 deletion.
diff --git a/device/mellanox/x86_64-mlnx_msn3700-r0/get_sensors_conf_path b/device/mellanox/x86_64-mlnx_msn3700-r0/get_sensors_conf_path
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+HW_RESPIN_VERSION="/var/run/hw-management/system/config3"
+SENSORS_CONF_FILE="/usr/share/sonic/platform/sensors.conf"
+SENSORS_RESPIN_CONF_FILE="/usr/share/sonic/platform/sensors_respin.conf"
+
+function get_sensor_conf_path() {
+    local _HW_RESPIN_VERSION="0"
+    if [[ -e $HW_RESPIN_VERSION ]]; then
+        _HW_RESPIN_VERSION=$(cat $HW_RESPIN_VERSION 2>&1)
+        if [[ "$_HW_RESPIN_VERSION" == "1" ]]; then
+            if [[ -e $SENSORS_RESPIN_CONF_FILE ]]; then
+                echo $SENSORS_RESPIN_CONF_FILE
+                return
+            fi
+        fi
+    fi
+    echo $SENSORS_CONF_FILE
+}
+
+get_sensor_conf_path
diff --git a/device/mellanox/x86_64-mlnx_msn3700-r0/sensors_respin.conf b/device/mellanox/x86_64-mlnx_msn3700-r0/sensors_respin.conf
@@ -0,0 +1,187 @@
+##
+## Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
+## Apache-2.0
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+
+# Temperature sensors
+bus "i2c-2" "i2c-1-mux (chan_id 1)"
+    chip "mlxsw-i2c-*-48"
+        label temp1 "Ambient ASIC Temp"
+
+bus "i2c-7" "i2c-1-mux (chan_id 6)"
+    chip "tmp102-i2c-*-49"
+        label temp1 "Ambient Fan Side Temp (air intake)"
+    chip "tmp102-i2c-*-4a"
+        label temp1 "Ambient Port Side Temp (air exhaust)"
+
+bus "i2c-15" "i2c-1-mux (chan_id 6)"
+    chip "tmp102-i2c-15-49"
+        label temp1 "Ambient COMEX Temp"
+
+# Power controllers
+bus "i2c-5" "i2c-1-mux (chan_id 4)"
+    chip "tps53679-i2c-*-70"
+        label in1 "PMIC-1 PSU 12V Rail (in1)"
+        label in2 "PMIC-1 PSU 12V Rail (in2)"
+        label in3 "PMIC-1 ASIC 0.8V VCORE Rail (out)"
+        label in4 "PMIC-1 ASIC 1.2V Rail (out)"
+        label temp1 "PMIC-1 Temp 1"
+        label temp2 "PMIC-1 Temp 2"
+        label power1 "PMIC-1 ASIC 0.8V VCORE Rail Pwr (out)"
+        label power2 "PMIC-1 ASIC 1.2V Rail Pwr (out)"
+        label curr1 "PMIC-1 ASIC 0.8V VCORE Rail Curr (out)"
+        label curr2 "PMIC-1 ASIC 1.2V Rail Curr (out)"
+    chip "tps53679-i2c-*-71"
+        label in1 "PMIC-2 PSU 12V Rail (in1)"
+        label in2 "PMIC-2 PSU 12V Rail (in2)"
+        label in3 "PMIC-2 ASIC 3.3V Rail (out)"
+        compute in3 (1.5)*@, @/(1.5)
+        label in4 "PMIC-2 ASIC 1.8V Rail (out)"
+        label temp1 "PMIC-2 Temp 1"
+        label temp2 "PMIC-2 Temp 2"
+        label power1 "PMIC-2 ASIC 3.3V Rail Pwr (out)"
+        label power2 "PMIC-2 ASIC 1.8V Rail Pwr (out)"
+        label curr1 "PMIC-2 ASIC 3.3V Rail Curr (out)"
+        label curr2 "PMIC-2 ASIC 1.8V Rail Curr (out)"
+
+    chip "mp2975-i2c-*-62"
+        label in1 "PMIC-1 PSU 12V Rail (in)"
+        label in2 "PMIC-1 ASIC 0.8V VCORE Rail (out)"
+        label in3 "PMIC-1 ASIC 1.2V Rail (out)"
+        ignore in4
+        label temp1 "PMIC-1 Temp 1"
+        label temp2 "PMIC-1 Temp 2"
+        label power1 "PMIC-1 ASIC 0.8V VCORE Rail Pwr (out)"
+        label power2 "PMIC-1 ASIC 1.2V Rail Pwr (out)"
+        label curr1 "PMIC-1 ASIC 0.8V VCORE Rail Curr (out)"
+        label curr2 "PMIC-1 ASIC 1.2V Rail Curr (out)"
+    chip "mp2975-i2c-*-66"
+        label in1 "PMIC-2 PSU 12V Rail (in)"
+        label in2 "PMIC-2 ASIC 3.3V Rail (out)"
+        compute in2 (2)*@, @/(2)
+        label in3 "PMIC-2 ASIC 1.8V Rail (out)"
+        ignore in4
+        label temp1 "PMIC-2 Temp 1"
+        label temp2 "PMIC-2 Temp 2"
+        label power1 "PMIC-2 ASIC 3.3V Rail Pwr (out)"
+        label power2 "PMIC-2 ASIC 1.8V Rail Pwr (out)"
+        label curr1 "PMIC-2 ASIC 3.3V Rail Curr (out)"
+        label curr2 "PMIC-2 ASIC 1.8V Rail Curr (out)"
+
+bus "i2c-15" "i2c-1-mux (chan_id 6)"
+    chip "tps53679-i2c-*-58"
+        label in1 "PMIC-3 PSU 12V Rail (in1)"
+        label in2 "PMIC-3 PSU 12V Rail (in2)"
+        label in3 "PMIC-3 COMEX 1.8V Rail (out)"
+        label in4 "PMIC-3 COMEX 1.05V Rail (out)"
+        label temp1 "PMIC-3 Temp 1"
+        label temp2 "PMIC-3 Temp 2"
+        label power1 "PMIC-3 COMEX 1.8V Rail Pwr (out)"
+        label power2 "PMIC-3 COMEX 1.05V Rail Pwr (out)"
+        label curr1 "PMIC-3 COMEX 1.8V Rail Curr (out)"
+        label curr2 "PMIC-3 COMEX 1.05V Rail Curr (out)"
+    chip "tps53679-i2c-*-61"
+        label in1 "PMIC-4 PSU 12V Rail (in1)"
+        label in2 "PMIC-4 PSU 12V Rail (in2)"
+        label in3 "PMIC-4 COMEX 1.2V Rail (out)"
+        ignore in4
+        label temp1 "PMIC-4 Temp 1"
+        label temp2 "PMIC-4 Temp 2"
+        label power1 "PMIC-4 COMEX 1.2V Rail Pwr (out)"
+        ignore power2
+        label curr1 "PMIC-4 COMEX 1.2V Rail Curr (out)"
+        ignore curr2
+
+    chip "mp2975-i2c-*-6a"
+        label in1 "PMIC-3 PSU 12V Rail (in1)"
+        label in2 "PMIC-3 COMEX 1.8V Rail (out)"
+        label in3 "PMIC-3 COMEX 1.05V Rail (out)"
+        label temp1 "PMIC-3 Temp 1"
+        label power1 "PMIC-3 COMEX 12V Rail Pwr (in)"
+        label power2 "PMIC-3 COMEX 1.8V Rail Pwr (out)"
+        label power3 "PMIC-3 COMEX 1.05V Rail Pwr (out)"
+        label curr1 "PMIC-3 COMEX 12V Rail Curr (in)"
+        label curr2 "PMIC-3 COMEX 1.8V Rail Curr (out)"
+        ignore curr3
+        ignore curr4
+        label curr5 "PMIC-3 COMEX 1.05V Rail Curr (out)"
+        ignore curr6
+
+    chip "mp2975-i2c-*-61"
+        label in1 "PMIC-4 PSU 12V Rail (in1)"
+        label in2 "PMIC-4 COMEX 1.2V Rail (out)"
+        label temp1 "PMIC-4 Temp 1"
+        label temp2 "PMIC-4 Temp 2"
+        label power1 "PMIC-4 COMEX 12V Rail Pwr (in)"
+        label power2 "PMIC-4 COMEX 1.2V Rail Pwr (out)"
+        label curr1 "PMIC-4 COMEX 12V Rail Curr (in)"
+        label curr2 "PMIC-4 COMEX 1.2V Rail Curr (out)"
+        ignore curr3
+
+# Power supplies
+bus "i2c-4" "i2c-1-mux (chan_id 3)"
+    chip "dps460-i2c-*-58"
+        label in1 "PSU-1 220V Rail (in)"
+        ignore in2
+        label in3 "PSU-1 12V Rail (out)"
+        label fan1 "PSU-1 Fan 1"
+        ignore fan2
+        ignore fan3
+        label temp1 "PSU-1 Temp 1"
+        label temp2 "PSU-1 Temp 2"
+        label temp3 "PSU-1 Temp 3"
+        label power1 "PSU-1 220V Rail Pwr (in)"
+        label power2 "PSU-1 12V Rail Pwr (out)"
+        label curr1 "PSU-1 220V Rail Curr (in)"
+        label curr2 "PSU-1 12V Rail Curr (out)"
+        set in3_lcrit in3_crit * 0.662
+        set in3_min in3_crit * 0.745
+        set in3_max in3_crit * 0.952
+    chip "dps460-i2c-*-59"
+        label in1 "PSU-2 220V Rail (in)"
+        ignore in2
+        label in3 "PSU-2 12V Rail (out)"
+        label fan1 "PSU-2 Fan 1"
+        ignore fan2
+        ignore fan3
+        label temp1 "PSU-2 Temp 1"
+        label temp2 "PSU-2 Temp 2"
+        label temp3 "PSU-2 Temp 3"
+        label power1 "PSU-2 220V Rail Pwr (in)"
+        label power2 "PSU-2 12V Rail Pwr (out)"
+        label curr1 "PSU-2 220V Rail Curr (in)"
+        label curr2 "PSU-2 12V Rail Curr (out)"
+        set in3_lcrit in3_crit * 0.662
+        set in3_min in3_crit * 0.745
+        set in3_max in3_crit * 0.952
+
+# Chassis fans
+chip "mlxreg_fan-isa-*"
+    label fan1 "Chassis Fan Drawer-1 Tach 1"
+    label fan2 "Chassis Fan Drawer-1 Tach 2"
+    label fan3 "Chassis Fan Drawer-2 Tach 1"
+    label fan4 "Chassis Fan Drawer-2 Tach 2"
+    label fan5 "Chassis Fan Drawer-3 Tach 1"
+    label fan6 "Chassis Fan Drawer-3 Tach 2"
+    label fan7 "Chassis Fan Drawer-4 Tach 1"
+    label fan8 "Chassis Fan Drawer-4 Tach 2"
+    label fan9 "Chassis Fan Drawer-5 Tach 1"
+    label fan10 "Chassis Fan Drawer-5 Tach 2"
+    label fan11 "Chassis Fan Drawer-6 Tach 1"
+    label fan12 "Chassis Fan Drawer-6 Tach 2"
+
+# Miscellaneous
+chip "*-virtual-*"
+    ignore temp1
diff --git a/device/mellanox/x86_64-mlnx_msn3700c-r0/get_sensors_conf_path b/device/mellanox/x86_64-mlnx_msn3700c-r0/get_sensors_conf_path
@@ -0,0 +1 @@
+../x86_64-mlnx_msn3700-r0/get_sensors_conf_path
diff --git a/device/mellanox/x86_64-mlnx_msn3700c-r0/sensors_respin.conf b/device/mellanox/x86_64-mlnx_msn3700c-r0/sensors_respin.conf
@@ -0,0 +1,183 @@
+##
+## Copyright (c) 2022 NVIDIA CORPORATION & AFFILIATES.
+## Apache-2.0
+##
+## Licensed under the Apache License, Version 2.0 (the "License");
+## you may not use this file except in compliance with the License.
+## You may obtain a copy of the License at
+##
+## http://www.apache.org/licenses/LICENSE-2.0
+##
+## Unless required by applicable law or agreed to in writing, software
+## distributed under the License is distributed on an "AS IS" BASIS,
+## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+## See the License for the specific language governing permissions and
+## limitations under the License.
+##
+
+# Temperature sensors
+bus "i2c-2" "i2c-1-mux (chan_id 1)"
+    chip "mlxsw-i2c-*-48"
+        label temp1 "Ambient ASIC Temp"
+
+bus "i2c-7" "i2c-1-mux (chan_id 6)"
+    chip "tmp102-i2c-*-49"
+        label temp1 "Ambient Fan Side Temp (air intake)"
+    chip "tmp102-i2c-*-4a"
+        label temp1 "Ambient Port Side Temp (air exhaust)"
+
+bus "i2c-15" "i2c-1-mux (chan_id 6)"
+    chip "tmp102-i2c-15-49"
+        label temp1 "Ambient COMEX Temp"
+
+# Power controllers
+bus "i2c-5" "i2c-1-mux (chan_id 4)"
+    chip "tps53679-i2c-*-70"
+        label in1 "PMIC-1 PSU 12V Rail (in1)"
+        label in2 "PMIC-1 PSU 12V Rail (in2)"
+        label in3 "PMIC-1 ASIC 0.8V VCORE Rail (out)"
+        label in4 "PMIC-1 ASIC 1.2V Rail (out)"
+        label temp1 "PMIC-1 Temp 1"
+        label temp2 "PMIC-1 Temp 2"
+        label power1 "PMIC-1 ASIC 0.8V VCORE Rail Pwr (out)"
+        label power2 "PMIC-1 ASIC 1.2V Rail Pwr (out)"
+        label curr1 "PMIC-1 ASIC 0.8V VCORE Rail Curr (out)"
+        label curr2 "PMIC-1 ASIC 1.2V Rail Curr (out)"
+    chip "tps53679-i2c-*-71"
+        label in1 "PMIC-2 PSU 12V Rail (in1)"
+        label in2 "PMIC-2 PSU 12V Rail (in2)"
+        label in3 "PMIC-2 ASIC 3.3V Rail (out)"
+        compute in3 (1.5)*@, @/(1.5)
+        label in4 "PMIC-2 ASIC 1.8V Rail (out)"
+        label temp1 "PMIC-2 Temp 1"
+        label temp2 "PMIC-2 Temp 2"
+        label power1 "PMIC-2 ASIC 3.3V Rail Pwr (out)"
+        label power2 "PMIC-2 ASIC 1.8V Rail Pwr (out)"
+        label curr1 "PMIC-2 ASIC 3.3V Rail Curr (out)"
+        label curr2 "PMIC-2 ASIC 1.8V Rail Curr (out)"
+
+    chip "mp2975-i2c-*-62"
+        label in1 "PMIC-1 PSU 12V Rail (in)"
+        label in2 "PMIC-1 ASIC 0.8V VCORE Rail (out)"
+        label in3 "PMIC-1 ASIC 1.2V Rail (out)"
+        ignore in4
+        label temp1 "PMIC-1 Temp 1"
+        label temp2 "PMIC-1 Temp 2"
+        label power1 "PMIC-1 ASIC 0.8V VCORE Rail Pwr (out)"
+        label power2 "PMIC-1 ASIC 1.2V Rail Pwr (out)"
+        label curr1 "PMIC-1 ASIC 0.8V VCORE Rail Curr (out)"
+        label curr2 "PMIC-1 ASIC 1.2V Rail Curr (out)"
+    chip "mp2975-i2c-*-66"
+        label in1 "PMIC-2 PSU 12V Rail (in)"
+        label in2 "PMIC-2 ASIC 3.3V Rail (out)"
+        compute in2 (2)*@, @/(2)
+        label in3 "PMIC-2 ASIC 1.8V Rail (out)"
+        ignore in4
+        label temp1 "PMIC-2 Temp 1"
+        label temp2 "PMIC-2 Temp 2"
+        label power1 "PMIC-2 ASIC 3.3V Rail Pwr (out)"
+        label power2 "PMIC-2 ASIC 1.8V Rail Pwr (out)"
+        label curr1 "PMIC-2 ASIC 3.3V Rail Curr (out)"
+        label curr2 "PMIC-2 ASIC 1.8V Rail Curr (out)"
+
+bus "i2c-15" "i2c-1-mux (chan_id 6)"
+    chip "tps53679-i2c-*-58"
+        label in1 "PMIC-3 PSU 12V Rail (in1)"
+        label in2 "PMIC-3 PSU 12V Rail (in2)"
+        label in3 "PMIC-3 COMEX 1.8V Rail (out)"
+        label in4 "PMIC-3 COMEX 1.05V Rail (out)"
+        label temp1 "PMIC-3 Temp 1"
+        label temp2 "PMIC-3 Temp 2"
+        label power1 "PMIC-3 COMEX 1.8V Rail Pwr (out)"
+        label power2 "PMIC-3 COMEX 1.05V Rail Pwr (out)"
+        label curr1 "PMIC-3 COMEX 1.8V Rail Curr (out)"
+        label curr2 "PMIC-3 COMEX 1.05V Rail Curr (out)"
+    chip "tps53679-i2c-*-61"
+        label in1 "PMIC-4 PSU 12V Rail (in1)"
+        label in2 "PMIC-4 PSU 12V Rail (in2)"
+        label in3 "PMIC-4 COMEX 1.2V Rail (out)"
+        ignore in4
+        label temp1 "PMIC-4 Temp 1"
+        label temp2 "PMIC-4 Temp 2"
+        label power1 "PMIC-4 COMEX 1.2V Rail Pwr (out)"
+        ignore power2
+        label curr1 "PMIC-4 COMEX 1.2V Rail Curr (out)"
+        ignore curr2
+
+    chip "mp2975-i2c-*-6a"
+        label in1 "PMIC-3 PSU 12V Rail (in1)"
+        label in2 "PMIC-3 COMEX 1.8V Rail (out)"
+        label in3 "PMIC-3 COMEX 1.05V Rail (out)"
+        label temp1 "PMIC-3 Temp 1"
+        label power1 "PMIC-3 COMEX 12V Rail Pwr (in)"
+        label power2 "PMIC-3 COMEX 1.8V Rail Pwr (out)"
+        label power3 "PMIC-3 COMEX 1.05V Rail Pwr (out)"
+        label curr1 "PMIC-3 COMEX 12V Rail Curr (in)"
+        label curr2 "PMIC-3 COMEX 1.8V Rail Curr (out)"
+        ignore curr3
+        ignore curr4
+        label curr5 "PMIC-3 COMEX 1.05V Rail Curr (out)"
+        ignore curr6
+
+    chip "mp2975-i2c-*-61"
+        label in1 "PMIC-4 PSU 12V Rail (in1)"
+        label in2 "PMIC-4 COMEX 1.2V Rail (out)"
+        label temp1 "PMIC-4 Temp 1"
+        label temp2 "PMIC-4 Temp 2"
+        label power1 "PMIC-4 COMEX 12V Rail Pwr (in)"
+        label power2 "PMIC-4 COMEX 1.2V Rail Pwr (out)"
+        label curr1 "PMIC-4 COMEX 12V Rail Curr (in)"
+        label curr2 "PMIC-4 COMEX 1.2V Rail Curr (out)"
+        ignore curr3
+
+# Power supplies
+bus "i2c-4" "i2c-1-mux (chan_id 3)"
+    chip "dps460-i2c-*-58"
+        label in1 "PSU-1 220V Rail (in)"
+        ignore in2
+        label in3 "PSU-1 12V Rail (out)"
+        label fan1 "PSU-1 Fan 1"
+        ignore fan2
+        ignore fan3
+        label temp1 "PSU-1 Temp 1"
+        label temp2 "PSU-1 Temp 2"
+        label temp3 "PSU-1 Temp 3"
+        label power1 "PSU-1 220V Rail Pwr (in)"
+        label power2 "PSU-1 12V Rail Pwr (out)"
+        label curr1 "PSU-1 220V Rail Curr (in)"
+        label curr2 "PSU-1 12V Rail Curr (out)"
+        set in3_lcrit in3_crit * 0.662
+        set in3_min in3_crit * 0.745
+        set in3_max in3_crit * 0.952
+    chip "dps460-i2c-*-59"
+        label in1 "PSU-2 220V Rail (in)"
+        ignore in2
+        label in3 "PSU-2 12V Rail (out)"
+        label fan1 "PSU-2 Fan 1"
+        ignore fan2
+        ignore fan3
+        label temp1 "PSU-2 Temp 1"
+        label temp2 "PSU-2 Temp 2"
+        label temp3 "PSU-2 Temp 3"
+        label power1 "PSU-2 220V Rail Pwr (in)"
+        label power2 "PSU-2 12V Rail Pwr (out)"
+        label curr1 "PSU-2 220V Rail Curr (in)"
+        label curr2 "PSU-2 12V Rail Curr (out)"
+        set in3_lcrit in3_crit * 0.662
+        set in3_min in3_crit * 0.745
+        set in3_max in3_crit * 0.952
+
+# Chassis fans
+chip "mlxreg_fan-isa-*"
+    label fan1 "Chassis Fan Drawer-1 Tach 1"
+    label fan2 "Chassis Fan Drawer-1 Tach 2"
+    label fan3 "Chassis Fan Drawer-2 Tach 1"
+    label fan4 "Chassis Fan Drawer-2 Tach 2"
+    label fan5 "Chassis Fan Drawer-3 Tach 1"
+    label fan6 "Chassis Fan Drawer-3 Tach 2"
+    label fan7 "Chassis Fan Drawer-4 Tach 1"
+    label fan8 "Chassis Fan Drawer-4 Tach 2"
+
+# Miscellaneous
+chip "*-virtual-*"
+    ignore temp1
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/get_sensors_conf_path b/device/mellanox/x86_64-mlnx_msn4600c-r0/get_sensors_conf_path