Skip to content

Commit d1ce820

Browse files
dgsudharsandgsudharsan
committed
Merge remote-tracking branch 'upstream/202405' into 202405_frr_atomic_fix
2 parents d9770a6 + a3608dc commit d1ce820

File tree

112 files changed

+2031
-464
lines changed

Some content is hidden

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

112 files changed

+2031
-464
lines changed

‎device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-256x200G/th5-a7060x6-64pe.config.bcm

+6-40
Original file line numberDiff line numberDiff line change
@@ -1947,7 +1947,7 @@ device:
19471947
THRESHOLD_MODE: LOSSY_AND_LOSSLESS
19481948

19491949
TM_SCHEDULER_CONFIG:
1950-
NUM_MC_Q: NUM_MC_Q_2
1950+
NUM_MC_Q: NUM_MC_Q_4
19511951

19521952
...
19531953

@@ -2144,7 +2144,7 @@ device:
21442144
TM_PORT_MC_Q_TO_SERVICE_POOL:
21452145
?
21462146
PORT_ID: [[1,8], [11,18], [21,29], [33,40], [43,51], [55,62], [65,73], [76,84], [87,95], [99,106], [109,117], [121,128], [131,139], [143,150], [153,161], [165,172], [175,183], [187,194], [197,205], [209,216], [219,227], [231,238], [241,249], [253,260], [263,271], [274,282], [285,293], [297,304], [307,315], [319,326], [329,337], [341,348], 351]
2147-
TM_MC_Q_ID: [[0,1]]
2147+
TM_MC_Q_ID: [[0,3]]
21482148
:
21492149
USE_QGROUP_MIN: 0
21502150

