Merge pull request sonic-net#95 from mssonicbld/sonicbld/202205-merge

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205
mlok-nokia · Sep 1, 2023 · 06b1fd1 · 06b1fd1
2 parents 02b4723 + 03fdb00
commit 06b1fd1
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 1 deletion.
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
@@ -861,3 +861,4 @@ 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_disable_srcmacqedstmac_ctrl=1 
+sai_default_cpu_tx_tc=7
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
@@ -1016,3 +1016,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=2
 sai_pfc_dlr_init_capability=0
 
 sai_disable_srcmacqedstmac_ctrl=1
+sai_default_cpu_tx_tc=7
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
@@ -1016,3 +1016,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=2
 sai_pfc_dlr_init_capability=0
 
 sai_disable_srcmacqedstmac_ctrl=1
+sai_default_cpu_tx_tc=7
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
@@ -1032,3 +1032,4 @@ 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
+sai_default_cpu_tx_tc=7
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
@@ -1032,3 +1032,4 @@ 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
+sai_default_cpu_tx_tc=7
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
@@ -1053,3 +1053,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 sai_pfc_dlr_init_capability=0
 
 sai_disable_srcmacqedstmac_ctrl=1
+sai_default_cpu_tx_tc=7
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
@@ -1053,3 +1053,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
 sai_pfc_dlr_init_capability=0
 
 sai_disable_srcmacqedstmac_ctrl=1
+sai_default_cpu_tx_tc=7
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
@@ -2094,3 +2094,4 @@ cmic_dma_abort_in_cold_boot=0
 sai_pfc_dlr_init_capability=0
 sai_disable_srcmacqedstmac_ctrl=1
 trunk_group_max_members=16
+sai_default_cpu_tx_tc=7
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
@@ -2095,3 +2095,4 @@ cmic_dma_abort_in_cold_boot=0
 sai_pfc_dlr_init_capability=0
 sai_disable_srcmacqedstmac_ctrl=1
 trunk_group_max_members=16
+sai_default_cpu_tx_tc=7
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
@@ -2096,3 +2096,4 @@ cmic_dma_abort_in_cold_boot=0
 sai_pfc_dlr_init_capability=0
 sai_disable_srcmacqedstmac_ctrl=1
 trunk_group_max_members=16
+sai_default_cpu_tx_tc=7        
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
@@ -2098,3 +2098,4 @@ cmic_dma_abort_in_cold_boot=0
 sai_pfc_dlr_init_capability=0
 sai_disable_srcmacqedstmac_ctrl=1
 trunk_group_max_members=16
+sai_default_cpu_tx_tc=7
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
@@ -1,5 +1,5 @@
 LIBSAIBCM_XGS_VERSION = 7.1.54.4-3
-LIBSAIBCM_DNX_VERSION = 7.1.54.4
+LIBSAIBCM_DNX_VERSION = 7.1.60.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
@@ -324,3 +324,4 @@ hybrid_pfc_deadlock_enable
 sai_pfc_dlr_init_capability
 sai_disable_srcmacqedstmac_ctrl
 appl_param_nof_ports_per_modid
+sai_default_cpu_tx_tc
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1016,3 +1016,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=2
		sai_pfc_dlr_init_capability=0

		sai_disable_srcmacqedstmac_ctrl=1
		sai_default_cpu_tx_tc=7
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1053,3 +1053,4 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
		sai_pfc_dlr_init_capability=0

		sai_disable_srcmacqedstmac_ctrl=1
		sai_default_cpu_tx_tc=7