Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305 #188

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

Merged
mssonicbld merged 4 commits into from
Dec 15, 2023
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305 #188

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7fb7722
[202305 branch] Upgrade dnx SAI version to 9.2.x (#17432)
wenyiz2021 Dec 13, 2023
dd294f3
Disable SA_EQUALS_DA trap on DNX LC SKUs (#17488)
arista-nwolfe Dec 14, 2023
bed8d24
[202305][Mellanox] Update SAI to SAIBuild2305.26.0.16, SDK/FW to 4.6.…
dgsudharsan Dec 14, 2023
8b96bcb
Merge branch '202305' of https://github.com/sonic-net/sonic-buildimag…
mssonicbld Dec 15, 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
3 changes: 2 additions & 1 deletion ...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 @@ -859,4 +859,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
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 @@ -1014,3 +1014,4 @@ appl_param_nof_ports_per_modid=64
xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=2
sai_pfc_dlr_init_capability=0
sai_disable_srcmacqedstmac_ctrl=1
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 @@ -1014,3 +1014,4 @@ appl_param_nof_ports_per_modid=64
xflow_macsec_secure_chan_to_num_secure_assoc_encrypt=2
xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=2
sai_pfc_dlr_init_capability=0
sai_disable_srcmacqedstmac_ctrl=1
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 @@ -1031,3 +1031,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
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 @@ -1031,3 +1031,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
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 @@ -1051,3 +1051,4 @@ appl_param_nof_ports_per_modid=64
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
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 @@ -1051,3 +1051,4 @@ appl_param_nof_ports_per_modid=64
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
2 changes: 1 addition & 1 deletion platform/broadcom/sai-modules.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ $(BRCM_OPENNSL_KERNEL)_MACHINE = broadcom
SONIC_DPKG_DEBS += $(BRCM_OPENNSL_KERNEL)

# SAI bcm modules for DNX family ASIC
BRCM_DNX_OPENNSL_KERNEL_VERSION = 7.1.0.0
BRCM_DNX_OPENNSL_KERNEL_VERSION = 9.2.0.0

BRCM_DNX_OPENNSL_KERNEL = opennsl-modules-dnx_$(BRCM_DNX_OPENNSL_KERNEL_VERSION)_amd64.deb
$(BRCM_DNX_OPENNSL_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/saibcm-modules-dnx
Expand Down
6 changes: 3 additions & 3 deletions platform/broadcom/sai.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
LIBSAIBCM_XGS_VERSION = 8.4.31.0
LIBSAIBCM_DNX_VERSION = 7.1.111.1
LIBSAIBCM_DNX_VERSION = 9.2.12.1
LIBSAIBCM_XGS_BRANCH_NAME = SAI_8.4.0_GA
LIBSAIBCM_DNX_BRANCH_NAME = REL_7.0_SAI_1.11
LIBSAIBCM_DNX_BRANCH_NAME = SAI_9.2.0.3
LIBSAIBCM_XGS_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/sai-broadcom/$(LIBSAIBCM_XGS_BRANCH_NAME)/$(LIBSAIBCM_XGS_VERSION)/xgs"
LIBSAIBCM_DNX_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/$(LIBSAIBCM_DNX_BRANCH_NAME)/$(LIBSAIBCM_DNX_VERSION)"
LIBSAIBCM_DNX_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/sai-broadcom/$(LIBSAIBCM_DNX_BRANCH_NAME)/$(LIBSAIBCM_DNX_VERSION)/dnx"

BRCM_XGS_SAI = libsaibcm_$(LIBSAIBCM_XGS_VERSION)_amd64.deb
$(BRCM_XGS_SAI)_URL = "$(LIBSAIBCM_XGS_URL_PREFIX)/$(BRCM_XGS_SAI)"
Expand Down
2 changes: 1 addition & 1 deletion platform/broadcom/saibcm-modules-dnx
Open in desktop
Submodule saibcm-modules-dnx updated 224 files
12 changes: 6 additions & 6 deletions platform/mellanox/fw.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,33 +21,33 @@ MLNX_FW_BASE_PATH = $(MLNX_SDK_BASE_PATH)
# Place an URL here to FW if you want to download FW instead
MLNX_FW_BASE_URL =

SIMX_VERSION = 24.1-1007
SIMX_VERSION = 23.10-1119

FW_FROM_URL = y

MLNX_FW_ASSETS_RELEASE_TAG = fw-2012.2102
MLNX_FW_ASSETS_RELEASE_TAG = fw-2012.2134
MLNX_FW_ASSETS_URL = $(MLNX_ASSETS_GITHUB_URL)/releases/download/$(MLNX_FW_ASSETS_RELEASE_TAG)

ifeq ($(MLNX_FW_BASE_URL), )
MLNX_FW_BASE_URL = $(MLNX_FW_ASSETS_URL)
endif

MLNX_SPC_FW_VERSION = 13.2012.2102
MLNX_SPC_FW_VERSION = 13.2012.2134
MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
$(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
$(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)

MLNX_SPC2_FW_VERSION = 29.2012.2102
MLNX_SPC2_FW_VERSION = 29.2012.2134
MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
$(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
$(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)

MLNX_SPC3_FW_VERSION = 30.2012.2102
MLNX_SPC3_FW_VERSION = 30.2012.2134
MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
$(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
$(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)

MLNX_SPC4_FW_VERSION = 34.2012.2102
MLNX_SPC4_FW_VERSION = 34.2012.2134
MLNX_SPC4_FW_FILE = fw-SPC4-rel-$(subst .,_,$(MLNX_SPC4_FW_VERSION))-EVB.mfa
$(MLNX_SPC4_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
$(MLNX_SPC4_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC4_FW_FILE)
Expand Down
2 changes: 1 addition & 1 deletion platform/mellanox/mlnx-sai.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Mellanox SAI

MLNX_SAI_VERSION = SAIBuild2305.26.0.9
MLNX_SAI_VERSION = SAIBuild2305.26.0.16
MLNX_SAI_ASSETS_GITHUB_URL = https://github.com/Mellanox/Spectrum-SDK-Drivers-SONiC-Bins
MLNX_SAI_ASSETS_RELEASE_TAG = sai-$(MLNX_SAI_VERSION)-$(BLDENV)-$(CONFIGURED_ARCH)
MLNX_SAI_ASSETS_URL = $(MLNX_ASSETS_GITHUB_URL)/releases/download/$(MLNX_SAI_ASSETS_RELEASE_TAG)
Expand Down
2 changes: 1 addition & 1 deletion platform/mellanox/sdk.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
MLNX_SDK_VERSION = 4.6.2102
MLNX_SDK_VERSION = 4.6.2134
MLNX_SDK_ISSU_VERSION = 101

MLNX_SDK_DRIVERS_GITHUB_URL = https://github.com/Mellanox/Spectrum-SDK-Drivers
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 @@ -333,3 +333,4 @@ cmic_dma_abort_in_cold_boot
hybrid_pfc_deadlock_enable
sai_pfc_dlr_init_capability
appl_param_nof_ports_per_modid
sai_disable_srcmacqedstmac_ctrl