Skip to content

[mellanox]: Update recipe for hw-mgmt according to latest changes #2128

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lguohan merged 1 commit into from
Oct 9, 2018
Merged

[mellanox]: Update recipe for hw-mgmt according to latest changes #2128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 device/mellanox/x86_64-mlnx_msn2010-r0/plugins/sfputil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def port_to_eeprom_mapping(self):
return self._port_to_eeprom_mapping

def __init__(self):
eeprom_path = "/bsp/qsfp/qsfp{0}"
eeprom_path = "/sys/devices/platform/i2c_mlxcpld.1/i2c-1/i2c-2/2-0048/qsfp{0}"

for x in range(0, self.port_end + 1):
self._port_to_eeprom_mapping[x] = eeprom_path.format(x + self.EEPROM_OFFSET)
Expand Down
2 changes: 1 addition & 1 deletion device/mellanox/x86_64-mlnx_msn2100-r0/plugins/sfputil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def port_to_eeprom_mapping(self):
return self._port_to_eeprom_mapping

def __init__(self):
eeprom_path = "/sys/class/i2c-adapter/i2c-2/2-0048/hwmon/hwmon4/qsfp{0}_eeprom"
eeprom_path = "/sys/devices/platform/i2c_mlxcpld.1/i2c-1/i2c-2/2-0048/qsfp{0}"

for x in range(0, self.port_end + 1):
self._port_to_eeprom_mapping[x] = eeprom_path.format(x + self.EEPROM_OFFSET)
Expand Down
2 changes: 1 addition & 1 deletion device/mellanox/x86_64-mlnx_msn2410-r0/plugins/sfputil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def port_to_eeprom_mapping(self):
return self._port_to_eeprom_mapping

def __init__(self):
eeprom_path = "/sys/class/i2c-adapter/i2c-2/2-0048/hwmon/hwmon7/qsfp{0}_eeprom"
eeprom_path = "/sys/devices/platform/i2c_mlxcpld.1/i2c-1/i2c-2/2-0048/qsfp{0}"

for x in range(0, self.port_end + 1):
self._port_to_eeprom_mapping[x] = eeprom_path.format(x + self.EEPROM_OFFSET)
Expand Down
2 changes: 1 addition & 1 deletion device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def port_to_eeprom_mapping(self):
return self._port_to_eeprom_mapping

def __init__(self):
eeprom_path = "/sys/class/i2c-adapter/i2c-2/2-0048/hwmon/hwmon7/qsfp{0}_eeprom"
eeprom_path = "/sys/devices/platform/i2c_mlxcpld.1/i2c-1/i2c-2/2-0048/qsfp{0}"

for x in range(0, self.port_end + 1):
self._port_to_eeprom_mapping[x] = eeprom_path.format(x + self.EEPROM_OFFSET)
Expand Down
2 changes: 1 addition & 1 deletion device/mellanox/x86_64-mlnx_msn2740-r0/plugins/sfputil.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ def port_to_eeprom_mapping(self):
return self._port_to_eeprom_mapping

def __init__(self):
eeprom_path = "/sys/class/i2c-adapter/i2c-2/2-0048/hwmon/hwmon6/qsfp{0}_eeprom"
eeprom_path = "/sys/devices/platform/i2c_mlxcpld.1/i2c-1/i2c-2/2-0048/qsfp{0}"

for x in range(0, self.port_end + 1):
self._port_to_eeprom_mapping[x] = eeprom_path.format(x + self.EEPROM_OFFSET)
Expand Down
2 changes: 1 addition & 1 deletion files/build_templates/updategraph.service.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ After=rc-local.service
After=database.service
Requires=database.service
{% if sonic_asic_platform == 'mellanox' -%}
Requires=hw-management.service
Requires=msn-chassis.service
{% endif -%}


