[202205] [Mellanox] Update hw-mgmt package to V.7.0020.4304

Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>
sonic-net · Sep 4, 2023 · 8e9e243 · 8e9e243
1 parent a5eda5a
commit 8e9e243
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/platform/mellanox/hw-management.mk b/platform/mellanox/hw-management.mk
@@ -16,7 +16,7 @@
 #
 # Mellanox HW Management
 
-MLNX_HW_MANAGEMENT_VERSION = 7.0020.4301
+MLNX_HW_MANAGEMENT_VERSION = 7.0020.4304
 
 export MLNX_HW_MANAGEMENT_VERSION
 

diff --git a/platform/mellanox/hw-management/0002-Disable-hw-mgmt-on-SimX-platforms.patch b/platform/mellanox/hw-management/0002-Disable-hw-mgmt-on-SimX-platforms.patch
@@ -1,18 +1,19 @@
-From 422b64397f2f33b394d037820f0ceb4c09e3a725 Mon Sep 17 00:00:00 2001
-From: Alexander Allen <arallen@nvidia.com>
-Date: Fri, 21 Jan 2022 16:47:19 +0000
-Subject: [PATCH 2/4] Disable hw-mgmt on SimX platforms
+From d09e7c6e299f8e473e34f1bb80d68eda4f465d49 Mon Sep 17 00:00:00 2001
+From: Volodymyr Samotiy <volodymyrs@nvidia.com>
+Date: Tue, 22 Aug 2023 11:12:02 +0300
+Subject: [PATCH] [PATCH 2/4] Disable hw-mgmt on SimX platforms
 
+Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>
 ---
  usr/usr/bin/hw-management-ready.sh | 11 +++++++----
  usr/usr/bin/hw-management.sh       |  9 +++++++++
  2 files changed, 16 insertions(+), 4 deletions(-)
 
 diff --git a/usr/usr/bin/hw-management-ready.sh b/usr/usr/bin/hw-management-ready.sh
-index 88672a8..7558c68 100755
+index 2b736d27..931cf785 100755
 --- a/usr/usr/bin/hw-management-ready.sh
 +++ b/usr/usr/bin/hw-management-ready.sh
-@@ -51,17 +51,20 @@ if [ -d /var/run/hw-management ]; then
+@@ -51,13 +51,14 @@ if [ -d /var/run/hw-management ]; then
  	rm -fr /var/run/hw-management
  fi
 
@@ -27,8 +28,11 @@ index 88672a8..7558c68 100755
  	;;
 -*)
 +    *)
- 	if [ ! -d /sys/devices/platform/mlxplat/mlxreg-hotplug/hwmon ]; then
- 		timeout 180 bash -c 'until [ -d /sys/devices/platform/mlxplat/mlxreg-hotplug/hwmon ]; do sleep 0.2; done'
+ 	arch=$(uname -m)
+ 	if [ "$arch" = "aarch64" ]; then
+ 		plat_path=/sys/devices/platform/MLNXBF49:00
+@@ -69,6 +70,8 @@ VMOD0014)
+ 		timeout 180 bash -c 'until [ -d ${plat_path}/mlxreg-hotplug/hwmon ]; do sleep 0.2; done'
  	fi
  	;;
 -esac
@@ -38,10 +42,10 @@ index 88672a8..7558c68 100755
  echo "Start Chassis HW management service."
  logger -t hw-management -p daemon.notice "Start Chassis HW management service."
 diff --git a/usr/usr/bin/hw-management.sh b/usr/usr/bin/hw-management.sh
-index 1ee05b5..50d922b 100755
+index 0381bdfe..fd51a134 100755
 --- a/usr/usr/bin/hw-management.sh
 +++ b/usr/usr/bin/hw-management.sh
-@@ -2310,6 +2310,13 @@ do_chip_down()
+@@ -2323,6 +2323,13 @@ do_chip_down()
  	/usr/bin/hw-management-thermal-events.sh change hotplug_asic down %S %p
  }
 
@@ -55,8 +59,8 @@ index 1ee05b5..50d922b 100755
  __usage="
  Usage: $(basename "$0") [Options]
 
-@@ -2335,6 +2342,8 @@ Options:
- 	force-reload	Performs hw-management 'stop' and the 'start.
+@@ -2349,6 +2356,8 @@ Options:
+ 	reset-cause	Output system reset cause.
  "
 
 +check_simx
@@ -65,5 +69,5 @@ index 1ee05b5..50d922b 100755
  	start)
  		if [ -d /var/run/hw-management ]; then
 -- 
-2.20.1
+2.17.1
 
diff --git a/platform/mellanox/hw-management/hw-mgmt b/platform/mellanox/hw-management/hw-mgmt
+135 −1		debian/Release.txt
+2 −3		debian/changelog
+218 −189		recipes-kernel/linux/Patch_Status_Table.txt
+50 −0		recipes-kernel/linux/linux-5.10/0283-mlxsw-core_hwmon-Align-modules-label-name-assignment.patch
+4 −0		usr/etc/hw-management-sensors/msn4700_respin_sensors.conf
+4 −0		usr/etc/hw-management-sensors/msn4700_sensors.conf
+0 −1		usr/etc/modules-load.d/05-hw-management-modules.conf
+18 −0		usr/usr/bin/hw-management-chassis-events.sh
+9 −2		usr/usr/bin/hw-management-ready.sh
+15 −13		usr/usr/bin/hw-management-thermal-events.sh
+55 −8		usr/usr/bin/hw-management.sh