Z9264f new platform changes

.gitmodules

@@ -3,7 +3,8 @@
 	url = https://github.com/Azure/sonic-swss-common
 [submodule "sonic-linux-kernel"]
 	path = src/sonic-linux-kernel
-	url = https://github.com/Azure/sonic-linux-kernel
+	url = https://github.com/lguohan/sonic-linux-kernel
+	branch = stretch
 [submodule "sonic-sairedis"]
 	path = src/sonic-sairedis
 	url = https://github.com/Azure/sonic-sairedis
@@ -37,13 +38,15 @@
 	url = https://github.com/Azure/sonic-utilities
 [submodule "platform/broadcom/sonic-platform-modules-s6000"]
 	path = platform/broadcom/sonic-platform-modules-s6000
-	url = https://github.com/Azure/sonic-platform-modules-s6000
+	url = https://github.com/lguohan/sonic-platform-modules-s6000
+	branch = stretch
 [submodule "platform/broadcom/sonic-platform-modules-arista"]
 	path = platform/broadcom/sonic-platform-modules-arista
 	url = https://github.com/aristanetworks/sonic
 [submodule "platform/broadcom/sonic-platform-modules-dell"]
 	path = platform/broadcom/sonic-platform-modules-dell
-	url = https://github.com/Azure/sonic-platform-modules-dell
+	url = https://github.com/lguohan/sonic-platform-modules-dell
+	branch = stretch
 [submodule "platform/broadcom/sonic-platform-modules-ingrasys"]
 	path = platform/broadcom/sonic-platform-modules-ingrasys
 	url = https://github.com/Ingrasys-sonic/sonic-platform-modules-ingrasys
@@ -56,9 +59,6 @@
 [submodule "platform/broadcom/sonic-platform-modules-accton"]
 	path = platform/broadcom/sonic-platform-modules-accton
 	url = https://github.com/edge-core/sonic-platform-modules-accton.git
-[submodule "platform/broadcom/sonic-platform-modules-cel"]
-	path = platform/broadcom/sonic-platform-modules-cel
-	url = https://github.com/celestica-Inc/sonic-platform-modules-cel.git
 [submodule "src/sonic-frr/frr"]
 	path = src/sonic-frr/frr
 	url = https://github.com/FRRouting/frr.git
@@ -77,3 +77,6 @@
 [submodule "platform/broadcom/sonic-platform-modules-mitac"]
 	path = platform/broadcom/sonic-platform-modules-mitac
 	url = https://github.com/MiTAC-EBU/sonic-platform-modules-mitac.git
+[submodule "platform/mellanox/hw-management"]
+	path = platform/mellanox/hw-management
+	url = https://github.com/Mellanox/hw-mgmt/

Makefile

@@ -29,11 +29,21 @@ $(shell rm -f .screen)
 
 MAKEFLAGS += -B
 
+ifeq ($(BLDENV), stretch)
+SLAVE_BASE_TAG = $(shell sha1sum sonic-slave-stretch/Dockerfile | awk '{print substr($$1,0,11);}')
+SLAVE_TAG = $(shell cat sonic-slave-stretch/Dockerfile.user sonic-slave-stretch/Dockerfile | sha1sum | awk '{print substr($$1,0,11);}')
+SLAVE_BASE_IMAGE = sonic-slave-stretch-base
+SLAVE_IMAGE = sonic-slave-stretch-$(USER)
+SLAVE_DIR = sonic-slave-stretch
+else
 SLAVE_BASE_TAG = $(shell sha1sum sonic-slave/Dockerfile | awk '{print substr($$1,0,11);}')
 SLAVE_TAG = $(shell cat sonic-slave/Dockerfile.user sonic-slave/Dockerfile | sha1sum | awk '{print substr($$1,0,11);}')
 SLAVE_BASE_IMAGE = sonic-slave-base
 SLAVE_IMAGE = sonic-slave-$(USER)
+SLAVE_DIR = sonic-slave
+endif
 
+INSMOD_OVERLAY := sudo modprobe overlay
 DOCKER_RUN := docker run --rm=true --privileged \
     -v $(PWD):/sonic \
     -w /sonic \
@@ -45,7 +55,7 @@ DOCKER_BASE_BUILD = docker build --no-cache \
 		    -t $(SLAVE_BASE_IMAGE) \
 		    --build-arg http_proxy=$(http_proxy) \
 		    --build-arg https_proxy=$(https_proxy) \
