Skip to content

Commit

Permalink
[202305][Mellanox]Integrate HW-MGMT 7.0030.2300 Changes (#19340)
Browse files Browse the repository at this point in the history
This PR depend with PR: sonic-net/sonic-linux-kernel#408

Why I did it
Intgerate HW-MGMT 7.0030.2300 Changes

Work item tracking
Microsoft ADO (number only):
How I did it
Run make integrate-mlnx-hw-mgmt

How to verify it
Build an image and run tests from "sonic-mgmt".
  • Loading branch information
dprital authored Aug 28, 2024
1 parent 0928744 commit e1c862a
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 26 deletions.
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.0030.2008
MLNX_HW_MANAGEMENT_VERSION = 7.0030.2300

export MLNX_HW_MANAGEMENT_VERSION

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
From eb3a76d7fbd0cbf2c370ecadd912960b094403d6 Mon Sep 17 00:00:00 2001
From: Junchao-Mellanox <junchao@nvidia.com>
Date: Wed, 23 Aug 2023 14:33:44 +0800
Subject: [PATCH] [PATCH 2/4] Disable hw-mgmt on SimX platforms
From 42a00c6690ae4d97040afff5bb282b5f0aa9a361 Mon Sep 17 00:00:00 2001
From: dgsudharsan <sudharsand@nvidia.com>
Date: Fri, 31 May 2024 15:43:00 +0000
Subject: [PATCH] Disable hw-mgmt on SimX platforms

---
usr/usr/bin/hw-management-ready.sh | 3 ---
usr/usr/bin/hw-management.sh | 21 +++++++++------------
2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/usr/usr/bin/hw-management-ready.sh b/usr/usr/bin/hw-management-ready.sh
index 840bb0b..2f8547f 100755
index 840bb0bf..2f8547f8 100755
--- a/usr/usr/bin/hw-management-ready.sh
+++ b/usr/usr/bin/hw-management-ready.sh
@@ -56,9 +56,6 @@ fi
Expand All @@ -23,10 +19,10 @@ index 840bb0b..2f8547f 100755
if systemctl is-enabled --quiet hw-management-tc; then
echo "Stopping and disabling hw-management-tc on SimX"
diff --git a/usr/usr/bin/hw-management.sh b/usr/usr/bin/hw-management.sh
index d3914d1..a60dba9 100755
index 78ac13e8..a6e002b8 100755
--- a/usr/usr/bin/hw-management.sh
+++ b/usr/usr/bin/hw-management.sh
@@ -545,7 +545,7 @@ function restore_i2c_bus_frequency_default()
@@ -601,7 +601,7 @@ function restore_i2c_bus_frequency_default()
function find_regio_sysfs_path_helper()
{
# Find hwmon{n} sysfs path for regio device
Expand All @@ -35,7 +31,7 @@ index d3914d1..a60dba9 100755
VMOD0014)
for path in /sys/devices/pci0000:00/*/NVSN2201:*/mlxreg-io/hwmon/hwmon*; do
if [ -d "$path" ]; then
@@ -732,10 +732,10 @@ set_jtag_gpio()
@@ -780,10 +780,10 @@ set_jtag_gpio()
gpio_tdi=$((gpiobase+jtag_tdi))
echo $gpio_tdi > /sys/class/gpio/"$export_unexport"

Expand All @@ -49,7 +45,7 @@ index d3914d1..a60dba9 100755
if [ "$board_type" == "VMOD0014" ]; then
mux_reset=27
jtag_mux_en=33
@@ -1294,7 +1294,7 @@ connect_msn4700_msn4600_A1()
@@ -1363,7 +1363,7 @@ connect_msn4700_msn4600_A1()
# msn4600C with removed A2D
connect_table+=(${msn4600C_A1_base_connect_table[@]})
else
Expand All @@ -58,7 +54,7 @@ index d3914d1..a60dba9 100755
connect_table+=(${msn4700_msn4600_A1_base_connect_table[@]})
fi
add_cpu_board_to_connection_table
@@ -2144,7 +2144,7 @@ create_symbolic_links()
@@ -2324,7 +2324,7 @@ create_symbolic_links()
fi
if [ ! -d $thermal_path ]; then
mkdir $thermal_path
Expand All @@ -67,7 +63,7 @@ index d3914d1..a60dba9 100755
if [ ! -d $config_path ]; then
mkdir $config_path
fi
@@ -2341,7 +2341,7 @@ do_start()
@@ -2556,7 +2556,7 @@ do_start()
check_system
set_asic_pci_id

Expand All @@ -76,7 +72,7 @@ index d3914d1..a60dba9 100755
if [[ $asic_control -ne 0 ]]; then
get_asic_bus
get_asic2_bus
@@ -2379,9 +2379,9 @@ do_start()
@@ -2595,9 +2595,9 @@ do_start()
else
ln -sf /etc/sensors3.conf $config_path/lm_sensors_config
fi
Expand All @@ -86,18 +82,18 @@ index d3914d1..a60dba9 100755
- fi
+ fi
if [ -v "thermal_control_config" ] && [ -f $thermal_control_config ]; then
ln -sf $thermal_control_config $config_path/tc_config.json
cp $thermal_control_config $config_path/tc_config.json
else
@@ -2528,9 +2528,6 @@ do_chip_up_down()
@@ -2777,9 +2777,6 @@ do_chip_up_down()
check_simx()
{
case $sku in
- HI130|HI122)
- HI130|HI122|HI144|HI147|HI157)
- # Let the initialization go through
- ;;
*)
if [ -n "$(lspci -vvv | grep SimX)" ]; then
exit 0
--
1.9.1
2.43.2

