Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205 #95

Merged
merged 3 commits into from
Sep 1, 2023
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202205 to 202205 #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
56d6ed1
[202205] Update Broadcom DNX SAI version to 7.1.60.4 (#16351)
tjchadaga Aug 31, 2023
134a222
Update CPU transmitted packets to queue 7 for chassis (#16349)
vmittal-msft Aug 31, 2023
03fdb00
Merge branch '202205' of https://github.com/sonic-net/sonic-buildimag…
mssonicbld Sep 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions ...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm
View file
Open in desktop
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
1 change: 1 addition & 0 deletions ...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm
View file
Open in desktop
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
1 change: 1 addition & 0 deletions ...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/j2p-a7800r3a-36d-36x400G.config.bcm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions ...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions ...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/j2p-a7800r3a-36d-36x400G.config.bcm
View file
Open in desktop
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
1 change: 1 addition & 0 deletions ...6_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm
View file
Open in desktop
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
1 change: 1 addition & 0 deletions ...4-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/jr2cp-nokia-18x100g-4x25g-config.bcm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions ...4-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/jr2cp-nokia-18x100g-4x25g-config.bcm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions .../x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/jr2cp-nokia-18x400g-config.bcm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions .../x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/jr2cp-nokia-18x400g-config.bcm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion platform/broadcom/sai.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)"
Expand Down
1 change: 1 addition & 0 deletions src/sonic-device-data/tests/permitted_list
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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