-		    sonic-slave && \
+		    $(SLAVE_DIR) && \
 		    docker tag $(SLAVE_BASE_IMAGE):latest $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG)
 
 DOCKER_BUILD = docker build --no-cache \
@@ -54,8 +64,8 @@ DOCKER_BUILD = docker build --no-cache \
 	       --build-arg guid=$(shell id -g) \
 	       --build-arg hostname=$(shell echo $$HOSTNAME) \
 	       -t $(SLAVE_IMAGE) \
-	       -f sonic-slave/Dockerfile.user \
-	       sonic-slave && \
+	       -f $(SLAVE_DIR)/Dockerfile.user \
+	       $(SLAVE_DIR) && \
 	       docker tag $(SLAVE_IMAGE):latest $(SLAVE_IMAGE):$(SLAVE_TAG)
 
 SONIC_BUILD_INSTRUCTION :=  make \
@@ -84,6 +94,7 @@ SONIC_BUILD_INSTRUCTION :=  make \
 	@docker inspect --type image $(SLAVE_IMAGE):$(SLAVE_TAG) &> /dev/null || \
 	    { echo Image $(SLAVE_IMAGE):$(SLAVE_TAG) not found. Building... ; \
 	    $(DOCKER_BUILD) ; }
+	@$(INSMOD_OVERLAY)
 ifeq "$(KEEP_SLAVE_ON)" "yes"
     ifdef SOURCE_FOLDER
 		@$(DOCKER_RUN) -v $(SOURCE_FOLDER):/var/$(USER)/src $(SLAVE_IMAGE):$(SLAVE_TAG) bash -c "$(SONIC_BUILD_INSTRUCTION) $@; /bin/bash"
@@ -105,6 +116,7 @@ sonic-slave-bash :
 	@docker inspect --type image $(SLAVE_IMAGE):$(SLAVE_TAG) &> /dev/null || \
 	    { echo Image $(SLAVE_IMAGE):$(SLAVE_TAG) not found. Building... ; \
 	    $(DOCKER_BUILD) ; }
+	@$(INSMOD_OVERLAY)
 	@$(DOCKER_RUN) -t $(SLAVE_IMAGE):$(SLAVE_TAG) bash
 
 init :

README.md

@@ -78,10 +78,9 @@ The SONiC installer contains all docker images needed. SONiC uses one image for
 For Broadcom ASIC, we build ONIE and EOS image. EOS image is used for Arista devices, ONIE image is used for all other Broadcom ASIC based devices. 
 
     make configure PLATFORM=broadcom
+    BLDENV=stretch make stretch
     # build ONIE image
     make target/sonic-broadcom.bin
-    # build EOS image
-    make target/sonic-aboot-broadcom.swi
 
 You may find the rules/config file useful. It contains configuration options for the build process, like adding more verbosity or showing dependencies, username and password for base image etc.
 

build_debian.sh

@@ -33,7 +33,8 @@ PASSWORD_ENCRYPTED=$2
 set -x -e
 
 ## docker engine version (with platform)
-DOCKER_VERSION=1.11.1-0~jessie_amd64
+DOCKER_VERSION=1.11.1-0~stretch_amd64
+LINUX_KERNEL_VERSION=4.9.0-5
 
 ## Working directory to prepare the file system
 FILESYSTEM_ROOT=./fsroot
@@ -68,7 +69,7 @@ touch $FILESYSTEM_ROOT/$PLATFORM_DIR/firsttime
 
 ## Build a basic Debian system by debootstrap
 echo '[INFO] Debootstrap...'
-sudo http_proxy=$http_proxy debootstrap --variant=minbase --arch amd64 jessie $FILESYSTEM_ROOT http://debian-archive.trafficmanager.net/debian
+sudo http_proxy=$http_proxy debootstrap --variant=minbase --arch amd64 stretch $FILESYSTEM_ROOT http://debian-archive.trafficmanager.net/debian
 
 ## Config hostname and hosts, otherwise 'sudo ...' will complain 'sudo: unable to resolve host ...'
 sudo LANG=C chroot $FILESYSTEM_ROOT /bin/bash -c "echo '$HOSTNAME' > /etc/hostname"
@@ -98,7 +99,7 @@ sudo LANG=C chroot $FILESYSTEM_ROOT bash -c 'apt-mark auto `apt-mark showmanual`
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y update
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y upgrade
 echo '[INFO] Install packages for building image'
-sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install makedev psmisc
+sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install makedev psmisc systemd-sysv
 
 ## Create device files
 echo '[INFO] MAKEDEV'
