Skip to content

Commit d30d84b

Browse files
yxiecayxieca
authored
[bcm sai] upgrade Broadcom SAI to 7.1.0.0-5 (#11236)
* [bcm sai] upgrade Broadcom SAI to 7.1.0.0-5 - Enable Microsoft AN/LT patch - Create infrastructure to allow upgrading DNX/XGS SAI independently. Signed-off-by: Ying Xie <ying.xie@microsoft.com>
1 parent 9b59ee0 commit d30d84b

8 files changed

+32
-30
lines changed

‎platform/broadcom/docker-pde.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ DOCKER_PDE = $(DOCKER_PDE_STEM).gz
66
DOCKER_PDE_DBG = $(DOCKER_PDE_STEM)-$(DBG_IMAGE_MARK).gz
77
$(DOCKER_PDE)_PATH = $(DOCKERS_PATH)/$(DOCKER_PDE_STEM)
88
$(DOCKER_PDE)_DEPENDS += $(PYTHON_NETIFACES)
9-
$(DOCKER_PDE)_DEPENDS += $(SONIC_PLATFORM_PDE) $(BRCM_SAI)
9+
$(DOCKER_PDE)_DEPENDS += $(SONIC_PLATFORM_PDE) $(BRCM_XGS_SAI)
1010

1111
$(DOCKER_PDE_RDEPENDS += $(PYTHON_NETIFACES)
1212
$(DOCKER_PDE)_PYTHON_DEBS += $(SONIC_UTILS)

‎platform/broadcom/docker-syncd-brcm.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ DOCKER_SYNCD_PLATFORM_CODE = brcm
44
include $(PLATFORM_PATH)/../template/docker-syncd-base.mk
55

66
$(DOCKER_SYNCD_BASE)_DEPENDS += $(SYNCD)
7-
$(DOCKER_SYNCD_BASE)_DEPENDS += $(BRCM_SAI)
7+
$(DOCKER_SYNCD_BASE)_DEPENDS += $(BRCM_XGS_SAI)
88
$(DOCKER_SYNCD_BASE)_FILES += $(DSSERVE) $(BCMCMD)
99

1010
$(DOCKER_SYNCD_BASE)_DBG_DEPENDS += $(SYNCD_DBG) \

‎platform/broadcom/libsaithrift-dev.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ else
1313
$(LIBSAITHRIFT_DEV)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(PYTHON_THRIFT) $(THRIFT_COMPILER)
1414
$(LIBSAITHRIFT_DEV)_RDEPENDS += $(LIBTHRIFT)
1515
endif
16-
$(LIBSAITHRIFT_DEV)_DEPENDS += $(BRCM_SAI) $(BRCM_SAI_DEV)
17-
$(LIBSAITHRIFT_DEV)_RDEPENDS += $(BRCM_SAI)
16+
$(LIBSAITHRIFT_DEV)_DEPENDS += $(BRCM_XGS_SAI) $(BRCM_XGS_SAI_DEV)
17+
$(LIBSAITHRIFT_DEV)_RDEPENDS += $(BRCM_XGS_SAI)
1818
SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV)
1919

2020
PYTHON_SAITHRIFT = python-saithrift$(SAITHRIFT_VER)_$(SAI_VER)_amd64.deb

‎platform/broadcom/rules.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@ SONIC_ALL += $(SONIC_ONE_IMAGE) $(SONIC_ONE_ABOOT_IMAGE) \
4242
$(DOCKER_FPM)
4343

4444
# Inject brcm sai into syncd
45-
$(SYNCD)_DEPENDS += $(BRCM_SAI) $(BRCM_SAI_DEV)
46-
$(SYNCD)_UNINSTALLS += $(BRCM_SAI_DEV) $(BRCM_SAI)
45+
$(SYNCD)_DEPENDS += $(BRCM_XGS_SAI) $(BRCM_XGS_SAI_DEV)
46+
$(SYNCD)_UNINSTALLS += $(BRCM_XGS_SAI_DEV) $(BRCM_XGS_SAI)
4747

4848
ifeq ($(ENABLE_SYNCD_RPC),y)
4949
$(SYNCD)_DEPENDS += $(LIBSAITHRIFT_DEV)

‎platform/broadcom/sai.dep

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11

22
#DPKG FRK
3-
SPATH := $($(BRCM_SAI)_SRC_PATH)
4-
DEP_FILES := $(SONIC_COMMON_FILES_LIST) platform/broadcom/sai.mk platform/broadcom/sai.dep
3+
SPATH := $($(BRCM_XGS_SAI)_SRC_PATH)
4+
DEP_FILES := $(SONIC_COMMON_FILES_LIST) platform/broadcom/sai.mk platform/broadcom/sai.dep
55
DEP_FILES += $(SONIC_COMMON_BASE_FILES_LIST)
66
# Get the Latest HTTP Header and calculate the SHA value as it is a softlink that always points to LATEST_INT_OCP_SAI_X.X.X
7-
SAI_FLAGS := $(shell wget --spider --server-response $($(BRCM_SAI)_URL) $($(BRCM_SAI_DEV)_URL) 2>&1 \
7+
SAI_FLAGS := $(shell wget --spider --server-response $($(BRCM_XGS_SAI)_URL) $($(BRCM_XGS_SAI_DEV)_URL) 2>&1 \
88
| grep -Ev -- '--|Date:|x-ms-request-id'|sha256sum|awk '{print $$1}' )
99

10-
$(BRCM_SAI)_CACHE_MODE := GIT_CONTENT_SHA
11-
$(BRCM_SAI)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) $(SAI_FLAGS)
12-
$(BRCM_SAI)_DEP_FILES := $(DEP_FILES)
10+
$(BRCM_XGS_SAI)_CACHE_MODE := GIT_CONTENT_SHA
11+
$(BRCM_XGS_SAI)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) $(SAI_FLAGS)
12+
$(BRCM_XGS_SAI)_DEP_FILES := $(DEP_FILES)
1313