@@ -2161,7 +2161,7 @@ device:
21612161
?
21622162
# uplink, downlink and loopback ports, 2 MC queues
21632163
PORT_ID: [[1,8], [11,18], [21,29], [33,40], [43,51], [55,62], [65,73], [76,84], [87,95], [99,106], [109,117], [121,128], [131,139], [143,150], [153,161], [165,172], [175,183], [187,194], [197,205], [209,216], [219,227], [231,238], [241,249], [253,260], [263,271], [274,282], [285,293], [297,304], [307,315], [319,326], [329,337], [341,348], 351]
2164-
TM_MC_Q_ID: [[0,1]]
2164+
TM_MC_Q_ID: [[0,3]]
21652165
:
21662166
MIN_GUARANTEE_CELLS: 0
21672167
SHARED_LIMITS: 1
@@ -2622,7 +2622,7 @@ device:
26222622
TM_PORT_UC_Q_TO_SERVICE_POOL:
26232623
?
26242624
PORT_ID: [[1,8], [11,18], [21,29], [33,40], [43,51], [55,62], [65,73], [76,84], [87,95], [99,106], [109,117], [121,128], [131,139], [143,150], [153,161], [165,172], [175,183], [187,194], [197,205], [209,216], [219,227], [231,238], [241,249], [253,260], [263,271], [274,282], [285,293], [297,304], [307,315], [319,326], [329,337], [341,348], 351]
2625-
TM_UC_Q_ID: [0,1,2,5,6,8,9]
2625+
TM_UC_Q_ID: [0,1,2,5,6]
26262626
:
26272627
USE_QGROUP_MIN: 0
26282628
TM_EGR_SERVICE_POOL_ID: 0
@@ -2648,7 +2648,7 @@ device:
26482648
TM_EGR_SERVICE_POOL_ID: 1
26492649
?
26502650
PORT_ID: [[1,8], [11,18], [21,29], [33,40], [43,51], [55,62], [65,73], [76,84], [87,95], [99,106], [109,117], [121,128], [131,139], [143,150], [153,161], [165,172], [175,183], [187,194], [197,205], [209,216], [219,227], [231,238], [241,249], [253,260], [263,271], [274,282], [285,293], [297,304], [307,315], [319,326], [329,337], [341,348], 351]
2651-
TM_MC_Q_ID: [[0,1]]
2651+
TM_MC_Q_ID: [[0,3]]
26522652
:
26532653
USE_QGROUP_MIN: 0
26542654
TM_EGR_SERVICE_POOL_ID: 0
@@ -2676,23 +2676,6 @@ device:
26762676
YELLOW_LIMIT_DYNAMIC: PERCENTAGE_750
26772677
RED_LIMIT_CELLS_STATIC: 0
26782678
RED_LIMIT_DYNAMIC: PERCENTAGE_625
2679-
?
2680-
PORT_ID: [[1,8], [11,18], [22,29], [33,40], [44,51], [55,62], [66,73], [77,84], [88,95], [99,106], [110,117], [121,128], [132,139], [143,150], [154,161], [165,172]]
2681-
TM_UC_Q_ID: [8,9]
2682-
:
2683-
MIN_GUARANTEE_CELLS: 0
2684-
SHARED_LIMITS: 1
2685-
DYNAMIC_SHARED_LIMITS: 1
2686-
SHARED_LIMIT_CELLS_STATIC: 0
2687-
SHARED_LIMIT_DYNAMIC: ALPHA_1
2688-
DYNAMIC_GROUP: MID_PRI_GROUP
2689-
RESUME_OFFSET_CELLS: 2
2690-
COLOR_SPECIFIC_LIMITS: 0
2691-
COLOR_SPECIFIC_DYNAMIC_LIMITS: 0
2692-
YELLOW_LIMIT_CELLS_STATIC: 0
2693-
YELLOW_LIMIT_DYNAMIC: PERCENTAGE_750
2694-
RED_LIMIT_CELLS_STATIC: 0
2695-
RED_LIMIT_DYNAMIC: PERCENTAGE_625
26962679
?
26972680
PORT_ID: [[1,8], [11,18], [22,29], [33,40], [44,51], [55,62], [66,73], [77,84], [88,95], [99,106], [110,117], [121,128], [132,139], [143,150], [154,161], [165,172]]
26982681
TM_UC_Q_ID: [3,4]
@@ -2724,23 +2707,6 @@ device:
27242707
YELLOW_LIMIT_DYNAMIC: PERCENTAGE_750
27252708
RED_LIMIT_CELLS_STATIC: 0
27262709
RED_LIMIT_DYNAMIC: PERCENTAGE_625
2727-
?
2728-
PORT_ID: [[176,183], [187,194], [198,205], [209,216], [220,227], [231,238], [242,249], [253,260], [264,271], [275,282], [286,293], [297,304], [308,315], [319,326], [330,337], [341,348]]
2729-
TM_UC_Q_ID: [8,9]
2730-
:
2731-
MIN_GUARANTEE_CELLS: 0
2732-
SHARED_LIMITS: 1
2733-
DYNAMIC_SHARED_LIMITS: 1
2734-
SHARED_LIMIT_CELLS_STATIC: 0
2735-
SHARED_LIMIT_DYNAMIC: ALPHA_1
2736-
DYNAMIC_GROUP: MID_PRI_GROUP
2737-
RESUME_OFFSET_CELLS: 2
2738-
COLOR_SPECIFIC_LIMITS: 0
2739-
COLOR_SPECIFIC_DYNAMIC_LIMITS: 0
2740-
YELLOW_LIMIT_CELLS_STATIC: 0
2741-
YELLOW_LIMIT_DYNAMIC: PERCENTAGE_750
2742-
RED_LIMIT_CELLS_STATIC: 0
2743-
RED_LIMIT_DYNAMIC: PERCENTAGE_625
27442710
?
27452711
PORT_ID: [[176,183], [187,194], [198,205], [209,216], [220,227], [231,238], [242,249], [253,260], [264,271], [275,282], [286,293], [297,304], [308,315], [319,326], [330,337], [341,348]]
27462712
TM_UC_Q_ID: [3,4]
@@ -2778,7 +2744,7 @@ device:
27782744
RESUME_OFFSET_CELLS: 2
27792745
?
27802746
PORT_ID: [[1,8], [11,18], [21,29], [33,40], [43,51], [55,62], [65,73], [76,84], [87,95], [99,106], [109,117], [121,128], [131,139], [143,150], [153,161], [165,172], [175,183], [187,194], [197,205], [209,216], [219,227], [231,238], [241,249], [253,260], [263,271], [274,282], [285,293], [297,304], [307,315], [319,326], [329,337], [341,348], 351]
2781-
TM_MC_Q_ID: [0,1]
2747+
TM_MC_Q_ID: [0,3]
27822748
SHARED_LIMIT_DYNAMIC: ALPHA_2
27832749
:
27842750
SHARED_LIMITS: 1

