Merge branch 'master' into upstream-silverstone2

sonic-net · May 28, 2020 · e3c1b80 · e3c1b80
2 parents 90f03e7 + 6d0f8dc
commit e3c1b80
Show file tree

Hide file tree

Showing 602 changed files with 32,707 additions and 9,985 deletions.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
@@ -10,7 +10,7 @@ If this is a bug fix, make sure your description includes "fixes #xxxx", or
 Please provide the following information:
 -->
 
-**- What I did**
+**- Why I did it**
 
 **- How I did it**
 

diff --git a/Makefile.work b/Makefile.work
@@ -251,6 +251,16 @@ sonic-slave-bash :
 	    $(DOCKER_BUILD) ; }
 	@$(DOCKER_RUN) -t $(SLAVE_IMAGE):$(SLAVE_TAG) bash
 
+sonic-slave-run :
+	@$(OVERLAY_MODULE_CHECK)
+	@docker inspect --type image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) &> /dev/null || \
+	    { echo Image $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG) not found. Building... ; \
+	    $(DOCKER_BASE_BUILD) ; }
+	@docker inspect --type image $(SLAVE_IMAGE):$(SLAVE_TAG) &> /dev/null || \
+	    { echo Image $(SLAVE_IMAGE):$(SLAVE_TAG) not found. Building... ; \
+	    $(DOCKER_BUILD) ; }
+	@$(DOCKER_RUN) $(SLAVE_IMAGE):$(SLAVE_TAG) bash -c "$(SONIC_RUN_CMDS)"
+
 showtag:
 	@echo $(SLAVE_IMAGE):$(SLAVE_TAG)
 	@echo $(SLAVE_BASE_IMAGE):$(SLAVE_BASE_TAG)

