just merge with master

build_debian.sh

@@ -225,7 +225,8 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y in
     gdisk                   \
     sysfsutils              \
     grub2-common            \
-    ethtool
+    ethtool                 \
+    screen
 
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y download \
     grub-pc-bin
@@ -238,6 +239,12 @@ sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/libwrap0_*.deb || \
 ## Disable kexec supported reboot which was installed by default
 sudo sed -i 's/LOAD_KEXEC=true/LOAD_KEXEC=false/' $FILESYSTEM_ROOT/etc/default/kexec
 
+## Fix ping tools permission so non root user can directly use them
+## Note: this is a workaround since aufs doesn't support extended attributes
+## Ref: https://github.com/moby/moby/issues/5650#issuecomment-303499489
+## TODO: remove workaround when the overlay filesystem support extended attributes
+sudo chmod u+s $FILESYSTEM_ROOT/bin/ping{,6}
+
 ## Remove sshd host keys, and will regenerate on first sshd start
 sudo rm -f $FILESYSTEM_ROOT/etc/ssh/ssh_host_*_key*
 sudo cp files/sshd/host-ssh-keygen.sh $FILESYSTEM_ROOT/usr/local/bin/
@@ -300,6 +307,7 @@ set /files/etc/sysctl.conf/net.ipv6.conf.eth0.forwarding 0
 
 set /files/etc/sysctl.conf/net.ipv6.conf.default.accept_dad 0
 set /files/etc/sysctl.conf/net.ipv6.conf.all.accept_dad 0
+set /files/etc/sysctl.conf/net.ipv6.conf.eth0.accept_dad 0
 
 set /files/etc/sysctl.conf/net.ipv6.conf.eth0.accept_ra_defrtr 0
 

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

@@ -0,0 +1 @@
+{}

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

