Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion platform/mellanox/hw-management.mk
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#
# Mellanox HW Management

MLNX_HW_MANAGEMENT_VERSION = 7.0010.3331
MLNX_HW_MANAGEMENT_VERSION = 7.0020.1300

export MLNX_HW_MANAGEMENT_VERSION

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
From 79dadd5b0d2f5e860b525c12d4d3843607b03a9f Mon Sep 17 00:00:00 2001
From: Alexander Allen <[email protected]>
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

This file was deleted.

2 changes: 1 addition & 1 deletion platform/mellanox/hw-management/hw-mgmt
Submodule hw-mgmt updated 93 files
+ Documentation/Chassis_Management_for_Mellanox_Switch_Systems_with_Sysfs-for-update_rev.2.0.pdf
+ Documentation/Chassis_Management_for_Mellanox_Switch_Systems_with_Sysfs-for-update_rev.2.1.pdf
+15 −0 README.md
+192 −0 debian/Release.txt
+2 −2 debian/changelog
+1 −1 debian/control
+138 −85 recipes-kernel/linux/Patch_Status_Table.txt
+11 −10 recipes-kernel/linux/linux-4.19/0064-platform-mellanox-mlxreg-io-Fix-read-access-of-n-byt.patch
+3 −3 recipes-kernel/linux/linux-4.19/0092-platform-x86-mlx-platform-Extend-FAN-and-LED-config-.patch
+45 −9 recipes-kernel/linux/linux-4.19/0126-mlxsw-minimal-Add-indexation-for-modules-on-for-line.patch
+5 −5 recipes-kernel/linux/linux-4.19/0127-mlxsw-minimal-Obtain-maximum-number-of-slots-support.patch
+5 −6 recipes-kernel/linux/linux-4.19/0128-mlxsw-minimal-Add-system-event-handler.patch
+6 −6 recipes-kernel/linux/linux-4.19/0129-mlxsw-minimal-Add-interfaces-for-line-card-initializ.patch
+38 −0 recipes-kernel/linux/linux-4.19/0133-platform-x86-mlx-platform-Extend-FAN-platform-data-d.patch
+128 −0 recipes-kernel/linux/linux-4.19/0134-hwmon-mlxreg-fan-Return-non-zero-value-when-fan-curr.patch
+174 −0 recipes-kernel/linux/linux-4.19/0135-hwmon-mlxreg-fan-Extend-driver-to-support-multiply-P.patch
+226 −0 recipes-kernel/linux/linux-4.19/0136-hwmon-mlxreg-fan-Extend-driver-to-support-multiply-c.patch
+34 −0 recipes-kernel/linux/linux-4.19/0137-hwmon-mlxreg-fan-Fix-out-of-bounds-read-on-array-fan.patch
+98 −0 recipes-kernel/linux/linux-4.19/0138-platform-x86-mlx-platform-Add-support-for-multiply-c.patch
+51 −0 recipes-kernel/linux/linux-4.19/0139-hwmon-mlxreg-fan-Modify-PWM-connectivity-validation.patch
+30 −0 recipes-kernel/linux/linux-4.19/0140-hwmon-mlxreg-fan-Rename-cooling-devices.patch
+30 −0 recipes-kernel/linux/linux-4.19/0141-mlxsw-core_thermal-Rename-cooling-devices.patch
+658 −0 recipes-kernel/linux/linux-4.19/0142-platform-x86-mlx-platform-Add-support-for-systems-eq.patch
+172 −0 recipes-kernel/linux/linux-4.19/0143-platform-x86-mlx-platform-Add-support-for-new-system.patch
+66 −0 recipes-kernel/linux/linux-4.19/0144-platform-x86-mlx-platform-Fix-cpld-_pn-register-seco.patch
+664 −0 recipes-kernel/linux/linux-4.19/0145-hwmon-Add-support-for-EMC2305-RPM-based-PWM-Fan-Spee.patch
+69 −0 recipes-kernel/linux/linux-4.19/0146-dt-bindings-Add-description-for-EMC2305-for-RPM-base.patch
+408 −0 recipes-kernel/linux/linux-4.19/0147-hwmon-powr1220-Upgrade-driver-to-support-hwmon-info-.patch
+53 −0 recipes-kernel/linux/linux-4.19/0148-hwmon-powr1220-Add-support-for-Lattice-s-POWR1014-po.patch
+40 −0 recipes-kernel/linux/linux-4.19/0149-platform_data-mlxreg-Add-field-for-notification-call.patch
+34 −0 recipes-kernel/linux/linux-4.19/0150-i2c-mlxcpld-Add-callback-to-notify-probing-completio.patch
+1,156 −0 recipes-kernel/linux/linux-4.19/0151-platform-mellanox-Add-support-for-new-SN2201-system.patch
+33 −0 recipes-kernel/linux/linux-4.19/0152-mlxsw-core-Extend-external-cooling-device-whitelist-.patch
+104 −0 recipes-kernel/linux/linux-4.19/0153-Documentation-ABI-Add-new-attributes-for-mlxreg-io-s.patch
+96 −0 recipes-kernel/linux/linux-4.19/0154-platform-x86-mlx-platform-Add-support-for-new-system.patch
+45 −0 recipes-kernel/linux/linux-4.19/0155-Squash-to-commit-16d59a4882b8-mlxsw-core-Add-APIs-fo.patch
+2 −2 recipes-kernel/linux/linux-4.9/0066-platform-x86-mlx-platform-Extend-FAN-and-LED-config-.patch
+68 −0 recipes-kernel/linux/linux-4.9/0074-platform-x86-mlx-platform-Fix-cpld-_pn-register-seco.patch
+21 −18 recipes-kernel/linux/linux-5.10/0052-hwmon-mlxreg-fan-Return-non-zero-value-when-fan-curr.patch
+210 −161 recipes-kernel/linux/linux-5.10/0056-platform-x86-mlx-platform-Add-initial-support-for-ne.patch
+3 −3 recipes-kernel/linux/linux-5.10/0064-hwmon-mlxreg-fan-Extend-the-maximum-number-of-tachom.patch
+14 −14 recipes-kernel/linux/linux-5.10/0065-platform-x86-mlx-platform-Extend-FAN-and-LED-config-.patch
+4 −4 recipes-kernel/linux/linux-5.10/0066-platform-x86-mlx-platform-Add-new-attributes-for-Cof.patch
+11 −11 recipes-kernel/linux/linux-5.10/0067-platform-mellanox-Add-dedicated-match-for-system-typ.patch
+93 −0 recipes-kernel/linux/linux-5.10/0068-mlxsw-core-Initialize-switch-driver-last.patch
+90 −0 recipes-kernel/linux/linux-5.10/0069-mlxsw-core-Remove-mlxsw_core_is_initialized.patch
+91 −0 recipes-kernel/linux/linux-5.10/0070-mlxsw-core_env-Defer-handling-of-module-temperature-.patch
+123 −0 recipes-kernel/linux/linux-5.10/0071-mlxsw-core_env-Convert-module_info_lock-to-a-mutex.patch
+154 −0 recipes-kernel/linux/linux-5.10/0072-mlxsw-Track-per-module-port-status.patch
+65 −0 recipes-kernel/linux/linux-5.10/0073-mlxsw-reg-Add-fields-to-PMAOS-register.patch
+59 −0 recipes-kernel/linux/linux-5.10/0074-mlxsw-Make-PMAOS-pack-function-more-generic.patch
+193 −0 recipes-kernel/linux/linux-5.10/0075-mlxsw-Add-support-for-transceiver-modules-reset.patch
+802 −0 recipes-kernel/linux/linux-5.10/0076-ethtool-Add-ability-to-control-transceiver-modules-p.patch
+85 −0 recipes-kernel/linux/linux-5.10/0077-mlxsw-reg-Add-Port-Module-Memory-Map-Properties-regi.patch
+70 −0 recipes-kernel/linux/linux-5.10/0078-mlxsw-reg-Add-Management-Cable-IO-and-Notifications-.patch
+378 −0 recipes-kernel/linux/linux-5.10/0079-mlxsw-Add-ability-to-control-transceiver-modules-pow.patch
+92 −0 recipes-kernel/linux/linux-5.10/0080-ethtool-Add-transceiver-module-extended-states.patch
+42 −0 recipes-kernel/linux/linux-5.10/0081-platform-x86-mlx-platform-Add-support-for-multiply-c.patch
+33 −0 recipes-kernel/linux/linux-5.10/0082-mlxsw-core-Extend-external-cooling-device-whitelist-.patch
+40 −0 recipes-kernel/linux/linux-5.10/0083-platform_data-mlxreg-Add-field-for-notification-call.patch
+34 −0 recipes-kernel/linux/linux-5.10/0084-i2c-mlxcpld-Add-callback-to-notify-probing-completio.patch
+305 −0 recipes-kernel/linux/linux-5.10/0085-hwmon-powr1220-Upgrade-driver-to-support-hwmon-info-.patch
+102 −0 recipes-kernel/linux/linux-5.10/0086-hwmon-powr1220-Add-support-for-Lattice-s-POWR1014-po.patch
+590 −0 recipes-kernel/linux/linux-5.10/0087-hwmon-Add-support-for-EMC2305-RPM-based-PWM-Fan-Spee.patch
+69 −0 recipes-kernel/linux/linux-5.10/0088-dt-bindings-Add-description-for-EMC2305-for-RPM-base.patch
+1,157 −0 recipes-kernel/linux/linux-5.10/0089-platform-mellanox-Add-support-for-new-SN2201-system.patch
+63 −0 recipes-kernel/linux/linux-5.10/0090-Documentation-ABI-Add-new-attributes-for-mlxreg-io-s.patch
+177 −0 recipes-kernel/linux/linux-5.10/0091-platform-x86-mlx-platform-Add-support-for-new-system.patch
+53 −0 recipes-kernel/linux/linux-5.10/0092-platform-mellanox-mlxreg-lc-fix-error-code-in-mlxreg.patch
+184 −0 recipes-kernel/linux/linux-5.10/0093-hwmon-mlxreg-fan-Extend-driver-to-support-multiply-P.patch
+177 −0 recipes-kernel/linux/linux-5.10/0094-hwmon-mlxreg-fan-Extend-driver-to-support-multiply-c.patch
+37 −0 recipes-kernel/linux/linux-5.10/0095-hwmon-mlxreg-fan-Fix-out-of-bounds-read-on-array-fan.patch
+44 −0 recipes-kernel/linux/linux-5.10/0096-hwmon-mlxreg-fan-Modify-PWM-connectivity-validation.patch
+51 −0 recipes-kernel/linux/linux-5.10/0097-hwmon-mlxreg-fan-Support-distinctive-names-per-diffe.patch
+220 −0 usr/etc/hw-management-sensors/e3597_sensors.conf
+9 −9 usr/etc/hw-management-sensors/msn4700_respin_sensors.conf
+11 −10 usr/etc/hw-management-sensors/msn4800_sensors.conf
+160 −0 usr/etc/hw-management-sensors/sn2201_sensors.conf
+9 −0 usr/etc/modules-load.d/05-hw-management-modules.conf
+88 −0 usr/lib/udev/rules.d/50-hw-management-events.rules
+130 −59 usr/usr/bin/hw-management-chassis-events.sh
+20 −8 usr/usr/bin/hw-management-generate-dump.sh
+27 −21 usr/usr/bin/hw-management-helpers.sh
+70 −0 usr/usr/bin/hw-management-i2c-gpio-expander.sh
+10 −7 usr/usr/bin/hw-management-parse-eeprom.sh
+16 −4 usr/usr/bin/hw-management-ready.sh
+4 −10 usr/usr/bin/hw-management-start-post.sh
+198 −22 usr/usr/bin/hw-management-thermal-control.sh
+241 −200 usr/usr/bin/hw-management-thermal-events.sh
+224 −57 usr/usr/bin/hw-management.sh
+126 −0 usr/usr/bin/hw_management_cpu_thermal.py
+154 −0 usr/usr/bin/hw_management_nvl_temperature_get.py
+35 −22 usr/usr/bin/hw_management_psu_fw_update_murata.py