Merge branch 'master' into V.7.0040.4000_BR

Author: sholeksandr

debian/changelog

@@ -1,4 +1,4 @@
-hw-management (1.mlnx.7.0040.3937) unstable; urgency=low
+hw-management (1.mlnx.7.0040.3936) unstable; urgency=low
   [ MLNX ] 
 
- -- NBU BSP <[email protected]> Tue, 13 Mar 2025 16:00:00 +030
+ -- NBU BSP <[email protected]> Tue, 06 Mar 2025 16:00:00 +030

usr/etc/hw-management-sensors/sn5640_sensors.conf

@@ -402,7 +402,7 @@ chip "dps460-i2c-*-58"
     ignore fan3
     label fan1 "PSU-2(L) Fan 1"
     label temp1 "PSU-2(L) Temp 1"
-    label temp2 "PSU-2(R) Temp 2"
+    label temp2 "PSU-2(L) Temp 2"
     label temp3 "PSU-2(L) Temp 3"
     label power1 "PSU-2(L) 220V Rail Pwr (in)"
     label power2 "PSU-2(L) 12V Rail Pwr (out)"
@@ -440,6 +440,19 @@ chip "dps460-i2c-*-5a"
     label curr2 "PSU-4(R) 12V Rail Curr (out)"
     set power2_cap 0
 
+# 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"
+
 # AMD Comex Power controllers
 chip "mp2855-i2c-*-69"
     label in1 "PMIC-12 COMEX (in) VDDCR INPUT VOLT"

usr/usr/bin/hw-management-chassis-events.sh

@@ -507,6 +507,46 @@ function set_fan_direction()
 	esac
 }
 
+
+# Get FAN direction based on VPD PN field
+#
+# Input parameters:
+# 1 - "$vpd_file"
+# Return FAN direction
+# 0 - Reverse (C2P)
+# 1 - Forward(P2C)
+# 2 - unknown (read error or field missing)
+get_fan_direction_by_vpd()
+{
+	vpd_file=$1
+	# Default dir "unknown" till it will not be detected later
+	dir=2
+	pn=$(grep PN: $vpd_file | grep -oE "[^ ]+$")
+	if [ -z $pn ]; then
+		if [ -f $config_path/fixed_fans_dir ]; then
+			dir=$(< $config_path/fixed_fans_dir) 
+		fi
+	else 
+		dir_char=""
+		if [ ! ${sys_fandir_vs_pn[$pn]}_ = _ ]; then
+			dir_char=${sys_fandir_vs_pn[$pn]}
+		else
+			PN_REGEXP="MTEF-FAN([R,F])"
+		    
+		    [[ $pn =~ $PN_REGEXP ]]
+		    if [[ ! -z "${BASH_REMATCH[1]}" ]]; then
+		        dir_char="${BASH_REMATCH[1]}"
+		    fi
+		fi
+		if [ $dir_char == "R" ]; then
+			dir=0
+		elif [ $dir_char == "F" ]; then
+			dir=1
+		fi
+	fi
+	return $dir
+}
+
 function set_fpga_combined_version()
 {
 	path="$1"
@@ -1179,31 +1219,17 @@ if [ "$1" == "add" ]; then
 			if [[ $sku == "HI138" ]] || [[ $sku == "HI139" ]]; then
 				exit 0
 			fi
-			# Replace "_info" to "_data" in eeprom name.
-			eeprom_vpd_filename=${eeprom_name/"_info"/"_data"}
-			hw-management-vpd-parser.py -t MLNX_FAN_VPD -i $eeprom_path/$eeprom_name -o $eeprom_path/$eeprom_vpd_filename
+			fan_prefix=$(echo $eeprom_name | cut -d_ -f1)
 			if [ "$board_type" == "VMOD0014" ]; then
-				fan_dir_offset=0x8
+				hw-management-vpd-parser.py -t FIXED_FIELD_FAN_VPD -i $eeprom_path/$eeprom_name -o $eeprom_path/"$fan_prefix"_data
 			else
-				fan_dir_offset=$fan_dir_offset_in_vpd_eeprom_pn
-			fi
-			# We need to read FAN direction from eeprom if cpld fan direction exists
-			if [[ ! -f $system_path/fan_dir ]] || [[ "$sku" == "HI117" ]]; then
-				fan_direction=$(xxd -u -p -l 1 -s $fan_dir_offset $eeprom_path/$eeprom_name)
-				fan_prefix=$(echo $eeprom_name | cut -d_ -f1)
-				case $fan_direction in
-				$fan_direction_exhaust)
-					echo 1 > $thermal_path/"${fan_prefix}"_dir
-					;;
-				$fan_direction_intake)
-					echo 0 > $thermal_path/"${fan_prefix}"_dir
-					;;
-				*)
-					# Unknown FAN dir
-					echo 2 > $thermal_path/"${fan_prefix}"_dir
-					;;
-				esac
+				hw-management-vpd-parser.py -t MLNX_FAN_VPD -i $eeprom_path/$eeprom_name -o $eeprom_path/"$fan_prefix"_data
 			fi