@@ -0,0 +1,153 @@
+{
+    "TC_TO_PRIORITY_GROUP_MAP": {
+        "AZURE": {
+            "0": "1",
+            "1": "0",
+            "3": "3",
+            "4": "4"
+        }
+    },
+    "MAP_PFC_PRIORITY_TO_QUEUE": {
+        "AZURE": {
+            "3": "3",
+            "4": "4"
+        }
+    },
+    "TC_TO_QUEUE_MAP": {
+        "AZURE": {
+            "0": "1",
+            "1": "0",
+            "3": "3",
+            "4": "4"
+        }
+    },
+    "DSCP_TO_TC_MAP": {
+        "AZURE": {
+            "0":"1",
+            "1":"0",
+            "2":"0",
+            "3":"3",
+            "4":"4",
+            "5":"0",
+            "6":"0",
+            "7":"0",
+            "8":"1",
+            "9":"0",
+            "10":"0",
+            "11":"0",
+            "12":"0",
+            "13":"0",
+            "14":"0",
+            "15":"0",
+            "16":"0",
+            "17":"0",
+            "18":"0",
+            "19":"0",
+            "20":"0",
+            "21":"0",
+            "22":"0",
+            "23":"0",
+            "24":"0",
+            "25":"0",
+            "26":"0",
+            "27":"0",
+            "28":"0",
+            "29":"0",
+            "30":"0",
+            "31":"0",
+            "32":"0",
+            "33":"0",
+            "34":"0",
+            "35":"0",
+            "36":"0",
+            "37":"0",
+            "38":"0",
+            "39":"0",
+            "40":"0",
+            "41":"0",
+            "42":"0",
+            "43":"0",
+            "44":"0",
+            "45":"0",
+            "46":"0",
+            "47":"0",
+            "48":"0",
+            "49":"0",
+            "50":"0",
+            "51":"0",
+            "52":"0",
+            "53":"0",
+            "54":"0",
+            "55":"0",
+            "56":"0",
+            "57":"0",
+            "58":"0",
+            "59":"0",
+            "60":"0",
+            "61":"0",
+            "62":"0",
+            "63":"0"
+        }
+    },
+    "SCHEDULER": {
+        "scheduler.0" : {
+            "type":"DWRR",
+            "weight": "25"
+        },
+        "scheduler.1" : {
+            "type":"DWRR",
+            "weight": "30"
+        },
+        "scheduler.2" : {
+            "type":"DWRR",
+            "weight": "20"
+        }
+    },
+    "PORT_QOS_MAP": {
+        "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet18,Ethernet19,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet33,Ethernet34,Ethernet35,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet43,Ethernet44,Ethernet45,Ethernet46,Ethernet47,Ethernet48,Ethernet49,Ethernet50,Ethernet51,Ethernet52,Ethernet53": {
+            "dscp_to_tc_map"  : "[DSCP_TO_TC_MAP|AZURE]",
+            "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]",
+            "tc_to_pg_map"    : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]",
+            "pfc_to_queue_map": "[MAP_PFC_PRIORITY_TO_QUEUE|AZURE]",
+            "pfc_enable": "3,4"
+        }
+    },
+    "WRED_PROFILE": {
+        "AZURE_LOSSY" : {
+            "wred_green_enable":"true",
+            "wred_yellow_enable":"true",
+            "wred_red_enable":"true",
+            "ecn":"ecn_all",
+            "red_max_threshold":"516096",
+            "red_min_threshold":"516096",
+            "yellow_max_threshold":"516096",
+            "yellow_min_threshold":"516096",
+            "green_max_threshold": "184128",
+            "green_min_threshold": "184128"
+        },
+        "AZURE_LOSSLESS" : {
+            "wred_green_enable":"true",
+            "wred_yellow_enable":"true",
+            "wred_red_enable":"true",
+            "ecn":"ecn_all",
+            "red_max_threshold":"516096",
+            "red_min_threshold":"516096",
+            "yellow_max_threshold":"516096",
+            "yellow_min_threshold":"516096",
+            "green_max_threshold": "184128",
+            "green_min_threshold": "184128"
+        }
+    },
+    "QUEUE": {
+        "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet18,Ethernet19,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet33,Ethernet34,Ethernet35,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet43,Ethernet44,Ethernet45,Ethernet46,Ethernet47,Ethernet48,Ethernet49,Ethernet50,Ethernet51,Ethernet52,Ethernet53|3-4" : {
+            "scheduler"     :   "[SCHEDULER|scheduler.0]",
+            "wred_profile"  :   "[WRED_PROFILE|AZURE_LOSSY]"
+        },
+        "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet18,Ethernet19,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet33,Ethernet34,Ethernet35,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet43,Ethernet44,Ethernet45,Ethernet46,Ethernet47,Ethernet48,Ethernet49,Ethernet50,Ethernet51,Ethernet52,Ethernet53|0" : {
+            "scheduler"     :   "[SCHEDULER|scheduler.1]"
+        },
+        "Ethernet0,Ethernet1,Ethernet2,Ethernet3,Ethernet4,Ethernet5,Ethernet6,Ethernet7,Ethernet8,Ethernet9,Ethernet10,Ethernet11,Ethernet12,Ethernet13,Ethernet14,Ethernet15,Ethernet16,Ethernet17,Ethernet18,Ethernet19,Ethernet20,Ethernet21,Ethernet22,Ethernet23,Ethernet24,Ethernet25,Ethernet26,Ethernet27,Ethernet28,Ethernet29,Ethernet30,Ethernet31,Ethernet32,Ethernet33,Ethernet34,Ethernet35,Ethernet36,Ethernet37,Ethernet38,Ethernet39,Ethernet40,Ethernet41,Ethernet42,Ethernet43,Ethernet44,Ethernet45,Ethernet46,Ethernet47,Ethernet48,Ethernet49,Ethernet50,Ethernet51,Ethernet52,Ethernet53|1" : {
+            "scheduler"     :   "[SCHEDULER|scheduler.2]"
+        }
+    }
+}

device/arista/x86_64-arista_7050_qx32/platform_reboot

