Merge branch 'master' into gnoi_sm_PR1

.azure-pipelines/azure-pipelines-build.yml

@@ -82,7 +82,7 @@ jobs:
           variables:
             dbg_image: yes
 
-        - name: innovium
+        - name: marvell-teralynx
           variables:
             dbg_image: yes
 

.azure-pipelines/template-variables.yml

@@ -1,6 +1,6 @@
 variables:
   DEFAULT_CONTAINER_REGISTRY: 'publicmirror.azurecr.io'
-  COMMON_LIB_BUILD_ENVS: 'bullseye'
+  COMMON_LIB_BUILD_ENVS: 'bookworm'
   SONIC_SLAVE_DOCKER_DRIVER: 'overlay2'
   SONIC_BUILD_RETRY_COUNT: 3
   SONIC_BUILD_RETRY_INTERVAL: 600

.gitmodules

@@ -124,12 +124,12 @@
 [submodule "platform/marvell/sonic-platform-marvell"]
 	path = platform/marvell/sonic-platform-marvell
 	url = https://github.com/Marvell-switching/sonic-platform-arm64.git
-[submodule "platform/innovium/sonic-platform-marvell"]
-	path = platform/innovium/sonic-platform-marvell
-	url = https://github.com/Marvell-switching/sonic-platform-marvell
 [submodule "src/sonic-stp"]
 	path = src/sonic-stp
 	url = https://github.com/sonic-net/sonic-stp
+[submodule "platform/marvell-teralynx/sonic-platform-marvell-teralynx"]
+	path = platform/marvell-teralynx/sonic-platform-marvell-teralynx
+	url = https://github.com/Marvell-switching/sonic-platform-marvell.git
 [submodule "src/sonic-framework/gnoi"]
 	path = src/sonic-framework/gnoi
 	url = https://github.com/openconfig/gnoi

README.md

