From f62623360f34b29c3e931c46daa50f57fc14dc54 Mon Sep 17 00:00:00 2001
From: Yuanzhe <150663541+yuazhe@users.noreply.github.com>
Date: Tue, 27 Aug 2024 11:50:21 +0800
Subject: [PATCH] Fix 2700a1 sensors.conf and update psu_sensors.json
 accordingly (#19515)

previously 2700a1 sensors.conf is missing bus section for psu,
so add it and update the psu_sensors.json with the info.

fix psu_sensors_conf_updater to treat PSR psu as same as PSF one.

Signed-off-by: Yuanzhe, Liu <yualiu@nvidia.com>
---
 .../x86_64-mlnx_msn2700-r0/psu_sensors.json   |  7 +++-
 .../psu_sensors_conf_updater                  |  4 +-
 .../x86_64-mlnx_msn2700a1-r0/sensors.conf     | 42 +++++++++----------
 3 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/psu_sensors.json b/device/mellanox/x86_64-mlnx_msn2700-r0/psu_sensors.json
index 983325f1e733..73f011e29d71 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/psu_sensors.json
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/psu_sensors.json
@@ -26,7 +26,10 @@
         },
         "MSN2700-A1": {
             "default": {
-                "bus": [],
+                "bus": [
+                    "i2c-10",
+                    "i2c-1-mux (chan_id 10)"
+                ],
                 "chip": {
                     "dps460-i2c-*-58": ["2", "R"],
                     "dps460-i2c-*-59": ["1", "L"]
@@ -363,7 +366,7 @@
         "MTEF-AC-G-ACBEL": {
             "label": [
                 "in1 PSU 220V Rail (in)",
-                "in3 PSU 12V Rail (out)",
+                "in2 PSU 12V Rail (out)",
                 "fan1 PSU Fan 1",
                 "temp1 PSU Temp 1",
                 "temp2 PSU Temp 2",
diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/psu_sensors_conf_updater b/device/mellanox/x86_64-mlnx_msn2700-r0/psu_sensors_conf_updater
index a548d7f985d8..1c60a574085c 100644
--- a/device/mellanox/x86_64-mlnx_msn2700-r0/psu_sensors_conf_updater
+++ b/device/mellanox/x86_64-mlnx_msn2700-r0/psu_sensors_conf_updater
@@ -55,11 +55,11 @@ function update_psu_sensors_configuration() {
             # keep looking for the rest psus
             continue
         else
-            if [ "$psu" == "MTEF-PSF-AC-G" ]; then
+            psu=$(echo "$psu" | sed -r 's/-PSR|-PSF//g')
+            if [ "$psu" == "MTEF-AC-G" ]; then
                 vendor=$(cat /var/run/hw-management/eeprom/psu${number}_vpd | grep "MFR_NAME:" | cut -d ' ' -f 2 2>&1)
                 psu="${psu}-${vendor}"
             fi
-            psu=$(echo "$psu" | sed -r 's/-PSR|-PSF//g')
 
             echo "    chip \""$chip"\"" >> $SENSORS_CONFIG_FILE
             mapfile -t opers < <(jq -r --arg psu "$psu" '.psu[$psu] | keys[]' $PSU_SENSORS_CONFIG)
diff --git a/device/mellanox/x86_64-mlnx_msn2700a1-r0/sensors.conf b/device/mellanox/x86_64-mlnx_msn2700a1-r0/sensors.conf
index 495627c1b389..286685a46c47 100644
--- a/device/mellanox/x86_64-mlnx_msn2700a1-r0/sensors.conf
+++ b/device/mellanox/x86_64-mlnx_msn2700a1-r0/sensors.conf
@@ -174,27 +174,27 @@ chip "xdpe15284-i2c-*-61"
     ignore curr3
 
 # Power supplies
-chip "dps460-i2c-*-58"
-    label in1 "PSU-2(R) 220V Rail (in)"
-    label in2 "PSU-2(R) 12V Rail (out)"
-    label fan1 "PSU-2(R) Fan 1"
-    label temp1 "PSU-2(R) Temp 1"
-    label temp2 "PSU-2(R) Temp 2"
-    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) 12V Rail (out)"
-    label fan1 "PSU-1(L) Fan 1"
-    label temp1 "PSU-1(L) Temp 1"
-    label temp2 "PSU-1(L) Temp 2"
-    label power1 "PSU-1(L) 220V Rail Pwr (in)"
-    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)"
+bus "i2c-10" "i2c-1-mux (chan_id 1)"
+    chip "dps460-i2c-*-58"
+        label in1 "PSU-2(R) 220V Rail (in)"
+        label in2 "PSU-2(R) 12V Rail (out)"
+        label fan1 "PSU-2(R) Fan 1"
+        label temp1 "PSU-2(R) Temp 1"
+        label temp2 "PSU-2(R) Temp 2"
+        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) 12V Rail (out)"
+        label fan1 "PSU-1(L) Fan 1"
+        label temp1 "PSU-1(L) Temp 1"
+        label temp2 "PSU-1(L) Temp 2"
+        label power1 "PSU-1(L) 220V Rail Pwr (in)"
+        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)"
 
 # Chassis fans
 chip "mlxreg_fan-isa-*"