[Mellanox] Update hw-mgmt package to V.7.0000.3020 (#4362)

* update hw-mgmt package to V.7.0000.3020
* update sonic-linux-kernel repo to pick up new patches
This commit is contained in:
Kebo Liu 2020-04-15 13:04:11 +03:00 committed by GitHub
parent 12400a447c
commit 89fb1059fa
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 3 additions and 34 deletions

View File

@ -1,6 +1,6 @@
# Mellanox HW Management
MLNX_HW_MANAGEMENT_VERSION = 7.0000.3012
MLNX_HW_MANAGEMENT_VERSION = 7.0000.3020
export MLNX_HW_MANAGEMENT_VERSION

View File

@ -1,31 +0,0 @@
From 76b02916794be2e2558fcff1d11609a594f633d7 Mon Sep 17 00:00:00 2001
From: Stephen Sun <stephens@mellanox.com>
Date: Fri, 14 Feb 2020 13:48:00 +0800
Subject: [PATCH] Disable thermal policy running in hw-mgmt service SONiC
thermal control algorithm has been supported.
Signed-off-by: Stephen Sun <stephens@mellanox.com>
---
usr/usr/bin/hw-management.sh | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/usr/usr/bin/hw-management.sh b/usr/usr/bin/hw-management.sh
index 2cdbfb2..48b41d5 100755
--- a/usr/usr/bin/hw-management.sh
+++ b/usr/usr/bin/hw-management.sh
@@ -799,7 +799,11 @@ do_start()
#disabled for leopard chipless bringup.
echo 1 > $config_path/suspend
- $THERMAL_CONTROL $thermal_type $max_tachos $max_psus&
+#
+# Disable thermal control algorithm in hw-management service
+# because there has already been that in SONiC
+#
+# $THERMAL_CONTROL $thermal_type $max_tachos $max_psus&
}
do_stop()
--
1.9.1

@ -1 +1 @@
Subproject commit 2f659142ab3b4deb58989a2ca38b0b1671600509
Subproject commit 5e0a3410bf2167af0f63ba85cd4158a0be9f1443

@ -1 +1 @@
Subproject commit 231bebb41b86c9f744adc86972773d75fd4a2a2a
Subproject commit 32963dab6b6ea9f9fbda9b2b49a77574453fb8ef