Merge pull request #4 from Azure/master

sync from Azure to Project-arlo

.gitignore

@@ -1,3 +1,6 @@
+# OS-generated files
+.DS_Store
+
 # Build system related
 .platform
 .screen

Makefile.work

@@ -61,7 +61,11 @@ SLAVE_IMAGE = sonic-slave-$(USER)
 SLAVE_DIR = sonic-slave
 endif
 
-OVERLAY_MODULE_CHECK := lsmod | grep "^overlay " > /dev/null 2>&1 || (echo "ERROR: Module 'overlay' not loaded. Try running 'sudo modprobe overlay'."; exit 1)
+OVERLAY_MODULE_CHECK := \
+    lsmod | grep -q "^overlay " &>/dev/null || \
+    zgrep -q 'CONFIG_OVERLAY_FS=y' /proc/config.gz &>/dev/null || \
+    grep -q 'CONFIG_OVERLAY_FS=y' /boot/config-$(shell uname -r) &>/dev/null || \
+    (echo "ERROR: Module 'overlay' not loaded. Try running 'sudo modprobe overlay'."; exit 1)
 
 BUILD_TIMESTAMP := $(shell date +%Y%m%d\.%H%M%S)
 
@@ -117,6 +121,7 @@ SONIC_BUILD_INSTRUCTION :=  make \
                            PASSWORD=$(PASSWORD) \
                            USERNAME=$(USERNAME) \
                            SONIC_BUILD_JOBS=$(SONIC_BUILD_JOBS) \
+                           SONIC_USE_DOCKER_BUILDKIT=$(SONIC_USE_DOCKER_BUILDKIT) \
                            VS_PREPARE_MEM=$(VS_PREPARE_MEM) \
                            KERNEL_PROCURE_METHOD=$(KERNEL_PROCURE_METHOD) \
                            HTTP_PROXY=$(http_proxy) \

build_debian.sh

@@ -30,7 +30,7 @@ set -x -e
 
 ## docker engine version (with platform)
 DOCKER_VERSION=5:18.09.2~3-0~debian-stretch
-LINUX_KERNEL_VERSION=4.9.0-8-2
+LINUX_KERNEL_VERSION=4.9.0-9-2
 
 ## Working directory to prepare the file system
 FILESYSTEM_ROOT=./fsroot
@@ -121,7 +121,7 @@ sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/initramfs-tools_*.deb || \
 sudo dpkg --root=$FILESYSTEM_ROOT -i $debs_path/linux-image-${LINUX_KERNEL_VERSION}-amd64_*.deb || \
     sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install acl
-sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install dmidecode 
+sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install dmidecode
 
 ## Update initramfs for booting with squashfs+overlay
 cat files/initramfs-tools/modules | sudo tee -a $FILESYSTEM_ROOT/etc/initramfs-tools/modules > /dev/null
@@ -409,7 +409,7 @@ fi
 ## Organization specific extensions such as Configuration & Scripts for features like AAA, ZTP...
 if [ "${enable_organization_extensions}" = "y" ]; then
    if [ -f files/build_templates/organization_extensions.sh ]; then
-      sudo chmod 755 files/build_templates/organization_extensions.sh 
+      sudo chmod 755 files/build_templates/organization_extensions.sh
       ./files/build_templates/organization_extensions.sh -f $FILESYSTEM_ROOT -h $HOSTNAME
    fi
 fi

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

@@ -5,6 +5,8 @@
 
 try:
     import time
+    import string
+    from ctypes import create_string_buffer
     from sonic_sfp.sfputilbase import SfpUtilBase
 except ImportError as e:
     raise ImportError("%s - required module not found" % str(e))
@@ -110,11 +112,63 @@ def get_presence(self, port_num):
 
         return False
 
