[Mellanox] Update mellanox hw-mgmt submodule and versions to V.7.0020.1300 (#9860)
- Why I did it New version of mellanox platform management code available adding support for new platforms and fixing bugs. - How I did it 1. Updated the submodule 2. Updated makefile version references 3. Regenerated SONiC patches
This commit is contained in:
parent
e5ee501116
commit
0ae2906c06
@ -16,7 +16,7 @@
|
|||||||
#
|
#
|
||||||
# Mellanox HW Management
|
# Mellanox HW Management
|
||||||
|
|
||||||
MLNX_HW_MANAGEMENT_VERSION = 7.0010.3331
|
MLNX_HW_MANAGEMENT_VERSION = 7.0020.1300
|
||||||
|
|
||||||
export MLNX_HW_MANAGEMENT_VERSION
|
export MLNX_HW_MANAGEMENT_VERSION
|
||||||
|
|
||||||
|
@ -0,0 +1,81 @@
|
|||||||
|
From 79dadd5b0d2f5e860b525c12d4d3843607b03a9f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Alexander Allen <arallen@nvidia.com>
|
||||||
|
Date: Fri, 21 Jan 2022 16:47:19 +0000
|
||||||
|
Subject: [PATCH] Disable hw-mgmt on SimX platforms
|
||||||
|
|
||||||
|
---
|
||||||
|
usr/usr/bin/hw-management-ready.sh | 31 ++++++++++++++++--------------
|
||||||
|
usr/usr/bin/hw-management.sh | 9 +++++++++
|
||||||
|
2 files changed, 26 insertions(+), 14 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/usr/usr/bin/hw-management-ready.sh b/usr/usr/bin/hw-management-ready.sh
|
||||||
|
index 5a9698c..364f906 100755
|
||||||
|
--- a/usr/usr/bin/hw-management-ready.sh
|
||||||
|
+++ b/usr/usr/bin/hw-management-ready.sh
|
||||||
|
@@ -51,19 +51,22 @@ if [ -d /var/run/hw-management ]; then
|
||||||
|
rm -fr /var/run/hw-management
|
||||||
|
fi
|
||||||
|
|
||||||
|
-case $board_type in
|
||||||
|
-VMOD0014)
|
||||||
|
- while [ ! -d /sys/devices/pci0000:00/0000:00:1f.0/NVSN2201:00/mlxreg-hotplug/hwmon ]
|
||||||
|
- do
|
||||||
|
- sleep 1
|
||||||
|
- done
|
||||||
|
- ;;
|
||||||
|
-*)
|
||||||
|
- while [ ! -d /sys/devices/platform/mlxplat/mlxreg-hotplug/hwmon ]
|
||||||
|
- do
|
||||||
|
- sleep 1
|
||||||
|
- done
|
||||||
|
- ;;
|
||||||
|
-esac
|
||||||
|
+if [ -z "$(lspci -vvv | grep SimX)" ]; then
|
||||||
|
+ case $board_type in
|
||||||
|
+ VMOD0014)
|
||||||
|
+ while [ ! -d /sys/devices/pci0000:00/0000:00:1f.0/NVSN2201:00/mlxreg-hotplug/hwmon ]
|
||||||
|
+ do
|
||||||
|
+ sleep 1
|
||||||
|
+ done
|
||||||
|
+ ;;
|
||||||
|
+ *)
|
||||||
|
+ while [ ! -d /sys/devices/platform/mlxplat/mlxreg-hotplug/hwmon ]
|
||||||
|
+ do
|
||||||
|
+ sleep 1
|
||||||
|
+ done
|
||||||
|
+ ;;
|
||||||
|
+ esac
|
||||||
|
+fi
|
||||||
|
+
|
||||||
|
echo "Start Chassis HW management service."
|
||||||
|
logger -t hw-management -p daemon.notice "Start Chassis HW management service."
|
||||||
|
diff --git a/usr/usr/bin/hw-management.sh b/usr/usr/bin/hw-management.sh
|
||||||
|
index ebfabb0..c0c038e 100755
|
||||||
|
--- a/usr/usr/bin/hw-management.sh
|
||||||
|
+++ b/usr/usr/bin/hw-management.sh
|
||||||
|
@@ -1495,6 +1495,13 @@ do_chip_down()
|
||||||
|
/usr/bin/hw-management-thermal-events.sh change hotplug_asic down %S %p
|
||||||
|
}
|
||||||
|
|
||||||
|
+check_simx()
|
||||||
|
+{
|
||||||
|
+ if [ -n "$(lspci -vvv | grep SimX)" ]; then
|
||||||
|
+ exit 0
|
||||||
|
+ fi
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
__usage="
|
||||||
|
Usage: $(basename "$0") [Options]
|
||||||
|
|
||||||
|
@@ -1520,6 +1527,8 @@ Options:
|
||||||
|
force-reload Performs hw-management 'stop' and the 'start.
|
||||||
|
"
|
||||||
|
|
||||||
|
+check_simx
|
||||||
|
+
|
||||||
|
case $ACTION in
|
||||||
|
start)
|
||||||
|
if [ -d /var/run/hw-management ]; then
|
||||||
|
--
|
||||||
|
2.17.1
|
||||||
|
|
@ -1,61 +0,0 @@
|
|||||||
From 5858f60aa5948a502ca8a1c9357ac81baa6f68dc Mon Sep 17 00:00:00 2001
|
|
||||||
From: junchao <junchao@nvidia.com>
|
|
||||||
Date: Fri, 23 Apr 2021 09:27:43 +0800
|
|
||||||
Subject: [PATCH] Make hw-mgmt SimX compatible
|
|
||||||
|
|
||||||
---
|
|
||||||
usr/usr/bin/hw-management-ready.sh | 11 +++++++----
|
|
||||||
usr/usr/bin/hw-management.sh | 9 +++++++++
|
|
||||||
2 files changed, 16 insertions(+), 4 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/usr/usr/bin/hw-management-ready.sh b/usr/usr/bin/hw-management-ready.sh
|
|
||||||
index 3c9f7b6..05d143f 100755
|
|
||||||
--- a/usr/usr/bin/hw-management-ready.sh
|
|
||||||
+++ b/usr/usr/bin/hw-management-ready.sh
|
|
||||||
@@ -49,9 +49,12 @@ if [ -d /var/run/hw-management ]; then
|
|
||||||
rm -fr /var/run/hw-management
|
|
||||||
fi
|
|
||||||
|
|
||||||
-while [ ! -d /sys/devices/platform/mlxplat/mlxreg-hotplug/hwmon ]
|
|
||||||
-do
|
|
||||||
- sleep 1
|
|
||||||
-done
|
|
||||||
+if [ -z "$(lspci -vvv | grep SimX)" ]; then
|
|
||||||
+ while [ ! -d /sys/devices/platform/mlxplat/mlxreg-hotplug/hwmon ]
|
|
||||||
+ do
|
|
||||||
+ sleep 1
|
|
||||||
+ done
|
|
||||||
+fi
|
|
||||||
+
|
|
||||||
echo "Start Chassis HW management service."
|
|
||||||
logger -t hw-management -p daemon.notice "Start Chassis HW management service."
|
|
||||||
diff --git a/usr/usr/bin/hw-management.sh b/usr/usr/bin/hw-management.sh
|
|
||||||
index 991cf45..16ad0bf 100755
|
|
||||||
--- a/usr/usr/bin/hw-management.sh
|
|
||||||
+++ b/usr/usr/bin/hw-management.sh
|
|
||||||
@@ -1265,6 +1265,13 @@ do_chip_down()
|
|
||||||
/usr/bin/hw-management-thermal-events.sh change hotplug_asic down %S %p
|
|
||||||
}
|
|
||||||
|
|
||||||
+check_simx()
|
|
||||||
+{
|
|
||||||
+ if [ -n "$(lspci -vvv | grep SimX)" ]; then
|
|
||||||
+ exit 0
|
|
||||||
+ fi
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
__usage="
|
|
||||||
Usage: $(basename "$0") [Options]
|
|
||||||
|
|
||||||
@@ -1290,6 +1297,8 @@ Options:
|
|
||||||
force-reload Performs hw-management 'stop' and the 'start.
|
|
||||||
"
|
|
||||||
|
|
||||||
+check_simx
|
|
||||||
+
|
|
||||||
case $ACTION in
|
|
||||||
start)
|
|
||||||
if [ -d /var/run/hw-management ]; then
|
|
||||||
--
|
|
||||||
1.9.1
|
|
||||||
|
|
@ -1 +1 @@
|
|||||||
Subproject commit 0ece116e31bd15031af263e28a1b681d4575db5e
|
Subproject commit cd4e3f7bdc9fe77f0dc78b405e52fe876f7ca490
|
Loading…
Reference in New Issue
Block a user