From 16774580f8b1c25e6e175b62be5107cfb2150b51 Mon Sep 17 00:00:00 2001 From: Kebo Liu Date: Mon, 16 Nov 2020 17:57:19 +0800 Subject: [PATCH] [Mellanox] update hw-mgmt package to V.7.0010.1300 (#5902) pick up new functions and bug fixes: - New Features - Add dynamic minimum tables for MSN3700X, MSN3800, MSN3420, MSN4600, MSN4700 systems - Split hw-management to one-shot init hw-management service and thermal control services. - Bug fixes HW Mgmt core: - Move PSU EEPROM configuration from kernel to user space for Spectrum 2 / Spectrum 3 system --- platform/mellanox/hw-management.mk | 2 +- ...agement-thermal-control-shell-script.patch | 28 ------------------- platform/mellanox/hw-management/hw-mgmt | 2 +- 3 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 platform/mellanox/hw-management/0001-Disable-hw-management-thermal-control-shell-script.patch diff --git a/platform/mellanox/hw-management.mk b/platform/mellanox/hw-management.mk index eb90cf16d4..521daa1c7c 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.1000 +MLNX_HW_MANAGEMENT_VERSION = 7.0010.1300 export MLNX_HW_MANAGEMENT_VERSION diff --git a/platform/mellanox/hw-management/0001-Disable-hw-management-thermal-control-shell-script.patch b/platform/mellanox/hw-management/0001-Disable-hw-management-thermal-control-shell-script.patch deleted file mode 100644 index eef970ed23..0000000000 --- a/platform/mellanox/hw-management/0001-Disable-hw-management-thermal-control-shell-script.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 3bce9e33132a86c0a53a7b0a49ee1932d65bfb7f Mon Sep 17 00:00:00 2001 -From: junchao -Date: Wed, 6 May 2020 11:37:56 +0800 -Subject: [PATCH] Disable hw-management thermal control shell script - ---- - usr/usr/bin/hw-management.sh | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/usr/usr/bin/hw-management.sh b/usr/usr/bin/hw-management.sh -index 65e5d39..cffff7a 100755 ---- a/usr/usr/bin/hw-management.sh -+++ b/usr/usr/bin/hw-management.sh -@@ -832,7 +832,10 @@ 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 thermal control shell script in hw-management -+ # because there has already been that in SONiC -+ # $THERMAL_CONTROL $thermal_type $max_tachos $max_psus& - } - - do_stop() --- -1.9.1 - diff --git a/platform/mellanox/hw-management/hw-mgmt b/platform/mellanox/hw-management/hw-mgmt index cdacf1e932..dec7935777 160000 --- a/platform/mellanox/hw-management/hw-mgmt +++ b/platform/mellanox/hw-management/hw-mgmt @@ -1 +1 @@ -Subproject commit cdacf1e932f929c8dedde6c7e14759a2083aac66 +Subproject commit dec7935777b52d31a2220bad8b0cec4b71ec0961