matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[Mellanox] [201911] Upgrade hw-mgmt to 7.0100.2303 (#7418)

Browse Source 
- Update hw-mgmt pointer
- Remove unused patches
- Fix existing patch to make sure it apply successfully
This commit is contained in:
Junchao-Mellanox 2021-05-02 01:30:51 +08:00 committed by GitHub
parent efe0515519
commit 6128ff6def
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 2 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
platform/mellanox/hw-management.mk
View File

@ -1,6 +1,6 @@
# Mellanox HW Management
MLNX_HW_MANAGEMENT_VERSION = 7.0010.1002
MLNX_HW_MANAGEMENT_VERSION = 7.0010.2303
export MLNX_HW_MANAGEMENT_VERSION

27
platform/mellanox/hw-management/0001-hw-management.sh-Disable-thermal-policy-running-in-h.patch
View File

@ -1,27 +0,0 @@
From 3512488c981eb81d51ce92cb3573721e36861f56 Mon Sep 17 00:00:00 2001
From: Junchao Chen <junchao@mellanox.com>
Date: Fri, 29 May 2020 10:38:53 +0300
Subject: [PATCH] Disable hw-management thermal control service
---
usr/usr/bin/hw-management.sh | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/usr/usr/bin/hw-management.sh b/usr/usr/bin/hw-management.sh
index 65e5d39..0d1c4a1 100755
--- a/usr/usr/bin/hw-management.sh
+++ b/usr/usr/bin/hw-management.sh
@@ -832,7 +832,9 @@ do_start()
if [ -f $config_path/max_tachos ]; then
max_tachos=$(<$config_path/max_tachos)
fi
- $THERMAL_CONTROL $thermal_type $max_tachos $max_psus&
+ # Disable hw-management thermal control because
+ # SONiC already implement it
+ #$THERMAL_CONTROL $thermal_type $max_tachos $max_psus&
}
do_stop()
--
1.9.1

30
platform/mellanox/hw-management/0002-hw-mgmt-events-Add-support-for-SDK-OFFLINE-event-for.patch
View File

@ -1,30 +0,0 @@
From 3e511778248403968e0a02857b7003f352669ba3 Mon Sep 17 00:00:00 2001
From: Vadim Pasternak <vadimp@nvidia.com>
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 <vadimp@mellanox.com>
---
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

2
platform/mellanox/hw-management/hw-mgmt

@ -1 +1 @@
Subproject commit 5a02bfcf26d73a2d6e945df71915e5fa48bbf4ee
Subproject commit 8cd7f9872ec4f8ca54863fc2c83722ae7ecc196a