1414

15-
$(BRCM_SAI_DEV)_CACHE_MODE := GIT_CONTENT_SHA
16-
$(BRCM_SAI_DEV)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) $(SAI_FLAGS)
17-
$(BRCM_SAI_DEV)_DEP_FILES := $(DEP_FILES)
15+
$(BRCM_XGS_SAI_DEV)_CACHE_MODE := GIT_CONTENT_SHA
16+
$(BRCM_XGS_SAI_DEV)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) $(SAI_FLAGS)
17+
$(BRCM_XGS_SAI_DEV)_DEP_FILES := $(DEP_FILES)
1818

1919
# Dependencies for SAI DNX ASIC family
20-
$(BRCM_DNX_SAI)_CACHE_MODE := GIT_CONTENT_SHA
20+
$(BRCM_DNX_SAI)_CACHE_MODE := GIT_CONTENT_SHA
2121
$(BRCM_DNX_SAI)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST) $(SAI_FLAGS)
2222
$(BRCM_DNX_SAI)_DEP_FILES := $(DEP_FILES)

‎platform/broadcom/sai.mk

+14-12
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,20 @@
1-
LIBSAIBCM_VERSION = 7.1.0.0-1
1+
LIBSAIBCM_XGS_VERSION = 7.1.0.0-5
2+
LIBSAIBCM_DNX_VERSION = 7.1.0.0-1
23
LIBSAIBCM_BRANCH_NAME = REL_7.0
3-
LIBSAIBCM_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_VERSION)"
4+
LIBSAIBCM_XGS_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_XGS_VERSION)"
5+
LIBSAIBCM_DNX_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_DNX_VERSION)"
46

