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

) Update the hw-mgmt to latest release V.2.0.0060. Update the related files according to the latest hw-mgmt. Signed-off-by: Kevin Wang <kevinw@mellanox.com>
sonic-net · Oct 9, 2018 · ea4b4bd · ea4b4bd
1 parent b1d290c
commit ea4b4bd
Show file tree

Hide file tree

Showing 12 changed files with 8 additions and 114 deletions.
diff --git a/device/mellanox/x86_64-mlnx_msn2010-r0/plugins/sfputil.py b/device/mellanox/x86_64-mlnx_msn2010-r0/plugins/sfputil.py
@@ -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)

diff --git a/device/mellanox/x86_64-mlnx_msn2100-r0/plugins/sfputil.py b/device/mellanox/x86_64-mlnx_msn2100-r0/plugins/sfputil.py
@@ -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)

diff --git a/device/mellanox/x86_64-mlnx_msn2410-r0/plugins/sfputil.py b/device/mellanox/x86_64-mlnx_msn2410-r0/plugins/sfputil.py
@@ -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)

diff --git a/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py b/device/mellanox/x86_64-mlnx_msn2700-r0/plugins/sfputil.py
@@ -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)

diff --git a/device/mellanox/x86_64-mlnx_msn2740-r0/plugins/sfputil.py b/device/mellanox/x86_64-mlnx_msn2740-r0/plugins/sfputil.py
@@ -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)

diff --git a/files/build_templates/updategraph.service.j2 b/files/build_templates/updategraph.service.j2
@@ -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 -%}
 
 

diff --git a/files/scripts/syncd.sh b/files/scripts/syncd.sh
@@ -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
@@ -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

diff --git a/platform/mellanox/hw-management.mk b/platform/mellanox/hw-management.mk
@@ -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
 

diff --git a/platform/mellanox/hw-management/Add-modprobe-config-for-at24-module.patch b/platform/mellanox/hw-management/Add-modprobe-config-for-at24-module.patch
diff --git a/platform/mellanox/hw-management/Add-systemd-service-config.patch b/platform/mellanox/hw-management/Add-systemd-service-config.patch
diff --git a/platform/mellanox/hw-management/Fix-system-EEPROM-for-MSN2740-platform.patch b/platform/mellanox/hw-management/Fix-system-EEPROM-for-MSN2740-platform.patch
diff --git a/platform/mellanox/hw-management/hw-mgmt b/platform/mellanox/hw-management/hw-mgmt