-    def get_low_power_mode(self, port_num): 
-      raise NotImplementedError
-
-    def set_low_power_mode(self, port_num, lpmode):
-        raise NotImplementedError
+    def get_low_power_mode(self, port_num):
+        # Check for invalid port_num
+        if port_num < self.port_start or port_num > self.port_end:
+            return False
+
+        try:
+            eeprom = None
+
+            if not self.get_presence(port_num):
+                return False
+
+            eeprom = open(self.port_to_eeprom_mapping[port_num], "rb")
+            eeprom.seek(93)
+            lpmode = ord(eeprom.read(1))
+
+            if ((lpmode & 0x3) == 0x3):
+                return True # Low Power Mode if "Power override" bit is 1 and "Power set" bit is 1
+            else:
+                return False # High Power Mode if one of the following conditions is matched:
+                             # 1. "Power override" bit is 0
+                             # 2. "Power override" bit is 1 and "Power set" bit is 0 
+        except IOError as e:
+            print "Error: unable to open file: %s" % str(e)
+            return False
+        finally:
+            if eeprom is not None:
+                eeprom.close()
+                time.sleep(0.01)
+
+    def set_low_power_mode(self, port_num, lpmode): 
+        # Check for invalid port_num
+        if port_num < self.port_start or port_num > self.port_end:
+            return False
+
+        try:
+            eeprom = None
+
+            if not self.get_presence(port_num):
+                return False # Port is not present, unable to set the eeprom
+
+            # Fill in write buffer
+            regval = 0x3 if lpmode else 0x1 # 0x3:Low Power Mode, 0x1:High Power Mode
+            buffer = create_string_buffer(1)
+            buffer[0] = chr(regval)
+
+            # Write to eeprom
+            eeprom = open(self.port_to_eeprom_mapping[port_num], "r+b")
+            eeprom.seek(93)
+            eeprom.write(buffer[0])
+            return True
+        except IOError as e:
+            print "Error: unable to open file: %s" % str(e)
+            return False
+        finally:
+            if eeprom is not None:
+                eeprom.close()
+                time.sleep(0.01)
 
     def reset(self, port_num):
         if port_num < self.port_start or port_num > self.port_end:

device/arista/x86_64-arista_7170_64c/Arista-7170-64C/switch-tna-sai.conf

@@ -0,0 +1,39 @@
+{
+    "instance": 0,
+    "chip_list": [
+        {
+            "id": "asic-0",
+            "chip_family": "Tofino",
+            "instance": 0,
+            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
+            "pcie_domain": 0,
+            "pcie_bus": 5,
+            "pcie_fn": 0,
+            "pcie_dev": 0,
+            "pcie_int_mode": 1,
+            "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
+        }
+    ],
+    "p4_devices": [
+        {
+            "device-id": 0,
+            "p4_programs": [
+                {
+                    "p4_pipelines": [
+                        {
+                            "p4_pipeline_name": "pipe",
+                            "config": "share/tofinopd/switch/pipe/tofino.bin",
+                            "context": "share/tofinopd/switch/pipe/context.json"
+                        }
+                    ],
+                    "program-name": "switch",
+                    "switchsai": "lib/libswitchsai.so",
+                    "bfrt-config": "share/tofinopd/switch/bf-rt.json",
+                    "model_json_path" : "share/switch/aug_model.json",
+                    "switchapi_port_add": false,
+                    "non_default_port_ppgs": 5
+                }
+            ]
+        }
+    ]
+}

device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/switch-tna-sai.conf

@@ -0,0 +1,39 @@
+{
+    "instance": 0,
+    "chip_list": [
+        {
+            "id": "asic-0",
+            "chip_family": "Tofino",
+            "instance": 0,
+            "pcie_sysfs_prefix": "/sys/devices/pci0000:00/0000:00:03.0/0000:05:00.0",
+            "pcie_domain": 0,
+            "pcie_bus": 5,
+            "pcie_fn": 0,
+            "pcie_dev": 0,
+            "pcie_int_mode": 1,
+            "sds_fw_path": "share/tofino_sds_fw/avago/firmware"
+        }
+    ],
+    "p4_devices": [
+        {
+            "device-id": 0,
+            "p4_programs": [
+                {
+                    "p4_pipelines": [
+                        {
+                            "p4_pipeline_name": "pipe",
+                            "config": "share/tofinopd/switch/pipe/tofino.bin",
+                            "context": "share/tofinopd/switch/pipe/context.json"
+                        }
+                    ],
+                    "program-name": "switch",
+                    "switchsai": "lib/libswitchsai.so",
+                    "bfrt-config": "share/tofinopd/switch/bf-rt.json",
+                    "model_json_path" : "share/switch/aug_model.json",
+                    "switchapi_port_add": false,
+                    "non_default_port_ppgs": 5
+                }
+            ]
+        }
+    ]
+}