Expand Down
2 changes: 0 additions & 2 deletions files/scripts/syncd.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@ start() {
/usr/bin/mlnx-fw-upgrade.sh
/etc/init.d/sxdkernel start
/sbin/modprobe i2c-dev
/etc/mlnx/mlnx-hw-management start
elif [ x$sonic_asic_platform == x'cavium' ]; then
/etc/init.d/xpnet.sh start
fi
Expand Down Expand Up @@ -115,7 +114,6 @@ stop() {
if [[ x"$WARM_BOOT" != x"true" ]]; then
# platform specific tasks
if [ x$sonic_asic_platform == x'mellanox' ]; then
/etc/mlnx/mlnx-hw-management stop
/etc/init.d/sxdkernel stop
/usr/bin/mst stop
elif [ x$sonic_asic_platform == x'cavium' ]; then
Expand Down
2 changes: 1 addition & 1 deletion platform/mellanox/hw-management.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Mellanox HW Management

MLNX_HW_MANAGEMENT_VERSION = onl.deb9.13.12.2017
MLNX_HW_MANAGEMENT_VERSION = 27.09.2018

export MLNX_HW_MANAGEMENT_VERSION

Expand Down
21 changes: 0 additions & 21 deletions platform/mellanox/hw-management/Add-modprobe-config-for-at24-module.patch
View file
Open in desktop

This file was deleted.

58 changes: 0 additions & 58 deletions platform/mellanox/hw-management/Add-systemd-service-config.patch
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions platform/mellanox/hw-management/Fix-system-EEPROM-for-MSN2740-platform.patch
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion platform/mellanox/hw-management/hw-mgmt
Open in desktop
Submodule hw-mgmt updated 25 files
+8 −2 debian/changelog
+2 −0 debian/rules
+123 −0 ...kernel/linux/linux-4.9-combined-sonic/patch/0012-mlxsw-qsfp_sysfs-Support-CPLD-version-reading-based-.patch
+83 −0 ...kernel/linux/linux-4.9-combined-sonic/patch/0013-platform-x86-mlx-platform-Add-support-for-more-reset.patch
+71 −0 ...kernel/linux/linux-4.9-combined-sonic/patch/0014-platform-mellanox-mlxreg-hotplug-add-extra-run-cycle.patch
+73 −0 ...kernel/linux/linux-4.9-combined-sonic/patch/0015-platform-mellanox-add-new-OEM-system-types-to-mlx-pl.patch
+39 −0 recipes-kernel/linux/linux-4.9-combined-sonic/patch/0016-platform-x86-mlx-platform-fix-module-aliases.patch
+266 −0 ...kernel/linux/linux-4.9-combined-sonic/patch/0017-platform-x86-mlx-platform-Add-bus-detection-and-diff.patch
+199 −0 recipes-kernel/linux/linux-4.9-combined-sonic/patch/0018-i2c-busses-Add-capabilities-to-i2c-mlxcpld.patch
+8 −0 recipes-kernel/linux/linux-4.9-combined-sonic/patch/series
+472 −0 recipes-kernel/linux/linux-4.9-combined/0011-platform-x86-mlx-platform-new-features.patch
+199 −0 recipes-kernel/linux/linux-4.9-combined/0012-i2c-busses-Add-capabilities-to-i2c-mlxcpld.patch
+3,063 −0 recipes-kernel/linux/linux-4.9-combined/0013-Mellanox-backport-patchwork-from-kernels-4.17-4.19.patch
+215 −0 recipes-kernel/linux/linux-4.9-combined/0014-platform-x86-mlx-platform-backport-from-4.19.patch
+203 −0 recipes-kernel/linux/linux-4.9-combined/0015-platform-x86-mlx-platform-Add-support-for-register-a.patch
+123 −0 recipes-kernel/linux/linux-4.9/0039-mlxsw-qsfp_sysfs-Support-CPLD-version-reading-based-.patch
+83 −0 recipes-kernel/linux/linux-4.9/0040-platform-x86-mlx-platform-Add-support-for-more-reset.patch
+2 −0 recipes-kernel/linux/linux_4.9_%.bbappend
+1 −0 recipes-kernel/linux/msn_x86_64_defconfig
+14 −0 recipes-kernel/linux/series
+62 −44 usr/etc/mlnx/mlnx-hw-management
+1 −0 usr/etc/modprobe.d/mellanox-system-whitelist.conf
+70 −34 usr/lib/udev/rules.d/50-mellanox-system-event.rules
+116 −10 usr/usr/bin/mellanox-system-event.sh
+ − usr/usr/sbin/iorw