From f494ff1890caeedb3f0f3f9a8f8b93187c6d047b Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Wed, 16 Sep 2020 10:38:21 -0700
Subject: [PATCH] Revert "[Mellanox] update hw-mgmt package to V.7.0010.1300
 (#5363)" (#5371)

This reverts commit 940de61ffc94875c1913f2f77998e8f3ad749866.
---
 platform/mellanox/hw-management.mk            |  2 +-
 ...agement-thermal-control-shell-script.patch | 28 +++++++++++++++++++
 platform/mellanox/hw-management/hw-mgmt       |  2 +-
 3 files changed, 30 insertions(+), 2 deletions(-)
 create 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 521daa1c7c..eb90cf16d4 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.1300
+MLNX_HW_MANAGEMENT_VERSION = 7.0010.1000
 
 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
new file mode 100644
index 0000000000..eef970ed23
--- /dev/null
+++ b/platform/mellanox/hw-management/0001-Disable-hw-management-thermal-control-shell-script.patch
@@ -0,0 +1,28 @@
+From 3bce9e33132a86c0a53a7b0a49ee1932d65bfb7f Mon Sep 17 00:00:00 2001
+From: junchao <junchao@mellanox.com>
+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 dec7935777..cdacf1e932 160000
--- a/platform/mellanox/hw-management/hw-mgmt
+++ b/platform/mellanox/hw-management/hw-mgmt
@@ -1 +1 @@
-Subproject commit dec7935777b52d31a2220bad8b0cec4b71ec0961
+Subproject commit cdacf1e932f929c8dedde6c7e14759a2083aac66