From 5b5bd5e818eeb21afe0f745393bc4daecae69b82 Mon Sep 17 00:00:00 2001 From: zitingguo-ms Date: Thu, 11 Aug 2022 06:02:47 +0800 Subject: [PATCH] [202012 BRCM SAI 4.3.7.0] Pick up fixes and make up BRCM SAI version to 4.3.7.0 (#11681) Pick upfollowing fixes and update BRCM SAI to 4.3.7.0: CS00012208537: Add back previous commit 54c5bc4848eb748 CS00012253061,SONIC-63280: WB from 3.5 to 4.3, followed by WB to 4.3 CS00012207978: SDK-296517, time spent for SAI operations CS00012245601,SONIC-62898: Egress ACL Counted ad Interface TX drops Update pcbb with Fixes for CS00012243699 Upgrade on pcbb with Fixes for KB0025353, CS00012221689, CS00012221688, KB0025391, CS00012230519 commit of "CS00012221688:PFC frames egressing, PFC storm happens simultaneously on 2 ports" is purposely skipped to be picked up later due to SWSS dependency not ready. Why I did it How I did it How to verify it Tested build target, successful Manually run these tests after installing sai binary within image 20201231.73 on 7050CX3 (TD3) T0 DUT, all passed. vxlan/test_vxlan_decap.py fdb/test_fdb.py pfcwd/test_pfcwd_all_port_storm.py acl/null_route/test_null_route_helper.py acl/test_acl.py vlan/test_vlan.py platform_tests/test_reboot.py Signed-off-by: zitingguo-ms --- files/build/versions/default/versions-web | 2 ++ platform/broadcom/sai.mk | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/files/build/versions/default/versions-web b/files/build/versions/default/versions-web index 8b638e27a593..ad8106d47eda 100644 --- a/files/build/versions/default/versions-web +++ b/files/build/versions/default/versions-web @@ -50,6 +50,8 @@ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_ https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg-5.dsc==2443e4dffbdb020e7ab4f947a7904912 https://sonicstorage.blob.core.windows.net/debian/pool/main/n/net-snmp/net-snmp_5.7.3+dfsg.orig.tar.xz==6391ae27eb1ae34ff5530712bb1c4209 https://sonicstorage.blob.core.windows.net/packages/20190307/dsserve?sv=2015-04-05&sr=b&sig=lk7BH3DtW%2F5ehc0Rkqfga%2BUCABI0UzQmDamBsZH9K6w%3D&se=2038-05-06T22%3A34%3A45Z&sp=r==f9d4b815ebb9be9f755dedca8a51170d +https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.0_amd64.deb?sv=2020-08-04&st=2022-08-10T09%3A20%3A59Z&se=2037-08-11T09%3A20%3A00Z&sr=b&sp=r&sig=0gWqYSKVRW1h8If5CS63QjwlMt%2F1sCQcFbmFd6WTxeU%3D==55daa0f34fe4e284270f2db2d974cb91 +https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.0_amd64.deb?sv=2020-08-04&st=2022-08-10T09%3A20%3A43Z&se=2037-08-11T09%3A20%3A00Z&sr=b&sp=r&sig=T%2FHU25LsKmG5jzXLN%2BXlVXAJFg%2Bv0bfvL%2FNITpRNDyA%3D==00a95db04e7736dbe0983da675c81985 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake-data_3.13.2-1_bpo9%2B1_all.deb?st=2020-03-27T02%3A22%3A24Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=Xby%2Bm3OZOjPB%2FSlDbHD65yDcPzAgoys%2FA3vK8RB4BzA%3D==147cf42f3a68f6d6f1e53d95a599a1af https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_amd64.deb?st=2020-03-27T02%3A27%3A21Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=4MvmmDBQuicFEJYakLm7xCNU19yJ8GIP4ankFSnITKY%3D==e75c741e8b6918b8f03625e456fa0275 https://sonicstorage.blob.core.windows.net/packages/cmake/cmake_3.13.2-1_bpo9%2B1_arm64.deb?st=2020-03-27T02%3A28%3A38Z&se=2100-03-26T19%3A00%3A00Z&sp=rl&sv=2018-03-28&sr=b&sig=rrHMkLi29aI8yH6s52ILCY8VcEbNFrzYT2DmC5RwOgs%3D==9bcc989e6ed168717f67c07e79177d4a diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk index 5efc4d739ee1..dc4d9aa0d839 100644 --- a/platform/broadcom/sai.mk +++ b/platform/broadcom/sai.mk @@ -1,8 +1,8 @@ -BRCM_SAI = libsaibcm_4.3.5.3-5_amd64.deb -$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.5.3-5_amd64.deb?sv=2020-08-04&st=2022-06-06T04%3A44%3A45Z&se=2037-06-07T04%3A44%3A00Z&sr=b&sp=r&sig=uG51Q6rJrZYNVVuoShw8F4zas1n6zi%2FJ7udpTSZ87M8%3D" -BRCM_SAI_DEV = libsaibcm-dev_4.3.5.3-5_amd64.deb +BRCM_SAI = libsaibcm_4.3.7.0_amd64.deb +$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm_4.3.7.0_amd64.deb?sv=2020-08-04&st=2022-08-10T09%3A20%3A43Z&se=2037-08-11T09%3A20%3A00Z&sr=b&sp=r&sig=T%2FHU25LsKmG5jzXLN%2BXlVXAJFg%2Bv0bfvL%2FNITpRNDyA%3D" +BRCM_SAI_DEV = libsaibcm-dev_4.3.7.0_amd64.deb $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV))) -$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.5.3-5_amd64.deb?sv=2020-08-04&st=2022-06-06T04%3A45%3A06Z&se=2037-06-07T04%3A45%3A00Z&sr=b&sp=r&sig=SF6YOtYzSIcwSR4BRInnimUjbusNp4mPHFunFjm%2Fors%3D" +$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/4.3/202012/libsaibcm-dev_4.3.7.0_amd64.deb?sv=2020-08-04&st=2022-08-10T09%3A20%3A59Z&se=2037-08-11T09%3A20%3A00Z&sr=b&sp=r&sig=0gWqYSKVRW1h8If5CS63QjwlMt%2F1sCQcFbmFd6WTxeU%3D" SONIC_ONLINE_DEBS += $(BRCM_SAI) $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)