[pull] master from Azure:master

.gitignore

@@ -74,6 +74,7 @@ platform/broadcom/sonic-platform-modules-dell/s6100/modules/dell_s6100_lpc.c
 platform/broadcom/sonic-platform-modules-dell/z9100/modules/dell_ich.c
 platform/broadcom/sonic-platform-modules-dell/z9100/modules/dell_mailbox.c
 platform/broadcom/sonic-platform-modules-dell/z9264f/sonic_platform/ipmihelper.py
+platform/cisco-8000
 
 # buildinfo
 files/build/buildinfo

Makefile

@@ -5,6 +5,27 @@ NOSTRETCH ?= 0
 NOBUSTER ?= 0
 NOBULLSEYE ?= 1
 
+ifeq ($(NOJESSIE),0)
+BUILD_JESSIE=1
+endif
+
+ifeq ($(NOSTRETCH),0)
+BUILD_STRETCH=1
+endif
+
+ifeq ($(NOBUSTER),0)
+BUILD_BUSTER=1
+endif
+
+ifeq ($(NOBULLSEYE),0)
+BUILD_BULLSEYE=1
+endif
+
+PLATFORM_PATH := platform/$(if $(PLATFORM),$(PLATFORM),$(CONFIGURED_PLATFORM))
+PLATFORM_CHECKOUT := platform/checkout
+PLATFORM_CHECKOUT_FILE := $(PLATFORM_CHECKOUT)/$(PLATFORM).ini
+PLATFORM_CHECKOUT_CMD := $(shell if [ -f $(PLATFORM_CHECKOUT_FILE) ]; then PLATFORM_PATH=$(PLATFORM_PATH) j2 $(PLATFORM_CHECKOUT)/template.j2 $(PLATFORM_CHECKOUT_FILE); fi)
+
 %::
 	@echo "+++ --- Making $@ --- +++"
 ifeq ($(NOJESSIE), 0)
@@ -42,20 +63,28 @@ init:
 	@echo "+++ Making $@ +++"
 	make -f Makefile.work $@
 
-clean configure reset showtag sonic-slave-build sonic-slave-bash :
+#
+# Function to invoke target $@ in Makefile.work with proper BLDENV
+#
+define make_work
 	@echo "+++ Making $@ +++"
-ifeq ($(NOJESSIE), 0)
-	make -f Makefile.work $@
-endif
-ifeq ($(NOSTRETCH), 0)
-	BLDENV=stretch make -f Makefile.work $@
-endif
-ifeq ($(NOBUSTER), 0)
-	BLDENV=buster make -f Makefile.work $@
-endif
-ifeq ($(NOBULLSEYE), 0)
-	BLDENV=bullseye make -f Makefile.work $@
-endif
+	$(if $(BUILD_JESSIE),make -f Makefile.work $@,)
+	$(if $(BUILD_STRETCH),BLDENV=stretch make -f Makefile.work $@,)
+	$(if $(BUILD_BUSTER),BLDENV=buster make -f Makefile.work $@,)
+	$(if $(BUILD_BULLSEYE),BLDENV=bullseye make -f Makefile.work $@,)
+endef
+
+.PHONY: $(PLATFORM_PATH)
+
+$(PLATFORM_PATH):
+	@echo "+++ Cheking $@ +++"
+	$(PLATFORM_CHECKOUT_CMD)
+
+configure : $(PLATFORM_PATH)
+	$(call make_work, $@)
+
+clean reset showtag sonic-slave-build sonic-slave-bash :
+	$(call make_work, $@)
 
 # Freeze the versions, see more detail options: scripts/versions_manager.py freeze -h
 freeze:

device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t0.j2

@@ -26,13 +26,13 @@
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "66800476",
+            "size": "66394076",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "8644128"
         },
         "egress_lossless_pool": {
-            "size": "66800476",
+            "size": "55921148",
             "type": "egress",
             "mode": "static"
         }
@@ -41,7 +41,7 @@
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "static_th":"66800476"
+            "static_th":"66394076"
         },
         "egress_lossless_profile": {
             "pool":"[BUFFER_POOL|egress_lossless_pool]",

device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/buffers_defaults_t1.j2

@@ -26,13 +26,13 @@
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "66800476",
+            "size": "66394076",
             "type": "ingress",
             "mode": "dynamic",
             "xoff": "8644128"
         },
         "egress_lossless_pool": {
-            "size": "66800476",
+            "size": "55921148",
             "type": "egress",
             "mode": "static"
         }
