201807 cel alex debug

build_debian.sh

@@ -226,7 +226,8 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     hping3                  \
     python-scapy            \
     tcptraceroute           \
-    mtr-tiny
+    mtr-tiny                \
+    dmidecode
 
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y download \
     grub-pc-bin

device/accton/x86_64-accton_as5712_54x-r0/plugins/sfputil.py

@@ -2,9 +2,9 @@
 #
 # Platform-specific SFP transceiver interface for SONiC
 #
-
 try:
     import time
+    import os
     from sonic_sfp.sfputilbase import SfpUtilBase
 except ImportError as e:
     raise ImportError("%s - required module not found" % str(e))
@@ -21,8 +21,14 @@ class SfpUtil(SfpUtilBase):
 
     BASE_VAL_PATH = "/sys/class/i2c-adapter/i2c-{0}/{1}-0050/"
     BASE_OOM_PATH = "/sys/bus/i2c/devices/{0}-0050/"
-    BASE_CPLD2_PATH = "/sys/bus/i2c/devices/0-0061/"
-    BASE_CPLD3_PATH = "/sys/bus/i2c/devices/0-0062/"
+    BASE_CPLD2_PATH = "/sys/bus/i2c/devices/{0}-0061/"
+    BASE_CPLD3_PATH = "/sys/bus/i2c/devices/{0}-0062/"
+    I2C_BUS_ORDER = -1
+
+    #The sidebands of QSFP is different. 
+    #present is in-order. 
+    #But lp_mode and reset are not. 	
+    qsfp_sb_map = [1, 3, 5, 2, 4, 6]
 
     _port_to_is_present = {}
     _port_to_lp_mode = {}
@@ -137,18 +143,30 @@ def __init__(self):
 
         SfpUtilBase.__init__(self)
 
+    #Two i2c buses might get flipped order, check them both.
+    def update_i2c_order(self):
+        if self.I2C_BUS_ORDER < 0:
+            eeprom_path = "/sys/bus/i2c/devices/1-0057/eeprom"
+            if os.path.exists(eeprom_path):
+                self.I2C_BUS_ORDER = 0
+            eeprom_path = "/sys/bus/i2c/devices/0-0057/eeprom"
+            if os.path.exists(eeprom_path):
+                self.I2C_BUS_ORDER = 1
+        return self.I2C_BUS_ORDER 
+
     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
 
+        order = self.update_i2c_order()
         if port_num < 24:
-            present_path = self.BASE_CPLD2_PATH + "module_present_" + str(self._port_to_i2c_mapping[port_num][0])            
+            present_path = self.BASE_CPLD2_PATH.format(order)         
         else:
-            present_path = self.BASE_CPLD3_PATH + "module_present_" + str(self._port_to_i2c_mapping[port_num][0])
+            present_path = self.BASE_CPLD3_PATH.format(order)
 
+        present_path = present_path + "module_present_" + str(self._port_to_i2c_mapping[port_num][0])            
         self.__port_to_is_present = present_path
-
 
         try:
             val_file = open(self.__port_to_is_present)
@@ -165,11 +183,21 @@ def get_presence(self, port_num):
 
         return False
 
+    def qsfp_sb_remap(self, port_num):
+        qsfp_start = self.qsfp_port_start
+        qsfp_index = self._port_to_i2c_mapping[port_num][0] - qsfp_start
+        qsfp_index = self.qsfp_sb_map[qsfp_index-1]
+        return qsfp_start+qsfp_index
+
     def get_low_power_mode(self, port_num):             
         if port_num < self.qsfp_port_start or port_num > self.qsfp_port_end:
             return False
 
-        lp_mode_path = self.BASE_CPLD3_PATH + "module_lp_mode_" + str(self._port_to_i2c_mapping[port_num][0])
+        order = self.update_i2c_order()
+        lp_mode_path = self.BASE_CPLD3_PATH.format(order)
+        lp_mode_path = lp_mode_path + "module_lp_mode_" 
+        q = self.qsfp_sb_remap(port_num)
+        lp_mode_path = lp_mode_path + str(q)
 
         try:
             val_file = open(lp_mode_path)
