Merge pull request #22 from SONIC-DEV/201811

201811

build_debian.sh

@@ -29,7 +29,7 @@
 set -x -e
 
 ## docker engine version (with platform)
-DOCKER_VERSION=1.11.1-0~stretch_amd64
+DOCKER_VERSION=5:18.09.0~3-0~debian-stretch
 LINUX_KERNEL_VERSION=4.9.0-8
 
 ## Working directory to prepare the file system
@@ -63,6 +63,11 @@ mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR
 mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR/x86_64-grub
 touch $FILESYSTEM_ROOT/$PLATFORM_DIR/firsttime
 
+## make / as a mountpoint in chroot env, needed by dockerd
+pushd $FILESYSTEM_ROOT
+sudo mount --bind . .
+popd
+
 ## Build a basic Debian system by debootstrap
 echo '[INFO] Debootstrap...'
 sudo http_proxy=$http_proxy debootstrap --variant=minbase --arch amd64 stretch $FILESYSTEM_ROOT http://debian-archive.trafficmanager.net/debian
@@ -159,12 +164,19 @@ echo '[INFO] Install docker'
 ## Install apparmor utils since they're missing and apparmor is enabled in the kernel
 ## Otherwise Docker will fail to start
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install apparmor
-docker_deb_url=https://apt.dockerproject.org/repo/pool/main/d/docker-engine/docker-engine_${DOCKER_VERSION}.deb
-docker_deb_temp=`mktemp`
-trap_push "rm -f $docker_deb_temp"
-wget $docker_deb_url -qO $docker_deb_temp
-sudo dpkg --root=$FILESYSTEM_ROOT -i $docker_deb_temp || \
-    sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install -f
+sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install apt-transport-https \
+                                                       ca-certificates \
+                                                       curl \
+                                                       gnupg2 \
+                                                       software-properties-common
+sudo LANG=C chroot $FILESYSTEM_ROOT curl -o /tmp/docker.gpg -fsSL https://download.docker.com/linux/debian/gpg
+sudo LANG=C chroot $FILESYSTEM_ROOT apt-key add /tmp/docker.gpg
+sudo LANG=C chroot $FILESYSTEM_ROOT rm /tmp/docker.gpg
+sudo LANG=C chroot $FILESYSTEM_ROOT add-apt-repository \
+                                    "deb [arch=amd64] https://download.docker.com/linux/debian stretch stable"
+sudo LANG=C chroot $FILESYSTEM_ROOT apt-get update
+sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install docker-ce=${DOCKER_VERSION}
+sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y remove software-properties-common gnupg2
 
 ## Add docker config drop-in to select aufs, otherwise it may select other storage driver
 sudo mkdir -p $FILESYSTEM_ROOT/etc/systemd/system/docker.service.d/

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

@@ -1,3 +1,3 @@
 CONSOLE_PORT=0x2f8
 CONSOLE_DEV=1
-ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich"
+ONIE_PLATFORM_EXTRA_CMDLINE_LINUX="module_blacklist=gpio_ich,i2c_mux_gpio"

device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100/buffers_defaults_t1.j2 → device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100-C32/buffers_defaults_t1.j2

@@ -14,7 +14,7 @@
             "size": "10443264",
             "type": "ingress",
             "mode": "dynamic",
