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

[devices]: xcvrd OIR support for Dell S6100/Z9100 switches (#2281)

Browse Source 
* xcvrd OIR support for Dell S6100/Z9100 switches

Introduced check_interrupts function to handle missed interrupts.
port_dict updated and returned for appropriate OIR events.
Added support for both S6100/Z9100 switches.

* Revamped sfputil.py for PEP8 Standards
This commit is contained in:
paavaanan 2018-12-04 23:48:39 +05:30 committed by lguohan
parent ae82c073aa
commit a888e15e5c
2 changed files with 321 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

418
device/dell/x86_64-dell_s6100_c2538-r0/plugins/sfputil.py
View File

@ -95,7 +95,7 @@ class SfpUtil(SfpUtilBase):
61: [9, 31, 47, 63, 79], 61: [9, 31, 47, 63, 79],
62: [9, 32, 48, 64, 80], 62: [9, 32, 48, 64, 80],
63: [9, 33, 49, 65, 81] 63: [9, 33, 49, 65, 81]
} }
IOM_1_PORT_START = 0 IOM_1_PORT_START = 0
IOM_1_PORT_END = 15 IOM_1_PORT_END = 15
@ -109,8 +109,11 @@ class SfpUtil(SfpUtilBase):
IOM_4_PORT_START = 48 IOM_4_PORT_START = 48
IOM_4_PORT_END = 63 IOM_4_PORT_END = 63
BASE_VAL_PATH="/sys/class/i2c-adapter/i2c-{0}/{0}-003e/" BASE_VAL_PATH = "/sys/class/i2c-adapter/i2c-{0}/{0}-003e/"
OIR_FD_PATH = "/sys/devices/platform/dell_ich.0/sci_int_gpio_sus6"
oir_fd = -1
epoll = -1
@property @property
def port_start(self): def port_start(self):
@ -164,59 +167,83 @@ class SfpUtil(SfpUtilBase):
def port_to_i2c_mapping(self): def port_to_i2c_mapping(self):
return self._port_to_i2c_mapping return self._port_to_i2c_mapping
def __init__(self): def __init__(self):
eeprom_path = "/sys/class/i2c-adapter/i2c-{0}/i2c-{1}/{1}-0050/eeprom" eeprom_path = "/sys/class/i2c-adapter/i2c-{0}/i2c-{1}/{1}-0050/eeprom"
global port_to_eeprom_path global port_to_eeprom_path
for port_num in range(0, self.port_end + 1): for port_num in range(0, self.port_end + 1):
if port_num >= self.iom1_port_start and port_num <= self.iom1_port_end: if port_num >= self.iom1_port_start and port_num <=\
assigned=0 self.iom1_port_end:
#i2c-6 assigned = 0
for x in range(1,5): # i2c-6
port_to_eeprom_path = eeprom_path.format(self.port_to_i2c_mapping[port_num][0], self.port_to_i2c_mapping[port_num][x]) for x in range(1, 5):
if ( os.path.isfile(port_to_eeprom_path) ): port_to_eeprom_path = eeprom_path.format(
self.port_to_eeprom_mapping[port_num]=port_to_eeprom_path self.port_to_i2c_mapping[port_num][0],
assigned=1 self.port_to_i2c_mapping[port_num][x])
if (os.path.isfile(port_to_eeprom_path)):
self.port_to_eeprom_mapping[port_num] =\
port_to_eeprom_path
assigned = 1
elif (not assigned): elif (not assigned):
self.port_to_eeprom_mapping[port_num]="No IOM" self.port_to_eeprom_mapping[port_num] =\
"No IOM"
elif port_num >= self.iom2_port_start and port_num <= self.iom2_port_end: elif(port_num >= self.iom2_port_start and
assigned=0 port_num <= self.iom2_port_end):
#i2c-8 assigned = 0
for x in range(1,5): # i2c-8
port_to_eeprom_path = eeprom_path.format(self.port_to_i2c_mapping[port_num][0], self.port_to_i2c_mapping[port_num][x]) for x in range(1, 5):
if ( os.path.isfile(port_to_eeprom_path) ): port_to_eeprom_path = eeprom_path.format(
self.port_to_eeprom_mapping[port_num]=port_to_eeprom_path self.port_to_i2c_mapping[port_num][0],
assigned=1 self.port_to_i2c_mapping[port_num][x])
if (os.path.isfile(port_to_eeprom_path)):
self.port_to_eeprom_mapping[port_num] =\
port_to_eeprom_path
assigned = 1
elif (not assigned): elif (not assigned):
self.port_to_eeprom_mapping[port_num]="No IOM" self.port_to_eeprom_mapping[port_num] =\
"No IOM"
elif port_num >= self.iom3_port_start and port_num <= self.iom3_port_end: elif(port_num >= self.iom3_port_start and port_num <=
assigned=0 self.iom3_port_end):
#i2c-7 assigned = 0
for x in range(1,5): # i2c-7
port_to_eeprom_path = eeprom_path.format(self.port_to_i2c_mapping[port_num][0], self.port_to_i2c_mapping[port_num][x]) for x in range(1, 5):
if ( os.path.isfile(port_to_eeprom_path) ): port_to_eeprom_path = eeprom_path.format(
self.port_to_eeprom_mapping[port_num]=port_to_eeprom_path self.port_to_i2c_mapping[port_num][0],
assigned=1 self.port_to_i2c_mapping[port_num][x])
if (os.path.isfile(port_to_eeprom_path)):
self.port_to_eeprom_mapping[port_num] =\
port_to_eeprom_path
assigned = 1
elif (not assigned): elif (not assigned):
self.port_to_eeprom_mapping[port_num]="No IOM" self.port_to_eeprom_mapping[port_num] =\
"No IOM"
elif(port_num >= self.iom4_port_start and port_num <=
elif port_num >= self.iom4_port_start and port_num <= self.iom4_port_end: self.iom4_port_end):
assigned=0 assigned = 0
#i2c-9 # i2c-9
for x in range(1,5): for x in range(1, 5):
port_to_eeprom_path = eeprom_path.format(self.port_to_i2c_mapping[port_num][0], self.port_to_i2c_mapping[port_num][x]) port_to_eeprom_path = eeprom_path.format(
if ( os.path.isfile(port_to_eeprom_path) ): self.port_to_i2c_mapping[port_num][0],
self.port_to_eeprom_mapping[port_num]=port_to_eeprom_path self.port_to_i2c_mapping[port_num][x])
assigned=1 if (os.path.isfile(port_to_eeprom_path)):
self.port_to_eeprom_mapping[port_num] =\
port_to_eeprom_path
assigned = 1
elif (not assigned): elif (not assigned):
self.port_to_eeprom_mapping[port_num]="No IOM" self.port_to_eeprom_mapping[port_num] =\
"No IOM"
SfpUtilBase.__init__(self) SfpUtilBase.__init__(self)
def __del__(self):
if self.oir_fd != -1:
self.epoll.unregister(self.oir_fd.fileno())
self.epoll.close()
self.oir_fd.close()
def get_presence(self, port_num): def get_presence(self, port_num):
global i2c_line global i2c_line
@ -225,15 +252,19 @@ class SfpUtil(SfpUtilBase):
if port_num < self.port_start or port_num > self.port_end: if port_num < self.port_start or port_num > self.port_end:
return False return False
#port_num and i2c match # port_num and i2c match
if port_num >= self.iom1_port_start and port_num <= self.iom1_port_end: if(port_num >= self.iom1_port_start and port_num <=
i2c_line=14 self.iom1_port_end):
elif port_num >= self.iom2_port_start and port_num <= self.iom2_port_end: i2c_line = 14
i2c_line=16 elif(port_num >= self.iom2_port_start and port_num <=
elif port_num >= self.iom3_port_start and port_num <= self.iom3_port_end: self.iom2_port_end):
i2c_line=15 i2c_line = 16
elif port_num >= self.iom4_port_start and port_num <= self.iom4_port_end: elif(port_num >= self.iom3_port_start and port_num <=
i2c_line=17 self.iom3_port_end):
i2c_line = 15
elif(port_num >= self.iom4_port_start and port_num <=
self.iom4_port_end):
i2c_line = 17
try: try:
qsfp_path = self.BASE_VAL_PATH.format(i2c_line)+"qsfp_modprs" qsfp_path = self.BASE_VAL_PATH.format(i2c_line)+"qsfp_modprs"
@ -245,16 +276,16 @@ class SfpUtil(SfpUtilBase):
content = reg_file.readline().rstrip() content = reg_file.readline().rstrip()
#Absence of IOM throws read error # Absence of IOM throws read error
if (content == 'read error'): if (content == 'read error'):
return False return False
# content is a string containing the hex representation of the register # content is a string containing the hex representation of the register
reg_value = int(content, 16) reg_value = int(content, 16)
#Rationalize port settings # Rationalize port settings
if port_num > 15: if port_num > 15:
port_num=port_num%16 port_num = port_num % 16
# Mask off the bit corresponding to our port # Mask off the bit corresponding to our port
mask = (1 << port_num) mask = (1 << port_num)
@ -270,15 +301,19 @@ class SfpUtil(SfpUtilBase):
if port_num < self.port_start or port_num > self.port_end: if port_num < self.port_start or port_num > self.port_end:
return False return False
#port_num and i2c match # port_num and i2c match
if port_num >= self.iom1_port_start and port_num <= self.iom1_port_end: if(port_num >= self.iom1_port_start and port_num <=
i2c_line=14 self.iom1_port_end):
elif port_num >= self.iom2_port_start and port_num <= self.iom2_port_end: i2c_line = 14
i2c_line=16 elif(port_num >= self.iom2_port_start and port_num <=
elif port_num >= self.iom3_port_start and port_num <= self.iom3_port_end: self.iom2_port_end):
i2c_line=15 i2c_line = 16
elif port_num >= self.iom4_port_start and port_num <= self.iom4_port_end: elif(port_num >= self.iom3_port_start and port_num <=
i2c_line=17 self.iom3_port_end):
i2c_line = 15
elif(port_num >= self.iom4_port_start and port_num <=
self.iom4_port_end):
i2c_line = 17
try: try:
qsfp_path = self.BASE_VAL_PATH.format(i2c_line)+"qsfp_lpmode" qsfp_path = self.BASE_VAL_PATH.format(i2c_line)+"qsfp_lpmode"
@ -290,16 +325,16 @@ class SfpUtil(SfpUtilBase):
content = reg_file.readline().rstrip() content = reg_file.readline().rstrip()
#Absence of IOM throws read error # Absence of IOM throws read error
if (content == 'read error'): if (content == 'read error'):
return False return False
# content is a string containing the hex representation of the register # content is a string containing the hex representation of the register
reg_value = int(content, 16) reg_value = int(content, 16)
#Rationalize port settings # Rationalize port settings
if port_num > 15: if port_num > 15:
port_num=port_num%16 port_num = port_num % 16
# Mask off the bit corresponding to our port # Mask off the bit corresponding to our port
mask = (1 << port_num) mask = (1 << port_num)
@ -315,15 +350,19 @@ class SfpUtil(SfpUtilBase):
if port_num < self.port_start or port_num > self.port_end: if port_num < self.port_start or port_num > self.port_end:
return False return False
#port_num and i2c match # port_num and i2c match
if port_num >= self.iom1_port_start and port_num <= self.iom1_port_end: if(port_num >= self.iom1_port_start and port_num <=
i2c_line=14 self.iom1_port_end):
elif port_num >= self.iom2_port_start and port_num <= self.iom2_port_end: i2c_line = 14
i2c_line=16 elif(port_num >= self.iom2_port_start and port_num <=
elif port_num >= self.iom3_port_start and port_num <= self.iom3_port_end: self.iom2_port_end):
i2c_line=15 i2c_line = 16
elif port_num >= self.iom4_port_start and port_num <= self.iom4_port_end: elif(port_num >= self.iom3_port_start and port_num <=
i2c_line=17 self.iom3_port_end):
i2c_line = 15
elif(port_num >= self.iom4_port_start and port_num <=
self.iom4_port_end):
i2c_line = 17
try: try:
qsfp_path = self.BASE_VAL_PATH.format(i2c_line)+"qsfp_lpmode" qsfp_path = self.BASE_VAL_PATH.format(i2c_line)+"qsfp_lpmode"
@ -335,16 +374,16 @@ class SfpUtil(SfpUtilBase):
content = reg_file.readline().rstrip() content = reg_file.readline().rstrip()
#Absence of IOM throws read error # Absence of IOM throws read error
if (content == 'read error'): if (content == 'read error'):
return False return False
# content is a string containing the hex representation of the register # content is a string containing the hex representation of the register
reg_value = int(content, 16) reg_value = int(content, 16)
#Rationalize port settings # Rationalize port settings
if port_num > 15: if port_num > 15:
port_num=port_num%16 port_num = port_num % 16
# Mask off the bit corresponding to our port # Mask off the bit corresponding to our port
mask = (1 << port_num) mask = (1 << port_num)
@ -372,15 +411,19 @@ class SfpUtil(SfpUtilBase):
if port_num < self.port_start or port_num > self.port_end: if port_num < self.port_start or port_num > self.port_end:
return False return False
#port_num and i2c match # port_num and i2c match
if port_num >= self.iom1_port_start and port_num <= self.iom1_port_end: if(port_num >= self.iom1_port_start and port_num <=
i2c_line=14 self.iom1_port_end):
elif port_num >= self.iom2_port_start and port_num <= self.iom2_port_end: i2c_line = 14
i2c_line=16 elif(port_num >= self.iom2_port_start and port_num <=
elif port_num >= self.iom3_port_start and port_num <= self.iom3_port_end: self.iom2_port_end):
i2c_line=15 i2c_line = 16
elif port_num >= self.iom4_port_start and port_num <= self.iom4_port_end: elif(port_num >= self.iom3_port_start and port_num <=
i2c_line=17 self.iom3_port_end):
i2c_line = 15
elif(port_num >= self.iom4_port_start and port_num <=
self.iom4_port_end):
i2c_line = 17
try: try:
qsfp_path = self.BASE_VAL_PATH.format(i2c_line)+"qsfp_lpmode" qsfp_path = self.BASE_VAL_PATH.format(i2c_line)+"qsfp_lpmode"
@ -392,17 +435,18 @@ class SfpUtil(SfpUtilBase):
content = reg_file.readline().rstrip() content = reg_file.readline().rstrip()
#Absence of IOM throws read error # Absence of IOM throws read error
if (content == 'read error'): if (content == 'read error'):
print("it's empty"); print("it's empty")
return False return False
# File content is a string containing the hex representation of the register # File content is a string containing the hex representation
# of the register
reg_value = int(content, 16) reg_value = int(content, 16)
#Rationalize port settings # Rationalize port settings
if port_num > 15: if port_num > 15:
port_num=port_num%16 port_num = port_num % 16
# Mask off the bit corresponding to our port # Mask off the bit corresponding to our port
mask = (1 << port_num) mask = (1 << port_num)
@ -418,7 +462,8 @@ class SfpUtil(SfpUtilBase):
# Sleep 1 second to allow it to settle # Sleep 1 second to allow it to settle
time.sleep(1) time.sleep(1)
# Flip the bit back high and write back to the register to take port out of reset # Flip the bit back high and write back to the register to take port
# out of reset
try: try:
qsfp_path = self.BASE_VAL_PATH.format(i2c_line)+"qsfp_lpmode" qsfp_path = self.BASE_VAL_PATH.format(i2c_line)+"qsfp_lpmode"
reg_file = open(qsfp_path, "w") reg_file = open(qsfp_path, "w")
@ -434,7 +479,6 @@ class SfpUtil(SfpUtilBase):
return True return True
def get_register(self, reg_file): def get_register(self, reg_file):
retval = 'ERR' retval = 'ERR'
@ -452,101 +496,107 @@ class SfpUtil(SfpUtilBase):
retval = retval.lstrip(" ") retval = retval.lstrip(" ")
return retval return retval
def check_interrupts(self, port_dict):
retval = 0
is_port_dict_updated = False
# Read the QSFP ABS interrupt & status registers
cpld2_abs_int = self.get_register(
"/sys/class/i2c-adapter/i2c-14/14-003e/qsfp_abs_int")
cpld2_abs_sta = self.get_register(
"/sys/class/i2c-adapter/i2c-14/14-003e/qsfp_abs_sta")
cpld3_abs_int = self.get_register(
"/sys/class/i2c-adapter/i2c-15/15-003e/qsfp_abs_int")
cpld3_abs_sta = self.get_register(
"/sys/class/i2c-adapter/i2c-15/15-003e/qsfp_abs_sta")
cpld4_abs_int = self.get_register(
"/sys/class/i2c-adapter/i2c-16/16-003e/qsfp_abs_int")
cpld4_abs_sta = self.get_register(
"/sys/class/i2c-adapter/i2c-16/16-003e/qsfp_abs_sta")
cpld5_abs_int = self.get_register(
"/sys/class/i2c-adapter/i2c-17/17-003e/qsfp_abs_int")
cpld5_abs_sta = self.get_register(
"/sys/class/i2c-adapter/i2c-17/17-003e/qsfp_abs_sta")
if (cpld2_abs_int == 'ERR' or cpld2_abs_sta == 'ERR' or
cpld3_abs_int == 'ERR' or cpld3_abs_sta == 'ERR' or
cpld4_abs_int == 'ERR' or cpld4_abs_sta == 'ERR' or
cpld5_abs_int == 'ERR' or cpld5_abs_sta == 'ERR'):
return -1
# If IOM is not present, interrupt will return 'read error'
# Handle the scenario gracefully
if (cpld2_abs_int == 'read error'):
cpld2_abs_int = "0x0"
cpld2_abs_sta = "0x0"
if (cpld3_abs_int == 'read error'):
cpld3_abs_int = "0x0"
cpld3_abs_sta = "0x0"
if (cpld4_abs_int == 'read error'):
cpld4_abs_int = "0x0"
cpld4_abs_sta = "0x0"
if (cpld5_abs_int == 'read error'):
cpld5_abs_int = "0x0"
cpld5_abs_sta = "0x0"
cpld2_abs_int = int(cpld2_abs_int, 16)
cpld2_abs_sta = int(cpld2_abs_sta, 16)
cpld3_abs_int = int(cpld3_abs_int, 16)
cpld3_abs_sta = int(cpld3_abs_sta, 16)
cpld4_abs_int = int(cpld4_abs_int, 16)
cpld4_abs_sta = int(cpld4_abs_sta, 16)
cpld5_abs_int = int(cpld5_abs_int, 16)
cpld5_abs_sta = int(cpld5_abs_sta, 16)
# Make it contiguous
interrupt_reg = (cpld2_abs_int & 0xffff) | \
((cpld4_abs_int & 0xffff) << 16) | \
((cpld3_abs_int & 0xffff) << 32) | \
((cpld5_abs_int & 0xffff) << 48)
status_reg = (cpld2_abs_sta & 0xffff) | \
((cpld4_abs_sta & 0xffff) << 16) | \
((cpld3_abs_sta & 0xffff) << 32) | \
((cpld5_abs_sta & 0xffff) << 48)
port = self.port_start
while port <= self.port_end:
if interrupt_reg & (1 << port):
# update only if atleast one port has generated
# interrupt
is_port_dict_updated = True
if status_reg & (1 << port):
# status reg 1 => optics is removed
port_dict[port] = '0'
else:
# status reg 0 => optics is inserted
port_dict[port] = '1'
port += 1
return retval, is_port_dict_updated
def get_transceiver_change_event(self, timeout=0): def get_transceiver_change_event(self, timeout=0):
epoll = select.epoll()
port_dict = {} port_dict = {}
try: try:
# We get notified when there is an SCI interrupt from GPIO SUS6 # We get notified when there is an SCI interrupt from GPIO SUS6
fd = open("/sys/devices/platform/dell_ich.0/sci_int_gpio_sus6", "r") # Check for missed interrupts by invoking self.check_interrupts
epoll.register(fd.fileno(), select.EPOLLIN) # it will update the port_dict.
events = epoll.poll(timeout=timeout if timeout != 0 else -1) # Then poll for new xcvr insertion/removal and
if events: # call self.check_interrupts again and return
# Read the QSFP ABS interrupt & status registers retval, is_port_dict_updated = self.check_interrupts(port_dict)
cpld2_abs_int = self.get_register("/sys/class/i2c-adapter/i2c-14/14-003e/qsfp_abs_int") if ((retval == 0) and (is_port_dict_updated is True)):
cpld2_abs_sta = self.get_register("/sys/class/i2c-adapter/i2c-14/14-003e/qsfp_abs_sta") return True, port_dict
cpld3_abs_int = self.get_register("/sys/class/i2c-adapter/i2c-15/15-003e/qsfp_abs_int")
cpld3_abs_sta = self.get_register("/sys/class/i2c-adapter/i2c-15/15-003e/qsfp_abs_sta")
cpld4_abs_int = self.get_register("/sys/class/i2c-adapter/i2c-16/16-003e/qsfp_abs_int")
cpld4_abs_sta = self.get_register("/sys/class/i2c-adapter/i2c-16/16-003e/qsfp_abs_sta")
cpld5_abs_int = self.get_register("/sys/class/i2c-adapter/i2c-17/17-003e/qsfp_abs_int")
cpld5_abs_sta = self.get_register("/sys/class/i2c-adapter/i2c-17/17-003e/qsfp_abs_sta")
# Block until an xcvr is inserted or removed with timeout = -1
if (cpld2_abs_int == 'read error' or cpld2_abs_sta == 'read error' or \ events = self.epoll.poll(
cpld3_abs_int == 'read error' or cpld3_abs_sta == 'read error' or \ timeout=timeout if timeout != 0 else -1)
cpld4_abs_int == 'read error' or cpld4_abs_sta == 'read error' or \ if events:
cpld4_abs_int == 'read error' or cpld4_abs_sta == 'read error' ): # check interrupts and return the port_dict
return False, {} retval, is_port_dict_updated = \
self.check_interrupts(port_dict)
cpld2_abs_int = int(cpld2_abs_int, 16) if (retval != 0):
cpld2_abs_sta = int(cpld2_abs_sta, 16) return False, {}
cpld3_abs_int = int(cpld3_abs_int, 16) return True, port_dict
cpld3_abs_sta = int(cpld3_abs_sta, 16) except:
cpld4_abs_int = int(cpld4_abs_int, 16) return False, {}
cpld4_abs_sta = int(cpld4_abs_sta, 16)
cpld5_abs_int = int(cpld5_abs_int, 16)
cpld5_abs_sta = int(cpld5_abs_sta, 16)
port=self.port_start
while port >= self.iom1_port_start and port <= self.iom1_port_end:
interrupt_reg = cpld2_abs_int
status_reg = cpld2_abs_sta
if interrupt_reg & (1<<port):
if status_reg & (1<<port):
# status reg 1 => optics is removed
port_dict[port] = '0'
else:
# status reg 0 => optics is inserted
port_dict[port] = '1'
port += 1
while port >= self.iom2_port_start and port <= self.iom2_port_end:
interrupt_reg = cpld4_abs_int
status_reg = cpld4_abs_sta
if interrupt_reg & (1<<port):
if status_reg & (1<<port):
# status reg 1 => optics is removed
port_dict[port] = '0'
else:
# status reg 0 => optics is inserted
port_dict[port] = '1'
port += 1
while port >= self.iom3_port_start and port <= self.iom3_port_end:
interrupt_reg = cpld3_abs_int
status_reg = cpld3_abs_sta
if interrupt_reg & (1<<port):
if status_reg & (1<<port):
# status reg 1 => optics is removed
port_dict[port] = '0'
else:
# status reg 0 => optics is inserted
port_dict[port] = '1'
port += 1
while port >= self.iom4_port_start and port <= self.iom4_port_end:
interrupt_reg = cpld5_abs_int
status_reg = cpld5_sta
if interrupt_reg & (1<<port):
if status_reg & (1<<port):
# status reg 1 => optics is removed
port_dict[port] = '0'
else:
# status reg 0 => optics is inserted
port_dict[port] = '1'
port += 1
return True, port_dict
finally:
fd.close()
epoll.close()
return False, {} return False, {}