@@ -190,7 +218,11 @@ def set_low_power_mode(self, port_num, lpmode):
         if port_num < self.qsfp_port_start or port_num > self.qsfp_port_end:
             return False    
 
-        lp_mode_path = self.BASE_CPLD3_PATH + "module_lp_mode_" + str(self._port_to_i2c_mapping[port_num][0])
+        order = self.update_i2c_order()
+        lp_mode_path = self.BASE_CPLD3_PATH.format(order)
+        lp_mode_path = lp_mode_path + "module_lp_mode_" 
+        q = self.qsfp_sb_remap(port_num)
+        lp_mode_path = lp_mode_path + str(q)
 
         try:
             reg_file = open(lp_mode_path, 'r+')
@@ -212,17 +244,25 @@ def reset(self, port_num):
         if port_num < self.qsfp_port_start or port_num > self.qsfp_port_end:
             return False
 
-        mod_rst_path = lp_mode_path = self.BASE_CPLD3_PATH + "module_reset_" + str(self._port_to_i2c_mapping[port_num][0])
+        order = self.update_i2c_order()
+        lp_mode_path = self.BASE_CPLD3_PATH.format(order)
+        mod_rst_path = lp_mode_path + "module_reset_" 
+        q = self.qsfp_sb_remap(port_num)
+        mod_rst_path = mod_rst_path + str(q)
 
         try:
             reg_file = open(mod_rst_path, 'r+')
         except IOError as e:
             print "Error: unable to open file: %s" % str(e)          
             return False
 
-        reg_value = '1'
-
-        reg_file.write(reg_value)
+        #toggle reset
+        reg_file.seek(0)
+        reg_file.write('0')
+        time.sleep(1)
+        reg_file.seek(0)
+        reg_file.write('1')
         reg_file.close()
+        return True
 
-        return True
+        return True

device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/buffers.json.j2

@@ -0,0 +1,2 @@
+{%- set default_topo = 't0' %}
+{%- include 'buffers_config.j2' %}

device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/buffers_defaults_t0.j2

