16a3929159
- Why I did it Update hw-mgmt to a new version to pick up support for the SN4600C A1 system. - How I did it Update the pointer of the hw-mgmt submodule Update the hw-mgmt version number Remove the staled code patch to hw-mgmt userspace code. - How to verify it Run platform regression on Mellanox platforms. Signed-off-by: Kebo Liu <kebol@nvidia.com>
62 lines
1.6 KiB
Diff
62 lines
1.6 KiB
Diff
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
|
|
|