Skip to content

Commit

Permalink
Add buffer configs for TH5 C224 and C256 SKUs
Browse files Browse the repository at this point in the history 
<!--
     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
- [ ] 202305

#### 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)
  • Loading branch information
@mssonicbld
mssonicbld committed Feb 11, 2025
1 parent b28c2b4 commit 67c8a3a
Show file tree
Hide file tree
Showing 11 changed files with 446 additions and 6 deletions.
1 change: 0 additions & 1 deletion device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-C224O8/buffers_defaults_t0.j2
View file

This file was deleted.

30 changes: 30 additions & 0 deletions device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-C224O8/buffers_defaults_t0.j2
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{%- set default_cable = '0m' %}

{%- include 'buffer_ports.j2' %}

{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossy_pool": {
"size": "166607744",
"type": "ingress",
"mode": "dynamic"
},
"egress_lossy_pool": {
"size": "166607744",
"type": "egress",
"mode": "dynamic"
}
},
"BUFFER_PROFILE": {
"ingress_lossy_profile": {
"pool": "ingress_lossy_pool",
"size": "0",
"static_th": "167546528"
},
"egress_lossy_profile": {
"pool": "egress_lossy_pool",
"size": "1778",
"dynamic_th": "1"
}
},
{%- endmacro %}
1 change: 0 additions & 1 deletion device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-C224O8/buffers_defaults_t1.j2
View file

This file was deleted.

30 changes: 30 additions & 0 deletions device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-C224O8/buffers_defaults_t1.j2
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
{%- set default_cable = '0m' %}

{%- include 'buffer_ports.j2' %}

{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossy_pool": {
"size": "166607744",
"type": "ingress",
"mode": "dynamic"
},
"egress_lossy_pool": {
"size": "166607744",
"type": "egress",
"mode": "dynamic"
}
},
"BUFFER_PROFILE": {
"ingress_lossy_profile": {
"pool": "ingress_lossy_pool",
"size": "0",
"static_th": "167546528"
},
"egress_lossy_profile": {
"pool": "egress_lossy_pool",
"size": "1778",
"dynamic_th": "1"
}
},
{%- endmacro %}
142 changes: 142 additions & 0 deletions device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-C224O8/qos.json.j2
View file
Original file line number Diff line number Diff line change
@@ -1 +1,143 @@
{%- macro generate_dscp_to_tc_map_per_sku() -%}
"DSCP_TO_TC_MAP": {
"AZURE": {
"0" : "0",
"1" : "1",
"2" : "2",
"3" : "3",
"4" : "4",
"5" : "4",
"6" : "4",
"7" : "0",
"8" : "0",
"9" : "0",
"10": "5",
"11": "0",
"12": "0",
"13": "0",
"14": "0",
"15": "0",
"16": "0",
"17": "0",
"18": "0",
"19": "0",
"20": "0",
"21": "0",
"22": "0",
"23": "0",
"24": "0",
"25": "0",
"26": "0",
"27": "0",
"28": "0",
"29": "0",
"30": "0",
"31": "0",
"32": "0",
"33": "0",
"34": "0",
"35": "0",
"36": "0",
"37": "0",
"38": "0",
"39": "0",
"40": "0",
"41": "0",
"42": "0",
"43": "0",
"44": "0",
"45": "0",
"46": "0",
"47": "0",
"48": "0",
"49": "0",
"50": "0",
"51": "0",
"52": "0",
"53": "0",
"54": "0",
"55": "0",
"56": "0",
"57": "0",
"58": "0",
"59": "0",
"60": "0",
"61": "0",
"62": "0",
"63": "0"
}
},
{%- endmacro -%}

{%- macro generate_tc_to_queue_map_per_sku() -%}
"TC_TO_QUEUE_MAP": {
"AZURE": {
"0": "0",
"1": "1",
"2": "2",
"3": "3",
"4": "4",
"5": "5",
"6": "6",
"7": "7",
"8": "8",
"9": "9"
}
},
{%- endmacro -%}