-            "xoff": "7335744"
+            "xoff": "4625920"
         },
         "egress_lossy_pool": {
             "size": "8877440",

device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100-C32/pg_profile_lookup.ini

@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable size    xon  xoff threshold xon_offset
+  10000  5m   1248    2288 35776  -3        2288
+  25000  5m   1248    2288 53248  -3        2288
+  40000  5m   1248    2288 66560  -3        2288
+  50000  5m   1248    2288 90272  -3        2288
+ 100000  5m   1248    2288 165568 -3        2288
+  10000  40m  1248    2288 37024  -3        2288
+  25000  40m  1248    2288 53248  -3        2288
+  40000  40m  1248    2288 71552  -3        2288
+  50000  40m  1248    2288 96096  -3        2288
+ 100000  40m  1248    2288 177632 -3        2288
+  10000  300m 1248    2288 46176  -3        2288
+  25000  300m 1248    2288 79040  -3        2288
+  40000  300m 1248    2288 108160 -3        2288
+  50000  300m 1248    2288 141856 -3        2288
+ 100000  300m 1248    2288 268736 -3        2288

device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100/th-z9100-32x100G.config.bcm → device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100-C32/th-z9100-32x100G.config.bcm

@@ -1,14 +1,25 @@
 #TH Z9100 32x100
+
 l3_alpm_enable=2
+pfc_deadlock_seq_control=1
+bcm_stat_interval=2000000
 bcm_num_cos=8
 switch_bypass_mode=0
 mmu_lossless=0
 lpm_scaling_enable=0
+lpm_scaling_enable=0
 lpm_ipv6_128b_reserved=0
 ipv6_lpm_128b_enable=1
-
+l2xmsg_mode=1
+oversubscribe_mode=1
 os=unix
 
+pbmp_oversubscribe=0x3fd000000ff4000003fc000001fe
+pbmp_xport_xe=0x3fd000000ff4000003fc000001fe
+
+serdes_if_type_xe=14
+serdes_if_type_ce=14
+
 #Parity
 parity_correction=1
 parity_enable=1
@@ -52,134 +63,139 @@ portmap_33=132:10
 portmap_67=133:10
 portmap_101=134:10
 portmap_135=135:10
+
 xgxs_tx_lane_map_ce0=0x0132
-xgxs_rx_lane_map_ce0=0x1023
-phy_xaui_tx_polarity_flip_ce0=0xe
-phy_xaui_rx_polarity_flip_ce0=0xc
 xgxs_tx_lane_map_ce1=0x2301
-xgxs_rx_lane_map_ce1=0x1302
-phy_xaui_tx_polarity_flip_ce1=0x2
-phy_xaui_rx_polarity_flip_ce1=0xd
 xgxs_tx_lane_map_ce2=0x0123
-xgxs_rx_lane_map_ce2=0x1203
-phy_xaui_tx_polarity_flip_ce2=0xa
-phy_xaui_rx_polarity_flip_ce2=0x2
 xgxs_tx_lane_map_ce3=0x3201
-xgxs_rx_lane_map_ce3=0x1302
-phy_xaui_tx_polarity_flip_ce3=0xb
-phy_xaui_rx_polarity_flip_ce3=0xf
 xgxs_tx_lane_map_ce4=0x3210
-xgxs_rx_lane_map_ce4=0x3201
-phy_xaui_tx_polarity_flip_ce4=0x2
-phy_xaui_rx_polarity_flip_ce4=0xc
 xgxs_tx_lane_map_ce5=0x2301
-xgxs_rx_lane_map_ce5=0x1302
-phy_xaui_tx_polarity_flip_ce5=0x0
-phy_xaui_rx_polarity_flip_ce5=0x2
 xgxs_tx_lane_map_ce6=0x0123
-xgxs_rx_lane_map_ce6=0x1203
-phy_xaui_tx_polarity_flip_ce6=0x0
-phy_xaui_rx_polarity_flip_ce6=0x2
 xgxs_tx_lane_map_ce7=0x1320
-xgxs_rx_lane_map_ce7=0x2301
-phy_xaui_tx_polarity_flip_ce7=0xa
-phy_xaui_rx_polarity_flip_ce7=0xd
 xgxs_tx_lane_map_ce8=0x1032
-xgxs_rx_lane_map_ce8=0x0312
-phy_xaui_tx_polarity_flip_ce8=0x0
-phy_xaui_rx_polarity_flip_ce8=0xd
 xgxs_tx_lane_map_ce9=0x2031
-xgxs_rx_lane_map_ce9=0x1302
-phy_xaui_tx_polarity_flip_ce9=0xb
-phy_xaui_rx_polarity_flip_ce9=0xa
 xgxs_tx_lane_map_ce10=0x1023
-xgxs_rx_lane_map_ce10=0x2103
-phy_xaui_tx_polarity_flip_ce10=0xe
-phy_xaui_rx_polarity_flip_ce10=0x7
 xgxs_tx_lane_map_ce11=0x0132
-xgxs_rx_lane_map_ce11=0x3210
-phy_xaui_tx_polarity_flip_ce11=0x6
-phy_xaui_rx_polarity_flip_ce11=0xf
 xgxs_tx_lane_map_ce12=0x0213
-xgxs_rx_lane_map_ce12=0x2301
-phy_xaui_tx_polarity_flip_ce12=0x6
-phy_xaui_rx_polarity_flip_ce12=0xf
 xgxs_tx_lane_map_ce13=0x1032
-xgxs_rx_lane_map_ce13=0x0213
-phy_xaui_tx_polarity_flip_ce13=0xf
-phy_xaui_rx_polarity_flip_ce13=0xd
 xgxs_tx_lane_map_ce14=0x0132
-xgxs_rx_lane_map_ce14=0x3210
-phy_xaui_tx_polarity_flip_ce14=0x5
-phy_xaui_rx_polarity_flip_ce14=0x4
 xgxs_tx_lane_map_ce15=0x0123
-xgxs_rx_lane_map_ce15=0x3210
-phy_xaui_tx_polarity_flip_ce15=0x8
-phy_xaui_rx_polarity_flip_ce15=0xb
 xgxs_tx_lane_map_ce16=0x0123
-xgxs_rx_lane_map_ce16=0x3201
-phy_xaui_tx_polarity_flip_ce16=0xf
-phy_xaui_rx_polarity_flip_ce16=0x2
 xgxs_tx_lane_map_ce17=0x0123
-xgxs_rx_lane_map_ce17=0x0213
-phy_xaui_tx_polarity_flip_ce17=0xf
-phy_xaui_rx_polarity_flip_ce17=0xd
 xgxs_tx_lane_map_ce18=0x1032
-xgxs_rx_lane_map_ce18=0x3210
-phy_xaui_tx_polarity_flip_ce18=0xf
-phy_xaui_rx_polarity_flip_ce18=0xf
 xgxs_tx_lane_map_ce19=0x0123
-xgxs_rx_lane_map_ce19=0x3210
-phy_xaui_tx_polarity_flip_ce19=0xf
-phy_xaui_rx_polarity_flip_ce19=0x0
 xgxs_tx_lane_map_ce20=0x2301
-xgxs_rx_lane_map_ce20=0x3102
-phy_xaui_tx_polarity_flip_ce20=0xf
-phy_xaui_rx_polarity_flip_ce20=0x0
 xgxs_tx_lane_map_ce21=0x3102
-xgxs_rx_lane_map_ce21=0x2103
-phy_xaui_tx_polarity_flip_ce21=0xf
-phy_xaui_rx_polarity_flip_ce21=0x5
 xgxs_tx_lane_map_ce22=0x1023
-xgxs_rx_lane_map_ce22=0x2301
-phy_xaui_tx_polarity_flip_ce22=0xb
-phy_xaui_rx_polarity_flip_ce22=0x0
 xgxs_tx_lane_map_ce23=0x2130
-xgxs_rx_lane_map_ce23=0x2310
-phy_xaui_tx_polarity_flip_ce23=0xa
-phy_xaui_rx_polarity_flip_ce23=0x2
 xgxs_tx_lane_map_ce24=0x2310
-xgxs_rx_lane_map_ce24=0x3201
-phy_xaui_tx_polarity_flip_ce24=0xf
-phy_xaui_rx_polarity_flip_ce24=0xc
 xgxs_tx_lane_map_ce25=0x2013
-xgxs_rx_lane_map_ce25=0x0123
-phy_xaui_tx_polarity_flip_ce25=0x0
-phy_xaui_rx_polarity_flip_ce25=0x8
 xgxs_tx_lane_map_ce26=0x0132
-xgxs_rx_lane_map_ce26=0x1023
-phy_xaui_tx_polarity_flip_ce26=0xb
-phy_xaui_rx_polarity_flip_ce26=0x4
 xgxs_tx_lane_map_ce27=0x0123
-xgxs_rx_lane_map_ce27=0x0213
-phy_xaui_tx_polarity_flip_ce27=0x7
-phy_xaui_rx_polarity_flip_ce27=0x7
 xgxs_tx_lane_map_ce28=0x0213
-xgxs_rx_lane_map_ce28=0x1203
-phy_xaui_tx_polarity_flip_ce28=0x8
-phy_xaui_rx_polarity_flip_ce28=0x7
 xgxs_tx_lane_map_ce29=0x0123
-xgxs_rx_lane_map_ce29=0x0213
-phy_xaui_tx_polarity_flip_ce29=0x3
-phy_xaui_rx_polarity_flip_ce29=0x9
 xgxs_tx_lane_map_ce30=0x2301
-xgxs_rx_lane_map_ce30=0x3201
-phy_xaui_tx_polarity_flip_ce30=0xc
-phy_xaui_rx_polarity_flip_ce30=0xc
 xgxs_tx_lane_map_ce31=0x0123
+
+xgxs_rx_lane_map_ce0=0x1023
+xgxs_rx_lane_map_ce1=0x1302
+xgxs_rx_lane_map_ce2=0x1203
+xgxs_rx_lane_map_ce3=0x1302
+xgxs_rx_lane_map_ce4=0x3201
+xgxs_rx_lane_map_ce5=0x1302
+xgxs_rx_lane_map_ce6=0x1203
+xgxs_rx_lane_map_ce7=0x2301
+xgxs_rx_lane_map_ce8=0x0312
+xgxs_rx_lane_map_ce9=0x1302
+xgxs_rx_lane_map_ce10=0x2103
+xgxs_rx_lane_map_ce11=0x3210
+xgxs_rx_lane_map_ce12=0x2301
+xgxs_rx_lane_map_ce13=0x0213
+xgxs_rx_lane_map_ce14=0x3210
+xgxs_rx_lane_map_ce15=0x3210
+xgxs_rx_lane_map_ce16=0x3201
+xgxs_rx_lane_map_ce17=0x0213
+xgxs_rx_lane_map_ce18=0x3210
+xgxs_rx_lane_map_ce19=0x3210
+xgxs_rx_lane_map_ce20=0x3102
+xgxs_rx_lane_map_ce21=0x2103
+xgxs_rx_lane_map_ce22=0x2301
+xgxs_rx_lane_map_ce23=0x2310
+xgxs_rx_lane_map_ce24=0x3201
+xgxs_rx_lane_map_ce25=0x0123
+xgxs_rx_lane_map_ce26=0x1023
+xgxs_rx_lane_map_ce27=0x0213
+xgxs_rx_lane_map_ce28=0x1203
+xgxs_rx_lane_map_ce29=0x0213
+xgxs_rx_lane_map_ce30=0x3201
 xgxs_rx_lane_map_ce31=0x0213
+
+phy_xaui_tx_polarity_flip_ce0=0xe
+phy_xaui_tx_polarity_flip_ce1=0x2
+phy_xaui_tx_polarity_flip_ce2=0xa
+phy_xaui_tx_polarity_flip_ce3=0xb
+phy_xaui_tx_polarity_flip_ce4=0x2
+phy_xaui_tx_polarity_flip_ce5=0x0
+phy_xaui_tx_polarity_flip_ce6=0x0
+phy_xaui_tx_polarity_flip_ce7=0xa
+phy_xaui_tx_polarity_flip_ce8=0x0
+phy_xaui_tx_polarity_flip_ce9=0xb
+phy_xaui_tx_polarity_flip_ce10=0xe
+phy_xaui_tx_polarity_flip_ce11=0x6
+phy_xaui_tx_polarity_flip_ce12=0x6
+phy_xaui_tx_polarity_flip_ce13=0xf
+phy_xaui_tx_polarity_flip_ce14=0x5
+phy_xaui_tx_polarity_flip_ce15=0x8
+phy_xaui_tx_polarity_flip_ce16=0xf
+phy_xaui_tx_polarity_flip_ce17=0xf
+phy_xaui_tx_polarity_flip_ce18=0xf
+phy_xaui_tx_polarity_flip_ce19=0xf
+phy_xaui_tx_polarity_flip_ce20=0xf
+phy_xaui_tx_polarity_flip_ce21=0xf
+phy_xaui_tx_polarity_flip_ce22=0xb
+phy_xaui_tx_polarity_flip_ce23=0xa
+phy_xaui_tx_polarity_flip_ce24=0xf
+phy_xaui_tx_polarity_flip_ce25=0x0
+phy_xaui_tx_polarity_flip_ce26=0xb
+phy_xaui_tx_polarity_flip_ce27=0x7
+phy_xaui_tx_polarity_flip_ce28=0x8
+phy_xaui_tx_polarity_flip_ce29=0x3
+phy_xaui_tx_polarity_flip_ce30=0xc
 phy_xaui_tx_polarity_flip_ce31=0x3
+
+phy_xaui_rx_polarity_flip_ce0=0xc
+phy_xaui_rx_polarity_flip_ce1=0xd
+phy_xaui_rx_polarity_flip_ce2=0x2
+phy_xaui_rx_polarity_flip_ce3=0xf
+phy_xaui_rx_polarity_flip_ce4=0xc
+phy_xaui_rx_polarity_flip_ce5=0x2
+phy_xaui_rx_polarity_flip_ce6=0x2
+phy_xaui_rx_polarity_flip_ce7=0xd
+phy_xaui_rx_polarity_flip_ce8=0xd
+phy_xaui_rx_polarity_flip_ce9=0xa
+phy_xaui_rx_polarity_flip_ce10=0x7
+phy_xaui_rx_polarity_flip_ce11=0xf
+phy_xaui_rx_polarity_flip_ce12=0xf
+phy_xaui_rx_polarity_flip_ce13=0xd
+phy_xaui_rx_polarity_flip_ce14=0x4
+phy_xaui_rx_polarity_flip_ce15=0xb
+phy_xaui_rx_polarity_flip_ce16=0x2
+phy_xaui_rx_polarity_flip_ce17=0xd
+phy_xaui_rx_polarity_flip_ce18=0xf
+phy_xaui_rx_polarity_flip_ce19=0x0
+phy_xaui_rx_polarity_flip_ce20=0x0
+phy_xaui_rx_polarity_flip_ce21=0x5
+phy_xaui_rx_polarity_flip_ce22=0x0
+phy_xaui_rx_polarity_flip_ce23=0x2
+phy_xaui_rx_polarity_flip_ce24=0xc
+phy_xaui_rx_polarity_flip_ce25=0x8
+phy_xaui_rx_polarity_flip_ce26=0x4
+phy_xaui_rx_polarity_flip_ce27=0x7
+phy_xaui_rx_polarity_flip_ce28=0x7
+phy_xaui_rx_polarity_flip_ce29=0x9
+phy_xaui_rx_polarity_flip_ce30=0xc
 phy_xaui_rx_polarity_flip_ce31=0x8
+
 dport_map_port_38=1
 dport_map_port_39=2
 dport_map_port_40=3
@@ -212,9 +228,5 @@ dport_map_port_2=29
 dport_map_port_1=30
 dport_map_port_4=31
 dport_map_port_3=32
-oversubscribe_mode=1
-pbmp_xport_xe=0x3fd000000ff4000003fc000001fe
-serdes_if_type_xe=14
-serdes_if_type_ce=14
 
 mmu_init_config="MSFT-TH-Tier1"

device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100-T0/buffers_defaults_t0.j2 → device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100-C8D48/buffers_defaults_t0.j2

@@ -28,7 +28,7 @@
             "size": "11213696",
             "type": "ingress",
             "mode": "dynamic",
-            "xoff": "6387264"
+            "xoff": "3855488"
         },
         "egress_lossy_pool": {
             "size": "9532224",

device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100-C8D48/pg_profile_lookup.ini

@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable size    xon  xoff threshold xon_offset
+  10000  5m   1248    2288 35776  -3        2288
+  25000  5m   1248    2288 53248  -3        2288
+  40000  5m   1248    2288 66560  -3        2288
+  50000  5m   1248    2288 90272  -3        2288
+ 100000  5m   1248    2288 165568 -3        2288
+  10000  40m  1248    2288 37024  -3        2288
+  25000  40m  1248    2288 53248  -3        2288
+  40000  40m  1248    2288 71552  -3        2288
+  50000  40m  1248    2288 96096  -3        2288
+ 100000  40m  1248    2288 177632 -3        2288
+  10000  300m 1248    2288 46176  -3        2288
+  25000  300m 1248    2288 79040  -3        2288
+  40000  300m 1248    2288 108160 -3        2288
+  50000  300m 1248    2288 141856 -3        2288
+ 100000  300m 1248    2288 268736 -3        2288