diff --git a/platform/mellanox/hw-management.mk b/platform/mellanox/hw-management.mk index 4929a5500df1..0c2f6a7d28d0 100644 --- a/platform/mellanox/hw-management.mk +++ b/platform/mellanox/hw-management.mk @@ -1,6 +1,6 @@ # Mellanox HW Management -MLNX_HW_MANAGEMENT_VERSION = 7.0010.2002 +MLNX_HW_MANAGEMENT_VERSION = 7.0010.2303 export MLNX_HW_MANAGEMENT_VERSION diff --git a/platform/mellanox/hw-management/0002-hw-mgmt-events-Add-support-for-SDK-OFFLINE-event-for.patch b/platform/mellanox/hw-management/0002-hw-mgmt-events-Add-support-for-SDK-OFFLINE-event-for.patch deleted file mode 100644 index 6c58f7299c2c..000000000000 --- a/platform/mellanox/hw-management/0002-hw-mgmt-events-Add-support-for-SDK-OFFLINE-event-for.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 3e511778248403968e0a02857b7003f352669ba3 Mon Sep 17 00:00:00 2001 -From: Vadim Pasternak -Date: Wed, 13 Jan 2021 13:19:17 +0200 -Subject: [PATCH] hw-mgmt: events: Add support for SDK OFFLINE event for - handling flow with in service firmware upgrade - -In order to prevent "mlxsw_minimal" driver access to ASIC during in -service firmware upgrade flow, SDK will raise "OFFLINE" 'udev' event -at early beginning of such flow. When this event is received, -hw-managemnet will remove "mlxsw_minimal" driver. -There is no need to implement opposite "ONLINE" event, since this flow -is ended up with "kexec". - -Signed-off-by: Vadim Pasternak ---- - usr/lib/udev/rules.d/50-hw-management-events.rules | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/usr/lib/udev/rules.d/50-hw-management-events.rules b/usr/lib/udev/rules.d/50-hw-management-events.rules -index cf4219e..33ea1bc 100644 ---- a/usr/lib/udev/rules.d/50-hw-management-events.rules -+++ b/usr/lib/udev/rules.d/50-hw-management-events.rules -@@ -269,3 +269,4 @@ SUBSYSTEM=="i2c", DEVPATH=="/devices/platform/mlxplat/i2c_mlxcpld*/i2c-*/i2c-*/* - # SDK - SUBSYSTEM=="pci", DRIVERS=="sx_core", ACTION=="add", RUN+="/usr/bin/hw-management-thermal-events.sh add sxcore add" - SUBSYSTEM=="pci", DRIVERS=="sx_core", ACTION=="remove", RUN+="/usr/bin/hw-management-thermal-events.sh rm sxcore remove" -+SUBSYSTEM=="pci", DRIVERS=="sx_core", ACTION=="offline", RUN+="/usr/bin/hw-management-thermal-events.sh rm sxcore remove" --- -1.9.1 - diff --git a/platform/mellanox/hw-management/0003-Make-hw-mgmt-SimX-compatiable.patch b/platform/mellanox/hw-management/0003-Make-hw-mgmt-SimX-compatiable.patch index 0eb3daa7977e..4e49516c8d54 100644 --- a/platform/mellanox/hw-management/0003-Make-hw-mgmt-SimX-compatiable.patch +++ b/platform/mellanox/hw-management/0003-Make-hw-mgmt-SimX-compatiable.patch @@ -1,3 +1,13 @@ +From 5858f60aa5948a502ca8a1c9357ac81baa6f68dc Mon Sep 17 00:00:00 2001 +From: junchao +Date: Fri, 23 Apr 2021 09:27:43 +0800 +Subject: [PATCH] Make hw-mgmt SimX compatible + +--- + 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 3c9f7b6..05d143f 100755 --- a/usr/usr/bin/hw-management-ready.sh @@ -20,10 +30,10 @@ index 3c9f7b6..05d143f 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 70f1297..e427a3d 100755 +index 991cf45..16ad0bf 100755 --- a/usr/usr/bin/hw-management.sh +++ b/usr/usr/bin/hw-management.sh -@@ -1110,6 +1110,13 @@ do_chip_down() +@@ -1265,6 +1265,13 @@ do_chip_down() /usr/bin/hw-management-thermal-events.sh change hotplug_asic down %S %p } @@ -35,9 +45,9 @@ index 70f1297..e427a3d 100755 +} + __usage=" - Usage: $(basename $0) [Options] + Usage: $(basename "$0") [Options] -@@ -1135,6 +1142,8 @@ Options: +@@ -1290,6 +1297,8 @@ Options: force-reload Performs hw-management 'stop' and the 'start. " @@ -46,3 +56,6 @@ index 70f1297..e427a3d 100755 case $ACTION in start) if [ -d /var/run/hw-management ]; then +-- +1.9.1 + diff --git a/platform/mellanox/hw-management/hw-mgmt b/platform/mellanox/hw-management/hw-mgmt index 298ffebcb802..8cd7f9872ec4 160000 --- a/platform/mellanox/hw-management/hw-mgmt +++ b/platform/mellanox/hw-management/hw-mgmt @@ -1 +1 @@ -Subproject commit 298ffebcb8026caafba36727ce2fba1f26b100aa +Subproject commit 8cd7f9872ec4f8ca54863fc2c83722ae7ecc196a