Skip to content

Commit 825fc9e

Browse files
alexrallenjudyjoseph
authored andcommitted
[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
1 parent 86bd652 commit 825fc9e

4 files changed

Lines changed: 83 additions & 63 deletions

File tree

platform/mellanox/hw-management.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#
1717
# Mellanox HW Management
1818

19-
MLNX_HW_MANAGEMENT_VERSION = 7.0010.3331
19+
MLNX_HW_MANAGEMENT_VERSION = 7.0020.1300
2020

2121
export MLNX_HW_MANAGEMENT_VERSION
2222

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
From 79dadd5b0d2f5e860b525c12d4d3843607b03a9f Mon Sep 17 00:00:00 2001
2+
From: Alexander Allen <arallen@nvidia.com>
3+
Date: Fri, 21 Jan 2022 16:47:19 +0000
4+
Subject: [PATCH] Disable hw-mgmt on SimX platforms
5+
6+
---
7+
usr/usr/bin/hw-management-ready.sh | 31 ++++++++++++++++--------------
8+
usr/usr/bin/hw-management.sh | 9 +++++++++
9+
2 files changed, 26 insertions(+), 14 deletions(-)
10+
11+
diff --git a/usr/usr/bin/hw-management-ready.sh b/usr/usr/bin/hw-management-ready.sh
12+
index 5a9698c..364f906 100755
13+
--- a/usr/usr/bin/hw-management-ready.sh
14+
+++ b/usr/usr/bin/hw-management-ready.sh
15+
@@ -51,19 +51,22 @@ if [ -d /var/run/hw-management ]; then
16+
rm -fr /var/run/hw-management
17+
fi
18+
19+
-case $board_type in
20+
-VMOD0014)
21+
- while [ ! -d /sys/devices/pci0000:00/0000:00:1f.0/NVSN2201:00/mlxreg-hotplug/hwmon ]
22+
- do
23+
- sleep 1
24+
- done
25+
- ;;
26+
-*)
27+
- while [ ! -d /sys/devices/platform/mlxplat/mlxreg-hotplug/hwmon ]
28+
- do
29+
- sleep 1
30+
- done
31+
- ;;
32+
-esac
33+
+if [ -z "$(lspci -vvv | grep SimX)" ]; then
34+
+ case $board_type in
35+
+ VMOD0014)
36+
+ while [ ! -d /sys/devices/pci0000:00/0000:00:1f.0/NVSN2201:00/mlxreg-hotplug/hwmon ]
37+
+ do
38+
+ sleep 1
39+
+ done
40+
+ ;;
41+
+ *)
42+
+ while [ ! -d /sys/devices/platform/mlxplat/mlxreg-hotplug/hwmon ]
43+
+ do
44+
+ sleep 1
45+
+ done
46+
+ ;;
47+
+ esac
48+
+fi
49+
+
50+
echo "Start Chassis HW management service."
51+
logger -t hw-management -p daemon.notice "Start Chassis HW management service."
52+
diff --git a/usr/usr/bin/hw-management.sh b/usr/usr/bin/hw-management.sh
53+
index ebfabb0..c0c038e 100755
54+
--- a/usr/usr/bin/hw-management.sh
55+
+++ b/usr/usr/bin/hw-management.sh
56+
@@ -1495,6 +1495,13 @@ do_chip_down()
57+
/usr/bin/hw-management-thermal-events.sh change hotplug_asic down %S %p
58+
}
59+
60+
+check_simx()
61+
+{
62+
+ if [ -n "$(lspci -vvv | grep SimX)" ]; then
63+
+ exit 0
64+
+ fi
65+
+}
66+
+
67+
__usage="
68+
Usage: $(basename "$0") [Options]
69+
70+
@@ -1520,6 +1527,8 @@ Options:
71+
force-reload Performs hw-management 'stop' and the 'start.
72+
"
73+
74+
+check_simx
75+
+
76+
case $ACTION in
77+
start)
78+
if [ -d /var/run/hw-management ]; then
79+
--
80+
2.17.1
81+

platform/mellanox/hw-management/0003-Make-hw-mgmt-SimX-compatiable.patch

Lines changed: 0 additions & 61 deletions
This file was deleted.
Submodule hw-mgmt updated 93 files

0 commit comments

Comments
 (0)