2 changes: 1 addition & 1 deletion platform/mellanox/hw-management/hw-mgmt
Submodule hw-mgmt updated 47 files
+59 −0 debian/Release.txt
+2 −2 debian/changelog
+3 −1 recipes-kernel/linux/Patch_Status_Table.txt
+0 −4 recipes-kernel/linux/kconfig.txt
+31 −0 recipes-kernel/linux/linux-5.10/0329-platform-mellanox-indicate-deferred-I2C-bus-creation.patch
+31 −0 recipes-kernel/linux/linux-6.1/0086-platform-mellanox-indicate-deferred-I2C-bus-creation.patch
+4 −0 usr/etc/hw-management-sensors/e3597_sensors.conf
+5 −1 usr/etc/hw-management-sensors/mqm9510_sensors.conf
+5 −1 usr/etc/hw-management-sensors/mqm9520_sensors.conf
+4 −4 usr/etc/hw-management-sensors/msn2010_sensors.conf
+4 −4 usr/etc/hw-management-sensors/msn2100_sensors.conf
+8 −8 usr/etc/hw-management-sensors/msn2410_sensors.conf
+4 −0 usr/etc/hw-management-sensors/msn27002_sensors.conf
+4 −0 usr/etc/hw-management-sensors/msn3420_sensors.conf
+8 −0 usr/etc/hw-management-sensors/msn4800_sensors.conf
+8 −0 usr/etc/hw-management-sensors/msn4800_sensors_lc.conf
+4 −0 usr/etc/hw-management-sensors/p4697_sensors.conf
+4 −0 usr/etc/hw-management-sensors/qm3000_sensors.conf
+4 −0 usr/etc/hw-management-sensors/qm3400_sensors.conf
+4 −0 usr/etc/hw-management-sensors/sn2201_sensors.conf
+25 −20 usr/etc/hw-management-sensors/sn5600_sensors.conf
+2 −2 usr/etc/hw-management-thermal/tc_config_mqm8700.json
+2 −2 usr/etc/hw-management-thermal/tc_config_mqm9700.json
+1 −1 usr/etc/hw-management-thermal/tc_config_msn27002.json
+2 −2 usr/etc/hw-management-thermal/tc_config_msn3420.json
+2 −2 usr/etc/hw-management-thermal/tc_config_msn3700.json
+2 −2 usr/etc/hw-management-thermal/tc_config_msn3700C.json
+2 −2 usr/etc/hw-management-thermal/tc_config_msn3750.json
+2 −2 usr/etc/hw-management-thermal/tc_config_msn3800.json
+2 −2 usr/etc/hw-management-thermal/tc_config_msn4410.json
+2 −2 usr/etc/hw-management-thermal/tc_config_msn4600.json
+2 −2 usr/etc/hw-management-thermal/tc_config_msn4600C.json
+2 −2 usr/etc/hw-management-thermal/tc_config_msn4700.json
+2 −2 usr/etc/hw-management-thermal/tc_config_msn4700_mps.json
+2 −2 usr/etc/hw-management-thermal/tc_config_msn5400.json
+2 −2 usr/etc/hw-management-thermal/tc_config_msn5600.json
+1 −1 usr/etc/hw-management-thermal/tc_config_qm3000.json
+2 −2 usr/etc/hw-management-thermal/tc_config_qm3400.json
+11 −0 usr/etc/hw-management-virtual/HI144/psu_vpd
+11 −0 usr/etc/hw-management-virtual/HI147/psu_vpd
+11 −0 usr/etc/hw-management-virtual/HI157/psu_vpd
+7 −4 usr/usr/bin/hw-management-chassis-events.sh
+5 −2 usr/usr/bin/hw-management-generate-dump.sh
+24 −1 usr/usr/bin/hw-management-helpers.sh
+31 −27 usr/usr/bin/hw-management-thermal-events.sh
+24 −7 usr/usr/bin/hw-management.sh
+16 −18 usr/usr/bin/hw_management_thermal_control.py
9 changes: 5 additions & 4 deletions platform/mellanox/non-upstream-patches/external-changes.patch
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
--- a/patch/series
+++ b/patch/series
@@ -108,6 +108,9 @@
@@ -110,6 +110,9 @@
0045-i2c-mlxcpld-Fix-criteria-for-frequency-setting.patch
0046-i2c-mlxcpld-Reduce-polling-time-for-performance-impr.patch
0047-i2c-mlxcpld-Allow-flexible-polling-time-setting-for-.patch
Expand All @@ -10,7 +10,7 @@
0053-mlxsw-core-Avoid-creation-virtual-hwmon-objects-by-t.patch
0054-mlxsw-minimal-Simplify-method-of-modules-number-dete.patch
0055-platform_data-mlxreg-Add-new-type-to-support-modular.patch
@@ -155,7 +158,68 @@
@@ -157,7 +160,68 @@
0097-1-mlxsw-Use-u16-for-local_port-field.patch
0097-2-mlxsw-i2c-Fix-chunk-size-setting.patch
0097-3-mlxsw-core_hwmon-Adjust-module-label-names.patch
Expand Down Expand Up @@ -79,7 +79,7 @@
0157-platform-x86-mlx-platform-Make-activation-of-some-dr.patch
0158-platform-x86-mlx-platform-Add-cosmetic-changes-for-a.patch
0159-mlx-platform-Add-support-for-systems-equipped-with-t.patch
@@ -166,14 +230,19 @@
@@ -168,14 +232,19 @@
0164-hwmon-jc42-Add-support-for-Seiko-Instruments-S-34TS0.patch
0165-platform-mellanox-mlxreg-io-Add-locking-for-io-opera.patch
0166-DS-leds-leds-mlxreg-Send-udev-event-from-leds-mlxreg.patch
Expand All @@ -99,7 +99,7 @@
0182-platform-mellanox-Introduce-support-of-new-Nvidia-L1.patch
0183-platform-mellanox-Split-initialization-procedure.patch
0184-platform-mellanox-Split-logic-in-init-and-exit-flow.patch
@@ -191,24 +260,121 @@
@@ -193,25 +262,122 @@
0197-platform-mellanox-Fix-order-in-exit-flow.patch
0198-platform-mellanox-Add-new-attributes.patch
0199-platform-mellanox-Change-register-offset-addresses.patch
Expand Down Expand Up @@ -217,6 +217,7 @@
+0326-platform-mellanox-mlxreg-hotplug-Add-support-for-new.patch
+0327-platform-mellanox-mlx-platform-Change-register-name.patch
+0328-platform-mellanox-mlx-platform-Add-support-for-new-X.patch
0329-platform-mellanox-indicate-deferred-I2C-bus-creation.patch
+9002-TMP-fix-for-fan-minimum-speed.patch
###-> mellanox_hw_mgmt-end

Expand Down

0 comments on commit e1c862a

Please sign in to comment.