@@ -0,0 +1,87 @@
+#!/usr/bin/env python
+# Copyright (c) 2018 Arista Networks, Inc.  All rights reserved.
+# Arista Networks, Inc. Confidential and Proprietary.
+
+# Reboot script for 7050QX-32
+
+from __future__ import print_function
+import sys
+import mmap, os
+import subprocess
+from struct import pack, unpack
+
+class MmapResource( object ):
+   """Resource implementation for a directly-mapped memory region."""
+
+   def __init__( self, path ):
+      try:
+         fd = os.open( path, os.O_RDWR )
+      except EnvironmentError:
+         print( "FAIL can not open scd memory-map resource file" )
+         print( "FAIL are you running on the proper platform?" )
+         sys.exit( 1 )
+      try:
+         size = os.fstat( fd ).st_size
+      except EnvironmentError:
+         print( "FAIL can not fstat scd memory-map resource file" )
+         print( "FAIL are you running on the proper platform?" )
+         sys.exit( 1 )
+      try:
+         self.mmap_ = mmap.mmap( fd, size, mmap.MAP_SHARED,
+                      mmap.PROT_READ | mmap.PROT_WRITE )
+      except EnvironmentError:
+         print( "FAIL can not map scd memory-map file" )
+         print( "FAIL are you running on the proper platform?" )
+         sys.exit( 1 )
+      finally:
+         try:
+            # Note that closing the file descriptor has no effect on the memory map
+            os.close( fd )
+         except EnvironmentError:
+            print( "FAIL failed to close scd memory-map file" )
+            sys.exit( 1 )
+
+   def read32( self, addr ):
+      return unpack( '<L', self.mmap_[ addr : addr + 4 ] )[ 0 ]
+
+   def write32( self, addr, value ):
+      self.mmap_[ addr: addr + 4 ] = pack( '<L', value )
+
+def scdRegTest( scd, offset, val1, count ):
+   scd.write32( offset, val1 )
+   val2 = scd.read32( offset )
+   if val1 != val2:
+      print( "FAIL: scd write 0x%08x but read back 0x%08x in iter %d" %
+             ( val1, val2, count ) )
+      sys.exit( 17 )
+
+def scdScrRegTest( scd ):
+   scrOffset = 0x0130
+   for i in range( 0, 3 ):
+      scdRegTest( scd, scrOffset, 0xdeadbeef, i )
+      scdRegTest( scd, scrOffset, 0xa5a5a5a5, i )
+      scdRegTest( scd, scrOffset, 0x00000000, i )
+
+def reboot( scd ):
+   # reboot the system by writing to register 0x7000
+   print( "Rebooting" )
+   scd.write32( 0x7000, 0xDEAD )
+   print( "REBOOTED" )
+
+def main():
+   busName = "/sys/bus/pci/devices/0000:04:00.0/resource0"
+
+   subprocess.call( [ 'modprobe', 'scd' ] )
+
+   scd = MmapResource( busName )
+
+   #
+   # verify that we can read/write scd scratch register
+   #
+   scdScrRegTest( scd )
+
+   # reboot the system
+   reboot( scd )
+
+if __name__ == "__main__":
+   main()

device/arista/x86_64-arista_7050_qx32/plugins/led_control.py

@@ -85,16 +85,6 @@ def __init__(self):
         with open("/sys/class/leds/psu2/brightness", "w") as f:
             f.write("1")
 
-        # Initialize all fan LEDs to green
-        with open("/sys/devices/platform/sb800-fans/hwmon/hwmon1/fan1_led", "w") as f:
-            f.write("3")
-        with open("/sys/devices/platform/sb800-fans/hwmon/hwmon1/fan2_led", "w") as f:
-            f.write("3")
-        with open("/sys/devices/platform/sb800-fans/hwmon/hwmon1/fan3_led", "w") as f:
-            f.write("3")
-        with open("/sys/devices/platform/sb800-fans/hwmon/hwmon1/fan4_led", "w") as f:
-            f.write("3")
-
         # Initialize: Turn all front panel QSFP LEDs off
         for qsfp_index in range(self.QSFP_BREAKOUT_START_IDX, self.QSFP_BREAKOUT_END_IDX + 1):
             for lane in range(1, 5):

device/arista/x86_64-arista_7050_qx32s/platform_reboot