+			# Get PSU FAN direction
+			set -x
+			exec 3>&1 4>&2 >>/tmp/log 2>&1
+			get_fan_direction_by_vpd $eeprom_path/"$fan_prefix"_data
+			echo $? > $thermal_path/"${fan_prefix}"_dir
 			;;
 		vpd_info)
 			hw-management-vpd-parser.py -t SYSTEM_VPD -i "$eeprom_path/$eeprom_name" -o "$eeprom_path"/vpd_data

usr/usr/bin/hw-management-helpers.sh

@@ -109,6 +109,9 @@ declare -A psu_fandir_vs_pn=(["00KX1W"]=R ["00MP582"]=F ["00MP592"]=R ["00WT061"
 
 declare -A psu_type_vs_eeprom=( ["FSP016-9G0G"]="24c02" ["FSP017-9G0G"]="24c02" )
 
+declare -A sys_fandir_vs_pn=(["00MP584"]=F ["00MP594"]=R ["00MP593"]=R \
+["841987-001"]=F ["841988-001"]=R  )
+
 base_cpu_bus_offset=10
 max_tachos=20
 i2c_asic_bus_default=2

usr/usr/bin/hw-management-thermal-events.sh

@@ -289,23 +289,33 @@ if [ "$1" == "add" ]; then
 		find_i2c_bus
 		i2c_comex_mon_bus_default=$(< $i2c_comex_mon_bus_default_file)
 		comex_bus=$((i2c_comex_mon_bus_default+i2c_bus_offset))
-		# Verify if this is ASIC sensor
-		asic_bus=$((i2c_asic_bus_default+i2c_bus_offset))
 		if [ -f $config_path/cx_default_i2c_bus ]; then
 			cx_i2c_bus=$(< $config_path/cx_default_i2c_bus)
 			cx_i2c_bus=$((cx_i2c_bus+i2c_bus_offset))
 		fi
 		busdir=$(echo "$3""$4" |xargs dirname |xargs dirname)
 		busfolder=$(basename "$busdir")
 		bus="${busfolder:0:${#busfolder}-5}"
+		# Verify if this is ASIC sensor
+		if [ ! -f "$config_path/asic_num" ]; then
+			asic_num=1
+		else
+			asic_num=$(< $config_path/asic_num)
+		fi
+		for ((i=1; i<=asic_num; i+=1)); do
+			asic_i2c_bus_id=$(< $config_path/asic"$i"_i2c_bus_id)
+			asic_bus=$((asic_i2c_bus_id+i2c_bus_offset))
+			if [ "$bus" == "$asic_bus" ]; then
+				exit 0
+			fi
+		done
+
 		if [ "$bus" == "$comex_bus" ]; then
 			if [ $2 == cx_amb ]; then
 				check_n_link "$3""$4"/temp2_input $thermal_path/cx_amb
 			else
 				check_n_link "$3""$4"/temp1_input $thermal_path/comex_amb
 			fi
-		elif [ "$bus" == "$asic_bus" ]; then
-			exit 0
 		elif [ $bus -eq $cx_i2c_bus ]; then
 			check_n_link "$3""$4"/temp2_input $thermal_path/cx_amb
 		else
@@ -897,8 +907,7 @@ if [ "$1" == "add" ]; then
 		sleep 1
 		# Set I2C bus for psu
 		echo "$bus" > $config_path/"$psu_name"_i2c_bus
-		# Set default fan speed
-		psu_set_fan_speed "$psu_name" $(< $fan_psu_default)
+
 		# Add thermal attributes
 		check_n_link "$5""$3"/temp1_input $thermal_path/"$psu_name"_temp1
 		check_n_link "$5""$3"/temp1_max $thermal_path/"$psu_name"_temp1_max
@@ -1046,6 +1055,12 @@ if [ "$1" == "add" ]; then
 		# PSU FW VER
 		mfr=$(grep MFR_NAME $eeprom_path/"$psu_name"_vpd | awk '{print $2}')
 		cap=$(grep CAPACITY $eeprom_path/"$psu_name"_vpd | awk '{print $2}')
+
+		# Don't set default PSU FAN speed for Delta 2000 on HI172 - let's PSU FW handle it
+		if [[ "$cap" != "2000" || $sku != "HI172" || $mfr != "DELTA" ]]; then
+		    psu_set_fan_speed "$psu_name" $(< $fan_psu_default)
+		fi
+
 		if echo $mfr | grep -iq "Murata"; then
 			# Support FW update only for specific Murata PSU capacities
 			fw_ver="N/A"

usr/usr/bin/hw-management-vpd-parser.py

@@ -312,7 +312,17 @@ class MLNX_ID(object):
                         ]},
 }
 
+# FAN "fixed fileds" FRU fields description
+FIXED_FIELD_FAN_VPD = {"type": "FIXED_FILED_VPD",
+                           "blk_type": "FIXED_FIELD_FAN_VPD_BLK",
+                           "format" : [
+                               ["PN",  0, 16,  "FT_ASCII"],
+                               ["SN",  16, 16, "FT_ASCII"]
+                          ]}
+
 MLNX_VENDOR_BLK_FIELDS = ["name", "minor_version", "offset", "length", "info_type", "type"]
