[Ingrasys]: Add Ingrasys S8900-64XC sfputil function and update submodule (#984)

* Add S8900-64XC SFP QSFP CPLD kernel module.
* Fixed QSFP function call in i2c_utils.sh.
* Add QSFP monitor service for SFP and QSFP SI.

Signed-off-by: Wade He <chihen.he@gmail.com>

device/ingrasys/x86_64-ingrasys_s8900_64xc-r0/plugins/sfputil.py

@@ -1,24 +1,30 @@
-#!/usr/bin/env python
+# sfputil.py
-
+#
-import subprocess
+# Platform-specific SFP transceiver interface for SONiC
+#
 
 try:
-    from sonic_sfp.sfputilbase import sfputilbase
+    import time
-except ImportError, e:
+    import subprocess
-    raise ImportError (str(e) + "- required module not found")
+    from sonic_sfp.sfputilbase import SfpUtilBase
+except ImportError as e:
+    raise ImportError("%s - required module not found" % str(e))
+
 
 i2c_set = 'i2cset'
+i2c_get = 'i2cget'
 cpld_addr = '0x33'
 mux_reg = '0x4A'
 
-class sfputil(sfputilbase):
+class SfpUtil(SfpUtilBase):
-    """Platform specific sfputil class"""
+    """Platform-specific SfpUtil class"""
 
-    port_start = 0
+    PORT_START = 0
-    port_end = 63
+    PORT_END = 63
-    ports_in_block = 64
+    QSFP_PORT_START = 48
+    PORTS_IN_BLOCK = 64
 
-    port_to_eeprom_mapping = {}
+    _port_to_eeprom_mapping = {}
     port_to_i2c_mapping = {
            0: [2,1],
            1: [2,2],
@@ -44,64 +50,207 @@ class sfputil(sfputilbase):
            21: [2,22],
            22: [2,23],
            23: [2,24],
-           24: [3,1],
+           24: [3,25],
-           25: [3,2],
+           25: [3,26],
-           26: [3,3],
+           26: [3,27],
-           27: [3,4],
+           27: [3,28],
-           28: [3,5],
+           28: [3,29],
-           29: [3,6],
+           29: [3,30],
-           30: [3,7],
+           30: [3,31],
-           31: [3,8],
+           31: [3,32],
-           32: [3,9],
+           32: [3,33],
-           33: [3,10],
+           33: [3,34],
-           34: [3,11],
+           34: [3,35],
-           35: [3,12],
+           35: [3,36],
-           36: [3,13],
+           36: [3,37],
-           37: [3,14],
+           37: [3,38],
-           38: [3,15],
+           38: [3,39],
-           39: [3,16],
+           39: [3,40],
-           40: [3,17],
+           40: [3,41],
-           41: [3,18],
+           41: [3,42],
-           42: [3,19],
+           42: [3,43],
-           43: [3,20],
+           43: [3,44],
-           44: [3,21],
+           44: [3,45],
-           45: [3,22],
+           45: [3,46],
-           46: [3,23],
+           46: [3,47],
-           47: [3,24],
+           47: [3,48],
-           48: [4,1],
+           48: [4,49],
-           49: [4,2],
+           49: [4,50],
-           50: [4,3],
+           50: [4,51],
-           51: [4,4],
+           51: [4,52],
-           52: [4,5],
+           52: [4,53],
-           53: [4,6],
+           53: [4,54],
-           54: [4,7],
+           54: [4,55],
-           55: [4,8],
+           55: [4,56],
-           56: [4,9],
+           56: [4,57],
-           57: [4,10],
+           57: [4,58],
-           58: [4,11],
+           58: [4,59],
-           59: [4,12],
+           59: [4,60],
-           60: [4,13],
+           60: [4,61],
-           61: [4,14],
+           61: [4,62],
-           62: [4,15],
+           62: [4,63],
-           63: [4,16]
+           63: [4,64]
     }
 
+    @property
+    def port_start(self):
+        return self.PORT_START
 
-    _qsfp_ports = range(0, ports_in_block + 1)
+    @property
+    def port_end(self):
+        return self.PORT_END
 
-    def __init__(self, port_num):
+    @property
-        # Override port_to_eeprom_mapping for class initialization
+    def qsfp_ports(self):
-        i2c_bus = self.port_to_i2c_mapping[port_num][0]
+        return range(0, self.PORTS_IN_BLOCK + 1)
-        sfp_idx = self.port_to_i2c_mapping[port_num][1]
-        proc = subprocess.Popen([i2c_set, '-y', str(i2c_bus), cpld_addr, mux_reg, str(sfp_idx)],
-                                stdout=subprocess.PIPE,
-                                shell=False,
-                                stderr=subprocess.STDOUT)
-        stdout = proc.communicate()[0]
-        proc.wait()
 
-        eeprom_path = '/sys/class/i2c-adapter/i2c-{0[0]}/{0[0]}-0050/eeprom'
+    @property
-        for x in range(self.port_start, self.port_end + 1):
+    def port_to_eeprom_mapping(self):
-            port_eeprom_path = eeprom_path.format(self.port_to_i2c_mapping[x])
+        return self._port_to_eeprom_mapping
+
+    @property
+    def qsfp_port_start(self):
+        return self.QSFP_PORT_START
+
+    def __init__(self):
+
+        sfp_eeprom_path = '/sys/bus/i2c/devices/{0[0]}-0050/sfp{0[1]}'
+        qsfp_eeprom_path = '/sys/bus/i2c/devices/{0[0]}-0050/qsfp{0[1]}'
+        for x in range(self.port_start, self.qsfp_port_start):
+            port_eeprom_path = sfp_eeprom_path.format(self.port_to_i2c_mapping[x])
             self.port_to_eeprom_mapping[x] = port_eeprom_path
-        sfputilbase.__init__(self, port_num)
+        for x in range(self.qsfp_port_start, self.port_end + 1):
+            port_eeprom_path = qsfp_eeprom_path.format(self.port_to_i2c_mapping[x])
+            self.port_to_eeprom_mapping[x] = port_eeprom_path
+
+        SfpUtilBase.__init__(self)
+
+    def get_presence(self, port_num):
+        # Check for invalid port_num
+        if port_num < self.port_start or port_num > self.port_end:
+            return False
+
+        try:
+            reg_file = open("/sys/devices/platform/ingrasys-s8900-64xc-cpld.0/qsfp_modprs")
+        except IOError as e:
+            print "Error: unable to open file: %s" % str(e)
+            return False
+
+        content = reg_file.readline().rstrip()
+
+        # content is a string containing the hex representation of the register
+        reg_value = int(content, 16)
+
+        # Mask off the bit corresponding to our port
+        mask = (1 << port_num)
+
+        # content is a string, either "0" or "1"
+        if reg_value & mask == 0:
+            return True
+
+        return False
+
+    def get_low_power_mode(self, port_num):
+        # Check for invalid port_num
+        if port_num < self.qsfp_port_start or port_num > self.port_end:
+            return False
+
+        try:
+            reg_file = open("/sys/devices/platform/ingrasys-s8900-64xc-cpld.0/qsfp_lpmode")
+        except IOError as e:
+            print "Error: unable to open file: %s" % str(e)
+            return False
+
+        content = reg_file.readline().rstrip()
+
+        # content is a string containing the hex representation of the register
+        reg_value = int(content, 16)
+
+        # Mask off the bit corresponding to our port
+        mask = (1 << (port_num - self.qsfp_port_start) )
+
+        # LPMode is active high
+        if reg_value & mask == 0:
+            return False
+
+        return True
+
+    def set_low_power_mode(self, port_num, lpmode):
+        # Check for invalid port_num
+        if port_num < self.qsfp_port_start or port_num > self.port_end:
+            return False
+
+        try:
+            reg_file = open("/sys/devices/platform/ingrasys-s8900-64xc-cpld.0/qsfp_lpmode", "r+")
+        except IOError as e:
+            print "Error: unable to open file: %s" % str(e)
+            return False
+
+        content = reg_file.readline().rstrip()
+
+        # content is a string containing the hex representation of the register
+        reg_value = int(content, 16)
+
+        # Mask off the bit corresponding to our port
+        mask = (1 << (port_num - self.qsfp_port_start) )
+
+        # LPMode is active high; set or clear the bit accordingly
+        if lpmode is True:
+            reg_value = reg_value | mask
+        else:
+            reg_value = reg_value & ~mask
+
+        # Convert our register value back to a hex string and write back
+        content = hex(reg_value)
+
+        reg_file.seek(0)
+        reg_file.write(content)
+        reg_file.close()
+
+        return True
+
+    def reset(self, port_num):
+        QSFP_RESET_REGISTER_DEVICE_FILE = "/sys/devices/platform/ingrasys-s8900-64xc-cpld.0/qsfp_reset"
+
+        # Check for invalid port_num
+        if port_num < self.qsfp_port_start or port_num > self.port_end:
+            return False
+
+        try:
+            reg_file = open(QSFP_RESET_REGISTER_DEVICE_FILE, "r+")
+        except IOError as e:
+            print "Error: unable to open file: %s" % str(e)
+            return False
+
+        content = reg_file.readline().rstrip()
+
+        # File content is a string containing the hex representation of the register
+        reg_value = int(content, 16)
+
+        # Mask off the bit corresponding to our port
+        mask = (1 << (port_num - self.qsfp_port_start))
+
+        # ResetL is active low
+        reg_value = reg_value & ~mask
+
+        # Convert our register value back to a hex string and write back
+        reg_file.seek(0)
+        reg_file.write(hex(reg_value))
+        reg_file.close()
+
+        # Sleep 1 second to allow it to settle
+        time.sleep(1)
+
+        # Flip the bit back high and write back to the register to take port out of reset
+        try:
+            reg_file = open(QSFP_RESET_REGISTER_DEVICE_FILE, "w")
+        except IOError as e:
+            print "Error: unable to open file: %s" % str(e)
+            return False
+
+        reg_value = reg_value | mask
+        reg_file.seek(0)
+        reg_file.write(hex(reg_value))
+        reg_file.close()
+
+        return True

platform/broadcom/sonic-platform-modules-ingrasys

@@ -1 +1 @@
-Subproject commit 458829af29ccbaf71ddc70db292e6a468e0e564c
+Subproject commit e66b8839da2180fd586aae040701faf180d59477