@@ -112,12 +113,15 @@ sudo LANG=C chroot $FILESYSTEM_ROOT /bin/bash -c 'cd /dev && MAKEDEV generic'
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install busybox
 echo '[INFO] Install SONiC linux kernel image'
 ## Note: duplicate apt-get command to ensure every line return zero
+sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/initramfs-tools-core_*.deb || \
+    sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
 sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/initramfs-tools_*.deb || \
     sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
-sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/linux-image-3.16.0-5-amd64_*.deb || \
+sudo dpkg --root=$FILESYSTEM_ROOT -i target/debs/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
 
-## Update initramfs for booting with squashfs+aufs
+## Update initramfs for booting with squashfs+overlay
 cat files/initramfs-tools/modules | sudo tee -a $FILESYSTEM_ROOT/etc/initramfs-tools/modules > /dev/null
 
 ## Hook into initramfs: change fs type from vfat to ext4 on arista switches
@@ -149,13 +153,10 @@ sudo cp files/initramfs-tools/mgmt-intf-dhcp $FILESYSTEM_ROOT/etc/initramfs-tool
 sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-bottom/mgmt-intf-dhcp
 sudo cp files/initramfs-tools/union-fsck $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/union-fsck
 sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/hooks/union-fsck
-sudo chroot $FILESYSTEM_ROOT update-initramfs -u
-
-## Install latest intel igb driver
-sudo cp target/debs/igb.ko $FILESYSTEM_ROOT/lib/modules/3.16.0-5-amd64/kernel/drivers/net/ethernet/intel/igb/igb.ko
+pushd $FILESYSTEM_ROOT/usr/share/initramfs-tools/scripts/init-bottom && sudo patch -p1 < $OLDPWD/files/initramfs-tools/udev.patch; popd
 
 ## Install latest intel ixgbe driver
-sudo cp target/debs/ixgbe.ko $FILESYSTEM_ROOT/lib/modules/3.16.0-5-amd64/kernel/drivers/net/ethernet/intel/ixgbe/ixgbe.ko
+sudo cp target/debs/ixgbe.ko $FILESYSTEM_ROOT/lib/modules/${LINUX_KERNEL_VERSION}-amd64/kernel/drivers/net/ethernet/intel/ixgbe/ixgbe.ko
 
 ## Install docker
 echo '[INFO] Install docker'
@@ -261,7 +262,7 @@ sudo sed -i '
     ' $FILESYSTEM_ROOT/etc/monit/monitrc
 
 sudo tee -a $FILESYSTEM_ROOT/etc/monit/monitrc > /dev/null <<'EOF'
-check filesystem root-aufs with path /
+check filesystem root-overlay with path /
   if space usage > 90% for 5 times within 10 cycles then alert
 check system $HOST
   if memory usage > 90% for 5 times within 10 cycles then alert
@@ -355,6 +356,9 @@ if [ "${enable_organization_extensions}" = "y" ]; then
    fi
 fi
 
+## Update initramfs
+sudo chroot $FILESYSTEM_ROOT update-initramfs -u
+
 ## Clean up apt
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get autoremove
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get autoclean

device/arista/x86_64-arista_7050_qx32/sensors.conf

@@ -2,21 +2,21 @@
 # ------------------------------------------------
 #
 
-bus "i2c-2" "SCD SMBus master 0 bus 0"
-bus "i2c-3" "SCD SMBus master 0 bus 1"
-bus "i2c-5" "SCD SMBus master 0 bus 3"
-bus "i2c-6" "SCD SMBus master 0 bus 4"
-bus "i2c-7" "SCD SMBus master 0 bus 5"
+bus "i2c-5" "SCD 0000:04:00.0 SMBus master 0 bus 0"
+bus "i2c-6" "SCD 0000:04:00.0 SMBus master 0 bus 1"
+bus "i2c-8" "SCD 0000:04:00.0 SMBus master 0 bus 3"
+bus "i2c-9" "SCD 0000:04:00.0 SMBus master 0 bus 4"
+bus "i2c-10" "SCD 0000:04:00.0 SMBus master 0 bus 5"
 
 chip "k10temp-pci-00c3"
     label temp1 "Cpu temp sensor"
 
-chip "lm73-i2c-3-48"
+chip "lm73-i2c-6-48"
     label temp1 "Back panel temp sensor"
     set temp1_max 65
     #set temp1_max_alarm 75 # read-only
 
