From 56933794df0868ee542a657b1915c5d172076602 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 24 Jul 2026 13:12:09 +1000 Subject: [PATCH 1/3] Update static_th values for TH5-512 hwskus (#28534) #### Why I did it Broadcom SAI version 14 changes the way that the static thresholds are used. These values need to be updated for all TH5-512 skus. ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it Went through all the TH5-512 hwskus and ensured the `static_th` was set to the correct value. #### How to verify it Boot device with new threshold, observe no errors related to it in syslog. #### Which release branch to backport (provide reason below if selected) - [ ] 202305 - [ ] 202311 - [ ] 202405 - [ ] 202411 - [ ] 202505 - [x] 202511 #### Tested branch (Please provide the tested image version) - [ ] - [ ] #### Description for the changelog In accordance with the broadcom SAI version 14, these static threshold values need to be changed. All TH5-512 hwskus should have the same value. #### Link to config_db schema for YANG module changes Signed-off-by: Sonic Build Admin #### A picture of a cute animal (not mandatory but encouraged) --- .../Arista-7060X6-16PE-384C-B-O128S2/buffers_defaults_t0.j2 | 4 ++-- .../Arista-7060X6-16PE-384C-B-O128S2/buffers_defaults_t1.j2 | 4 ++-- .../Arista-7060X6-64PE-B-O128/buffers_defaults_lt2.j2 | 4 ++-- .../Arista-7060X6-64PE-B-P32O64/buffers_defaults_t1.j2 | 4 ++-- .../Arista-7060X6-64PE-B-P32V128/buffers_defaults_t0.j2 | 4 ++-- .../tests/sample_output/py3/buffer-frh-b-o128.json | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/device/arista/x86_64-arista_7060x6_16pe_384c_b/Arista-7060X6-16PE-384C-B-O128S2/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7060x6_16pe_384c_b/Arista-7060X6-16PE-384C-B-O128S2/buffers_defaults_t0.j2 index 95a3ca75b8..08fbcd7d76 100644 --- a/device/arista/x86_64-arista_7060x6_16pe_384c_b/Arista-7060X6-16PE-384C-B-O128S2/buffers_defaults_t0.j2 +++ b/device/arista/x86_64-arista_7060x6_16pe_384c_b/Arista-7060X6-16PE-384C-B-O128S2/buffers_defaults_t0.j2 @@ -20,7 +20,7 @@ "ingress_lossy_profile": { "pool": "ingress_lossless_pool", "size": "0", - "static_th": "82682080" + "static_th": "82434938" }, "egress_lossy_profile": { "pool": "egress_lossless_pool", @@ -30,7 +30,7 @@ "egress_lossless_profile": { "pool": "egress_lossless_pool", "size": "0", - "static_th": "82682080" + "static_th": "82434938" } }, {%- endmacro %} diff --git a/device/arista/x86_64-arista_7060x6_16pe_384c_b/Arista-7060X6-16PE-384C-B-O128S2/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7060x6_16pe_384c_b/Arista-7060X6-16PE-384C-B-O128S2/buffers_defaults_t1.j2 index 95a3ca75b8..08fbcd7d76 100644 --- a/device/arista/x86_64-arista_7060x6_16pe_384c_b/Arista-7060X6-16PE-384C-B-O128S2/buffers_defaults_t1.j2 +++ b/device/arista/x86_64-arista_7060x6_16pe_384c_b/Arista-7060X6-16PE-384C-B-O128S2/buffers_defaults_t1.j2 @@ -20,7 +20,7 @@ "ingress_lossy_profile": { "pool": "ingress_lossless_pool", "size": "0", - "static_th": "82682080" + "static_th": "82434938" }, "egress_lossy_profile": { "pool": "egress_lossless_pool", @@ -30,7 +30,7 @@ "egress_lossless_profile": { "pool": "egress_lossless_pool", "size": "0", - "static_th": "82682080" + "static_th": "82434938" } }, {%- endmacro %} diff --git a/device/arista/x86_64-arista_7060x6_64pe_b/Arista-7060X6-64PE-B-O128/buffers_defaults_lt2.j2 b/device/arista/x86_64-arista_7060x6_64pe_b/Arista-7060X6-64PE-B-O128/buffers_defaults_lt2.j2 index 03a61f4241..bf47ec9141 100644 --- a/device/arista/x86_64-arista_7060x6_64pe_b/Arista-7060X6-64PE-B-O128/buffers_defaults_lt2.j2 +++ b/device/arista/x86_64-arista_7060x6_64pe_b/Arista-7060X6-64PE-B-O128/buffers_defaults_lt2.j2 @@ -20,7 +20,7 @@ "ingress_lossy_profile": { "pool": "ingress_lossless_pool", "size": "0", - "static_th": "165364160" + "static_th": "82434938" }, "egress_lossy_profile": { "pool": "egress_lossless_pool", @@ -30,7 +30,7 @@ "egress_lossless_profile": { "pool": "egress_lossless_pool", "size": "0", - "static_th": "165364160" + "static_th": "82434938" } }, {%- endmacro %} diff --git a/device/arista/x86_64-arista_7060x6_64pe_b/Arista-7060X6-64PE-B-P32O64/buffers_defaults_t1.j2 b/device/arista/x86_64-arista_7060x6_64pe_b/Arista-7060X6-64PE-B-P32O64/buffers_defaults_t1.j2 index 1b7c711dcf..952fd06d71 100644 --- a/device/arista/x86_64-arista_7060x6_64pe_b/Arista-7060X6-64PE-B-P32O64/buffers_defaults_t1.j2 +++ b/device/arista/x86_64-arista_7060x6_64pe_b/Arista-7060X6-64PE-B-P32O64/buffers_defaults_t1.j2 @@ -25,12 +25,12 @@ "egress_lossless_profile": { "pool": "egress_lossless_pool", "size": "0", - "static_th": "165364160" + "static_th": "82434938" }, "ingress_lossy_profile": { "pool": "ingress_lossless_pool", "size": "0", - "static_th": "165364160" + "static_th": "82434938" } }, {%- endmacro %} diff --git a/device/arista/x86_64-arista_7060x6_64pe_b/Arista-7060X6-64PE-B-P32V128/buffers_defaults_t0.j2 b/device/arista/x86_64-arista_7060x6_64pe_b/Arista-7060X6-64PE-B-P32V128/buffers_defaults_t0.j2 index d3a81f4c86..6d1e2197dc 100644 --- a/device/arista/x86_64-arista_7060x6_64pe_b/Arista-7060X6-64PE-B-P32V128/buffers_defaults_t0.j2 +++ b/device/arista/x86_64-arista_7060x6_64pe_b/Arista-7060X6-64PE-B-P32V128/buffers_defaults_t0.j2 @@ -25,12 +25,12 @@ "egress_lossless_profile": { "pool": "egress_lossless_pool", "size": "0", - "static_th": "165364160" + "static_th": "82434938" }, "ingress_lossy_profile": { "pool": "ingress_lossless_pool", "size": "0", - "static_th": "165364160" + "static_th": "82434938" } }, {%- endmacro %} diff --git a/src/sonic-config-engine/tests/sample_output/py3/buffer-frh-b-o128.json b/src/sonic-config-engine/tests/sample_output/py3/buffer-frh-b-o128.json index 01fab80784..c75fe2e746 100644 --- a/src/sonic-config-engine/tests/sample_output/py3/buffer-frh-b-o128.json +++ b/src/sonic-config-engine/tests/sample_output/py3/buffer-frh-b-o128.json @@ -150,7 +150,7 @@ "ingress_lossy_profile": { "pool": "ingress_lossless_pool", "size": "0", - "static_th": "165364160" + "static_th": "82434938" }, "egress_lossy_profile": { "pool": "egress_lossless_pool", @@ -160,7 +160,7 @@ "egress_lossless_profile": { "pool": "egress_lossless_pool", "size": "0", - "static_th": "165364160" + "static_th": "82434938" } }, From de4f9f0baae9667c05bfe9fdeb1a4fdf4bd19d6c Mon Sep 17 00:00:00 2001 From: aaronber0614 <82425405+aaronber0614@users.noreply.github.com> Date: Fri, 24 Jul 2026 02:47:26 -0400 Subject: [PATCH 2/3] [Broadcom][202605] Upgrade Broadcom xgs SAI version to 15.2.0.0.0.0.11.1 (#28549) Bump LIBSAIBCM_XGS_VERSION on the 202605 release branch from 15.2.0.0.0.0.3.1 to 15.2.0.0.0.0.11.1 (SAI branch SAI_15.2.0_GA, SDK 6.5.35). This is the manual counterpart of the master bump (sonic-net/sonic-buildimage#28478); the libsaibcm .deb and the sdk-6.5.35-xgs SDK/KNET are byte-identical between master and 202605 (sai-xgs.mk is identical to master at this version). Signed-off-by: Aaron Bernardino Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 551d207b-8ce1-40fb-b69f-291f72e021d3 --- platform/broadcom/sai-xgs.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/broadcom/sai-xgs.mk b/platform/broadcom/sai-xgs.mk index 774988ac2a..fea4727928 100644 --- a/platform/broadcom/sai-xgs.mk +++ b/platform/broadcom/sai-xgs.mk @@ -1,4 +1,4 @@ -LIBSAIBCM_XGS_VERSION = 15.2.0.0.0.0.3.1 +LIBSAIBCM_XGS_VERSION = 15.2.0.0.0.0.11.1 LIBSAIBCM_XGS_BRANCH_NAME = SAI_15.2.0_GA LIBSAIBCM_XGS_URL_PREFIX = "$(BUILD_PUBLIC_URL)/sai/sai-broadcom/$(LIBSAIBCM_XGS_BRANCH_NAME)/$(LIBSAIBCM_XGS_VERSION)/xgs" From ec1bb42e41984b8393998b1602830ce89f0b566c Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Fri, 24 Jul 2026 20:12:31 +1000 Subject: [PATCH 3/3] [submodule] Update submodule sonic-platform-common to the latest HEAD automatically (#28611) #### Why I did it src/sonic-platform-common ``` * 9da0138 - (HEAD -> 202605, origin/202605) [sonic_pcie]: Fix regex string literals to use raw strings in pcie_common.py (#725) (3 hours ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog --- src/sonic-platform-common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-platform-common b/src/sonic-platform-common index 357115bfef..9da01383f8 160000 --- a/src/sonic-platform-common +++ b/src/sonic-platform-common @@ -1 +1 @@ -Subproject commit 357115bfefd855df695735b5ff5dd827ed809824 +Subproject commit 9da01383f8a90d39e922ce87957fd17f21757bec