From 6ad3cbb2003d27c4c4b86eff12be3d29b98db699 Mon Sep 17 00:00:00 2001 From: Stephen Sun Date: Fri, 14 Feb 2020 15:02:37 +0800 Subject: [PATCH 1/2] [Mellanox/hw-mgmt]Add patch which disables thermal policy in hw-mgmt --- ...-Disable-thermal-policy-running-in-h.patch | 30 +++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 platform/mellanox/hw-management/0002-hw-management.sh-Disable-thermal-policy-running-in-h.patch diff --git a/platform/mellanox/hw-management/0002-hw-management.sh-Disable-thermal-policy-running-in-h.patch b/platform/mellanox/hw-management/0002-hw-management.sh-Disable-thermal-policy-running-in-h.patch new file mode 100644 index 000000000000..0ad5641cdca1 --- /dev/null +++ b/platform/mellanox/hw-management/0002-hw-management.sh-Disable-thermal-policy-running-in-h.patch @@ -0,0 +1,30 @@ +From 42cefa91796e8768792eb64538714cc55d5a11e2 Mon Sep 17 00:00:00 2001 +From: Stephen Sun +Date: Fri, 14 Feb 2020 13:48:00 +0800 +Subject: [PATCH] [hw-management.sh]Disable thermal policy running in hw-mgmt + service SONiC thermal control algorithm has been supported. + +--- + 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 cff10fe..605ba23 100755 +--- a/usr/usr/bin/hw-management.sh ++++ b/usr/usr/bin/hw-management.sh +@@ -593,7 +593,11 @@ do_start() + echo $asic_bus > $config_path/asic_bus + connect_platform + +- $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 + From 8e978635d10f10592be37ca11c658d6777f6ea74 Mon Sep 17 00:00:00 2001 From: Stephen Sun Date: Tue, 25 Feb 2020 21:45:20 +0800 Subject: [PATCH 2/2] [Mellanox/hw-mgmt]Update the patch of disabling thermal policy for hw-mgmt V.7.0000.3012 --- ...t.sh-Disable-thermal-policy-running-in-h.patch | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/platform/mellanox/hw-management/0002-hw-management.sh-Disable-thermal-policy-running-in-h.patch b/platform/mellanox/hw-management/0002-hw-management.sh-Disable-thermal-policy-running-in-h.patch index 0ad5641cdca1..d1c34fd16ec0 100644 --- a/platform/mellanox/hw-management/0002-hw-management.sh-Disable-thermal-policy-running-in-h.patch +++ b/platform/mellanox/hw-management/0002-hw-management.sh-Disable-thermal-policy-running-in-h.patch @@ -1,20 +1,21 @@ -From 42cefa91796e8768792eb64538714cc55d5a11e2 Mon Sep 17 00:00:00 2001 +From 76b02916794be2e2558fcff1d11609a594f633d7 Mon Sep 17 00:00:00 2001 From: Stephen Sun Date: Fri, 14 Feb 2020 13:48:00 +0800 -Subject: [PATCH] [hw-management.sh]Disable thermal policy running in hw-mgmt - service SONiC thermal control algorithm has been supported. +Subject: [PATCH] Disable thermal policy running in hw-mgmt service SONiC + thermal control algorithm has been supported. +Signed-off-by: Stephen Sun --- 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 cff10fe..605ba23 100755 +index 2cdbfb2..48b41d5 100755 --- a/usr/usr/bin/hw-management.sh +++ b/usr/usr/bin/hw-management.sh -@@ -593,7 +593,11 @@ do_start() - echo $asic_bus > $config_path/asic_bus - connect_platform +@@ -799,7 +799,11 @@ do_start() + #disabled for leopard chipless bringup. + echo 1 > $config_path/suspend - $THERMAL_CONTROL $thermal_type $max_tachos $max_psus& +#