@@ -41,7 +41,7 @@
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "static_th":"66800476"
+            "static_th":"66394076"
         },
         "egress_lossless_profile": {
             "pool":"[BUFFER_POOL|egress_lossless_pool]",

device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-M-O16C64/th3-z9332f-16x400G-64x100G.config.bcm

@@ -31,7 +31,6 @@ max_vp_lags.0=0
 tdma_intr_enable=1
 tdma_timeout_usec.0=5000000
 parity_correction.0=1
-mmu_lossless.0=0
 bcm_num_cos=10
 default_cpu_tx_queue=7
 pktdma_poll_mode_channel_bitmap=1

device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/buffers_defaults_t0.j2

@@ -10,13 +10,13 @@
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "66435732",
+            "size": "66394076",
             "type": "ingress",
             "mode": "dynamic",
-            "xoff": "27400374"
+            "xoff": "27200352"
         },
         "egress_lossless_pool": {
-            "size": "66435732",
+            "size": "38462204",
             "type": "egress",
             "mode": "static"
         }
@@ -25,7 +25,7 @@
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "static_th":"66435732"
+            "static_th":"66394076"
         },
         "egress_lossless_profile": {
             "pool":"[BUFFER_POOL|egress_lossless_pool]",

device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/buffers_defaults_t1.j2

@@ -10,13 +10,13 @@
 {%- macro generate_buffer_pool_and_profiles() %}
     "BUFFER_POOL": {
         "ingress_lossless_pool": {
-            "size": "66435732",
+            "size": "66394076",
             "type": "ingress",
             "mode": "dynamic",
-            "xoff": "27400374"
+            "xoff": "27200352"
         },
         "egress_lossless_pool": {
-            "size": "66435732",
+            "size": "38462204",
             "type": "egress",
             "mode": "static"
         }
@@ -25,7 +25,7 @@
         "ingress_lossy_profile": {
             "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
-            "static_th":"66435732"
+            "static_th":"66394076"
         },
         "egress_lossless_profile": {
             "pool":"[BUFFER_POOL|egress_lossless_pool]",

device/dell/x86_64-dellemc_z9332f_d1508-r0/DellEMC-Z9332f-O32/th3-z9332f-32x400G.config.bcm

@@ -31,7 +31,6 @@ max_vp_lags.0=0
 tdma_intr_enable=1
 tdma_timeout_usec.0=5000000
 parity_correction.0=1
-mmu_lossless.0=0
 bcm_num_cos=10
 default_cpu_tx_queue=7
 pktdma_poll_mode_channel_bitmap=1

device/dell/x86_64-dellemc_z9332f_d1508-r0/pcie.yaml

@@ -0,0 +1,28 @@
+- bus: '00'
+  dev: '03'
+  fn: '0'
+  id: 6f08
+  name: 'PCI bridge: Intel Corporation Xeon E7 v4/Xeon E5 v4/Xeon E3 v4/Xeon D PCI
+    Express Root Port 3 (rev 03)'
+- bus: '00'
+  dev: 1c
+  fn: '0'
+  id: 8c10
+  name: 'PCI bridge: Intel Corporation 8 Series/C220 Series Chipset Family PCI Express
+    Root Port #1 (rev d5)'
+- bus: '00'
+  dev: 1f
+  fn: '2'
+  id: 8c02
+  name: 'SATA controller: Intel Corporation 8 Series/C220 Series Chipset Family 6-port
+    SATA Controller 1 [AHCI mode] (rev 05)'
+- bus: '05'
+  dev: '00'
+  fn: '0'
+  id: b980
+  name: 'Ethernet controller: Broadcom Limited Device b980 (rev 11)'
+- bus: 09
+  dev: '00'
+  fn: '0'
+  id: '7021'
+  name: 'Memory controller: Xilinx Corporation Device 7021'

platform/checkout/cisco-8000.ini

@@ -0,0 +1,3 @@
+[module]
+repo=git@github.com:Cisco-8000-sonic/platform-cisco-8000.git
+ref=v0.1

platform/checkout/template.j2

@@ -0,0 +1,11 @@
+{% set path = env('PLATFORM_PATH') %}
+if [ ! -d {{ path }} ]; then git clone {{ module.repo }} {{ path }}; fi;
+if [ -d {{ path }}/.git ]; then cd {{ path }} &&
+
+{% if module.ref is defined %}
+git checkout {{ module.ref }} && git submodule update --init --recursive;
+{% else %}
+git submodule update --init --recursive;
+{% endif %}
+
+else echo "{{ path }}/.git not found"; exit 1; fi