@@ -0,0 +1,72 @@
+{% set default_cable = '5m' %}
+{% set ingress_lossless_pool_size =  '20971328' %}
+{% set ingress_lossy_pool_size =  '20971328' %}
+{% set egress_lossless_pool_size =  '20971328' %}
+{% set egress_lossy_pool_size =  '20971328' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0, 48) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(48, 54) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (48 + (port_idx-48) * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "{{ ingress_lossless_pool_size }}",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "ingress_lossy_pool": {
+            "size": "{{ ingress_lossy_pool_size }}",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "{{ egress_lossless_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossy_pool": {
+            "size": "{{ egress_lossy_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "xon":"78400",
+            "xoff":"132160",
+            "size":"3584",
+            "static_th":"82880"
+        },
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
+            "size":"3584",
+            "dynamic_th":"-1"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"3584",
+            "dynamic_th":"-4"
+        }
+    },
+{%- endmacro %}
+
+{# the typo of generate_pg_profils dued to buffers_config.j2 #}
+{# Default, we do not bind any buffer profiles. #}
+{%- macro generate_pg_profils(port_names) %}
+    "BUFFER_PG": {
+    }
+{%- endmacro %}
+
+{# Default, we do not bind any buffer profiles. #}
+{%- macro generate_queue_buffers(port_names) %}
+    "BUFFER_QUEUE": {
+    }
+{%- endmacro %}

device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/buffers_defaults_t1.j2

@@ -0,0 +1,72 @@
+{% set default_cable = '5m' %}
+{% set ingress_lossless_pool_size =  '20971328' %}
+{% set ingress_lossy_pool_size =  '20971328' %}
+{% set egress_lossless_pool_size =  '20971328' %}
+{% set egress_lossy_pool_size =  '20971328' %}
+
+{%- macro generate_port_lists(PORT_ALL) %}
+    {# Generate list of ports #}
+    {%- for port_idx in range(0, 48) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (port_idx)) %}{%- endif %}
+    {%- endfor %}
+    {%- for port_idx in range(48, 54) %}
+        {%- if PORT_ALL.append("Ethernet%d" % (48 + (port_idx-48) * 4)) %}{%- endif %}
+    {%- endfor %}
+{%- endmacro %}
+
+{%- macro generate_buffer_pool_and_profiles() %}
+    "BUFFER_POOL": {
+        "ingress_lossless_pool": {
+            "size": "{{ ingress_lossless_pool_size }}",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "ingress_lossy_pool": {
+            "size": "{{ ingress_lossy_pool_size }}",
+            "type": "ingress",
+            "mode": "dynamic"
+        },
+        "egress_lossless_pool": {
+            "size": "{{ egress_lossless_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        },
+        "egress_lossy_pool": {
+            "size": "{{ egress_lossy_pool_size }}",
+            "type": "egress",
+            "mode": "dynamic"
+        }
+    },
+    "BUFFER_PROFILE": {
+        "ingress_lossless_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
+            "xon":"78400",
+            "xoff":"132160",
+            "size":"3584",
+            "static_th":"82880"
+        },
+        "ingress_lossy_profile": {
+            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
+            "size":"3584",
+            "dynamic_th":"-1"
+        },
+        "egress_lossy_profile": {
+            "pool":"[BUFFER_POOL|egress_lossy_pool]",
+            "size":"3584",
+            "dynamic_th":"-4"
+        }
+    },
+{%- endmacro %}
+
+{# the typo of generate_pg_profils dued to buffers_config.j2 #}
+{# Default, we do not bind any buffer profiles. #}
+{%- macro generate_pg_profils(port_names) %}
+    "BUFFER_PG": {
+    }
+{%- endmacro %}
+
+{# Default, we do not bind any buffer profiles. #}
+{%- macro generate_queue_buffers(port_names) %}
+    "BUFFER_QUEUE": {
+    }
+{%- endmacro %}

device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/pg_profile_lookup.ini

@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable  size    xon    xoff    threshold
+  10000  5m    3584    32256  59136   36736
+  25000  5m    3584    41216  68096   45696
+  40000  5m    3584    47488  74368   51968
+  50000  5m    3584    52864  79744   57344
+ 100000  5m    3584    78400  132160  82880
+  10000  40m   3584    32256  59136   36736
+  25000  40m   3584    41216  68096   45696
+  40000  40m   3584    47488  74368   51968
+  50000  40m   3584    52864  79744   57344
+ 100000  40m   3584    78400  132160  82880
+  10000  300m  3584    32256  65856   36736
+  25000  300m  3584    41216  84672   45696
+  40000  300m  3584    47488  101024  51968
+  50000  300m  3584    52864  113120  57344
+ 100000  300m  3584    78400  198688  82880

device/accton/x86_64-accton_as7116_54x-r0/Accton-AS7116-54X/port_config.ini

@@ -47,12 +47,9 @@ Ethernet44      76                Ethernet45/1      44
 Ethernet45      77                Ethernet46/1      45
 Ethernet46      78                Ethernet47/1      46
 Ethernet47      79                Ethernet48/1      47
-Ethernet48      80                Ethernet49/1      48
-Ethernet49      81                Ethernet50/1      49
-Ethernet50      82                Ethernet51/1      50
-Ethernet51      83                Ethernet52/1      51
-Ethernet52      84,85,86,87       Ethernet53/1      52
-Ethernet53      104,105,106,107   Ethernet54/1      53
-Ethernet54      108,109,110,111   Ethernet55/1      54
-Ethernet55      112,113,114,115   Ethernet56/1      55
-Ethernet56      116,117,118,119   Ethernet57/1      56
+Ethernet48      84,85,86,87       Ethernet49/1      48
+Ethernet49      80,81,82,83       Ethernet50/1      49
+Ethernet50      104,105,106,107   Ethernet51/1      50
+Ethernet51      108,109,110,111   Ethernet52/1      51
+Ethernet52      112,113,114,115   Ethernet53/1      52
+Ethernet53      116,117,118,119   Ethernet54/1      53