@@ -3,7 +3,7 @@
 [![Broadcom](https://dev.azure.com/mssonic/build/_apis/build/status/broadcom/Azure.sonic-buildimage.official.broadcom?branchName=master&label=Broadcom)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=138&branchName=master)
 [![Centec](https://dev.azure.com/mssonic/build/_apis/build/status/centec/Azure.sonic-buildimage.official.centec?branchName=master&label=Centec)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=143&branchName=master)
 [![Centec(arm64)](https://dev.azure.com/mssonic/build/_apis/build/status/centec/Azure.sonic-buildimage.official.centec-arm64?branchName=master&label=Centec-arm64)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=140&branchName=master)
-[![Innovium](https://dev.azure.com/mssonic/build/_apis/build/status/innovium/Azure.sonic-buildimage.official.innovium?branchName=master&label=Innovium)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=148&branchName=master)
+[![Marvell-Teralynx](https://dev.azure.com/mssonic/build/_apis/build/status/marvell-teralynx/Azure.sonic-buildimage.official.marvell-teralynx?branchName=master&label=Marvell-Teralynx)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=148&branchName=master)
 [![Mellanox](https://dev.azure.com/mssonic/build/_apis/build/status/mellanox/Azure.sonic-buildimage.official.mellanox?branchName=master&label=Mellanox)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=139&branchName=master)
 [![Marvell(armhf)](https://dev.azure.com/mssonic/build/_apis/build/status/marvell/Azure.sonic-buildimage.official.marvell-armhf?branchName=master&label=Marvell-armhf)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=141&branchName=master)
 [![Marvell(arm64)](https://dev.azure.com/mssonic/build/_apis/build/status/marvell/Azure.sonic-buildimage.official.marvell-arm64?branchName=master&label=Marvell-arm64)](https://dev.azure.com/mssonic/build/_build/latest?definitionId=999&branchName=master)
@@ -215,7 +215,7 @@ The supported ASIC vendors are:
 * PLATFORM=centec
 * PLATFORM=nephos
 * PLATFORM=nvidia-bluefield
-* PLATFORM=innovium
+* PLATFORM=marvell-teralynx
 * PLATFORM=vs
 
 ## Usage for ARM Architecture
@@ -373,8 +373,8 @@ on the SAI version for each SONiC release.
     and Mellanox switch ASIC (gzip tar archive)
   * docker-syncd-nephos.gz: docker image for the daemon to sync database
     and Nephos switch ASIC (gzip tar archive)
-  * docker-syncd-invm.gz: docker image for the daemon to sync database
-    and Innovium switch ASIC (gzip tar archive)
+  * docker-syncd-mrvl-teralynx.gz: docker image for the daemon to sync database
+    and Marvell-Teralynx switch ASIC (gzip tar archive)
   * docker-sonic-p4.gz: docker image for all-in-one for p4 software switch
     (gzip tar archive)
   * docker-sonic-vs.gz: docker image for all-in-one for software virtual switch

azure-pipelines.yml

@@ -70,6 +70,8 @@ stages:
       - name: broadcom
         variables:
           swi_image: yes
+          docker_syncd_rpc_image: yes
+          platform_rpc: brcm
           INCLUDE_RESTAPI: y
       - name: mellanox
         variables:

device/arista/x86_64-arista_7800r3_48cq2_lc/services.conf

@@ -0,0 +1 @@
+startup_tsa_tsb.service

device/arista/x86_64-arista_7800r3_48cq2_lc/startup-tsa-tsb.conf

@@ -0,0 +1 @@
+STARTUP_TSB_TIMER=900

device/arista/x86_64-arista_7800r3_48cqm2_lc/services.conf

@@ -0,0 +1 @@
+startup_tsa_tsb.service

device/arista/x86_64-arista_7800r3_48cqm2_lc/startup-tsa-tsb.conf

@@ -0,0 +1 @@
+STARTUP_TSB_TIMER=900

device/arista/x86_64-arista_7800r3a_36d2_lc/services.conf

@@ -0,0 +1 @@
+startup_tsa_tsb.service

device/arista/x86_64-arista_7800r3a_36d2_lc/startup-tsa-tsb.conf

@@ -0,0 +1 @@
+STARTUP_TSB_TIMER=900

device/broadcom/x86_64-broadcom_common/x86_64-broadcom_b27/broadcom-sonic-td3.config.bcm

@@ -0,0 +1,9 @@
+[Low Inheritance Precedence]
+mem_cache_enable=1
+l3_mem_entries=16384
+l3_alpm_enable=0
+riot_enable=0
+l2xmsg_mode=1
+l2_mem_entries=32768
+lpm_scaling_enable=0
+ipv6_lpm_128b_enable=0x1

device/broadcom/x86_64-broadcom_common/x86_64-broadcom_b37/broadcom-sonic-td3.config.bcm

@@ -0,0 +1,25 @@
+[Low Inheritance Precedence]
+sai_tunnel_support=1
+flow_init_mode=1
+riot_enable=1
+vlan_xlate_1_mem_entries=16384
+vlan_xlate_2_mem_entries=2048
+mem_cache_enable=1
+sai_load_hw_config=/usr/lib/cancun/
+l2_entry_used_as_my_station=1
+core_clock_frequency=893
+use_all_splithorizon_groups=1
+riot_overlay_l3_intf_mem_size=4096
+riot_overlay_l3_egress_mem_size=8192
+l3_ecmp_levels=2
+riot_overlay_ecmp_resilient_hash_size=16384
+mpls_mem_entries=2048
+sai_fast_convergence_support=1
+bcm_num_cos=8
+sai_brcm_sonic_trap_group=1
+host_as_route_disable=1
+multi_hash_recurse_depth_l3=6
+sai_stats_support_mask=0x1
+
+# CPU Tx HW replication
+sai_hostif_netif_iff_up_set=1

device/broadcom/x86_64-broadcom_common/x86_64-broadcom_b77/broadcom-sonic-td3.config.bcm

@@ -1,12 +1,32 @@
-mem_cache_enable=0
+[Low Inheritance Precedence]
+mem_cache_enable=1
+flow_init_mode=1
+mpls_mem_entries=16384
+vlan_xlate_1_mem_entries=65536
+vlan_xlate_2_mem_entries=16384
+riot_enable=1
 ifp_inports_support_enable=1
 ipv6_lpm_128b_enable=0x1
 l3_max_ecmp_mode=1
 lpm_scaling_enable=0
 bcm_num_cos=10
-default_cpu_tx_queue=9
 mmu_lossless=0
 host_as_route_disable=1
 sai_eapp_config_file=/etc/broadcom/eapps_cfg.json
 sai_fast_convergence_support=1
-flow_init_mode=1
+sai_load_hw_config=/usr/lib/cancun/
+sai_nbr_bcast_ifp_optimized=1
+sai_brcm_sonic_acl_enhancements=1
+# Reduced Trap Group QSET for BRCM Sonic
+sai_brcm_sonic_trap_group=1
+l2_entry_used_as_my_station=1
+multi_hash_recurse_depth_l3=3
+sai_stats_support_mask=0x1
+
+#l3 common setting
+riot_overlay_ecmp_resilient_hash_size=16384
+riot_overlay_l3_egress_mem_size=32768
+riot_overlay_l3_intf_mem_size=8192
+
+l3_alpm_ipv6_128b_bkt_rsvd=1
+l3_ecmp_levels=2

device/broadcom/x86_64-broadcom_common/x86_64-broadcom_b78/broadcom-sonic-td4.config.bcm

@@ -0,0 +1,19 @@
+[Low Inheritance Precedence]
+sai_tunnel_support: 1
+riot_enable: 1
+pktio_mode: 1
+vlan_flooding_l2mc_num_reserved: 0
+shared_block_mask_section: uc_bc
+ctr_evict_enable: 0
+sai_brcm_sonic_acl_enhancements: 1
+sai_field_group_auto_prioritize: 1
+sai_modify_hash_flexdigest: 1
+sai_fast_convergence_support: 1
+sai_port_queue_ecn_counter: 1
+l2_table_default_view: 1
+flexctr_action_reserved_ipmc_hitbit: 1
+default_cpu_tx_queue: 7
+max_vp_lags: 1024
+multi_network_groups: 1
+bcm_tunnel_term_compatible_mode: 1
+use_all_splithorizon_groups: 1

device/broadcom/x86_64-broadcom_common/x86_64-broadcom_b85/broadcom-sonic-td2.config.bcm

@@ -1,6 +1,10 @@
+[Low Inheritance Precedence]
 mmu_lossless=0
 #PTP
-num_queues_pci=24
+num_queues_pci=30
 num_queues_uc0=1
 num_queues_uc1=19
 sai_fast_convergence_support=1
+sai_nbr_bcast_ifp_optimized=1
+# Reduced Trap Group QSET for BRCM Sonic
+sai_brcm_sonic_trap_group=1

device/broadcom/x86_64-broadcom_common/x86_64-broadcom_b87/broadcom-sonic-td3.config.bcm

@@ -1,8 +1,53 @@
-mem_cache_enable=0
+[Low Inheritance Precedence]
+mem_cache_enable=1
+mpls_mem_entries=16384
+vlan_xlate_1_mem_entries=65536
+vlan_xlate_2_mem_entries=16384
+flow_init_mode=1
+sai_tunnel_support=1
 ifp_inports_support_enable=1
 ipv6_lpm_128b_enable=0x1
 l3_max_ecmp_mode=1
 lpm_scaling_enable=0
 bcm_num_cos=10
-default_cpu_tx_queue=9
 mmu_lossless=0
+sai_nbr_bcast_ifp_optimized=1
+l2_entry_used_as_my_station=1
+multi_hash_recurse_depth_l3=3
+# Drop monitor and IFA configuration
+flowtracker_enable=2
+flowtracker_max_flows=48000
+flowtracker_drop_monitor_enable=1
+flowtracker_export_interval_usecs=1000000
+flowtracker_max_export_pkt_length=9000
+flowtracker_fsp_reinject_max_length=128
+host_as_route_disable=1
+num_queues_pci=46
+num_queues_uc0=1
+num_queues_uc1=1
+sai_eapp_config_file=/etc/broadcom/eapps_cfg.json
+ifa_enable=1
+sai_load_hw_config=/usr/lib/cancun/
+sai_fast_convergence_support=1
+sai_brcm_sonic_acl_enhancements=1
+# Reduced Trap Group QSET for BRCM Sonic
+sai_brcm_sonic_trap_group=1
+sai_stats_support_mask=0x1
+
+# MMU Lossless configurations 
+sai_optimized_mmu=1
+sai_mmu_tc_to_pg_config=1
+buf.map.egress_pool0.ingress_pool=0
+buf.map.egress_pool1.ingress_pool=0
+buf.map.egress_pool2.ingress_pool=1
+
+#Tunnels
+use_all_splithorizon_groups=1
+bcm_tunnel_term_compatible_mode=1
+
+#RIOT Enable
+riot_enable=1
+riot_overlay_l3_intf_mem_size=8192
+riot_overlay_l3_egress_mem_size=32768
+l3_ecmp_levels=2
+riot_overlay_ecmp_resilient_hash_size=16384

device/broadcom/x86_64-broadcom_common/x86_64-broadcom_b88/broadcom-sonic-td4.config.bcm

@@ -0,0 +1,18 @@
+[Low Inheritance Precedence]
+sai_tunnel_support: 1
+l2_table_default_view: 1
+riot_enable: 1
+pktio_mode: 1
+vlan_flooding_l2mc_num_reserved: 0
+shared_block_mask_section: uc_bc
+ctr_evict_enable: 0
+sai_brcm_sonic_acl_enhancements: 1
+sai_field_group_auto_prioritize: 1
+sai_modify_hash_flexdigest: 1
+sai_fast_convergence_support: 1
+sai_port_queue_ecn_counter: 1
+flexctr_action_reserved_ipmc_hitbit: 1
+default_cpu_tx_queue: 7
+multi_network_groups: 1
+bcm_tunnel_term_compatible_mode: 1
+use_all_splithorizon_groups: 1

device/broadcom/x86_64-broadcom_common/x86_64-broadcom_b96/broadcom-sonic-th.config.bcm

@@ -1,9 +1,13 @@
+[Low Inheritance Precedence]
 mmu_lossless=0
 bcm_num_cos=10
 default_cpu_tx_queue=9
 #PTP
-num_queues_pci=24
+num_queues_pci=30
 num_queues_uc0=1
 num_queues_uc1=1
 sai_fast_convergence_support=1
-
+sai_nbr_bcast_ifp_optimized=1
+# Reduced Trap Group QSET for BRCM Sonic
+sai_brcm_sonic_trap_group=1
+sai_stats_support_mask=0x1

device/broadcom/x86_64-broadcom_common/x86_64-broadcom_b97/broadcom-sonic-th2.config.bcm

@@ -1,5 +1,8 @@
-schan_intr_enable=0
+[Low Inheritance Precedence]
 l2xmsg_mode=1
+max_vp_lags=0
+flow_init_mode=1
+schan_intr_enable=0
 mmu_lossless=0
 arl_clean_timeout_usec=15000000
 asf_mem_profile=2
@@ -9,23 +12,23 @@ cdma_timeout_usec=15000000
 dma_desc_timeout_usec=15000000
 ipv6_lpm_128b_enable=1
 lpm_scaling_enable=0
-max_vp_lags=0
 miim_intr_enable=0
 module_64ports=1
 oversubscribe_mode=1
 bcm_num_cos=10
-default_cpu_tx_queue=9
 # Drop monitor configuration
 flowtracker_enable=2
 flowtracker_max_flows=48000
 flowtracker_drop_monitor_enable=1
 flowtracker_export_interval_usecs=1000000
 flowtracker_max_export_pkt_length=9000
 flowtracker_fsp_reinject_max_length=128
-flow_init_mode=1
 num_queues_pci=46
 num_queues_uc0=1
 num_queues_uc1=1
 sai_eapp_config_file=/etc/broadcom/eapps_cfg.json
 sai_fast_convergence_support=1
-
+sai_nbr_bcast_ifp_optimized=1
+# Reduced Trap Group QSET for BRCM Sonic
+sai_brcm_sonic_trap_group=1
+sai_stats_support_mask=0x1

device/broadcom/x86_64-broadcom_common/x86_64-broadcom_b98/broadcom-sonic-th3.config.bcm

@@ -1,10 +1,12 @@
+[Low Inheritance Precedence]
+l2xmsg_mode.0=1
+flow_init_mode=1
 phy_null=1
 pll_bypass=1
 core_clock_frequency=1325
 dpr_clock_frequency=1000
 device_clock_frequency=1325
 port_flex_enable=1
-l2xmsg_mode.0=1
 mmu_port_num_mc_queue.0=1
 module_64ports.0=1
 multicast_l2_range.0=511
@@ -19,10 +21,14 @@ flowtracker_drop_monitor_enable=1
 flowtracker_export_interval_usecs=1000000
 flowtracker_max_export_pkt_length=9000
 flowtracker_fsp_reinject_max_length=128
-flow_init_mode=1
 num_queues_pci=46
 num_queues_uc0=1
 num_queues_uc1=1
 sai_eapp_config_file=/etc/broadcom/eapps_cfg.json
 sai_fast_convergence_support=1
+sai_nbr_bcast_ifp_optimized=1
+# Reduced Trap Group QSET for BRCM Sonic
+sai_brcm_sonic_trap_group=1
 
+# MMU Lossless configurations
+sai_optimized_mmu=1

device/broadcom/x86_64-broadcom_common/x86_64-broadcom_b99/broadcom-sonic-th4.config.bcm

@@ -0,0 +1,19 @@
+[Low Inheritance Precedence]
+sai_tunnel_support: 2
+#System Configs
+pktio_mode: 1
+pfc_deadlock_seq_control : 1
+default_cpu_tx_queue: 7
+vlan_flooding_l2mc_num_reserved: 0
+shared_block_mask_section: uc_bc
+
+#L3 Configs
+ipv6_lpm_128b_enable: 1
+skip_protocol_default_entries: 1
+l3_alpm_template: 1
+l3_alpm_hit_skip: 1
+l3_ecmp_member_first_lkup_mem_size: 12288
+l3_intf_vlan_split_egress : 1
+bcm_tunnel_term_compatible_mode: 1
+sai_field_group_auto_prioritize: 1
+sai_port_queue_ecn_counter: 1

device/celestica/x86_64-cel_midstone-r0/platform_asic

@@ -1 +1 @@
-innovium
+marvell-teralynx

device/delta/x86_64-delta_agc032-r0/platform_asic

@@ -1 +1 @@
-innovium
+marvell-teralynx

device/marvell/x86_64-marvell_dbmvtx9180-r0/platform_asic

@@ -1 +1 @@
-innovium
+marvell-teralynx