‎device/arista/x86_64-arista_7800r3_48cq2_lc/services.conf

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
startup_tsa_tsb.service

‎device/arista/x86_64-arista_7800r3_48cq2_lc/startup-tsa-tsb.conf

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
STARTUP_TSB_TIMER=900

‎device/arista/x86_64-arista_7800r3_48cqm2_lc/services.conf

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
startup_tsa_tsb.service

‎device/arista/x86_64-arista_7800r3_48cqm2_lc/startup-tsa-tsb.conf

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
STARTUP_TSB_TIMER=900

‎device/arista/x86_64-arista_7800r3a_36d2_lc/services.conf

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
startup_tsa_tsb.service

‎device/arista/x86_64-arista_7800r3a_36d2_lc/startup-tsa-tsb.conf

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
STARTUP_TSB_TIMER=900

‎device/mellanox/x86_64-mlnx_msn2700-r0/pmon_daemon_control.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"skip_ledd": true,
33
"skip_fancontrol": true,
44
"delay_xcvrd": true,
5-
"skip_xcvrd_cmis_mgr": true
5+
"skip_xcvrd_cmis_mgr": true,
6+
"delay_non_critical_daemon": true
67
}
78

‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256X1/buffers.json.j2 ‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/buffers.json.j2

File renamed without changes.

‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256X1/buffers_defaults_objects.j2 ‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/buffers_defaults_objects.j2

File renamed without changes.

‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256X1/buffers_defaults_t0.j2 ‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/buffers_defaults_t0.j2

+5-4
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 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
34
Apache-2.0
45
56
Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,10 +16,10 @@
1516
limitations under the License.
1617
#}
1718
{% set default_cable = '40m' %}
18-
{% set ingress_lossless_pool_size = '118249472' %}
19-
{% set ingress_lossless_pool_xoff = '15728640' %}
19+
{% set ingress_lossless_pool_size = '115245056' %}
20+
{% set ingress_lossless_pool_xoff = '14826496' %}
2021
{% set egress_lossless_pool_size = '158229504' %}
21-
{% set egress_lossy_pool_size = '118249472' %}
22+
{% set egress_lossy_pool_size = '115245056' %}
2223

2324
{% import 'buffers_defaults_objects.j2' as defs with context %}
2425

‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256X1/buffers_defaults_t1.j2 ‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/buffers_defaults_t1.j2

+2-1
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 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
34
Apache-2.0
45
56
Licensed under the Apache License, Version 2.0 (the "License");

‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256X1/buffers_dynamic.json.j2 ‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/buffers_dynamic.json.j2

+2-1
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 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
34
Apache-2.0
45
Licensed under the Apache License, Version 2.0 (the "License");
56
you may not use this file except in compliance with the License.

‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256X1/create_only_config_db_buffers.json ‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/create_only_config_db_buffers.json

File renamed without changes.

‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256X1/media_settings.json ‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/media_settings.json

File renamed without changes.

‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256X1/optics_si_settings.json ‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/optics_si_settings.json

File renamed without changes.

‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/pg_profile_lookup.ini

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
##
2+
## SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
3+
## Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
4+
## Apache-2.0
5+
##
6+
## Licensed under the Apache License, Version 2.0 (the "License");
7+
## you may not use this file except in compliance with the License.
8+
## You may obtain a copy of the License at
9+
##
10+
## http://www.apache.org/licenses/LICENSE-2.0
11+
##
12+
## Unless required by applicable law or agreed to in writing, software
13+
## distributed under the License is distributed on an "AS IS" BASIS,
14+
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
## See the License for the specific language governing permissions and
16+
## limitations under the License.
17+
##
18+
# PG lossless profiles.
19+
# speed cable size xon xoff threshold
20+
10000 5m 19456 19456 20480 0
21+
25000 5m 19456 19456 21504 0
22+
40000 5m 19456 19456 24576 0
23+
50000 5m 19456 19456 26624 0
24+
100000 5m 19456 19456 44032 0
25+
200000 5m 19456 19456 50176 0
26+
400000 5m 19456 19456 86016 0
27+
800000 5m 38912 38912 95232 0
28+
10000 40m 19456 19456 20480 0
29+
25000 40m 19456 19456 22528 0
30+
40000 40m 19456 19456 25600 0
31+
50000 40m 19456 19456 28672 0
32+
100000 40m 19456 19456 49152 0
33+
200000 40m 19456 19456 60416 0
34+
400000 40m 19456 19456 104448 0
35+
800000 40m 38912 38912 132096 0
36+
10000 250m 43008 19456 23552 0
37+
25000 250m 19456 19456 29696 0
38+
40000 250m 19456 19456 36864 0
39+
50000 250m 19456 19456 43008 0
40+
100000 250m 19456 19456 76800 0
41+
200000 250m 19456 19456 116736 0
42+
400000 250m 19456 19456 217088 0
43+
800000 250m 38912 38912 357376 0
44+
10000 300m 19456 19456 23552 0
45+
25000 300m 19456 19456 30720 0
46+
40000 300m 19456 19456 39936 0
47+
50000 300m 19456 19456 46080 0
48+
100000 300m 19456 19456 83968 0
49+
200000 300m 19456 19456 130048 0
50+
400000 300m 19456 19456 243712 0
51+
800000 300m 38912 38912 411648 0

‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256X1/pmon_daemon_control.json ‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/pmon_daemon_control.json

File renamed without changes.

‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256X1/port_config.ini ‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/port_config.ini

+3-2
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 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
34
## Apache-2.0
45
##
56
## Licensed under the Apache License, Version 2.0 (the "License");
@@ -272,4 +273,4 @@ Ethernet500 500 etp63e 63 100000
272273
Ethernet501 501 etp63f 63 100000 rs off 6
273274
Ethernet502 502 etp63g 63 100000 rs off 7
274275
Ethernet503 503 etp63h 63 100000 rs off 8
275-
Ethernet512 512 etp65 65 25000 rs
276+
Ethernet512 512 etp65 65 10000 rs

‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256X1/qos.json.j2 ‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/qos.json.j2

File renamed without changes.

‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256X1/sai.profile ‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/sai.profile

File renamed without changes.

‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256X1/sai_5600_256x100g.xml ‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/sai_5600_256x100g.xml

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0"?>
22
<!--
3-
Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES.
3+
SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
4+
Copyright (c) 2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
45
Apache-2.0
56
67
Licensed under the Apache License, Version 2.0 (the "License");

‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256S1/supporting_bulk_counter_groups

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
QUEUE_WATERMARK_STAT_COUNTER,PG_WATERMARK_STAT_COUNTER,PFC_WD

‎device/mellanox/x86_64-nvidia_sn5600-r0/Mellanox-SN5600-C256X1/pg_profile_lookup.ini

-42
This file was deleted.

‎device/nokia/arm64-nokia_ixs7215_52xb-r0/Nokia-7215-A1/ASK-Board-AC5X-xb.md5

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
f3d3345bef9c6ac4eea19c6170e92970
1+
7333f3669bbbd18bcc3890028d7afb39

0 commit comments

Comments
 (0)