Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305 #455

Merged
merged 2 commits into from
Sep 11, 2024
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305 #455

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1179cc2
[Mellanox]: Add Mellanox-SN4600C-D24C52 SKU. (#20141)
nazariig Sep 11, 2024
a65fe48
Merge branch '202305' of https://github.com/sonic-net/sonic-buildimag…
mssonicbld Sep 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D24C52/buffers.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../ACS-MSN4600C/buffers.json.j2
1 change: 1 addition & 0 deletions device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D24C52/buffers_defaults_objects.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../x86_64-mlnx_msn2700-r0/Mellanox-SN2700-D48C8/buffers_defaults_objects.j2
39 changes: 39 additions & 0 deletions device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D24C52/buffers_defaults_t0.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{#
Copyright (c) 2020-2021 NVIDIA CORPORATION & AFFILIATES.
Apache-2.0

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
#}
{% set default_cable = '2m' %}
{% set ingress_lossless_pool_size = '57176064' %}
{% set ingress_lossless_pool_xoff = '1099776' %}
{% set egress_lossless_pool_size = '60817392' %}
{% set egress_lossy_pool_size = '57176064' %}

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

{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
{%- endmacro %}

{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
{%- endmacro %}

{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
{%- endmacro %}

{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
{%- endmacro %}
39 changes: 39 additions & 0 deletions device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D24C52/buffers_defaults_t1.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{#
Copyright (c) 2020-2021 NVIDIA CORPORATION & AFFILIATES.
Apache-2.0

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
#}
{% set default_cable = '40m' %}
{% set ingress_lossless_pool_size = '57099264' %}
{% set ingress_lossless_pool_xoff = '1176576' %}
{% set egress_lossless_pool_size = '60817392' %}
{% set egress_lossy_pool_size = '57099264' %}

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

{%- macro generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) %}
{{ defs.generate_buffer_pool_and_profiles_with_inactive_ports(port_names_inactive) }}
{%- endmacro %}

{%- macro generate_profile_lists_with_inactive_ports(port_names_active, port_names_inactive) %}
{{ defs.generate_profile_lists(port_names_active, port_names_inactive) }}
{%- endmacro %}

{%- macro generate_queue_buffers_with_inactive_ports(port_names_active, port_names_inactive) %}
{{ defs.generate_queue_buffers(port_names_active, port_names_inactive) }}
{%- endmacro %}

{%- macro generate_pg_profiles_with_inactive_ports(port_names_active, port_names_inactive) %}
{{ defs.generate_pg_profiles(port_names_active, port_names_inactive) }}
{%- endmacro %}
1 change: 1 addition & 0 deletions device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D24C52/buffers_dynamic.json.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../../x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_dynamic.json.j2
232 changes: 232 additions & 0 deletions device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D24C52/hwsku.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,232 @@
{
"interfaces": {
"Ethernet0":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet4":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet8":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet12":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet16":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet20":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet24":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet28":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet32":{
"default_brkout_mode": "2x50G[25G,10G,1G]"
},
"Ethernet34":{
"default_brkout_mode": "2x50G[25G,10G,1G]"
},
"Ethernet36":{
"default_brkout_mode": "2x50G[25G,10G,1G]"
},
"Ethernet38":{
"default_brkout_mode": "2x50G[25G,10G,1G]"
},
"Ethernet40":{
"default_brkout_mode": "2x50G[25G,10G,1G]"
},
"Ethernet42":{
"default_brkout_mode": "2x50G[25G,10G,1G]"
},
"Ethernet44":{
"default_brkout_mode": "2x50G[25G,10G,1G]"
},
"Ethernet46":{
"default_brkout_mode": "2x50G[25G,10G,1G]"
},
"Ethernet48":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet52":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet56":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet60":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet64":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet68":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet72":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet76":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet80":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet84":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet88":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet92":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet96":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet100":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet104":{
"default_brkout_mode": "2x50G[25G,10G,1G]"
},
"Ethernet106":{
"default_brkout_mode": "2x50G[25G,10G,1G]"
},
"Ethernet108":{
"default_brkout_mode": "2x50G[25G,10G,1G]"
},
"Ethernet110":{
"default_brkout_mode": "2x50G[25G,10G,1G]"
},
"Ethernet112":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet116":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet120":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet124":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet128":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet132":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet136":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet140":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet144":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet148":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet152":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet156":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet160":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet164":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet168":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet172":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet176":{
"default_brkout_mode": "2x50G[25G,10G,1G]"
},
"Ethernet178":{
"default_brkout_mode": "2x50G[25G,10G,1G]"
},
"Ethernet180":{
"default_brkout_mode": "2x50G[25G,10G,1G]"
},
"Ethernet182":{
"default_brkout_mode": "2x50G[25G,10G,1G]"
},
"Ethernet184":{
"default_brkout_mode": "2x50G[25G,10G,1G]"
},
"Ethernet186":{
"default_brkout_mode": "2x50G[25G,10G,1G]"
},
"Ethernet188":{
"default_brkout_mode": "2x50G[25G,10G,1G]"
},
"Ethernet190":{
"default_brkout_mode": "2x50G[25G,10G,1G]"
},
"Ethernet192":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet196":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet200":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet204":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet208":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet212":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet216":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet220":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet224":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet228":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet232":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet236":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet240":{
"default_brkout_mode": "2x50G[25G,10G,1G]"
},
"Ethernet242":{
"default_brkout_mode": "2x50G[25G,10G,1G]"
},
"Ethernet244":{
"default_brkout_mode": "2x50G[25G,10G,1G]"
},
"Ethernet246":{
"default_brkout_mode": "2x50G[25G,10G,1G]"
},
"Ethernet248":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
},
"Ethernet252":{
"default_brkout_mode": "1x100G[50G,40G,25G,10G,1G]"
}
}
}
44 changes: 44 additions & 0 deletions device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-D24C52/pg_profile_lookup.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
##
## Copyright (c) 2019-2021 NVIDIA CORPORATION & AFFILIATES.
## Apache-2.0
##
## Licensed under the Apache License, Version 2.0 (the "License");
## you may not use this file except in compliance with the License.
## You may obtain a copy of the License at
##
## http://www.apache.org/licenses/LICENSE-2.0
##
## Unless required by applicable law or agreed to in writing, software
## distributed under the License is distributed on an "AS IS" BASIS,
## WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
## See the License for the specific language governing permissions and
## limitations under the License.
##

# PG lossless profiles
# speed cable size xon xoff threshold
10000 2m 19456 19456 18432 0
25000 2m 19456 19456 19456 0
40000 2m 19456 19456 21504 0
50000 2m 19456 19456 23552 0
100000 2m 19456 19456 41984 0
10000 5m 19456 19456 18432 0
25000 5m 19456 19456 19456 0
40000 5m 19456 19456 21504 0
50000 5m 19456 19456 24576 0
100000 5m 19456 19456 43008 0
10000 40m 19456 19456 18432 0
25000 40m 19456 19456 20480 0
40000 40m 19456 19456 23552 0
50000 40m 19456 19456 26624 0
100000 40m 19456 19456 48128 0
10000 300m 19456 19456 22528 0
25000 300m 19456 19456 29696 0
40000 300m 19456 19456 38912 0
50000 300m 19456 19456 45056 0
100000 300m 19456 19456 84992 0
10000 2000m 19456 19456 47104 0
25000 2000m 19456 19456 91136 0
40000 2000m 19456 19456 137216 0
50000 2000m 19456 19456 168960 0
100000 2000m 19456 19456 331776 0
Loading
Loading