+FIXED_FIELD_BLK_FIELDS = ["name", "offset", "length",  "type"]
+
 MLNX_CPU_VPD = MLNX_VENDOR_BLK
 MLNX_FAN_VPD = MLNX_VENDOR_BLK
 MLNX_PDB_VPD = MLNX_VENDOR_BLK
@@ -350,6 +360,54 @@ def format_unpack(_data, item, blk_header, verbose=False):
     return val
 
 
+def parse_fru_fixed_fields_bin(data, blk_hdr, verbose=False):
+    if "format" not in blk_hdr.keys():
+        return "-"
+    block_format = blk_hdr["format"]
+    printv("Block_type {}\n".format(blk_hdr["blk_type"]), verbose)
+    rec_list = []
+    for rec in block_format:
+        rec_dict = dict(list(zip(FIXED_FIELD_BLK_FIELDS, rec)))
+        rec_size = rec_dict["length"]
+        rec_offset = rec_dict["offset"]
+
+        rec_type = rec_dict["type"]
+        if rec_type == "FT_RESERVED":
+            continue
+
+        printv("rec: {}".format(rec), verbose)
+
+        _data = data[rec_offset : rec_offset+rec_size]
+        rec_name = rec_dict["name"]
+        if rec_type == "FT_ASCII":
+            item_format = "{}s".format(rec_size)
+            val = struct.unpack(item_format, _data)[0]
+            val = val.split(b'\x00')[0]
+        elif rec_type == "FT_NUM":
+            _data_str = struct.unpack("{}B".format(rec_size), _data)
+            val = int_unpack_be(_data_str)
+        elif rec_type == "FT_NUM_INV":
+            _data_str = struct.unpack("{}B".format(rec_size), _data)
+            val = int_unpack_le(_data_str)
+        elif rec_type == "FT_HEX":
+            _data_str = struct.unpack("{}B".format(rec_size), _data)
+            val = hex(int_unpack_be(_data_str))
+        elif rec_type == "FT_HEX_INV":
+            _data_str = struct.unpack("{}B".format(rec_size), _data)
+            val = hex(int_unpack_le(_data_str))
+        elif rec_type == "FT_MAC":
+            _data_str = struct.unpack("{}B".format(rec_size), _data)
+            val = ':'.join(['{:02X}'.format(byte) for byte in _data_str])
+        else:
+            continue
+
+        printv("BIN: {}".format(binascii.hexlify(_data)), verbose)
+        printv("{} : {}\n".format(rec_name, bin_decode(val)), verbose)
+
+        rec_list.append([rec_name, bin_decode(val)])
+
+    return {'items' : rec_list}
+
 def mlnx_blk_unpack(data, blk_hdr, size, verbose=False):
     if "format" not in blk_hdr.keys():
         return "-"
@@ -585,6 +643,8 @@ def parse_fru_bin(data, VPD_TYPE, verbose):
         res = parse_fru_onie_bin(data, FRU_ITEMS, verbose)
     elif FRU_ITEMS["type"] == "MLNX":
         res = parse_fru_mlnx_bin(data, FRU_ITEMS, verbose)
+    elif FRU_ITEMS["type"] == "FIXED_FILED_VPD":
+        res = parse_fru_fixed_fields_bin(data, FRU_ITEMS, verbose)
     else:
         res = parse_fru_onie_bin(data, SYSTEM_VPD, verbose)
         if not res:
@@ -670,6 +730,7 @@ def check_crc32(data_bin, crc32):
                                                                                                                    "SYSTEM_VPD",
                                                                                                                    "MLNX_CPU_VPD",
                                                                                                                    "MLNX_FAN_VPD",
+                                                                                                                   "FIXED_FIELD_FAN_VPD",
                                                                                                                    "MLNX_PDB_VPD",
                                                                                                                    "MLNX_CARTRIDGE_VPD"])
     parser.add_argument('--verbose', dest='verbose', required=False, default=0, help=argparse.SUPPRESS)

usr/usr/bin/hw-management.sh

@@ -2760,6 +2760,11 @@ set_config_data()
 	echo $hotplug_linecards > $config_path/hotplug_linecards
 	echo $fan_speed_tolerance > $config_path/fan_speed_tolerance
 	echo $leakage_count > $config_path/leakage_num
+	if [ -v "thermal_control_config" ] && [ -f $thermal_control_config ]; then
+		cp $thermal_control_config $config_path/tc_config.json
+	else
+		cp $thermal_control_configs_path/tc_config_not_supported.json $config_path/tc_config.json
+	fi
 }
 
 connect_platform()
@@ -3298,11 +3303,6 @@ do_start()
 	else
 		ln -sf /etc/sensors3.conf $config_path/lm_sensors_config
 	fi
-	if [ -v "thermal_control_config" ] && [ -f $thermal_control_config ]; then
-		cp $thermal_control_config $config_path/tc_config.json
-	else
-		cp $thermal_control_configs_path/tc_config_not_supported.json $config_path/tc_config.json
-	fi
 	log_info "Init completed."
 }