Skip to content

Commit 93b4201

Browse files
gpunathilellgpunathilell
authored
Merge branch 'sonic-net:master' into Fix_sm_mnt
2 parents 8c45a4b + e54a984 commit 93b4201

File tree

74 files changed

+1179
-760
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

74 files changed

+1179
-760
lines changed

‎device/arista/x86_64-arista_7800r3_48cq2_lc/Arista-7800R3-48CQ2-C48/jr2-a7280cr3-32d4-40x100G.config.bcm

+2
Original file line numberDiff line numberDiff line change
@@ -863,3 +863,5 @@ dma_desc_aggregator_enable_specific_MDB_FEC.BCM8869X=1
863863
sai_pfc_dlr_init_capability=0
864864
sai_default_cpu_tx_tc=7
865865
sai_disable_srcmacqedstmac_ctrl=1
866+
appl_param_active_links_thr_high=58
867+
appl_param_active_links_thr_low=1

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/0/j2p-a7800r3a-36d-36x400G.config.bcm

+2
Original file line numberDiff line numberDiff line change
@@ -1017,3 +1017,5 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=2
10171017
sai_pfc_dlr_init_capability=0
10181018
sai_default_cpu_tx_tc=7
10191019
sai_disable_srcmacqedstmac_ctrl=1
1020+
appl_param_active_links_thr_high=91
1021+
appl_param_active_links_thr_low=1

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C36/1/j2p-a7800r3a-36d-36x400G.config.bcm

+2
Original file line numberDiff line numberDiff line change
@@ -1017,3 +1017,5 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=2
10171017
sai_pfc_dlr_init_capability=0
10181018
sai_default_cpu_tx_tc=7
10191019
sai_disable_srcmacqedstmac_ctrl=1
1020+
appl_param_active_links_thr_high=91
1021+
appl_param_active_links_thr_low=1

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/0/j2p-a7800r3a-36d-36x400G.config.bcm

+2
Original file line numberDiff line numberDiff line change
@@ -1034,3 +1034,5 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
10341034
sai_pfc_dlr_init_capability=0
10351035
sai_default_cpu_tx_tc=7
10361036
sai_disable_srcmacqedstmac_ctrl=1
1037+
appl_param_active_links_thr_high=91
1038+
appl_param_active_links_thr_low=1

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-C72/1/j2p-a7800r3a-36d-36x400G.config.bcm

+2
Original file line numberDiff line numberDiff line change
@@ -1034,3 +1034,5 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
10341034
sai_pfc_dlr_init_capability=0
10351035
sai_default_cpu_tx_tc=7
10361036
sai_disable_srcmacqedstmac_ctrl=1
1037+
appl_param_active_links_thr_high=91
1038+
appl_param_active_links_thr_low=1

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/0/j2p-a7800r3a-36d-36x400G.config.bcm

+2
Original file line numberDiff line numberDiff line change
@@ -1054,3 +1054,5 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
10541054
sai_pfc_dlr_init_capability=0
10551055
sai_default_cpu_tx_tc=7
10561056
sai_disable_srcmacqedstmac_ctrl=1
1057+
appl_param_active_links_thr_high=91
1058+
appl_param_active_links_thr_low=1

‎device/arista/x86_64-arista_7800r3a_36d2_lc/Arista-7800R3A-36D2-D36/1/j2p-a7800r3a-36d-36x400G.config.bcm

+2
Original file line numberDiff line numberDiff line change
@@ -1054,3 +1054,5 @@ xflow_macsec_secure_chan_to_num_secure_assoc_decrypt=4
10541054
sai_pfc_dlr_init_capability=0
10551055
sai_default_cpu_tx_tc=7
10561056
sai_disable_srcmacqedstmac_ctrl=1
1057+
appl_param_active_links_thr_high=91
1058+
appl_param_active_links_thr_low=1

‎device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O28/buffers_defaults_objects.j2

+3-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{#
2-
Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
2+
SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
3+
Copyright (c) 2024-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
34
Apache-2.0
45
56
Licensed under the Apache License, Version 2.0 (the "License");
@@ -92,8 +93,7 @@
9293
"BUFFER_PG": {
9394
"Dpc": {
9495
"active": {
95-
"dynamic": "ingress_lossy_profile",
96-
"static": "ingress_lossy_profile"
96+
"dynamic": "NULL"
9797
},
9898
"inactive": {
9999
"dynamic": "ingress_lossy_profile",
@@ -361,12 +361,6 @@
361361
"{{ port }}|3-4": {
362362
"profile" : {{find_profile_to_attach('BUFFER_PG', port, 'active', 'dynamic')}}
363363
},
364-
{% else %}
365-
{% if port in PORT_DPC %}
366-
"{{ port }}|3-4": {
367-
"profile" : {{find_profile_to_attach('BUFFER_PG', port, 'active', 'static')}}
368-
},
369-
{% endif %}
370364
{% endif %}
371365
"{{ port }}|0": {
372366
"profile" : "ingress_lossy_profile"

‎device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-O32/pg_profile_lookup.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../../x86_64-nvidia_sn4280-r0/ACS-SN4280/pg_profile_lookup.ini
1+
../Mellanox-SN4700-O8C48/pg_profile_lookup.ini

‎device/mellanox/x86_64-mlnx_msn4700-r0/Mellanox-SN4700-V64/pg_profile_lookup.ini

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../../x86_64-nvidia_sn4280-r0/ACS-SN4280/pg_profile_lookup.ini
1+
../Mellanox-SN4700-O8C48/pg_profile_lookup.ini

‎device/mellanox/x86_64-nvidia_sn4280-r0/ACS-SN4280/buffers.json.j2

-18
This file was deleted.

‎device/mellanox/x86_64-nvidia_sn4280-r0/ACS-SN4280/buffers_defaults_objects.j2

-1
This file was deleted.

‎device/mellanox/x86_64-nvidia_sn4280-r0/ACS-SN4280/buffers_defaults_t0.j2

-43
This file was deleted.

‎device/mellanox/x86_64-nvidia_sn4280-r0/ACS-SN4280/buffers_defaults_t1.j2

-44
This file was deleted.

‎device/mellanox/x86_64-nvidia_sn4280-r0/ACS-SN4280/buffers_dynamic.json.j2

-19
This file was deleted.

‎device/mellanox/x86_64-nvidia_sn4280-r0/ACS-SN4280/hwsku.json

-140
This file was deleted.

0 commit comments

Comments
 (0)