From 87e9f8239b8bf0acd7297d502336d1a36e8849d6 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Tue, 25 Feb 2025 19:01:05 +0800 Subject: [PATCH 1/5] [submodule] Update submodule sonic-swss to the latest HEAD automatically (#21839) #### Why I did it src/sonic-swss ``` * e21b5a5a - (HEAD -> 202411, origin/202411) Link orchagent against jemalloc (#3530) (22 hours ago) [mssonicbld] * aac84b5d - Merge pull request #3531 from mssonicbld/cherry/202411/3426 (26 hours ago) [Kumaresh Perumal] * 272f45a9 - vlanmgrd not to throw exception for Portchannel ip link add because of race condition with PortChannel removal. (29 hours ago) [Sonic Build Admin] ``` #### How I did it #### How to verify it #### Description for the changelog --- src/sonic-swss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-swss b/src/sonic-swss index 16f5331e44..e21b5a5a8e 160000 --- a/src/sonic-swss +++ b/src/sonic-swss @@ -1 +1 @@ -Subproject commit 16f5331e44bff5b75be175b1d7f9b0b9cb68de8c +Subproject commit e21b5a5a8e0d76c641b16ea639270f760e8e2912 From 833485165f1c5dfbc40e74158bf59c9e43456e36 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Wed, 26 Feb 2025 04:01:14 +0800 Subject: [PATCH 2/5] Update PG flow control threshold based on port speed (not on hwsku) (#21834) #### Why I did it To update PG flow control threshold alpha value based on port speed. Current assumption was based on hwsku. ##### Work item tracking - Microsoft ADO **(31374200)**: #### How I did it Updated pg_profile.ini for various HW SKUs based on BRCM j2/j2c+ chip #### How to verify it #### Which release branch to backport (provide reason below if selected) - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [ ] 202205 - [ ] 202211 - [ ] 202305 #### Tested branch (Please provide the tested image version) - [ ] - [ ] #### Description for the changelog #### Link to config_db schema for YANG module changes #### A picture of a cute animal (not mandatory but encouraged) --- .../pg_profile_lookup.ini | 10 +++++----- .../pg_profile_lookup.ini | 10 +++++----- .../0/pg_profile_lookup.ini | 10 +++++----- .../1/pg_profile_lookup.ini | 10 +++++----- .../0/pg_profile_lookup.ini | 10 +++++----- .../1/pg_profile_lookup.ini | 10 +++++----- .../0/pg_profile_lookup.ini | 20 +++++++++---------- .../1/pg_profile_lookup.ini | 20 +++++++++---------- .../0/pg_profile_lookup.ini | 10 +++++----- .../1/pg_profile_lookup.ini | 10 +++++----- .../0/pg_profile_lookup.ini | 20 +++++++++---------- .../1/pg_profile_lookup.ini | 20 +++++++++---------- 12 files changed, 80 insertions(+), 80 deletions(-) diff --git a/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/pg_profile_lookup.ini b/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/pg_profile_lookup.ini index 5670401e02..ba784705e0 100644 --- a/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/pg_profile_lookup.ini +++ b/device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/pg_profile_lookup.ini @@ -2,16 +2,16 @@ # speed cable size xon xoff threshold xon_offset 40000 300m 0 2560 69632 -6 181753 100000 300m 0 2560 110592 -6 363506 - 400000 300m 0 2560 315392 -6 1454025 + 400000 300m 0 2560 315392 -5 1454025 40000 1000m 0 2560 114688 -6 181753 100000 1000m 0 2560 225280 -6 363506 - 400000 1000m 0 2560 778240 -6 1454025 + 400000 1000m 0 2560 778240 -5 1454025 40000 2000m 0 2560 184320 -6 181753 100000 2000m 0 2560 393216 -6 363506 - 400000 2000m 0 2560 1445888 -6 1454025 + 400000 2000m 0 2560 1445888 -5 1454025 40000 80000m 0 2560 5369856 -6 181753 100000 80000m 0 2560 13357056 -6 363506 - 400000 80000m 0 2560 53305344 -6 1454025 + 400000 80000m 0 2560 53305344 -5 1454025 40000 120000m 0 2560 8028160 -6 181753 100000 120000m 0 2560 20004864 -6 363506 - 400000 120000m 0 2560 79900672 -6 1454025 + 400000 120000m 0 2560 79900672 -5 1454025 diff --git a/device/arista/x86_64-arista_7800r3_48cqm2_lc/Arista-7800R3-48CQM2-C48/pg_profile_lookup.ini b/device/arista/x86_64-arista_7800r3_48cqm2_lc/Arista-7800R3-48CQM2-C48/pg_profile_lookup.ini index 5670401e02..ba784705e0 100644 --- a/device/arista/x86_64-arista_7800r3_48cqm2_lc/Arista-7800R3-48CQM2-C48/pg_profile_lookup.ini +++ b/device/arista/x86_64-arista_7800r3_48cqm2_lc/Arista-7800R3-48CQM2-C48/pg_profile_lookup.ini @@ -2,16 +2,16 @@ # speed cable size xon xoff threshold xon_offset 40000 300m 0 2560 69632 -6 181753 100000 300m 0 2560 110592 -6 363506 - 400000 300m 0 2560 315392 -6 1454025 + 400000 300m 0 2560 315392 -5 1454025 40000 1000m 0 2560 114688 -6 181753 100000 1000m 0 2560 225280 -6 363506 - 400000 1000m 0 2560 778240 -6 1454025 + 400000 1000m 0 2560 778240 -5 1454025 40000 2000m 0 2560 184320 -6 181753 100000 2000m 0 2560 393216 -6 363506 - 400000 2000m 0 2560 1445888 -6 1454025 + 400000 2000m 0 2560 1445888 -5 1454025 40000 80000m 0 2560 5369856 -6 181753 100000 80000m 0 2560 13357056 -6 363506 - 400000 80000m 0 2560 53305344 -6 1454025 + 400000 80000m 0 2560 53305344 -5 1454025 40000 120000m 0 2560 8028160 -6 181753 100000 120000m 0 2560 20004864 -6 363506 - 400000 120000m 0 2560 79900672 -6 1454025 + 400000 120000m 0 2560 79900672 -5 1454025 diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/pg_profile_lookup.ini b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/pg_profile_lookup.ini index 5670401e02..ba784705e0 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/pg_profile_lookup.ini +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/pg_profile_lookup.ini @@ -2,16 +2,16 @@ # speed cable size xon xoff threshold xon_offset 40000 300m 0 2560 69632 -6 181753 100000 300m 0 2560 110592 -6 363506 - 400000 300m 0 2560 315392 -6 1454025 + 400000 300m 0 2560 315392 -5 1454025 40000 1000m 0 2560 114688 -6 181753 100000 1000m 0 2560 225280 -6 363506 - 400000 1000m 0 2560 778240 -6 1454025 + 400000 1000m 0 2560 778240 -5 1454025 40000 2000m 0 2560 184320 -6 181753 100000 2000m 0 2560 393216 -6 363506 - 400000 2000m 0 2560 1445888 -6 1454025 + 400000 2000m 0 2560 1445888 -5 1454025 40000 80000m 0 2560 5369856 -6 181753 100000 80000m 0 2560 13357056 -6 363506 - 400000 80000m 0 2560 53305344 -6 1454025 + 400000 80000m 0 2560 53305344 -5 1454025 40000 120000m 0 2560 8028160 -6 181753 100000 120000m 0 2560 20004864 -6 363506 - 400000 120000m 0 2560 79900672 -6 1454025 + 400000 120000m 0 2560 79900672 -5 1454025 diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/pg_profile_lookup.ini b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/pg_profile_lookup.ini index 5670401e02..ba784705e0 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/pg_profile_lookup.ini +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/pg_profile_lookup.ini @@ -2,16 +2,16 @@ # speed cable size xon xoff threshold xon_offset 40000 300m 0 2560 69632 -6 181753 100000 300m 0 2560 110592 -6 363506 - 400000 300m 0 2560 315392 -6 1454025 + 400000 300m 0 2560 315392 -5 1454025 40000 1000m 0 2560 114688 -6 181753 100000 1000m 0 2560 225280 -6 363506 - 400000 1000m 0 2560 778240 -6 1454025 + 400000 1000m 0 2560 778240 -5 1454025 40000 2000m 0 2560 184320 -6 181753 100000 2000m 0 2560 393216 -6 363506 - 400000 2000m 0 2560 1445888 -6 1454025 + 400000 2000m 0 2560 1445888 -5 1454025 40000 80000m 0 2560 5369856 -6 181753 100000 80000m 0 2560 13357056 -6 363506 - 400000 80000m 0 2560 53305344 -6 1454025 + 400000 80000m 0 2560 53305344 -5 1454025 40000 120000m 0 2560 8028160 -6 181753 100000 120000m 0 2560 20004864 -6 363506 - 400000 120000m 0 2560 79900672 -6 1454025 + 400000 120000m 0 2560 79900672 -5 1454025 diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/pg_profile_lookup.ini b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/pg_profile_lookup.ini index 5670401e02..ba784705e0 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/pg_profile_lookup.ini +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/pg_profile_lookup.ini @@ -2,16 +2,16 @@ # speed cable size xon xoff threshold xon_offset 40000 300m 0 2560 69632 -6 181753 100000 300m 0 2560 110592 -6 363506 - 400000 300m 0 2560 315392 -6 1454025 + 400000 300m 0 2560 315392 -5 1454025 40000 1000m 0 2560 114688 -6 181753 100000 1000m 0 2560 225280 -6 363506 - 400000 1000m 0 2560 778240 -6 1454025 + 400000 1000m 0 2560 778240 -5 1454025 40000 2000m 0 2560 184320 -6 181753 100000 2000m 0 2560 393216 -6 363506 - 400000 2000m 0 2560 1445888 -6 1454025 + 400000 2000m 0 2560 1445888 -5 1454025 40000 80000m 0 2560 5369856 -6 181753 100000 80000m 0 2560 13357056 -6 363506 - 400000 80000m 0 2560 53305344 -6 1454025 + 400000 80000m 0 2560 53305344 -5 1454025 40000 120000m 0 2560 8028160 -6 181753 100000 120000m 0 2560 20004864 -6 363506 - 400000 120000m 0 2560 79900672 -6 1454025 + 400000 120000m 0 2560 79900672 -5 1454025 diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/pg_profile_lookup.ini b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/pg_profile_lookup.ini index 5670401e02..ba784705e0 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/pg_profile_lookup.ini +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/pg_profile_lookup.ini @@ -2,16 +2,16 @@ # speed cable size xon xoff threshold xon_offset 40000 300m 0 2560 69632 -6 181753 100000 300m 0 2560 110592 -6 363506 - 400000 300m 0 2560 315392 -6 1454025 + 400000 300m 0 2560 315392 -5 1454025 40000 1000m 0 2560 114688 -6 181753 100000 1000m 0 2560 225280 -6 363506 - 400000 1000m 0 2560 778240 -6 1454025 + 400000 1000m 0 2560 778240 -5 1454025 40000 2000m 0 2560 184320 -6 181753 100000 2000m 0 2560 393216 -6 363506 - 400000 2000m 0 2560 1445888 -6 1454025 + 400000 2000m 0 2560 1445888 -5 1454025 40000 80000m 0 2560 5369856 -6 181753 100000 80000m 0 2560 13357056 -6 363506 - 400000 80000m 0 2560 53305344 -6 1454025 + 400000 80000m 0 2560 53305344 -5 1454025 40000 120000m 0 2560 8028160 -6 181753 100000 120000m 0 2560 20004864 -6 363506 - 400000 120000m 0 2560 79900672 -6 1454025 + 400000 120000m 0 2560 79900672 -5 1454025 diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/pg_profile_lookup.ini b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/pg_profile_lookup.ini index 99fbd830e2..ba784705e0 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/pg_profile_lookup.ini +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/pg_profile_lookup.ini @@ -1,17 +1,17 @@ # PG lossless profiles. # speed cable size xon xoff threshold xon_offset - 40000 300m 0 2560 69632 -5 181753 - 100000 300m 0 2560 110592 -5 363506 + 40000 300m 0 2560 69632 -6 181753 + 100000 300m 0 2560 110592 -6 363506 400000 300m 0 2560 315392 -5 1454025 - 40000 1000m 0 2560 114688 -5 181753 - 100000 1000m 0 2560 225280 -5 363506 + 40000 1000m 0 2560 114688 -6 181753 + 100000 1000m 0 2560 225280 -6 363506 400000 1000m 0 2560 778240 -5 1454025 - 40000 2000m 0 2560 184320 -5 181753 - 100000 2000m 0 2560 393216 -5 363506 + 40000 2000m 0 2560 184320 -6 181753 + 100000 2000m 0 2560 393216 -6 363506 400000 2000m 0 2560 1445888 -5 1454025 - 40000 80000m 0 2560 5369856 -5 181753 - 100000 80000m 0 2560 13357056 -5 363506 + 40000 80000m 0 2560 5369856 -6 181753 + 100000 80000m 0 2560 13357056 -6 363506 400000 80000m 0 2560 53305344 -5 1454025 - 40000 120000m 0 2560 8028160 -5 181753 - 100000 120000m 0 2560 20004864 -5 363506 + 40000 120000m 0 2560 8028160 -6 181753 + 100000 120000m 0 2560 20004864 -6 363506 400000 120000m 0 2560 79900672 -5 1454025 diff --git a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/pg_profile_lookup.ini b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/pg_profile_lookup.ini index 99fbd830e2..ba784705e0 100644 --- a/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/pg_profile_lookup.ini +++ b/device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/pg_profile_lookup.ini @@ -1,17 +1,17 @@ # PG lossless profiles. # speed cable size xon xoff threshold xon_offset - 40000 300m 0 2560 69632 -5 181753 - 100000 300m 0 2560 110592 -5 363506 + 40000 300m 0 2560 69632 -6 181753 + 100000 300m 0 2560 110592 -6 363506 400000 300m 0 2560 315392 -5 1454025 - 40000 1000m 0 2560 114688 -5 181753 - 100000 1000m 0 2560 225280 -5 363506 + 40000 1000m 0 2560 114688 -6 181753 + 100000 1000m 0 2560 225280 -6 363506 400000 1000m 0 2560 778240 -5 1454025 - 40000 2000m 0 2560 184320 -5 181753 - 100000 2000m 0 2560 393216 -5 363506 + 40000 2000m 0 2560 184320 -6 181753 + 100000 2000m 0 2560 393216 -6 363506 400000 2000m 0 2560 1445888 -5 1454025 - 40000 80000m 0 2560 5369856 -5 181753 - 100000 80000m 0 2560 13357056 -5 363506 + 40000 80000m 0 2560 5369856 -6 181753 + 100000 80000m 0 2560 13357056 -6 363506 400000 80000m 0 2560 53305344 -5 1454025 - 40000 120000m 0 2560 8028160 -5 181753 - 100000 120000m 0 2560 20004864 -5 363506 + 40000 120000m 0 2560 8028160 -6 181753 + 100000 120000m 0 2560 20004864 -6 363506 400000 120000m 0 2560 79900672 -5 1454025 diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/pg_profile_lookup.ini b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/pg_profile_lookup.ini index 5670401e02..ba784705e0 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/pg_profile_lookup.ini +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/0/pg_profile_lookup.ini @@ -2,16 +2,16 @@ # speed cable size xon xoff threshold xon_offset 40000 300m 0 2560 69632 -6 181753 100000 300m 0 2560 110592 -6 363506 - 400000 300m 0 2560 315392 -6 1454025 + 400000 300m 0 2560 315392 -5 1454025 40000 1000m 0 2560 114688 -6 181753 100000 1000m 0 2560 225280 -6 363506 - 400000 1000m 0 2560 778240 -6 1454025 + 400000 1000m 0 2560 778240 -5 1454025 40000 2000m 0 2560 184320 -6 181753 100000 2000m 0 2560 393216 -6 363506 - 400000 2000m 0 2560 1445888 -6 1454025 + 400000 2000m 0 2560 1445888 -5 1454025 40000 80000m 0 2560 5369856 -6 181753 100000 80000m 0 2560 13357056 -6 363506 - 400000 80000m 0 2560 53305344 -6 1454025 + 400000 80000m 0 2560 53305344 -5 1454025 40000 120000m 0 2560 8028160 -6 181753 100000 120000m 0 2560 20004864 -6 363506 - 400000 120000m 0 2560 79900672 -6 1454025 + 400000 120000m 0 2560 79900672 -5 1454025 diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/pg_profile_lookup.ini b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/pg_profile_lookup.ini index b1dd17d9da..95e1af1e13 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/pg_profile_lookup.ini +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x100G/1/pg_profile_lookup.ini @@ -2,16 +2,16 @@ # speed cable size xon xoff threshold xon_offset 40000 300m 0 2560 69632 -6 181753 100000 300m 0 2560 110592 -6 363506 - 400000 300m 0 2560 315392 -6 1454025 + 400000 300m 0 2560 315392 -5 1454025 40000 1000m 0 2560 114688 -6 181753 100000 1000m 0 2560 225280 -6 363506 - 400000 1000m 0 2560 778240 -6 1454025 + 400000 1000m 0 2560 778240 -5 1454025 40000 2000m 0 2560 184320 -6 181753 100000 2000m 0 2560 393216 -6 363506 - 400000 2000m 0 2560 1445888 -6 1454025 + 400000 2000m 0 2560 1445888 -5 1454025 40000 80000m 0 2560 5369856 -6 181753 100000 80000m 0 2560 13357056 -6 363506 - 400000 80000m 0 2560 53305344 -6 1454025 + 400000 80000m 0 2560 53305344 -5 1454025 40000 120000m 0 2560 8028160 -6 181753 100000 120000m 0 2560 20004864 -6 363506 - 400000 120000m 0 2560 79900672 -6 1454025 + 400000 120000m 0 2560 79900672 -5 1454025 diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/pg_profile_lookup.ini b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/pg_profile_lookup.ini index 99fbd830e2..ba784705e0 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/pg_profile_lookup.ini +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/0/pg_profile_lookup.ini @@ -1,17 +1,17 @@ # PG lossless profiles. # speed cable size xon xoff threshold xon_offset - 40000 300m 0 2560 69632 -5 181753 - 100000 300m 0 2560 110592 -5 363506 + 40000 300m 0 2560 69632 -6 181753 + 100000 300m 0 2560 110592 -6 363506 400000 300m 0 2560 315392 -5 1454025 - 40000 1000m 0 2560 114688 -5 181753 - 100000 1000m 0 2560 225280 -5 363506 + 40000 1000m 0 2560 114688 -6 181753 + 100000 1000m 0 2560 225280 -6 363506 400000 1000m 0 2560 778240 -5 1454025 - 40000 2000m 0 2560 184320 -5 181753 - 100000 2000m 0 2560 393216 -5 363506 + 40000 2000m 0 2560 184320 -6 181753 + 100000 2000m 0 2560 393216 -6 363506 400000 2000m 0 2560 1445888 -5 1454025 - 40000 80000m 0 2560 5369856 -5 181753 - 100000 80000m 0 2560 13357056 -5 363506 + 40000 80000m 0 2560 5369856 -6 181753 + 100000 80000m 0 2560 13357056 -6 363506 400000 80000m 0 2560 53305344 -5 1454025 - 40000 120000m 0 2560 8028160 -5 181753 - 100000 120000m 0 2560 20004864 -5 363506 + 40000 120000m 0 2560 8028160 -6 181753 + 100000 120000m 0 2560 20004864 -6 363506 400000 120000m 0 2560 79900672 -5 1454025 diff --git a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/pg_profile_lookup.ini b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/pg_profile_lookup.ini index 99fbd830e2..ba784705e0 100644 --- a/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/pg_profile_lookup.ini +++ b/device/nokia/x86_64-nokia_ixr7250e_36x400g-r0/Nokia-IXR7250E-36x400G/1/pg_profile_lookup.ini @@ -1,17 +1,17 @@ # PG lossless profiles. # speed cable size xon xoff threshold xon_offset - 40000 300m 0 2560 69632 -5 181753 - 100000 300m 0 2560 110592 -5 363506 + 40000 300m 0 2560 69632 -6 181753 + 100000 300m 0 2560 110592 -6 363506 400000 300m 0 2560 315392 -5 1454025 - 40000 1000m 0 2560 114688 -5 181753 - 100000 1000m 0 2560 225280 -5 363506 + 40000 1000m 0 2560 114688 -6 181753 + 100000 1000m 0 2560 225280 -6 363506 400000 1000m 0 2560 778240 -5 1454025 - 40000 2000m 0 2560 184320 -5 181753 - 100000 2000m 0 2560 393216 -5 363506 + 40000 2000m 0 2560 184320 -6 181753 + 100000 2000m 0 2560 393216 -6 363506 400000 2000m 0 2560 1445888 -5 1454025 - 40000 80000m 0 2560 5369856 -5 181753 - 100000 80000m 0 2560 13357056 -5 363506 + 40000 80000m 0 2560 5369856 -6 181753 + 100000 80000m 0 2560 13357056 -6 363506 400000 80000m 0 2560 53305344 -5 1454025 - 40000 120000m 0 2560 8028160 -5 181753 - 100000 120000m 0 2560 20004864 -5 363506 + 40000 120000m 0 2560 8028160 -6 181753 + 100000 120000m 0 2560 20004864 -6 363506 400000 120000m 0 2560 79900672 -5 1454025 From dac861a06e676309636cafbc6c884ad1228fc900 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Thu, 27 Feb 2025 19:01:14 +0800 Subject: [PATCH 3/5] [submodule] Update submodule sonic-utilities to the latest HEAD automatically (#21859) #### Why I did it src/sonic-utilities ``` * 17a7b18b - (HEAD -> 202411, origin/202411) Fix `vnet_route_check` for active and inactive routes, add `--all` option (#3780) (2 days ago) [mssonicbld] ``` #### How I did it #### How to verify it #### Description for the changelog --- src/sonic-utilities | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sonic-utilities b/src/sonic-utilities index 5cc10123fe..17a7b18be2 160000 --- a/src/sonic-utilities +++ b/src/sonic-utilities @@ -1 +1 @@ -Subproject commit 5cc10123fe08f05ac176f9616f54964dac3329aa +Subproject commit 17a7b18be249ef0ef5234373a924cd0437957461 From f3dd569cd68e1be1b72dca28f63ea2f1ec4d2648 Mon Sep 17 00:00:00 2001 From: Tejaswini Chadaga <85581939+tjchadaga@users.noreply.github.com> Date: Fri, 28 Feb 2025 11:50:09 -0800 Subject: [PATCH 4/5] Update Broadcom DNX SAI to 12.3 and update kernel drivers (#21873) Update Broadcom DNX SAI to 12.3 and update kernel drivers --- platform/broadcom/sai-modules.mk | 2 +- platform/broadcom/sai.mk | 4 ++-- platform/broadcom/saibcm-modules-dnx | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/platform/broadcom/sai-modules.mk b/platform/broadcom/sai-modules.mk index ae65a00070..2eb459dd0d 100644 --- a/platform/broadcom/sai-modules.mk +++ b/platform/broadcom/sai-modules.mk @@ -10,7 +10,7 @@ $(BRCM_OPENNSL_KERNEL)_MACHINE = broadcom SONIC_DPKG_DEBS += $(BRCM_OPENNSL_KERNEL) # SAI bcm modules for DNX family ASIC -BRCM_DNX_OPENNSL_KERNEL_VERSION = 11.2.13.1-1 +BRCM_DNX_OPENNSL_KERNEL_VERSION = 12.3.2.2 BRCM_DNX_OPENNSL_KERNEL = opennsl-modules-dnx_$(BRCM_DNX_OPENNSL_KERNEL_VERSION)_amd64.deb $(BRCM_DNX_OPENNSL_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/saibcm-modules-dnx diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk index 326f481e3a..c186853a68 100644 --- a/platform/broadcom/sai.mk +++ b/platform/broadcom/sai.mk @@ -1,7 +1,7 @@ LIBSAIBCM_XGS_VERSION = 12.3.2.2 -LIBSAIBCM_DNX_VERSION = 11.2.13.1-1 +LIBSAIBCM_DNX_VERSION = 12.3.2.2 LIBSAIBCM_XGS_BRANCH_NAME = SAI_12.3.0_GA -LIBSAIBCM_DNX_BRANCH_NAME = SAI_11.2.0_GA +LIBSAIBCM_DNX_BRANCH_NAME = SAI_12.3.0_GA 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/sai-broadcom/$(LIBSAIBCM_DNX_BRANCH_NAME)/$(LIBSAIBCM_DNX_VERSION)/dnx" diff --git a/platform/broadcom/saibcm-modules-dnx b/platform/broadcom/saibcm-modules-dnx index 3a1e939bc2..dc9e885093 160000 --- a/platform/broadcom/saibcm-modules-dnx +++ b/platform/broadcom/saibcm-modules-dnx @@ -1 +1 @@ -Subproject commit 3a1e939bc2b7169953ebd89f2494341a34ed78f7 +Subproject commit dc9e88509398011df02db2e7efd030e796f4cb09 From d8287d8c54e2d8b8f8ee54c6dde31c9649081353 Mon Sep 17 00:00:00 2001 From: mssonicbld <79238446+mssonicbld@users.noreply.github.com> Date: Sat, 1 Mar 2025 07:00:48 +0800 Subject: [PATCH 5/5] [Mellanox] Fix the issue with sensors with discrete indexes initialization (#21890) #### Why I did it Fix the issue with the position calculation of the sensors with discrete indexes. ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it Pass the base position into `create_discrete_thermal` function instead of initializing the position with 1. #### How to verify it Run `snmp/test_snmp_phy_entity.py` sonic-mgmt test on the platform with discrete sensors. #### Which release branch to backport (provide reason below if selected) - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [ ] 202205 - [ ] 202211 - [ ] 202305 #### Tested branch (Please provide the tested image version) - [ ] - [ ] #### Description for the changelog #### Link to config_db schema for YANG module changes #### A picture of a cute animal (not mandatory but encouraged) --- .../mellanox/mlnx-platform-api/sonic_platform/thermal.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py index 8167885227..e4a48784ff 100644 --- a/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py +++ b/platform/mellanox/mlnx-platform-api/sonic_platform/thermal.py @@ -173,7 +173,10 @@ def initialize_chassis_thermals(): thermal_list.append(create_indexable_thermal(rule, index, CHASSIS_THERMAL_SYSFS_FOLDER, position)) position += 1 elif thermal_type == 'discrete': - thermal_list.extend(create_discrete_thermal(rule)) + discrete_thermals = create_discrete_thermal(rule, position) + if discrete_thermals: + position += len(discrete_thermals) + thermal_list.extend(discrete_thermals) else: thermal_object = create_single_thermal(rule, CHASSIS_THERMAL_SYSFS_FOLDER, position) if thermal_object: @@ -280,10 +283,9 @@ def create_single_thermal(rule, sysfs_folder, position, presence_cb=None): return RemovableThermal(name, temp_file, high_th_file, high_crit_th_file, high_th_default, high_crit_th_default, scale, position, presence_cb) -def create_discrete_thermal(rule): +def create_discrete_thermal(rule, position): search_pattern = rule.get('search_pattern') index_pattern = rule.get('index_pattern') - position = 1 thermal_list = [] for file_path in glob.iglob(search_pattern): file_name = os.path.basename(file_path)