matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[hlx/sfp] fix hlx platform sfp+ tx disable issue (#11532)

Browse Source 
Why I did it:
To fix hlx platform sfp+ module tx disable issue

How I did it:
Fix sfp+ tx disable function according SFF-8472 specification

Co-authored-by: Eric Zhu <erzhu@celestica.com>
This commit is contained in:
Ikki Zhu 2022-07-28 09:39:23 +08:00 committed by Ying Xie
parent 5a313e6912
commit 400b401f4b
1 changed files with 36 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
device/celestica/x86_64-cel_e1031-r0/sonic_platform/sfp.py
View File

@ -8,7 +8,7 @@
try: try:
import time import time
from ctypes import create_string_buffer from ctypes import c_char
from sonic_platform_base.sfp_base import SfpBase from sonic_platform_base.sfp_base import SfpBase
from sonic_platform_base.sonic_sfp.sff8472 import sff8472InterfaceId from sonic_platform_base.sonic_sfp.sff8472 import sff8472InterfaceId
from sonic_platform_base.sonic_sfp.sff8472 import sff8472Dom from sonic_platform_base.sonic_sfp.sff8472 import sff8472Dom
@ -121,8 +121,8 @@ SFP_VOLT_OFFSET = 98
SFP_VOLT_WIDTH = 2 SFP_VOLT_WIDTH = 2
SFP_CHANNL_MON_OFFSET = 100 SFP_CHANNL_MON_OFFSET = 100
SFP_CHANNL_MON_WIDTH = 6 SFP_CHANNL_MON_WIDTH = 6
SFP_CHANNL_STATUS_OFFSET = 110 SFP_STATUS_CONTROL_OFFSET = 110
SFP_CHANNL_STATUS_WIDTH = 1 SFP_STATUS_CONTROL_WIDTH = 1
SFP_TX_DISABLE_HARD_BIT = 7 SFP_TX_DISABLE_HARD_BIT = 7
SFP_TX_DISABLE_SOFT_BIT = 6 SFP_TX_DISABLE_SOFT_BIT = 6
@ -869,7 +869,7 @@ class Sfp(SfpBase):
elif self.sfp_type == SFP_TYPE: elif self.sfp_type == SFP_TYPE:
offset = 256 offset = 256
dom_channel_monitor_raw = self._read_eeprom_specific_bytes( dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
(offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH) (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
if dom_channel_monitor_raw is not None: if dom_channel_monitor_raw is not None:
rx_los_data = int(dom_channel_monitor_raw[0], 16) rx_los_data = int(dom_channel_monitor_raw[0], 16)
rx_los_list.append(rx_los_data & 0x02 != 0) rx_los_list.append(rx_los_data & 0x02 != 0)
@ -901,7 +901,7 @@ class Sfp(SfpBase):
elif self.sfp_type == SFP_TYPE: elif self.sfp_type == SFP_TYPE:
offset = 256 offset = 256
dom_channel_monitor_raw = self._read_eeprom_specific_bytes( dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
(offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH) (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
if dom_channel_monitor_raw is not None: if dom_channel_monitor_raw is not None:
tx_fault_data = int(dom_channel_monitor_raw[0], 16) tx_fault_data = int(dom_channel_monitor_raw[0], 16)
tx_fault_list.append(tx_fault_data & 0x04 != 0) tx_fault_list.append(tx_fault_data & 0x04 != 0)
@ -936,7 +936,7 @@ class Sfp(SfpBase):
elif self.sfp_type == SFP_TYPE: elif self.sfp_type == SFP_TYPE:
offset = 256 offset = 256
dom_channel_monitor_raw = self._read_eeprom_specific_bytes( dom_channel_monitor_raw = self._read_eeprom_specific_bytes(
(offset + SFP_CHANNL_STATUS_OFFSET), SFP_CHANNL_STATUS_WIDTH) (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
if dom_channel_monitor_raw is not None: if dom_channel_monitor_raw is not None:
tx_disable_data = int(dom_channel_monitor_raw[0], 16) tx_disable_data = int(dom_channel_monitor_raw[0], 16)
tx_disable_list.append(tx_disable_data & 0xC0 != 0) tx_disable_list.append(tx_disable_data & 0xC0 != 0)
@ -1170,9 +1170,15 @@ class Sfp(SfpBase):
Returns: Returns:
A boolean, True if tx_disable is set successfully, False if not A boolean, True if tx_disable is set successfully, False if not
""" """
if not self.get_presence():
return False
if self.dom_tx_disable_supported:
# SFP status/control register at address A2h, byte 110
offset = 256
sysfs_sfp_i2c_client_eeprom_path = self.port_to_eeprom_mapping[self.port_num] sysfs_sfp_i2c_client_eeprom_path = self.port_to_eeprom_mapping[self.port_num]
status_control_raw = self._read_eeprom_specific_bytes( status_control_raw = self._read_eeprom_specific_bytes(
SFP_CHANNL_STATUS_OFFSET, SFP_CHANNL_STATUS_WIDTH) (offset + SFP_STATUS_CONTROL_OFFSET), SFP_STATUS_CONTROL_WIDTH)
if status_control_raw is not None: if status_control_raw is not None:
# Set bit 6 for Soft TX Disable Select # Set bit 6 for Soft TX Disable Select
# 01000000 = 64 and 10111111 = 191 # 01000000 = 64 and 10111111 = 191
@ -1183,11 +1189,10 @@ class Sfp(SfpBase):
try: try:
sysfsfile_eeprom = open( sysfsfile_eeprom = open(
sysfs_sfp_i2c_client_eeprom_path, mode="r+b", buffering=0) sysfs_sfp_i2c_client_eeprom_path, mode="r+b", buffering=0)
buffer = create_string_buffer(1) tx_disable_data = c_char(tx_disable_ctl)
buffer[0] = chr(tx_disable_ctl)
# Write to eeprom # Write to eeprom
sysfsfile_eeprom.seek(SFP_CHANNL_STATUS_OFFSET) sysfsfile_eeprom.seek(offset + SFP_STATUS_CONTROL_OFFSET)
sysfsfile_eeprom.write(buffer[0]) sysfsfile_eeprom.write(tx_disable_data)
except Exception: except Exception:
return False return False
finally: finally: