Skip to content

Commit 68fdc5d

Browse files
authored
Backport SmartSAF enable and Scale NHG for DT2 HWSKU (sonic-net#1769)
Changes missing from msft_202503: sonic-net#23908 sonic-net#23722 Was already added for Arista-7060X6-64PE-B-O128 in Azure/sonic-buildimage-msft#1674 <!-- Please make sure you've read and understood our contributing guidelines: https://github.com/Azure/SONiC/blob/gh-pages/CONTRIBUTING.md ** Make sure all your commits include a signature generated with `git commit -s` ** If this is a bug fix, make sure your description includes "fixes #xxxx", or "closes #xxxx" or "resolves #xxxx" Please provide the following information: --> #### Why I did it ##### Work item tracking - Microsoft ADO **(number only)**: #### How I did it #### How to verify it <!-- If PR needs to be backported, then the PR must be tested against the base branch and the earliest backport release branch and provide tested image version on these two branches. For example, if the PR is requested for master, 202211 and 202012, then the requester needs to provide test results on master and 202012. --> #### Which release branch to backport (provide reason below if selected) <!-- - Note we only backport fixes to a release branch, *not* features! - Please also provide a reason for the backporting below. - e.g. - [x] 202006 --> - [ ] 201811 - [ ] 201911 - [ ] 202006 - [ ] 202012 - [ ] 202106 - [ ] 202111 - [ ] 202205 - [ ] 202211 #### Tested branch (Please provide the tested image version) <!-- - Please provide tested image version - e.g. - [x] 20201231.100 --> - [ ] <!-- image version 1 --> - [ ] <!-- image version 2 --> #### Description for the changelog <!-- Write a short (one line) summary that describes the changes in this pull request for inclusion in the changelog: --> <!-- Ensure to add label/tag for the feature raised. example - PR#2174 under sonic-utilities repo. where, Generic Config and Update feature has been labelled as GCU. --> #### Link to config_db schema for YANG module changes <!-- Provide a link to config_db schema for the table for which YANG model is defined Link should point to correct section on https://github.com/Azure/sonic-buildimage/blob/master/src/sonic-yang-models/doc/Configuration.md --> #### A picture of a cute animal (not mandatory but encouraged)
2 parents 01ba2a4 + 068c9a7 commit 68fdc5d

6 files changed

Lines changed: 32 additions & 8 deletions

File tree

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th5-a7060x6-64pe.config.bcm
22
SAI_NUM_ECMP_MEMBERS=100
3+
SAI_NHG_HIERARCHICAL_NEXTHOP=false

device/arista/x86_64-arista_7060x6_64pe_b/Arista-7060X6-64PE-B-P28O72/th5-a7060x6-64pe.config.bcm

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ bcm_device:
4141
pfc_deadlock_seq_control : 1
4242
sai_tunnel_support: 2
4343
bcm_tunnel_term_compatible_mode: 1
44-
l3_ecmp_member_first_lkup_mem_size: 12288
44+
l3_ecmp_member_first_lkup_mem_size: 0
45+
l3_ecmp_member_secondary_mem_size: 0
4546
stat_custom_receive0_management_mode: 1
4647

4748
---
@@ -1307,3 +1308,10 @@ device:
13071308
DEVICE_CONFIG:
13081309
AUTOLOAD_BOARD_SETTINGS: 0
13091310
...
1311+
# Initialize SmartSAF functionality
1312+
---
1313+
device:
1314+
0:
1315+
TM_SMART_STORE_AND_FORWARD_CONFIG:
1316+
SMART_STORE_AND_FORWARD: 1
1317+
...
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th5-a7060x6-64pe.config.bcm
2-
SAI_NUM_ECMP_MEMBERS=96
2+
SAI_NUM_ECMP_MEMBERS=96
3+
SAI_NHG_HIERARCHICAL_NEXTHOP=false

device/arista/x86_64-arista_7060x6_64pe_b/Arista-7060X6-64PE-B-P32O64/th5-a7060x6-64pe.config.bcm

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ bcm_device:
4141
pfc_deadlock_seq_control : 1
4242
sai_tunnel_support: 2
4343
bcm_tunnel_term_compatible_mode: 1
44-
l3_ecmp_member_first_lkup_mem_size: 12288
44+
l3_ecmp_member_first_lkup_mem_size: 0
4545
stat_custom_receive0_management_mode: 1
4646
l3_alpm_large_vrf_mode: 1
47-
l3_ecmp_member_secondary_mem_size: 4096
47+
l3_ecmp_member_secondary_mem_size: 0
4848
sai_mmu_custom_config: 1
4949
sai_pfc_dlr_init_capability: 2
5050
---
@@ -2575,4 +2575,10 @@ device:
25752575
TRAFFIC_CLASS: OBM_TC_LOSSLESS0
25762576

25772577
...
2578-
2578+
# Initialize SmartSAF functionality
2579+
---
2580+
device:
2581+
0:
2582+
TM_SMART_STORE_AND_FORWARD_CONFIG:
2583+
SMART_STORE_AND_FORWARD: 1
2584+
...
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/th5-a7060x6-64pe.config.bcm
2-
SAI_NUM_ECMP_MEMBERS=64
2+
SAI_NUM_ECMP_MEMBERS=64
3+
SAI_NHG_HIERARCHICAL_NEXTHOP=false

device/arista/x86_64-arista_7060x6_64pe_b/Arista-7060X6-64PE-B-P64/th5-a7060x6-64pe.config.bcm

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,10 @@ bcm_device:
4141
pfc_deadlock_seq_control : 1
4242
sai_tunnel_support: 2
4343
bcm_tunnel_term_compatible_mode: 1
44-
l3_ecmp_member_first_lkup_mem_size: 12288
44+
l3_ecmp_member_first_lkup_mem_size: 0
4545
stat_custom_receive0_management_mode: 1
4646
l3_alpm_large_vrf_mode: 1
47-
l3_ecmp_member_secondary_mem_size: 4096
47+
l3_ecmp_member_secondary_mem_size: 0
4848
sai_mmu_custom_config: 1
4949
sai_pfc_dlr_init_capability: 2
5050
---
@@ -2319,4 +2319,11 @@ device:
23192319
:
23202320
TRAFFIC_CLASS: OBM_TC_LOSSLESS0
23212321

2322+
...
2323+
# Initialize SmartSAF functionality
2324+
---
2325+
device:
2326+
0:
2327+
TM_SMART_STORE_AND_FORWARD_CONFIG:
2328+
SMART_STORE_AND_FORWARD: 1
23222329
...

0 commit comments

Comments
 (0)