-chip "max6658-i2c-2-4c"
+chip "max6658-i2c-5-4c"
     label temp1 "Board temp sensor"
     set temp1_max 65
     set temp1_crit 75
@@ -26,7 +26,7 @@ chip "max6658-i2c-2-4c"
     set temp2_crit 75
 
 # disabled because of some eeprom corruption risks
-#chip "pmbus-i2c-3-4e"
+#chip "pmbus-i2c-6-4e"
 #    label temp1 "Power controller sensor 1"
 #    set temp1_max 60
 #    set temp1_crit 70
@@ -37,7 +37,7 @@ chip "max6658-i2c-2-4c"
 
 #    ignore curr1
 
-chip "dps460-i2c-5-58"
+chip "dps460-i2c-8-58"
     label temp1 "Power supply 1 inlet temp sensor"
     # maximum and critical thresholds are not supported for this psu
     set temp1_max 60
@@ -59,7 +59,7 @@ chip "dps460-i2c-5-58"
     set curr2_max 36
     set curr2_crit 37
 
-chip "dps460-i2c-6-58"
+chip "dps460-i2c-9-58"
     label temp1 "Power supply 2 inlet temp sensor"
     # maximum and critical thresholds are not supported for this psu
     set temp1_max 60

device/arista/x86_64-arista_7050_qx32s/sensors.conf

@@ -2,11 +2,11 @@
 # ------------------------------------------------
 #
 
-bus "i2c-2" "SCD SMBus master 0 bus 0"
-bus "i2c-3" "SCD SMBus master 0 bus 1"
-bus "i2c-5" "SCD SMBus master 0 bus 3"
-bus "i2c-6" "SCD SMBus master 0 bus 4"
-bus "i2c-7" "SCD SMBus master 0 bus 5"
+bus "i2c-2" "SCD 0000:02:00.0 SMBus master 0 bus 0"
+bus "i2c-3" "SCD 0000:02:00.0 SMBus master 0 bus 1"
+bus "i2c-5" "SCD 0000:02:00.0 SMBus master 0 bus 3"
+bus "i2c-6" "SCD 0000:02:00.0 SMBus master 0 bus 4"
+bus "i2c-7" "SCD 0000:02:00.0 SMBus master 0 bus 5"
 
 chip "k10temp-pci-00c3"
     label temp1 "Cpu temp sensor"

device/celestica/x86_64-cel_seastone-r0/sensors.conf

@@ -37,28 +37,28 @@ chip "dps460-i2c-*-5b"
     set in3_lcrit 11.0  
 
 # These sensors located on Main Switch Board.
-chip "dx010_lm75b-i2c-*-48"
+chip "lm75b-i2c-*-48"
     label temp1 "Front-panel temp sensor 1"
     set temp1_max 43
     set temp1_max_hyst 28
 
-chip "dx010_lm75b-i2c-*-49"
+chip "lm75b-i2c-*-49"
     label temp1 "Front-panel temp sensor 2"
     set temp1_max 43
     set temp1_max_hyst 28
 
-chip "dx010_lm75b-i2c-*-4a"
+chip "lm75b-i2c-*-4a"
     label temp1 "ASIC temp sensor"
     set temp1_max 43
     set temp1_max_hyst 28
 
 # These sensors located on CPU Board.
-chip "dx010_lm75b-i2c-*-48"
+chip "lm75b-i2c-*-48"
     label temp1 "Rear-panel temp sensor 1"
     set temp1_max 43
     set temp1_max_hyst 28
 
-chip "dx010_lm75b-i2c-*-4e"
+chip "lm75b-i2c-*-4e"
     label temp1 "Rear-panel temp sensor 2"
     set temp1_max 43
     set temp1_max_hyst 28

device/dell/x86_64-dellemc_z9264f_c3538-r0/DellEMC-Z9264f/port_config.ini