diff --git a/README.md b/README.md
@@ -1,8 +1,9 @@
-*master builds*:
-
 [![Total alerts](https://img.shields.io/lgtm/alerts/g/Azure/sonic-buildimage.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/Azure/sonic-buildimage/alerts/)
 [![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/Azure/sonic-buildimage.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/Azure/sonic-buildimage/context:python)
 
+
+*master builds*:
+
 [![Innovium](https://sonic-jenkins.westus2.cloudapp.azure.com/job/innovium/job/buildimage-invm-all/badge/icon?subject=Innovium)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/innovium/job/buildimage-invm-all)
 [![Barefoot](https://sonic-jenkins.westus2.cloudapp.azure.com/job/barefoot/job/buildimage-bf-all/badge/icon?subject=Barefoot)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/barefoot/job/buildimage-bf-all)
 [![Broadcom](https://sonic-jenkins.westus2.cloudapp.azure.com/job/broadcom/job/buildimage-brcm-all/badge/icon?subject=Broadcom)](https://sonic-jenkins.westus2.cloudapp.azure.com/job/broadcom/job/buildimage-brcm-all)

diff --git a/build_debian.sh b/build_debian.sh
@@ -165,6 +165,10 @@ sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/arista-
 sudo cp files/initramfs-tools/resize-rootfs $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/resize-rootfs
 sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/resize-rootfs
 
+# Hook into initramfs: run fsck to repair a non-clean filesystem prior to be mounted
+sudo cp files/initramfs-tools/fsck-rootfs $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/fsck-rootfs
+sudo chmod +x $FILESYSTEM_ROOT/etc/initramfs-tools/scripts/init-premount/fsck-rootfs
+
 ## Hook into initramfs: after partition mount and loop file mount
 ## 1. Prepare layered file system
 ## 2. Bind-mount docker working directory (docker overlay storage cannot work over overlay rootfs)
@@ -200,7 +204,12 @@ sudo LANG=C chroot $FILESYSTEM_ROOT rm /tmp/docker.gpg
 sudo LANG=C chroot $FILESYSTEM_ROOT add-apt-repository \
                                     "deb [arch=$CONFIGURED_ARCH] https://download.docker.com/linux/debian $IMAGE_DISTRO stable"
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get update
-sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install docker-ce=${DOCKER_VERSION} docker-ce-cli=${DOCKER_VERSION}
+if dpkg --compare-versions ${DOCKER_VERSION} ge "18.09"; then
+    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install docker-ce=${DOCKER_VERSION} docker-ce-cli=${DOCKER_VERSION}
+else
+    sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y install docker-ce=${DOCKER_VERSION}
+fi
+
 sudo LANG=C chroot $FILESYSTEM_ROOT apt-get -y remove software-properties-common gnupg2
 
 if [ "$INSTALL_KUBERNETES" == "y" ]

diff --git a/device/accton/x86_64-accton_as4630_54pe-r0/Accton-AS4630-54PE/port_config.ini b/device/accton/x86_64-accton_as4630_54pe-r0/Accton-AS4630-54PE/port_config.ini
@@ -1,55 +1,55 @@
-# name          lanes                 alias             index   speed
-Ethernet0       26                    thousandE1        1         1000
-Ethernet1       25                    thousandE2        2         1000
-Ethernet2       28                    thousandE3        3         1000
-Ethernet3       27                    thousandE4        4         1000
-Ethernet4       30                    thousandE5        5         1000
-Ethernet5       29                    thousandE6        6         1000
-Ethernet6       32                    thousandE7        7         1000
-Ethernet7       31                    thousandE8        8         1000
-Ethernet8       38                    thousandE9        9         1000
-Ethernet9       37                    thousandE10       10        1000
-Ethernet10      40                    thousandE11       11        1000
-Ethernet11      39                    thousandE12       12        1000
-Ethernet12      34                    thousandE13       13        1000
-Ethernet13      33                    thousandE14       14        1000
-Ethernet14      36                    thousandE15       15        1000
-Ethernet15      35                    thousandE16       16        1000
-Ethernet16      46                    thousandE17       17        1000
-Ethernet17      45                    thousandE18       18        1000
-Ethernet18      48                    thousandE19       19        1000
-Ethernet19      47                    thousandE20       20        1000
-Ethernet20      42                    thousandE21       21        1000
-Ethernet21      41                    thousandE22       22        1000
-Ethernet22      44                    thousandE23       23        1000
-Ethernet23      43                    thousandE24       24        1000
-Ethernet24      2                     thousandE25       25        1000
-Ethernet25      1                     thousandE26       26        1000
-Ethernet26      4                     thousandE27       27        1000
-Ethernet27      3                     thousandE28       28        1000
-Ethernet28      6                     thousandE29       29        1000
-Ethernet29      5                     thousandE30       30        1000
-Ethernet30      8                     thousandE31       31        1000
-Ethernet31      7                     thousandE32       32        1000
-Ethernet32      10                    thousandE33       33        1000
-Ethernet33      9                     thousandE34       34        1000
-Ethernet34      12                    thousandE35       35        1000
-Ethernet35      11                    thousandE36       36        1000
-Ethernet36      14                    thousandE37       37        1000
-Ethernet37      13                    thousandE38       38        1000
-Ethernet38      16                    thousandE39       39        1000
-Ethernet39      15                    thousandE40       40        1000
-Ethernet40      18                    thousandE41       41        1000
-Ethernet41      17                    thousandE42       42        1000
-Ethernet42      20                    thousandE43       43        1000
-Ethernet43      19                    thousandE44       44        1000
-Ethernet44      22                    thousandE45       45        1000
-Ethernet45      21                    thousandE46       46        1000
-Ethernet46      24                    thousandE47       47        1000
-Ethernet47      23                    thousandE48       48        1000
-Ethernet48      67                    twentyfiveGigE49  49       25000
-Ethernet49      66                    twentyfiveGigE50  50       25000
-Ethernet50      65                    twentyfiveGigE51  51       25000
-Ethernet51      68                    twentyfiveGigE52  52       25000
-Ethernet52      73,74,75,76           hundredGigE53     53      100000
-Ethernet56      69,70,71,72           hundredGigE54     54      100000
+# name          lanes                 alias             index   speed           autoneg
+Ethernet0       26                    thousandE1        1         1000           1
+Ethernet1       25                    thousandE2        2         1000           1
+Ethernet2       28                    thousandE3        3         1000           1
+Ethernet3       27                    thousandE4        4         1000           1
+Ethernet4       30                    thousandE5        5         1000           1
+Ethernet5       29                    thousandE6        6         1000           1
+Ethernet6       32                    thousandE7        7         1000           1
+Ethernet7       31                    thousandE8        8         1000           1
+Ethernet8       38                    thousandE9        9         1000           1
+Ethernet9       37                    thousandE10       10        1000           1
+Ethernet10      40                    thousandE11       11        1000           1
+Ethernet11      39                    thousandE12       12        1000           1
+Ethernet12      34                    thousandE13       13        1000           1
+Ethernet13      33                    thousandE14       14        1000           1
+Ethernet14      36                    thousandE15       15        1000           1
+Ethernet15      35                    thousandE16       16        1000           1
+Ethernet16      46                    thousandE17       17        1000           1
+Ethernet17      45                    thousandE18       18        1000           1
+Ethernet18      48                    thousandE19       19        1000           1
+Ethernet19      47                    thousandE20       20        1000           1
+Ethernet20      42                    thousandE21       21        1000           1
+Ethernet21      41                    thousandE22       22        1000           1
+Ethernet22      44                    thousandE23       23        1000           1
+Ethernet23      43                    thousandE24       24        1000           1
+Ethernet24      2                     thousandE25       25        1000           1
+Ethernet25      1                     thousandE26       26        1000           1
+Ethernet26      4                     thousandE27       27        1000           1
+Ethernet27      3                     thousandE28       28        1000           1
+Ethernet28      6                     thousandE29       29        1000           1
+Ethernet29      5                     thousandE30       30        1000           1
+Ethernet30      8                     thousandE31       31        1000           1
+Ethernet31      7                     thousandE32       32        1000           1
+Ethernet32      10                    thousandE33       33        1000           1
+Ethernet33      9                     thousandE34       34        1000           1
+Ethernet34      12                    thousandE35       35        1000           1
+Ethernet35      11                    thousandE36       36        1000           1
+Ethernet36      14                    thousandE37       37        1000           1
+Ethernet37      13                    thousandE38       38        1000           1
+Ethernet38      16                    thousandE39       39        1000           1
+Ethernet39      15                    thousandE40       40        1000           1
+Ethernet40      18                    thousandE41       41        1000           1
+Ethernet41      17                    thousandE42       42        1000           1
+Ethernet42      20                    thousandE43       43        1000           1
+Ethernet43      19                    thousandE44       44        1000           1
+Ethernet44      22                    thousandE45       45        1000           1
+Ethernet45      21                    thousandE46       46        1000           1
+Ethernet46      24                    thousandE47       47        1000           1
+Ethernet47      23                    thousandE48       48        1000           1
+Ethernet48      67                    twentyfiveGigE49  49       25000           0
+Ethernet49      66                    twentyfiveGigE50  50       25000           0
+Ethernet50      65                    twentyfiveGigE51  51       25000           0
+Ethernet51      68                    twentyfiveGigE52  52       25000           0
+Ethernet52      73,74,75,76           hundredGigE53     53      100000           0
+Ethernet56      69,70,71,72           hundredGigE54     54      100000           0
diff --git a/device/accton/x86_64-accton_as4630_54pe-r0/custom_led.bin b/device/accton/x86_64-accton_as4630_54pe-r0/custom_led.bin
diff --git a/device/accton/x86_64-accton_as4630_54pe-r0/led_proc_init.soc b/device/accton/x86_64-accton_as4630_54pe-r0/led_proc_init.soc
@@ -1,2 +1,3 @@
+m0 load 0 0x3800 /usr/share/sonic/platform/custom_led.bin
 led start
 led auto on
diff --git a/device/accton/x86_64-accton_as4630_54pe-r0/media_settings.json b/device/accton/x86_64-accton_as4630_54pe-r0/media_settings.json
@@ -0,0 +1,52 @@
+{
+    "PORT_MEDIA_SETTINGS": {
+        "49": {
+            "Default": {
+                "preemphasis": {
+                    "lane0":"0x124106"
+                }
+            }
+        },
+        "50": {
+            "Default": {
+                "preemphasis": {
+                    "lane0":"0x124106"
+                }
+            }
+        },
+        "51": {
+            "Default": {
+                "preemphasis": {
+                    "lane0":"0x124106"
+                }
+            }
+        },
+        "52": {
+            "Default": {
+                "preemphasis": {
+                    "lane0":"0x124106"
+                }
+            }
+        },
+        "53": {
+            "Default": {
+                "preemphasis": {
+                    "lane0":"0x124106",
+                    "lane1":"0x124106",
+                    "lane2":"0x124106",
+                    "lane3":"0x124106"
+                }
+            }
+        },
+        "54": {
+            "Default": {
+                "preemphasis": {
+                    "lane0":"0x124106",
+                    "lane1":"0x124106",
+                    "lane2":"0x124106",
+                    "lane3":"0x124106"
+                }
+            }
+        }
+    }
+}
diff --git a/...-54T/td3-as5835t-48x10G+6x100G.config.bcm → ...-54T/mv2-as5835t-48x10G+6x100G.config.bcm b/...-54T/td3-as5835t-48x10G+6x100G.config.bcm → ...-54T/mv2-as5835t-48x10G+6x100G.config.bcm
@@ -14,10 +14,29 @@ parity_enable=0
 mem_cache_enable=0
 
 l2_mem_entries=32768
-#l3_mem_entries=49152
-#fpem_mem_entries=16384
+l3_mem_entries=16384
+fpem_mem_entries=16384
 l2xmsg_mode=1
 
+# Platform specfic
+bcm_num_cos=8
+bcm_stat_interval=2000000
+cdma_timeout_usec=3000000
+ifp_inports_support_enable=1
+ipv6_lpm_128b_enable=0x1
+l3_alpm_enable=2
+l3_max_ecmp_mode=1
+max_vp_lags=0
+miim_intr_enable=0
+module_64ports=1
+port_flex_enable=1
+schan_intr_enable=0
+stable_size=0x5500000 ;Specify the stable cache size in bytes used for Warm boot operations
+tdma_timeout_usec=3000000 
+skip_L2_USER_ENTRY=0
+bcm_tunnel_term_compatible_mode=1
+l3_alpm_ipv6_128b_bkt_rsvd=1
+
 #FC0
 dport_map_port_1=2
 dport_map_port_2=1

diff --git a/device/accton/x86_64-accton_as5835_54t-r0/Accton-AS5835-54T/port_config.ini b/device/accton/x86_64-accton_as5835_54t-r0/Accton-AS5835-54T/port_config.ini
@@ -47,9 +47,9 @@ Ethernet44      74                    tenGigE45         45     10000
 Ethernet45      73                    tenGigE46         46     10000
 Ethernet46      76                    tenGigE47         47     10000
 Ethernet47      75                    tenGigE48         48     10000
-Ethernet48      29,30,31,32           hundredGigE49     49     100000
-Ethernet52      33,34,35,36           hundredGigE50     53     100000
-Ethernet56      37,38,39,40           hundredGigE51     57     100000
-Ethernet60      41,42,43,44           hundredGigE52     61     100000
+Ethernet48      37,38,39,40           hundredGigE49     49     100000
+Ethernet52      29,30,31,32           hundredGigE50     53     100000
+Ethernet56      33,34,35,36           hundredGigE51     57     100000
+Ethernet60      49,50,51,52           hundredGigE52     61     100000
 Ethernet64      45,46,47,48           hundredGigE53     65     100000
-Ethernet68      49,50,51,52           hundredGigE54     69     100000
+Ethernet68      41,42,43,44           hundredGigE54     69     100000
diff --git a/device/accton/x86_64-accton_as5835_54t-r0/Accton-AS5835-54T/sai.profile b/device/accton/x86_64-accton_as5835_54t-r0/Accton-AS5835-54T/sai.profile
@@ -1 +1,2 @@
-SAI_INIT_CONFIG_FILE=/etc/bcm/td3-as5835t-48x10G+6x100G.config.bcm
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/mv2-as5835t-48x10G+6x100G.config.bcm
+SAI_BOARD_CONFIG_PATH=/etc/accton
diff --git a/device/accton/x86_64-accton_as7326_56x-r0/led_proc_init.soc b/device/accton/x86_64-accton_as7326_56x-r0/led_proc_init.soc
@@ -1,6 +1,6 @@
 #led auto off
 #led stop
-m0 load 0 0x0 /usr/share/sonic/platform/linkscan_led_fw.bin
+#m0 load 0 0x0 /usr/share/sonic/platform/linkscan_led_fw.bin
 m0 load 0 0x3800 /usr/share/sonic/platform/custom_led.bin
 led auto on
 led start
diff --git a/device/accton/x86_64-accton_as7726_32x-r0/Accton-AS7726-32X/sai.profile b/device/accton/x86_64-accton_as7726_32x-r0/Accton-AS7726-32X/sai.profile
@@ -1 +1 @@
-SAI_INIT_CONFIG_FILE=/etc/bcm/td3-as7726-32x100G.config.bcm
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-as7726-32x100G.config.bcm
diff --git a/device/accton/x86_64-accton_as7726_32x-r0/Accton-AS7726-32X/td3-as7726-32x100G.config.bcm b/device/accton/x86_64-accton_as7726_32x-r0/Accton-AS7726-32X/td3-as7726-32x100G.config.bcm
@@ -11,26 +11,28 @@ mem_cache_enable=0
 
 l2_mem_entries=32768
 l3_mem_entries=16384
-fpem_mem_entries=131072
+fpem_mem_entries=16384
 l2xmsg_mode=1
 
 # Platform specfic
 bcm_num_cos=8
 bcm_stat_interval=2000000
 cdma_timeout_usec=3000000
+ifp_inports_support_enable=1
 ipv6_lpm_128b_enable=0x1
 l3_max_ecmp_mode=1
-#l3_alpm_enable=2
+l3_alpm_enable=2
 lpm_scaling_enable=0
 max_vp_lags=0
 miim_intr_enable=0
 module_64ports=1
+port_flex_enable=1
 schan_intr_enable=0
 stable_size=0x5500000
 tdma_timeout_usec=3000000
 skip_L2_USER_ENTRY=0
 bcm_tunnel_term_compatible_mode=1
-
+l3_alpm_ipv6_128b_bkt_rsvd=1
 phy_an_c73=1
 
 dport_map_port_1=1
@@ -100,10 +102,10 @@ portmap_115=113:100
 portmap_119=117:100
 portmap_123=121:100
 portmap_127=125:100
-portmap_66=129:10:m
-portmap_130=128:10:m
-portmap_65=130:10
-portmap_131=131:10
+#portmap_66=129:10:m
+#portmap_130=128:10:m
+#portmap_65=130:10
+#portmap_131=131:10
 
 phy_chain_rx_lane_map_physical{1.0}=0x1320
 phy_chain_rx_lane_map_physical{5.0}=0x0123

diff --git a/device/accton/x86_64-accton_as7726_32x-r0/custom_led.bin b/device/accton/x86_64-accton_as7726_32x-r0/custom_led.bin
diff --git a/device/accton/x86_64-accton_as7726_32x-r0/led_proc_init.soc b/device/accton/x86_64-accton_as7726_32x-r0/led_proc_init.soc
@@ -0,0 +1,4 @@
+
+m0 load 0 0x3800 /usr/share/sonic/platform/custom_led.bin
+led auto on
+led start
diff --git a/device/accton/x86_64-accton_as7816_64x-r0/Accton-AS7816-64X/sai.profile b/device/accton/x86_64-accton_as7816_64x-r0/Accton-AS7816-64X/sai.profile
@@ -1 +1 @@
-SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th2-as7816-64x100G.config.bcm
+SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th2-as7816-64x25G-48x100G_row1.config.bcm
diff --git a/...-AS7816-64X/th2-as7816-64x100G.config.bcm → ...th2-as7816-64x25G-48x100G_row1.config.bcm b/...-AS7816-64X/th2-as7816-64x100G.config.bcm → ...th2-as7816-64x25G-48x100G_row1.config.bcm
@@ -26,20 +26,21 @@ max_vp_lags=0
 miim_intr_enable=0
 module_64ports=1
 oversubscribe_mode=1
+port_flex_enable=1
 
 #add loopback port
 # port 33 is the first loopback port
-portmap_33=260:10
+#portmap_33=260:10
 # port 66 is the first management port
-portmap_66=257:10
+#portmap_66=257:10
 # port 67 is the second loopback port
-portmap_67=261:10
+#portmap_67=261:10
 # port 100 is the second management port
-portmap_100=259:10
+#portmap_100=259:10
 # port 101 is the third loopback port
-portmap_101=262:10
+#portmap_101=262:10
 # port 135 is the fourth loopback port
-portmap_135=263:10
+#portmap_135=263:10
 
 #Port0
 #FC18