131
device/dell/x86_64-dell_z9100_c2538-r0/plugins/sfputil.py
View File

@ -27,7 +27,10 @@ class SfpUtil(SfpUtilBase):
IOM_3_PORT_END = 31 IOM_3_PORT_END = 31
BASE_VAL_PATH = "/sys/class/i2c-adapter/i2c-{0}/{0}-003e/" BASE_VAL_PATH = "/sys/class/i2c-adapter/i2c-{0}/{0}-003e/"
OIR_FD_PATH = "/sys/devices/platform/dell_ich.0/sci_int_gpio_sus6"
oir_fd = -1
epoll = -1
_port_to_eeprom_mapping = {} _port_to_eeprom_mapping = {}
_port_to_i2c_mapping = { _port_to_i2c_mapping = {
0: [9, 18], 0: [9, 18],
@ -116,8 +119,19 @@ class SfpUtil(SfpUtilBase):
self.port_to_i2c_mapping[x][0], self.port_to_i2c_mapping[x][0],
self.port_to_i2c_mapping[x][1]) self.port_to_i2c_mapping[x][1])
self.oir_fd = open(self.OIR_FD_PATH, "r")
self.epoll = select.epoll()
if self.oir_fd != -1:
self.epoll.register(self.oir_fd.fileno(), select.EPOLLIN)
SfpUtilBase.__init__(self) SfpUtilBase.__init__(self)
def __del__(self):
if self.oir_fd != -1:
self.epoll.unregister(self.oir_fd.fileno())
self.epoll.close()
self.oir_fd.close()
def get_presence(self, port_num): def get_presence(self, port_num):
global i2c_line global i2c_line
@ -358,52 +372,81 @@ class SfpUtil(SfpUtilBase):
retval = retval.lstrip(" ") retval = retval.lstrip(" ")
return retval return retval
def check_interrupts(self, port_dict):
retval = 0
is_port_dict_updated = False
# Read the QSFP ABS interrupt & status registers
cpld2_abs_int = self.get_register(
"/sys/class/i2c-adapter/i2c-14/14-003e/qsfp_abs_int")
cpld2_abs_sta = self.get_register(
"/sys/class/i2c-adapter/i2c-14/14-003e/qsfp_abs_sta")
cpld3_abs_int = self.get_register(
"/sys/class/i2c-adapter/i2c-15/15-003e/qsfp_abs_int")
cpld3_abs_sta = self.get_register(
"/sys/class/i2c-adapter/i2c-15/15-003e/qsfp_abs_sta")
cpld4_abs_int = self.get_register(
"/sys/class/i2c-adapter/i2c-16/16-003e/qsfp_abs_int")
cpld4_abs_sta = self.get_register(
"/sys/class/i2c-adapter/i2c-16/16-003e/qsfp_abs_sta")
if (cpld2_abs_int == 'ERR' or cpld2_abs_sta == 'ERR' or
cpld3_abs_int == 'ERR' or cpld3_abs_sta == 'ERR' or
cpld4_abs_int == 'ERR' or cpld4_abs_sta == 'ERR'):
return -1
cpld2_abs_int = int(cpld2_abs_int, 16)
cpld2_abs_sta = int(cpld2_abs_sta, 16)
cpld3_abs_int = int(cpld3_abs_int, 16)
cpld3_abs_sta = int(cpld3_abs_sta, 16)
cpld4_abs_int = int(cpld4_abs_int, 16)
cpld4_abs_sta = int(cpld4_abs_sta, 16)
# Make it contiguous (discard reserved bits)
interrupt_reg = (cpld2_abs_int & 0xfff) |\
((cpld3_abs_int & 0x3ff) << 12) |\
((cpld4_abs_int & 0x3ff) << 22)
status_reg = (cpld2_abs_sta & 0xfff) |\
((cpld3_abs_sta & 0x3ff) << 12) |\
((cpld4_abs_sta & 0x3ff) << 22)
port = self.port_start
while port <= self.port_end:
if interrupt_reg & (1 << port):
# update only if atleast one port has generated
# interrupt
is_port_dict_updated = True
if status_reg & (1 << port):
# status reg 1 => optics is removed
port_dict[port] = '0'
else:
# status reg 0 => optics is inserted
port_dict[port] = '1'
port += 1
return retval, is_port_dict_updated
def get_transceiver_change_event(self, timeout=0): def get_transceiver_change_event(self, timeout=0):
epoll = select.epoll()
port_dict = {} port_dict = {}
try: try:
# We get notified when there is an SCI interrupt from GPIO SUS6 # We get notified when there is an SCI interrupt from GPIO SUS6
fd = open("/sys/devices/platform/dell_ich.0/sci_int_gpio_sus6", "r") # Check for missed interrupts by invoking self.check_interrupts
epoll.register(fd.fileno(), select.EPOLLIN) # it will update the port_dict.
events = epoll.poll(timeout=timeout if timeout != 0 else -1) # Then poll for new xcvr insertion/removal and
if events: # call self.check_interrupts again and return
# Read the QSFP ABS interrupt & status registers retval, is_port_dict_updated = self.check_interrupts(port_dict)
cpld2_abs_int = self.get_register("/sys/class/i2c-adapter/i2c-14/14-003e/qsfp_abs_int") if ((retval == 0) and (is_port_dict_updated is True)):
cpld2_abs_sta = self.get_register("/sys/class/i2c-adapter/i2c-14/14-003e/qsfp_abs_sta") return True, port_dict
cpld3_abs_int = self.get_register("/sys/class/i2c-adapter/i2c-15/15-003e/qsfp_abs_int")
cpld3_abs_sta = self.get_register("/sys/class/i2c-adapter/i2c-15/15-003e/qsfp_abs_sta")
cpld4_abs_int = self.get_register("/sys/class/i2c-adapter/i2c-16/16-003e/qsfp_abs_int")
cpld4_abs_sta = self.get_register("/sys/class/i2c-adapter/i2c-16/16-003e/qsfp_abs_sta")
if (cpld2_abs_int == 'ERR' or cpld2_abs_sta == 'ERR' or \
cpld3_abs_int == 'ERR' or cpld3_abs_sta == 'ERR' or \
cpld4_abs_int == 'ERR' or cpld4_abs_sta == 'ERR' ):
return False, {}
cpld2_abs_int = int(cpld2_abs_int, 16)
cpld2_abs_sta = int(cpld2_abs_sta, 16)
cpld3_abs_int = int(cpld3_abs_int, 16)
cpld3_abs_sta = int(cpld3_abs_sta, 16)
cpld4_abs_int = int(cpld4_abs_int, 16)
cpld4_abs_sta = int(cpld4_abs_sta, 16)
# Make it contiguous (discard reserved bits)
interrupt_reg = (cpld2_abs_int & 0xfff) | ((cpld3_abs_int & 0x3ff) << 12) | ((cpld4_abs_int & 0x3ff) << 22)
status_reg = (cpld2_abs_sta & 0xfff) | ((cpld3_abs_sta & 0x3ff) << 12) | ((cpld4_abs_sta & 0x3ff) << 22)
port=self.port_start
while port <= self.port_end:
if interrupt_reg & (1<<port):
if status_reg & (1<<port):
# status reg 1 => optics is removed
port_dict[port] = '0'
else:
# status reg 0 => optics is inserted
port_dict[port] = '1'
port += 1
return True, port_dict
finally:
fd.close()
epoll.close()
# Block until an xcvr is inserted or removed with timeout = -1
events = self.epoll.poll(
timeout=timeout if timeout != 0 else -1)
if events:
# check interrupts and return the port_dict
retval, is_port_dict_updated = \
self.check_interrupts(port_dict)
if (retval != 0):
return False, {}
return True, port_dict
except:
return False, {}
return False, {} return False, {}