@@ -0,0 +1,65 @@
+# name          lanes                 alias              index
+Ethernet0       49,50,51,52           hundredGigE1/1     0
+Ethernet4       53,54,55,56           hundredGigE1/2     1
+Ethernet8       65,66,67,68           hundredGigE1/3     2
+Ethernet12      69,70,71,72           hundredGigE1/4     3
+Ethernet16      81,82,83,84           hundredGigE1/5     4
+Ethernet20      85,86,87,88           hundredGigE1/6     5
+Ethernet24      97,98,99,100          hundredGigE1/7     6
+Ethernet28      101,102,103,104       hundredGigE1/8     7
+Ethernet32      1,2,3,4               hundredGigE1/9     8
+Ethernet36      5,6,7,8               hundredGigE1/10    9
+Ethernet40      17,18,19,20           hundredGigE1/11    10
+Ethernet44      21,22,23,24           hundredGigE1/12    11
+Ethernet48      33,34,35,36           hundredGigE1/13    12
+Ethernet52      37,38,39,40           hundredGigE1/14    13
+Ethernet56      113,114,115,116       hundredGigE1/15    14
+Ethernet60      117,118,119,120       hundredGigE1/16    15
+Ethernet64      133,134,135,136       hundredGigE1/17    16
+Ethernet68      129,130,131,132       hundredGigE1/18    17
+Ethernet72      213,214,215,216       hundredGigE1/19    18
+Ethernet76      209,210,211,212       hundredGigE1/20    19
+Ethernet80      229,230,231,232       hundredGigE1/21    20
+Ethernet84      225,226,227,228       hundredGigE1/22    21
+Ethernet88      245,246,247,248       hundredGigE1/23    22
+Ethernet92      241,242,243,244       hundredGigE1/24    23
+Ethernet96      149,150,151,152       hundredGigE1/25    24
+Ethernet100     145,146,147,148       hundredGigE1/26    25
+Ethernet104     165,166,167,168       hundredGigE1/27    26
+Ethernet108     161,162,163,164       hundredGigE1/28    27
+Ethernet112     181,182,183,184       hundredGigE1/29    28
+Ethernet116     177,178,179,180       hundredGigE1/30    29
+Ethernet120     197,198,199,200       hundredGigE1/31    30
+Ethernet124     193,194,195,196       hundredGigE1/32    31
+Ethernet128     61,62,63,64           hundredGigE1/33    32
+Ethernet132     57,58,59,60           hundredGigE1/34    33
+Ethernet136     77,78,79,80           hundredGigE1/35    34
+Ethernet140     73,74,75,76           hundredGigE1/36    35
+Ethernet144     93,94,95,96           hundredGigE1/37    36
+Ethernet148     89,90,91,92           hundredGigE1/38    37
+Ethernet152     109,110,111,112       hundredGigE1/39    38
+Ethernet156     105,106,107,108       hundredGigE1/40    39
+Ethernet160     13,14,15,16           hundredGigE1/41    40
+Ethernet164     9,10,11,12            hundredGigE1/42    41
+Ethernet168     29,30,31,32           hundredGigE1/43    42
+Ethernet172     25,26,27,28           hundredGigE1/44    43
+Ethernet176     45,46,47,48           hundredGigE1/45    44
+Ethernet180     41,42,43,44           hundredGigE1/46    45
+Ethernet184     125,126,127,128       hundredGigE1/47    46
+Ethernet188     121,122,123,124       hundredGigE1/48    47
+Ethernet192     137,138,139,140       hundredGigE1/49    48
+Ethernet196     141,142,143,144       hundredGigE1/50    49
+Ethernet200     217,218,219,220       hundredGigE1/51    50
+Ethernet204     221,222,223,224       hundredGigE1/52    51
+Ethernet208     233,234,235,236       hundredGigE1/53    52
+Ethernet212     237,238,239,240       hundredGigE1/54    53
+Ethernet216     249,250,251,252       hundredGigE1/55    54
+Ethernet220     253,254,255,256       hundredGigE1/56    55
+Ethernet224     153,154,155,156       hundredGigE1/57    56
+Ethernet228     157,158,159,160       hundredGigE1/58    57
+Ethernet232     169,170,171,172       hundredGigE1/59    58
+Ethernet236     173,174,175,176       hundredGigE1/60    59
+Ethernet240     185,186,187,188       hundredGigE1/61    60
+Ethernet244     189,190,191,192       hundredGigE1/62    61
+Ethernet248     201,202,203,204       hundredGigE1/63    62
+Ethernet252     205,206,207,208       hundredGigE1/64    63

device/dell/x86_64-dellemc_z9264f_c3538-r0/DellEMC-Z9264f/sai.profile

@@ -0,0 +1 @@
+SAI_INIT_CONFIG_FILE=/etc/bcm/th2-z9264f-64x100G.config.bcm

device/dell/x86_64-dellemc_z9264f_c3538-r0/installer.conf

@@ -0,0 +1,3 @@
+CONSOLE_PORT=0x3f8
+CONSOLE_DEV=0
+CONSOLE_SPEED=115200