device/celestica/x86_64-cel_e1031-r0/sonic_platform/chassis.py

@@ -17,6 +17,7 @@
 try:
     from sonic_platform_base.chassis_base import ChassisBase
     from sonic_platform.fan import Fan
+    from sonic_platform.psu import Psu
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
@@ -26,6 +27,7 @@
 SMC_CPLD_PATH = "/sys/devices/platform/e1031.smc/version"
 MMC_CPLD_PATH = "/sys/devices/platform/e1031.smc/getreg"
 NUM_FAN = 3
+NUM_PSU = 2
 
 
 class Chassis(ChassisBase):
@@ -36,6 +38,9 @@ def __init__(self):
         for index in range(0, NUM_FAN):
             fan = Fan(index)
             self._fan_list.append(fan)
+        for index in range(0, NUM_PSU):
+            psu = Psu(index)
+            self._psu_list.append(psu)
         ChassisBase.__init__(self)
 
     def __get_register_value(self, path, register):

device/celestica/x86_64-cel_e1031-r0/sonic_platform/psu.py

@@ -0,0 +1,61 @@
+#!/usr/bin/env python
+
+#############################################################################
+# Celestica
+#
+# Module contains an implementation of SONiC Platform Base API and
+# provides the PSUs status which are available in the platform
+#
+#############################################################################
+
+import os.path
+import sonic_platform
+
+try:
+    from sonic_platform_base.psu_base import PsuBase
+    from sonic_platform.fan import Fan
+except ImportError as e:
+    raise ImportError(str(e) + "- required module not found")
+
+FAN_E1031_SPEED_PATH = "/sys/class/hwmon/hwmon{}/fan1_input"
+FAN_MAX_RPM = 11000
+
+
+class Psu(PsuBase):
+    """Platform-specific Psu class"""
+
+    def __init__(self, psu_index):
+        PsuBase.__init__(self)
+        self.index = psu_index
+
+    def get_fan(self):
+        """
+        Retrieves object representing the fan module contained in this PSU
+        Returns:
+            An object dervied from FanBase representing the fan module
+            contained in this PSU
+        """
+        fan_speed_path = FAN_E1031_SPEED_PATH.format(
+            str(self.index+3))
+        try:
+            with open(fan_speed_path) as fan_speed_file:
+                fan_speed_rpm = int(fan_speed_file.read())
+        except IOError:
+            fan_speed = 0
+
+        fan_speed = float(fan_speed_rpm)/FAN_MAX_RPM * 100
+        fan = Fan(0)
+        fan.fan_speed = int(fan_speed) if int(fan_speed) <= 100 else 100
+        return fan
+
+    def set_status_led(self, color):
+        """
+        Sets the state of the PSU status LED
+        Args:
+            color: A string representing the color with which to set the PSU status LED
+                   Note: Only support green and off
+        Returns:
+            bool: True if status LED state is set successfully, False if not
+        """
+        # Hardware not supported
+        return False

device/celestica/x86_64-cel_seastone-r0/sonic_platform/chassis.py

@@ -17,13 +17,15 @@
 try:
     from sonic_platform_base.chassis_base import ChassisBase
     from sonic_platform.fan import Fan
+    from sonic_platform.psu import Psu
 except ImportError as e:
     raise ImportError(str(e) + "- required module not found")
 
 BIOS_VERSION_PATH = "/sys/class/dmi/id/bios_version"
 GETREG_PATH = "/sys/devices/platform/dx010_cpld/getreg"
 CONFIG_DB_PATH = "/etc/sonic/config_db.json"
 NUM_FAN = 5
+NUM_PSU = 2
 CPLD_ADDR_MAPPING = {
     "CPLD1": "0x100",
     "CPLD2": "0x200",
@@ -41,6 +43,9 @@ def __init__(self):
         for index in range(0, NUM_FAN):
             fan = Fan(index)
             self._fan_list.append(fan)
+        for index in range(0, NUM_PSU):
+            psu = Psu(index)
+            self._psu_list.append(psu)
         ChassisBase.__init__(self)
 
     def __get_register_value(self, path, register):