Skip to content

[Cherry-pick][submodule]Advance sairdis with sai 1.11 and add brcm and mlnx sai sdk #12820

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
StormLiangMS merged 1 commit into from
Nov 24, 2022
Merged

[Cherry-pick][submodule]Advance sairdis with sai 1.11 and add brcm and mlnx sai sdk #12820

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
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,6 +1,6 @@
LIBSAIBCM_XGS_VERSION = 7.1.21.4
LIBSAIBCM_DNX_VERSION = 7.1.21.4
LIBSAIBCM_BRANCH_NAME = REL_7.0
LIBSAIBCM_XGS_VERSION = 7.1.111.1
LIBSAIBCM_DNX_VERSION = 7.1.111.1
LIBSAIBCM_BRANCH_NAME = REL_7.0_SAI_1.11
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
6 changes: 3 additions & 3 deletions platform/mellanox/fw.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ else
FW_FROM_URL = n
endif

MLNX_SPC_FW_VERSION = 13.2010.3186
MLNX_SPC_FW_VERSION = 13.2010.4026
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.2010.3186
MLNX_SPC2_FW_VERSION = 29.2010.4026
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.2010.3186
MLNX_SPC3_FW_VERSION = 30.2010.4026
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)
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 = SAIBuild2205.22.1.19
MLNX_SAI_VERSION = SAIBuild2211.23.1.0

export MLNX_SAI_VERSION

Expand Down
2 changes: 1 addition & 1 deletion platform/mellanox/mlnx-sai/SAI-Implementation
Open in desktop
Submodule SAI-Implementation updated 179 files
2 changes: 1 addition & 1 deletion platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
Open in desktop
Submodule Switch-SDK-drivers updated 182 files
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 @@ -16,7 +16,7 @@
#
MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/$(CONFIGURED_ARCH)/
MLNX_SDK_VERSION = 4.5.3186
MLNX_SDK_VERSION = 4.5.4026
MLNX_SDK_ISSU_VERSION = 101

MLNX_SDK_DEB_VERSION = $(subst -,.,$(subst _,.,$(MLNX_SDK_VERSION)))
Expand Down
2 changes: 1 addition & 1 deletion src/sonic-sairedis
Open in desktop
Submodule sonic-sairedis updated 31 files
+1 −1 SAI
+44 −0 lib/ClientSai.cpp
+1 −0 lib/Makefile.am
+13 −9 lib/Recorder.cpp
+67 −0 lib/RedisRemoteSaiInterface.cpp
+48 −47 lib/sai_redis.h
+7 −0 lib/sai_redis_genericprogrammable.cpp
+1 −0 lib/sai_redis_interfacequery.cpp
+3 −1 lib/sai_redis_neighbor.cpp
+2 −2 lib/sai_redis_nexthopgroup.cpp
+26 −0 lib/sai_redis_switch.cpp
+2 −2 lib/sai_redis_tunnel.cpp
+45 −0 meta/DummySaiInterface.cpp
+177 −1 meta/Meta.cpp
+1 −0 meta/SaiInterface.h
+185 −1 meta/SaiSerialize.cpp
+1 −0 syncd/FlexCounter.cpp
+74 −0 syncd/VendorSai.cpp
+18 −0 unittest/lib/TestClientServerSai.cpp
+145 −0 unittest/meta/TestMeta.cpp
+38 −0 unittest/meta/TestSaiSerialize.cpp
+146 −0 unittest/syncd/TestVendorSai.cpp
+1 −0 vslib/Makefile.am
+66 −0 vslib/VirtualSwitchSaiInterface.cpp
+48 −47 vslib/sai_vs.h
+7 −0 vslib/sai_vs_genericprogrammable.cpp
+1 −0 vslib/sai_vs_interfacequery.cpp
+3 −0 vslib/sai_vs_neighbor.cpp
+2 −2 vslib/sai_vs_nexthopgroup.cpp
+26 −1 vslib/sai_vs_switch.cpp
+2 −2 vslib/sai_vs_tunnel.cpp