@@ -0,0 +1,87 @@
+#!/usr/bin/env python
+# Copyright (c) 2018 Arista Networks, Inc.  All rights reserved.
+# Arista Networks, Inc. Confidential and Proprietary.
+
+# Reboot script for 7050QX-32S
+
+from __future__ import print_function
+import sys
+import mmap, os
+import subprocess
+from struct import pack, unpack
+
+class MmapResource( object ):
+   """Resource implementation for a directly-mapped memory region."""
+
+   def __init__( self, path ):
+      try:
+         fd = os.open( path, os.O_RDWR )
+      except EnvironmentError:
+         print( "FAIL can not open scd memory-map resource file" )
+         print( "FAIL are you running on the proper platform?" )
+         sys.exit( 1 )
+      try:
+         size = os.fstat( fd ).st_size
+      except EnvironmentError:
+         print( "FAIL can not fstat scd memory-map resource file" )
+         print( "FAIL are you running on the proper platform?" )
+         sys.exit( 1 )
+      try:
+         self.mmap_ = mmap.mmap( fd, size, mmap.MAP_SHARED,
+                      mmap.PROT_READ | mmap.PROT_WRITE )
+      except EnvironmentError:
+         print( "FAIL can not map scd memory-map file" )
+         print( "FAIL are you running on the proper platform?" )
+         sys.exit( 1 )
+      finally:
+         try:
+            # Note that closing the file descriptor has no effect on the memory map
+            os.close( fd )
+         except EnvironmentError:
+            print( "FAIL failed to close scd memory-map file" )
+            sys.exit( 1 )
+
+   def read32( self, addr ):
+      return unpack( '<L', self.mmap_[ addr : addr + 4 ] )[ 0 ]
+
+   def write32( self, addr, value ):
+      self.mmap_[ addr: addr + 4 ] = pack( '<L', value )
+
+def scdRegTest( scd, offset, val1, count ):
+   scd.write32( offset, val1 )
+   val2 = scd.read32( offset )
+   if val1 != val2:
+      print( "FAIL: scd write 0x%08x but read back 0x%08x in iter %d" %
+             ( val1, val2, count ) )
+      sys.exit( 17 )
+
+def scdScrRegTest( scd ):
+   scrOffset = 0x0130
+   for i in range( 0, 3 ):
+      scdRegTest( scd, scrOffset, 0xdeadbeef, i )
+      scdRegTest( scd, scrOffset, 0xa5a5a5a5, i )
+      scdRegTest( scd, scrOffset, 0x00000000, i )
+
+def reboot( scd ):
+   # reboot the system by writing to register 0x7000
+   print( "Rebooting" )
+   scd.write32( 0x7000, 0xDEAD )
+   print( "REBOOTED" )
+
+def main():
+   busName = "/sys/bus/pci/devices/0000:02:00.0/resource0"
+
+   subprocess.call( [ 'modprobe', 'scd' ] )
+
+   scd = MmapResource( busName )
+
+   #
+   # verify that we can read/write scd scratch register
+   #
+   scdScrRegTest( scd )
+
+   # reboot the system
+   reboot( scd )
+
+if __name__ == "__main__":
+   main()

device/arista/x86_64-arista_7050_qx32s/plugins/led_control.py

@@ -80,17 +80,6 @@ def __init__(self):
         with open("/sys/class/leds/psu2/brightness", "w") as f:
             f.write("1")
 
-        # Initialize all fan LEDs to green
-        with open("/sys/devices/pci0000:00/0000:00:02.2/0000:02:00.0/i2c-3/3-0060/hwmon/hwmon4/fan1_led", "w") as f:
-            f.write("1")
-        with open("/sys/devices/pci0000:00/0000:00:02.2/0000:02:00.0/i2c-3/3-0060/hwmon/hwmon4/fan2_led", "w") as f:
-            f.write("1")
-        with open("/sys/devices/pci0000:00/0000:00:02.2/0000:02:00.0/i2c-3/3-0060/hwmon/hwmon4/fan3_led", "w") as f:
-            f.write("1")
-        with open("/sys/devices/pci0000:00/0000:00:02.2/0000:02:00.0/i2c-3/3-0060/hwmon/hwmon4/fan4_led", "w") as f:
-            f.write("1")
-
-
         # Initialize: Turn all front panel QSFP LEDs off
         for qsfp_index in range(self.QSFP_BREAKOUT_START_IDX, self.QSFP_BREAKOUT_END_IDX + 1):
             for lane in range(1, 5):