[202205] Update BRCM SAI version to 7.1.31.4 (#13346)

Why I did it To bring in the following fixes: Revert temporary fix added to disable SA equal DA drops CS00012273013 - [7.1][J2, J2c+] Disable SA Equals DA trap on DNX CS00012274222 - How to block the voq for given destination port for a flow from a remote mod-id CS00012275381 - SAI_INGRESS_PRIORITY_GROUP_STAT_PACKETS is incremented for port's PG's even if there are no traffic sent to that PG CS00012274433 - Local Fault and Remote Fault are not polled by linkscan thread How I did it Merged above fixes to SAI code How to verify it Validated by running the basic sanity tests on XGS and DNX chassis platforms including fib/test_fib.py decap/test_decap.py drop_counters/test_drop_counters.py arp/test_arpall.py
sonic-net · Jan 13, 2023 · 3c485e0 · 3c485e0
1 parent 9bfb70e
commit 3c485e0
Show file tree

Hide file tree

Showing 13 changed files with 19 additions and 3 deletions.
diff --git a/...86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm b/...86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm
@@ -793,4 +793,5 @@ dma_desc_aggregator_buff_size_kb.BCM8869X=100
 dma_desc_aggregator_timeout_usec.BCM8869X=1000
 dma_desc_aggregator_enable_specific_MDB_LPM.BCM8869X=1
 dma_desc_aggregator_enable_specific_MDB_FEC.BCM8869X=1
-sai_pfc_dlr_init_capability=0 
+sai_pfc_dlr_init_capability=0
+sai_disable_srcmacqedstmac_ctrl=1 
diff --git a/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm b/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -983,3 +983,5 @@ serdes_tx_taps_36=nrz:-8:89:-29:0:0:0
 
 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=2
+
+sai_disable_srcmacqedstmac_ctrl=1
diff --git a/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm b/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -983,3 +983,5 @@ serdes_tx_taps_36=nrz:-7:85:-25:0:0:0
 
 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=2
+
+sai_disable_srcmacqedstmac_ctrl=1
diff --git a/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/j2p-a7800r3a-36d-36x400G.config.bcm b/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -1002,3 +1002,4 @@ serdes_tx_taps_36=nrz:-8:89:-29:0:0:0
 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 sai_pfc_dlr_init_capability=0
+sai_disable_srcmacqedstmac_ctrl=1
diff --git a/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm b/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -1002,3 +1002,4 @@ serdes_tx_taps_36=nrz:-7:85:-25:0:0:0
 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 sai_pfc_dlr_init_capability=0
+sai_disable_srcmacqedstmac_ctrl=1
diff --git a/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/j2p-a7800r3a-36d-36x400G.config.bcm b/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -1020,3 +1020,5 @@ serdes_tx_taps_36=pam4:-16:137:-12:2:0:-3
 
 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
+
+sai_disable_srcmacqedstmac_ctrl=1
diff --git a/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm b/...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm
@@ -1020,3 +1020,5 @@ serdes_tx_taps_36=pam4:-16:137:-12:2:0:-3
 
 xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
+
+sai_disable_srcmacqedstmac_ctrl=1
diff --git a/...4-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm b/...4-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm
@@ -2092,3 +2092,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 cmic_dma_abort_in_cold_boot=0
 sai_pfc_dlr_init_capability=0
+sai_disable_srcmacqedstmac_ctrl=1
diff --git a/...4-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm b/...4-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm
@@ -2093,3 +2093,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 cmic_dma_abort_in_cold_boot=0
 sai_pfc_dlr_init_capability=0
+sai_disable_srcmacqedstmac_ctrl=1
diff --git a/.../x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/jr2cp-nokia-18x400g-config.bcm b/.../x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/jr2cp-nokia-18x400g-config.bcm
@@ -2094,3 +2094,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 cmic_dma_abort_in_cold_boot=0
 sai_pfc_dlr_init_capability=0
+sai_disable_srcmacqedstmac_ctrl=1
diff --git a/.../x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/jr2cp-nokia-18x400g-config.bcm b/.../x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/jr2cp-nokia-18x400g-config.bcm
@@ -2096,3 +2096,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
 xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 cmic_dma_abort_in_cold_boot=0
 sai_pfc_dlr_init_capability=0
+sai_disable_srcmacqedstmac_ctrl=1
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
@@ -1,5 +1,5 @@
-LIBSAIBCM_XGS_VERSION = 7.1.28.4
-LIBSAIBCM_DNX_VERSION = 7.1.28.4
+LIBSAIBCM_XGS_VERSION = 7.1.31.4
+LIBSAIBCM_DNX_VERSION = 7.1.31.4
 LIBSAIBCM_BRANCH_NAME = REL_7.0_202205
 LIBSAIBCM_XGS_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_XGS_VERSION)"
 LIBSAIBCM_DNX_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_DNX_VERSION)"

diff --git a/src/sonic-device-data/tests/permitted_list b/src/sonic-device-data/tests/permitted_list
@@ -322,3 +322,4 @@ system_ref_core_clock_khz
 cmic_dma_abort_in_cold_boot
 hybrid_pfc_deadlock_enable
 sai_pfc_dlr_init_capability
+sai_disable_srcmacqedstmac_ctrl
Original file line number	Diff line number	Diff line change
Expand Up		@@ -983,3 +983,5 @@ serdes_tx_taps_36=nrz:-8:89:-29:0:0:0

		xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
		xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=2

		sai_disable_srcmacqedstmac_ctrl=1
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1020,3 +1020,5 @@ serdes_tx_taps_36=pam4:-16:137:-12:2:0:-3

		xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
		xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4

		sai_disable_srcmacqedstmac_ctrl=1