From a3ea2e7a176a666641f0750a21fffc2445b89042 Mon Sep 17 00:00:00 2001 From: zitingguo-ms Date: Wed, 15 Mar 2023 10:02:38 +0800 Subject: [PATCH] Upgrade SAI xgs to 7.1.36.4 and migrate to dmz repo (#14210) Why I did it Update SAI xgs version to 7.1.36.4 to include the following changes and migrate xgs to DMZ repo. JIRA# SONIC-69731 (7.1.33.4) Issue Summary: SAI_SWITCH_ATTR_SWITCH_HARDWARE_INFO brcm_sai_get_switch_attribute returns null. Root Cause: Not implemented. Fix Description: Get support for SAI switch attr SAI_SWITCH_ATTR_SWITCH_HARDWARE_INFO added JIRA# SONIC-70737 (7.1.34.4) Issue Summary: ECN being marked as CE even without congestion Root Cause: ecn_thresh was set to very low value and packets were 100% marked. Fix Description: ecn_thresh set to correct value backport SONIC-70081 to SAI7.1 (7.1.35.4) egress lossy queue PFC Rx fix:ignore PFC signals from egress Update git submodules (7.1.36.4) Update sdk-src/hsdk_6.5.24_SAI_7.1.0_GA from branch 'hsdk_6.5.24_SAI_7.1.0_GA' to 57d0e360269c4ab659c4790ae471aa4dba2532b4 [SAI_BRANCH rel_ocp_sai_7_1] Broadcom image build failed with SAI 7.1 in DMZ repo (on bullseye) How I did it Update SAI xgs code. How to verify it Run the SONiC and SAI test with the 7.1 SAI pipeline. Signed-off-by: zitingguo-ms --- platform/broadcom/sai.mk | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk index 76de0998e9..8bc9125fa4 100644 --- a/platform/broadcom/sai.mk +++ b/platform/broadcom/sai.mk @@ -1,8 +1,9 @@ -LIBSAIBCM_XGS_VERSION = 7.1.32.4 +LIBSAIBCM_XGS_VERSION = 7.1.36.4 LIBSAIBCM_DNX_VERSION = 7.1.36.4-2 -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)" +LIBSAIBCM_XGS_BRANCH_NAME = SAI_7.1.0_GA +LIBSAIBCM_DNX_BRANCH_NAME = REL_7.0_202205 +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)" BRCM_XGS_SAI = libsaibcm_$(LIBSAIBCM_XGS_VERSION)_amd64.deb $(BRCM_XGS_SAI)_URL = "$(LIBSAIBCM_XGS_URL_PREFIX)/$(BRCM_XGS_SAI)"