{%- macro generate_scheduler_per_sku() -%}
"SCHEDULER": {
"scheduler.0": {
"type" : "DWRR",
"weight": "1"
},
"scheduler.1": {
"type" : "DWRR",
"weight": "10"
},
"scheduler.2": {
"type" : "DWRR",
"weight": "20"
},
"scheduler.3": {
"type" : "DWRR",
"weight": "30"
}
},
{%- endmacro -%}

{%- macro generate_single_queue_per_sku(port) -%}
"{{ port }}|0": {
"scheduler": "scheduler.0"
},
"{{ port }}|1": {
"scheduler": "scheduler.1"
},
"{{ port }}|2": {
"scheduler": "scheduler.2"
},
"{{ port }}|3": {
"scheduler": "scheduler.3"
},
"{{ port }}|4": {
"scheduler": "scheduler.1"
},
"{{ port }}|5": {
"scheduler": "scheduler.1"
},
"{{ port }}|6": {
"scheduler": "scheduler.1"
},
"{{ port }}|7": {
"scheduler": "scheduler.1"
},
"{{ port }}|8": {
"scheduler": "scheduler.1"
},
"{{ port }}|9": {
"scheduler": "scheduler.1"
}
{%- endmacro -%}

{%- include 'qos_config.j2' %}
9 changes: 9 additions & 0 deletions ...ce/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-C224O8/th5-a7060x6-64pe.config.bcm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1848,3 +1848,12 @@ device:
DEVICE_CONFIG:
AUTOLOAD_BOARD_SETTINGS: 0
...
---
device:
0:
TM_THD_CONFIG:
SKIP_BUFFER_RESERVATION: 0
THRESHOLD_MODE: LOSSY
TM_SCHEDULER_CONFIG:
NUM_MC_Q: NUM_MC_Q_2
...
1 change: 0 additions & 1 deletion device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-C256S2/buffers_defaults_t0.j2
View file

This file was deleted.

40 changes: 40 additions & 0 deletions device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-C256S2/buffers_defaults_t0.j2
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{%- set default_cable = '0m' %}

{%- include 'buffer_ports.j2' %}

{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossy_pool": {
"size": "166607744",
"type": "ingress",
"mode": "dynamic"
},
"egress_lossy_pool": {
"size": "166607744",
"type": "egress",
"mode": "dynamic"
}
},
"BUFFER_PROFILE": {
"ingress_lossy_profile": {
"pool": "ingress_lossy_pool",
"size": "0",
"static_th": "167546528"
},
"egress_lossy_profile": {
"pool": "egress_lossy_pool",
"size": "1778",
"dynamic_th": "1"
}
},
{%- endmacro %}
{%- macro generate_queue_buffers(ports) %}
"BUFFER_QUEUE": {
{% for port in ports.split(',') %}
"{{ port }}|0-9": {
"profile" : "egress_lossy_profile"
}
{%- if not loop.last -%},{% endif %}
{% endfor %}
}
{%- endmacro %}
1 change: 0 additions & 1 deletion device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-C256S2/buffers_defaults_t1.j2
View file

This file was deleted.

40 changes: 40 additions & 0 deletions device/arista/x86_64-arista_7060x6_64pe/Arista-7060X6-64PE-C256S2/buffers_defaults_t1.j2
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
{%- set default_cable = '0m' %}

{%- include 'buffer_ports.j2' %}

{%- macro generate_buffer_pool_and_profiles() %}
"BUFFER_POOL": {
"ingress_lossy_pool": {
"size": "166607744",
"type": "ingress",
"mode": "dynamic"
},
"egress_lossy_pool": {
"size": "166607744",
"type": "egress",
"mode": "dynamic"
}
},
"BUFFER_PROFILE": {
"ingress_lossy_profile": {
"pool": "ingress_lossy_pool",
"size": "0",
"static_th": "167546528"
},
"egress_lossy_profile": {
"pool": "egress_lossy_pool",
"size": "1778",
"dynamic_th": "1"
}
},
{%- endmacro %}
{%- macro generate_queue_buffers(ports) %}
"BUFFER_QUEUE": {
{% for port in ports.split(',') %}
"{{ port }}|0-9": {
"profile" : "egress_lossy_profile"
}
{%- if not loop.last -%},{% endif %}
{% endfor %}
}
{%- endmacro %}
Loading

0 comments on commit 67c8a3a

Please sign in to comment.