5-
BRCM_SAI = libsaibcm_$(LIBSAIBCM_VERSION)_amd64.deb
6-
$(BRCM_SAI)_URL = "$(LIBSAIBCM_URL_PREFIX)/$(BRCM_SAI)"
7-
BRCM_SAI_DEV = libsaibcm-dev_$(LIBSAIBCM_VERSION)_amd64.deb
8-
$(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
9-
$(BRCM_SAI_DEV)_URL = "$(LIBSAIBCM_URL_PREFIX)/$(BRCM_SAI_DEV)"
7+
BRCM_XGS_SAI = libsaibcm_$(LIBSAIBCM_XGS_VERSION)_amd64.deb
8+
$(BRCM_XGS_SAI)_URL = "$(LIBSAIBCM_XGS_URL_PREFIX)/$(BRCM_XGS_SAI)"
9+
BRCM_XGS_SAI_DEV = libsaibcm-dev_$(LIBSAIBCM_XGS_VERSION)_amd64.deb
10+
$(eval $(call add_derived_package,$(BRCM_XGS_SAI),$(BRCM_XGS_SAI_DEV)))
11+
$(BRCM_XGS_SAI_DEV)_URL = "$(LIBSAIBCM_XGS_URL_PREFIX)/$(BRCM_XGS_SAI_DEV)"
1012

1113
# SAI module for DNX Asic family
12-
BRCM_DNX_SAI = libsaibcm_dnx_$(LIBSAIBCM_VERSION)_amd64.deb
13-
$(BRCM_DNX_SAI)_URL = "$(LIBSAIBCM_URL_PREFIX)/$(BRCM_DNX_SAI)"
14+
BRCM_DNX_SAI = libsaibcm_dnx_$(LIBSAIBCM_DNX_VERSION)_amd64.deb
15+
$(BRCM_DNX_SAI)_URL = "$(LIBSAIBCM_DNX_URL_PREFIX)/$(BRCM_DNX_SAI)"
1416

15-
SONIC_ONLINE_DEBS += $(BRCM_SAI)
17+
SONIC_ONLINE_DEBS += $(BRCM_XGS_SAI)
1618
SONIC_ONLINE_DEBS += $(BRCM_DNX_SAI)
17-
$(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)
18-
$(eval $(call add_conflict_package,$(BRCM_SAI_DEV),$(LIBSAIVS_DEV)))
19+
$(BRCM_XGS_SAI_DEV)_DEPENDS += $(BRCM_XGS_SAI)
20+
$(eval $(call add_conflict_package,$(BRCM_XGS_SAI_DEV),$(LIBSAIVS_DEV)))

‎platform/broadcom/sonic-pde-tests.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22

33
SONIC_PLATFORM_PDE = sonic-platform-pde_1.0_amd64.deb
44
$(SONIC_PLATFORM_PDE)_SRC_PATH = $(SRC_PATH)/sonic-platform-pde
5-
$(SONIC_PLATFORM_PDE)_DEPENDS += $(BRCM_SAI) $(BRCM_SAI_DEV) $(SWIG)
5+
$(SONIC_PLATFORM_PDE)_DEPENDS += $(BRCM_XGS_SAI) $(BRCM_XGS_SAI_DEV) $(SWIG)
66

77
SONIC_DPKG_DEBS += $(SONIC_PLATFORM_PDE)

‎platform/marvell/libsaithrift-dev.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ PYTHON_SAITHRIFT = python-saithrift_$(SAI_VER)_amd64.deb
1212
$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(PYTHON_SAITHRIFT)))
1313

1414
SAISERVER = saiserver_$(SAI_VER)_amd64.deb
15-
$(SAISERVER)_RDEPENDS += $(LIBTHRIFT) $(BRCM_SAI)
15+
$(SAISERVER)_RDEPENDS += $(LIBTHRIFT) $(BRCM_XGS_SAI)
1616
$(eval $(call add_extra_package,$(LIBSAITHRIFT_DEV),$(SAISERVER)))
1717

1818
SAISERVER_DBG = saiserver-dbg_$(SAI_VER)_amd64.deb

0 commit comments

Comments
 (0)