From 5849e8ba0fcc793a03e0b7eef6631194e94ce028 Mon Sep 17 00:00:00 2001 From: Ashok Daparthi Date: Tue, 2 Jul 2019 11:33:04 -0700 Subject: [PATCH 1/6] Added > /64 ip6 route support for 1024 entries. --- .../DellEMC-S5232f-C32/buffers_defaults_t0.j2 | 47 +++++++++++++++++++ .../td3-s5232f-32x100G.config.bcm | 4 +- .../td3-s5232f-32x100G.config.bcm | 4 +- .../td3-s5232f-8x100G-96x10G.config.bcm | 4 +- .../td3-s5232f-8x100G-96x25G.config.bcm | 4 +- 5 files changed, 55 insertions(+), 8 deletions(-) create mode 100644 device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t0.j2 diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t0.j2 b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t0.j2 new file mode 100644 index 00000000000..181ca345c36 --- /dev/null +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t0.j2 @@ -0,0 +1,47 @@ + +{%- set default_cable = '40m' %} + +{%- macro generate_port_lists(PORT_ALL) %} + {# Generate list of ports #} + {%- for port_idx in range(0,32) %} + {%- if PORT_ALL.append("Ethernet%d" % (port_idx*4)) %}{%- endif %} + {%- endfor %} +{%- endmacro %} + +{%- macro generate_buffer_pool_and_profiles() %} + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "27678784", + "type": "ingress", + "mode": "dynamic", + "xoff": "4194112" + }, + "egress_lossy_pool": { + "size": "26045524", + "type": "egress", + "mode": "dynamic" + }, + "egress_lossless_pool": { + "size": "32786432", + "type": "egress", + "mode": "static" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"[BUFFER_POOL|ingress_lossless_pool]", + "size":"0", + "dynamic_th":"3" + }, + "egress_lossless_profile": { + "pool":"[BUFFER_POOL|egress_lossless_pool]", + "size":"1518", + "static_th":"3995680" + }, + "egress_lossy_profile": { + "pool":"[BUFFER_POOL|egress_lossy_pool]", + "size":"1518", + "dynamic_th":"3" + } + }, +{%- endmacro %} diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm index 8c03e140d83..6fb19007f9a 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm @@ -27,8 +27,8 @@ pktdma_poll_mode_channel_bitmap=1 l2xmsg_mode=1 l2xmsg_hostbuf_size=8192 -ipv6_lpm_128b_enable=0 -num_ipv6_lpm_128b_entries=0 +ipv6_lpm_128b_enable=1 +num_ipv6_lpm_128b_entries=1024 max_vp_lags=0 l3_alpm_enable=2 diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm index 8c03e140d83..6fb19007f9a 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm @@ -27,8 +27,8 @@ pktdma_poll_mode_channel_bitmap=1 l2xmsg_mode=1 l2xmsg_hostbuf_size=8192 -ipv6_lpm_128b_enable=0 -num_ipv6_lpm_128b_entries=0 +ipv6_lpm_128b_enable=1 +num_ipv6_lpm_128b_entries=1024 max_vp_lags=0 l3_alpm_enable=2 diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-8x100G-96x10G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-8x100G-96x10G.config.bcm index 110d486bdba..1e3cb91a41a 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-8x100G-96x10G.config.bcm +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-8x100G-96x10G.config.bcm @@ -27,8 +27,8 @@ pktdma_poll_mode_channel_bitmap=1 l2xmsg_mode=1 l2xmsg_hostbuf_size=8192 -ipv6_lpm_128b_enable=0 -num_ipv6_lpm_128b_entries=0 +ipv6_lpm_128b_enable=1 +num_ipv6_lpm_128b_entries=1024 max_vp_lags=0 l3_alpm_enable=2 diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-8x100G-96x25G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-8x100G-96x25G.config.bcm index d892e9ec8c6..d572139a211 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-8x100G-96x25G.config.bcm +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-8x100G-96x25G.config.bcm @@ -27,8 +27,8 @@ pktdma_poll_mode_channel_bitmap=1 l2xmsg_mode=1 l2xmsg_hostbuf_size=8192 -ipv6_lpm_128b_enable=0 -num_ipv6_lpm_128b_entries=0 +ipv6_lpm_128b_enable=1 +num_ipv6_lpm_128b_entries=1024 max_vp_lags=0 l3_alpm_enable=2 From 12d30020287d9b8951232f8d15cffc4e3d1dcf07 Mon Sep 17 00:00:00 2001 From: Ashok Daparthi Date: Tue, 2 Jul 2019 14:52:52 -0700 Subject: [PATCH 2/6] Added t0 buffer_default file --- .../DellEMC-S5232f-C32/buffers_defaults_t0.j2 | 2 +- .../td3-s5232f-32x100G.config.bcm | 3 +- .../buffers_defaults_t0.j2 | 47 +++++++++++++++++++ .../td3-s5232f-32x100G.config.bcm | 3 +- .../buffers_defaults_t0.j2 | 47 +++++++++++++++++++ .../td3-s5232f-8x100G-96x10G.config.bcm | 3 +- .../buffers_defaults_t0.j2 | 47 +++++++++++++++++++ .../td3-s5232f-8x100G-96x25G.config.bcm | 3 +- 8 files changed, 146 insertions(+), 9 deletions(-) create mode 100644 device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/buffers_defaults_t0.j2 create mode 100644 device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/buffers_defaults_t0.j2 create mode 100644 device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/buffers_defaults_t0.j2 diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t0.j2 b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t0.j2 index 181ca345c36..853fbb1016c 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t0.j2 +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t0.j2 @@ -1,5 +1,5 @@ -{%- set default_cable = '40m' %} +{%- set default_cable = '5m' %} {%- macro generate_port_lists(PORT_ALL) %} {# Generate list of ports #} diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm index 6fb19007f9a..e3e2c5c8679 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm @@ -28,13 +28,12 @@ pktdma_poll_mode_channel_bitmap=1 l2xmsg_mode=1 l2xmsg_hostbuf_size=8192 ipv6_lpm_128b_enable=1 -num_ipv6_lpm_128b_entries=1024 max_vp_lags=0 l3_alpm_enable=2 l2_mem_entries=32768 l3_mem_entries=16384 -l3_max_ecmp_mode=1 +l3_max_ecmp_mode=1 bcm_tunnel_term_compatible_mode=1 ifp_inports_support_enable=1 diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/buffers_defaults_t0.j2 b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/buffers_defaults_t0.j2 new file mode 100644 index 00000000000..853fbb1016c --- /dev/null +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/buffers_defaults_t0.j2 @@ -0,0 +1,47 @@ + +{%- set default_cable = '5m' %} + +{%- macro generate_port_lists(PORT_ALL) %} + {# Generate list of ports #} + {%- for port_idx in range(0,32) %} + {%- if PORT_ALL.append("Ethernet%d" % (port_idx*4)) %}{%- endif %} + {%- endfor %} +{%- endmacro %} + +{%- macro generate_buffer_pool_and_profiles() %} + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "27678784", + "type": "ingress", + "mode": "dynamic", + "xoff": "4194112" + }, + "egress_lossy_pool": { + "size": "26045524", + "type": "egress", + "mode": "dynamic" + }, + "egress_lossless_pool": { + "size": "32786432", + "type": "egress", + "mode": "static" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"[BUFFER_POOL|ingress_lossless_pool]", + "size":"0", + "dynamic_th":"3" + }, + "egress_lossless_profile": { + "pool":"[BUFFER_POOL|egress_lossless_pool]", + "size":"1518", + "static_th":"3995680" + }, + "egress_lossy_profile": { + "pool":"[BUFFER_POOL|egress_lossy_pool]", + "size":"1518", + "dynamic_th":"3" + } + }, +{%- endmacro %} diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm index 6fb19007f9a..e3e2c5c8679 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm @@ -28,13 +28,12 @@ pktdma_poll_mode_channel_bitmap=1 l2xmsg_mode=1 l2xmsg_hostbuf_size=8192 ipv6_lpm_128b_enable=1 -num_ipv6_lpm_128b_entries=1024 max_vp_lags=0 l3_alpm_enable=2 l2_mem_entries=32768 l3_mem_entries=16384 -l3_max_ecmp_mode=1 +l3_max_ecmp_mode=1 bcm_tunnel_term_compatible_mode=1 ifp_inports_support_enable=1 diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/buffers_defaults_t0.j2 b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/buffers_defaults_t0.j2 new file mode 100644 index 00000000000..853fbb1016c --- /dev/null +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/buffers_defaults_t0.j2 @@ -0,0 +1,47 @@ + +{%- set default_cable = '5m' %} + +{%- macro generate_port_lists(PORT_ALL) %} + {# Generate list of ports #} + {%- for port_idx in range(0,32) %} + {%- if PORT_ALL.append("Ethernet%d" % (port_idx*4)) %}{%- endif %} + {%- endfor %} +{%- endmacro %} + +{%- macro generate_buffer_pool_and_profiles() %} + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "27678784", + "type": "ingress", + "mode": "dynamic", + "xoff": "4194112" + }, + "egress_lossy_pool": { + "size": "26045524", + "type": "egress", + "mode": "dynamic" + }, + "egress_lossless_pool": { + "size": "32786432", + "type": "egress", + "mode": "static" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"[BUFFER_POOL|ingress_lossless_pool]", + "size":"0", + "dynamic_th":"3" + }, + "egress_lossless_profile": { + "pool":"[BUFFER_POOL|egress_lossless_pool]", + "size":"1518", + "static_th":"3995680" + }, + "egress_lossy_profile": { + "pool":"[BUFFER_POOL|egress_lossy_pool]", + "size":"1518", + "dynamic_th":"3" + } + }, +{%- endmacro %} diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-8x100G-96x10G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-8x100G-96x10G.config.bcm index 1e3cb91a41a..26d37223c19 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-8x100G-96x10G.config.bcm +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-8x100G-96x10G.config.bcm @@ -28,13 +28,12 @@ pktdma_poll_mode_channel_bitmap=1 l2xmsg_mode=1 l2xmsg_hostbuf_size=8192 ipv6_lpm_128b_enable=1 -num_ipv6_lpm_128b_entries=1024 max_vp_lags=0 l3_alpm_enable=2 l2_mem_entries=32768 l3_mem_entries=16384 -l3_max_ecmp_mode=1 +l3_max_ecmp_mode=1 bcm_tunnel_term_compatible_mode=1 ifp_inports_support_enable=1 diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/buffers_defaults_t0.j2 b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/buffers_defaults_t0.j2 new file mode 100644 index 00000000000..853fbb1016c --- /dev/null +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/buffers_defaults_t0.j2 @@ -0,0 +1,47 @@ + +{%- set default_cable = '5m' %} + +{%- macro generate_port_lists(PORT_ALL) %} + {# Generate list of ports #} + {%- for port_idx in range(0,32) %} + {%- if PORT_ALL.append("Ethernet%d" % (port_idx*4)) %}{%- endif %} + {%- endfor %} +{%- endmacro %} + +{%- macro generate_buffer_pool_and_profiles() %} + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "27678784", + "type": "ingress", + "mode": "dynamic", + "xoff": "4194112" + }, + "egress_lossy_pool": { + "size": "26045524", + "type": "egress", + "mode": "dynamic" + }, + "egress_lossless_pool": { + "size": "32786432", + "type": "egress", + "mode": "static" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"[BUFFER_POOL|ingress_lossless_pool]", + "size":"0", + "dynamic_th":"3" + }, + "egress_lossless_profile": { + "pool":"[BUFFER_POOL|egress_lossless_pool]", + "size":"1518", + "static_th":"3995680" + }, + "egress_lossy_profile": { + "pool":"[BUFFER_POOL|egress_lossy_pool]", + "size":"1518", + "dynamic_th":"3" + } + }, +{%- endmacro %} diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-8x100G-96x25G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-8x100G-96x25G.config.bcm index d572139a211..54104eb9f73 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-8x100G-96x25G.config.bcm +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-8x100G-96x25G.config.bcm @@ -28,13 +28,12 @@ pktdma_poll_mode_channel_bitmap=1 l2xmsg_mode=1 l2xmsg_hostbuf_size=8192 ipv6_lpm_128b_enable=1 -num_ipv6_lpm_128b_entries=1024 max_vp_lags=0 l3_alpm_enable=2 l2_mem_entries=32768 l3_mem_entries=16384 -l3_max_ecmp_mode=1 +l3_max_ecmp_mode=1 bcm_tunnel_term_compatible_mode=1 ifp_inports_support_enable=1 From 3a17fb38d2e348751167d8679bc1d564092d6964 Mon Sep 17 00:00:00 2001 From: Ashok Daparthi Date: Tue, 2 Jul 2019 15:32:27 -0700 Subject: [PATCH 3/6] Seperated buffer config as seperate PR Signed-off-by: Ashok Daparthi --- .../DellEMC-S5232f-C32/buffers_defaults_t0.j2 | 47 ------------------- .../buffers_defaults_t0.j2 | 47 ------------------- .../buffers_defaults_t0.j2 | 47 ------------------- .../buffers_defaults_t0.j2 | 47 ------------------- 4 files changed, 188 deletions(-) delete mode 100644 device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t0.j2 delete mode 100644 device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/buffers_defaults_t0.j2 delete mode 100644 device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/buffers_defaults_t0.j2 delete mode 100644 device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/buffers_defaults_t0.j2 diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t0.j2 b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t0.j2 deleted file mode 100644 index 853fbb1016c..00000000000 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t0.j2 +++ /dev/null @@ -1,47 +0,0 @@ - -{%- set default_cable = '5m' %} - -{%- macro generate_port_lists(PORT_ALL) %} - {# Generate list of ports #} - {%- for port_idx in range(0,32) %} - {%- if PORT_ALL.append("Ethernet%d" % (port_idx*4)) %}{%- endif %} - {%- endfor %} -{%- endmacro %} - -{%- macro generate_buffer_pool_and_profiles() %} - "BUFFER_POOL": { - "ingress_lossless_pool": { - "size": "27678784", - "type": "ingress", - "mode": "dynamic", - "xoff": "4194112" - }, - "egress_lossy_pool": { - "size": "26045524", - "type": "egress", - "mode": "dynamic" - }, - "egress_lossless_pool": { - "size": "32786432", - "type": "egress", - "mode": "static" - } - }, - "BUFFER_PROFILE": { - "ingress_lossy_profile": { - "pool":"[BUFFER_POOL|ingress_lossless_pool]", - "size":"0", - "dynamic_th":"3" - }, - "egress_lossless_profile": { - "pool":"[BUFFER_POOL|egress_lossless_pool]", - "size":"1518", - "static_th":"3995680" - }, - "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"1518", - "dynamic_th":"3" - } - }, -{%- endmacro %} diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/buffers_defaults_t0.j2 b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/buffers_defaults_t0.j2 deleted file mode 100644 index 853fbb1016c..00000000000 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/buffers_defaults_t0.j2 +++ /dev/null @@ -1,47 +0,0 @@ - -{%- set default_cable = '5m' %} - -{%- macro generate_port_lists(PORT_ALL) %} - {# Generate list of ports #} - {%- for port_idx in range(0,32) %} - {%- if PORT_ALL.append("Ethernet%d" % (port_idx*4)) %}{%- endif %} - {%- endfor %} -{%- endmacro %} - -{%- macro generate_buffer_pool_and_profiles() %} - "BUFFER_POOL": { - "ingress_lossless_pool": { - "size": "27678784", - "type": "ingress", - "mode": "dynamic", - "xoff": "4194112" - }, - "egress_lossy_pool": { - "size": "26045524", - "type": "egress", - "mode": "dynamic" - }, - "egress_lossless_pool": { - "size": "32786432", - "type": "egress", - "mode": "static" - } - }, - "BUFFER_PROFILE": { - "ingress_lossy_profile": { - "pool":"[BUFFER_POOL|ingress_lossless_pool]", - "size":"0", - "dynamic_th":"3" - }, - "egress_lossless_profile": { - "pool":"[BUFFER_POOL|egress_lossless_pool]", - "size":"1518", - "static_th":"3995680" - }, - "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"1518", - "dynamic_th":"3" - } - }, -{%- endmacro %} diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/buffers_defaults_t0.j2 b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/buffers_defaults_t0.j2 deleted file mode 100644 index 853fbb1016c..00000000000 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/buffers_defaults_t0.j2 +++ /dev/null @@ -1,47 +0,0 @@ - -{%- set default_cable = '5m' %} - -{%- macro generate_port_lists(PORT_ALL) %} - {# Generate list of ports #} - {%- for port_idx in range(0,32) %} - {%- if PORT_ALL.append("Ethernet%d" % (port_idx*4)) %}{%- endif %} - {%- endfor %} -{%- endmacro %} - -{%- macro generate_buffer_pool_and_profiles() %} - "BUFFER_POOL": { - "ingress_lossless_pool": { - "size": "27678784", - "type": "ingress", - "mode": "dynamic", - "xoff": "4194112" - }, - "egress_lossy_pool": { - "size": "26045524", - "type": "egress", - "mode": "dynamic" - }, - "egress_lossless_pool": { - "size": "32786432", - "type": "egress", - "mode": "static" - } - }, - "BUFFER_PROFILE": { - "ingress_lossy_profile": { - "pool":"[BUFFER_POOL|ingress_lossless_pool]", - "size":"0", - "dynamic_th":"3" - }, - "egress_lossless_profile": { - "pool":"[BUFFER_POOL|egress_lossless_pool]", - "size":"1518", - "static_th":"3995680" - }, - "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"1518", - "dynamic_th":"3" - } - }, -{%- endmacro %} diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/buffers_defaults_t0.j2 b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/buffers_defaults_t0.j2 deleted file mode 100644 index 853fbb1016c..00000000000 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/buffers_defaults_t0.j2 +++ /dev/null @@ -1,47 +0,0 @@ - -{%- set default_cable = '5m' %} - -{%- macro generate_port_lists(PORT_ALL) %} - {# Generate list of ports #} - {%- for port_idx in range(0,32) %} - {%- if PORT_ALL.append("Ethernet%d" % (port_idx*4)) %}{%- endif %} - {%- endfor %} -{%- endmacro %} - -{%- macro generate_buffer_pool_and_profiles() %} - "BUFFER_POOL": { - "ingress_lossless_pool": { - "size": "27678784", - "type": "ingress", - "mode": "dynamic", - "xoff": "4194112" - }, - "egress_lossy_pool": { - "size": "26045524", - "type": "egress", - "mode": "dynamic" - }, - "egress_lossless_pool": { - "size": "32786432", - "type": "egress", - "mode": "static" - } - }, - "BUFFER_PROFILE": { - "ingress_lossy_profile": { - "pool":"[BUFFER_POOL|ingress_lossless_pool]", - "size":"0", - "dynamic_th":"3" - }, - "egress_lossless_profile": { - "pool":"[BUFFER_POOL|egress_lossless_pool]", - "size":"1518", - "static_th":"3995680" - }, - "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"1518", - "dynamic_th":"3" - } - }, -{%- endmacro %} From 36857a46700f61478f2efb6dfa8b96243ec7e05e Mon Sep 17 00:00:00 2001 From: Ashok Daparthi Date: Mon, 22 Jul 2019 09:42:04 -0700 Subject: [PATCH 4/6] Corrected Wrong dport map and renamed config files --- .../DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm | 5 +++-- .../DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm | 5 +++-- ...96x10G.config.bcm => td3-s5232f-96x10G+8x100G.config.bcm} | 5 +++-- ...96x25G.config.bcm => td3-s5232f-96x25G+8x100G.config.bcm} | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) rename device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/{td3-s5232f-8x100G-96x10G.config.bcm => td3-s5232f-96x10G+8x100G.config.bcm} (99%) rename device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/{td3-s5232f-8x100G-96x25G.config.bcm => td3-s5232f-96x25G+8x100G.config.bcm} (99%) diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm index e3e2c5c8679..964046c808a 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm @@ -442,7 +442,7 @@ dport_map_port_26=26 dport_map_port_27=27 dport_map_port_28=28 dport_map_port_29=29 -dport_map_port_30=20 +dport_map_port_30=30 dport_map_port_31=31 dport_map_port_32=32 dport_map_port_33=33 @@ -455,7 +455,8 @@ dport_map_port_39=39 dport_map_port_40=40 dport_map_port_41=41 dport_map_port_42=42 -dport_map_port_43=44 +dport_map_port_43=43 +dport_map_port_44=44 dport_map_port_45=45 dport_map_port_46=46 dport_map_port_47=47 diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm index e3e2c5c8679..964046c808a 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm @@ -442,7 +442,7 @@ dport_map_port_26=26 dport_map_port_27=27 dport_map_port_28=28 dport_map_port_29=29 -dport_map_port_30=20 +dport_map_port_30=30 dport_map_port_31=31 dport_map_port_32=32 dport_map_port_33=33 @@ -455,7 +455,8 @@ dport_map_port_39=39 dport_map_port_40=40 dport_map_port_41=41 dport_map_port_42=42 -dport_map_port_43=44 +dport_map_port_43=43 +dport_map_port_44=44 dport_map_port_45=45 dport_map_port_46=46 dport_map_port_47=47 diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-8x100G-96x10G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-96x10G+8x100G.config.bcm similarity index 99% rename from device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-8x100G-96x10G.config.bcm rename to device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-96x10G+8x100G.config.bcm index 26d37223c19..cd7dfd2fea5 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-8x100G-96x10G.config.bcm +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-96x10G+8x100G.config.bcm @@ -515,7 +515,7 @@ dport_map_port_26=26 dport_map_port_27=27 dport_map_port_28=28 dport_map_port_29=29 -dport_map_port_30=20 +dport_map_port_30=30 dport_map_port_31=31 dport_map_port_32=32 dport_map_port_33=33 @@ -528,7 +528,8 @@ dport_map_port_39=39 dport_map_port_40=40 dport_map_port_41=41 dport_map_port_42=42 -dport_map_port_43=44 +dport_map_port_43=43 +dport_map_port_44=44 dport_map_port_45=45 dport_map_port_46=46 dport_map_port_47=47 diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-8x100G-96x25G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-96x25G+8x100G.config.bcm similarity index 99% rename from device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-8x100G-96x25G.config.bcm rename to device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-96x25G+8x100G.config.bcm index 54104eb9f73..f76764e2756 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-8x100G-96x25G.config.bcm +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-96x25G+8x100G.config.bcm @@ -515,7 +515,7 @@ dport_map_port_26=26 dport_map_port_27=27 dport_map_port_28=28 dport_map_port_29=29 -dport_map_port_30=20 +dport_map_port_30=30 dport_map_port_31=31 dport_map_port_32=32 dport_map_port_33=33 @@ -528,7 +528,8 @@ dport_map_port_39=39 dport_map_port_40=40 dport_map_port_41=41 dport_map_port_42=42 -dport_map_port_43=44 +dport_map_port_43=43 +dport_map_port_44=44 dport_map_port_45=45 dport_map_port_46=46 dport_map_port_47=47 From 4ea6374e7c08679aa7ca545b2c518acb3348b24b Mon Sep 17 00:00:00 2001 From: ashokd Date: Fri, 2 Aug 2019 22:23:11 +0000 Subject: [PATCH 5/6] [dell] s5232f buffer configuration defaults --- .../DellEMC-S5232f-C32/buffers_defaults_t0.j2 | 37 +++++++++++++++ .../DellEMC-S5232f-C32/buffers_defaults_t1.j2 | 30 ++++-------- .../td3-s5232f-32x100G.config.bcm | 3 +- .../buffers_defaults_t0.j2 | 46 +++++++++++++++++++ .../buffers_defaults_t1.j2 | 19 +++----- .../pg_profile_lookup.ini | 17 ------- .../DellEMC-S5232f-P-100G/qos.json.j2 | 24 ++++------ .../td3-s5232f-32x100G.config.bcm | 3 +- .../buffers_defaults_t0.j2 | 46 +++++++++++++++++++ .../buffers_defaults_t1.j2 | 19 +++----- .../DellEMC-S5232f-P-10G/qos.json.j2 | 24 ++++------ .../td3-s5232f-96x10G+8x100G.config.bcm | 3 +- .../buffers_defaults_t0.j2 | 46 +++++++++++++++++++ .../buffers_defaults_t1.j2 | 19 +++----- .../DellEMC-S5232f-P-25G/qos.json.j2 | 24 ++++------ .../td3-s5232f-96x25G+8x100G.config.bcm | 3 +- 16 files changed, 231 insertions(+), 132 deletions(-) create mode 100644 device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t0.j2 create mode 100644 device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/buffers_defaults_t0.j2 delete mode 100644 device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/pg_profile_lookup.ini create mode 100644 device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/buffers_defaults_t0.j2 create mode 100644 device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/buffers_defaults_t0.j2 diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t0.j2 b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t0.j2 new file mode 100644 index 00000000000..98ec91a9b69 --- /dev/null +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t0.j2 @@ -0,0 +1,37 @@ + +{%- set default_cable = '40m' %} + +{%- macro generate_buffer_pool_and_profiles() %} + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "28550336", + "type": "ingress", + "mode": "dynamic", + "xoff": "4194112" + }, + "egress_pool": { + "size": "28550336", + "type": "egress", + "mode": "static" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"[BUFFER_POOL|ingress_lossless_pool]", + "size":"0", + "dynamic_th":"3" + }, + "egress_lossless_profile": { + "pool":"[BUFFER_POOL|egress_pool]", + "size":"0", + "mode": "static", + "static_th":"32744448" + }, + "egress_lossy_profile": { + "pool":"[BUFFER_POOL|egress_pool]", + "size":"0", + "mode": "dynamic", + "dynamic_th":"3" + } + }, +{%- endmacro %} diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t1.j2 b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t1.j2 index 181ca345c36..98ec91a9b69 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t1.j2 +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/buffers_defaults_t1.j2 @@ -1,28 +1,16 @@ {%- set default_cable = '40m' %} -{%- macro generate_port_lists(PORT_ALL) %} - {# Generate list of ports #} - {%- for port_idx in range(0,32) %} - {%- if PORT_ALL.append("Ethernet%d" % (port_idx*4)) %}{%- endif %} - {%- endfor %} -{%- endmacro %} - {%- macro generate_buffer_pool_and_profiles() %} "BUFFER_POOL": { "ingress_lossless_pool": { - "size": "27678784", + "size": "28550336", "type": "ingress", "mode": "dynamic", "xoff": "4194112" }, - "egress_lossy_pool": { - "size": "26045524", - "type": "egress", - "mode": "dynamic" - }, - "egress_lossless_pool": { - "size": "32786432", + "egress_pool": { + "size": "28550336", "type": "egress", "mode": "static" } @@ -34,13 +22,15 @@ "dynamic_th":"3" }, "egress_lossless_profile": { - "pool":"[BUFFER_POOL|egress_lossless_pool]", - "size":"1518", - "static_th":"3995680" + "pool":"[BUFFER_POOL|egress_pool]", + "size":"0", + "mode": "static", + "static_th":"32744448" }, "egress_lossy_profile": { - "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"1518", + "pool":"[BUFFER_POOL|egress_pool]", + "size":"0", + "mode": "dynamic", "dynamic_th":"3" } }, diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm index 964046c808a..e5b61b7f1b5 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-C32/td3-s5232f-32x100G.config.bcm @@ -37,7 +37,6 @@ l3_max_ecmp_mode=1 bcm_tunnel_term_compatible_mode=1 ifp_inports_support_enable=1 -mmu_init_config="MSFT-TD3-Tier1" stable_size=0x5500000 @@ -542,4 +541,4 @@ dport_map_port_129=126 dport_map_port_66=127 dport_map_port_130=128 - +mmu_init_config="TD3-DEFAULT-LOSSLESS-P3P4" diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/buffers_defaults_t0.j2 b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/buffers_defaults_t0.j2 new file mode 100644 index 00000000000..c31728e4654 --- /dev/null +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/buffers_defaults_t0.j2 @@ -0,0 +1,46 @@ + +{%- set default_cable = '40m' %} + +{%- macro generate_buffer_pool_and_profiles() %} + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "32744448", + "type": "ingress", + "mode": "static" + }, + "egress_lossy_pool": { + "size": "32744448", + "type": "egress", + "mode": "dynamic" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"[BUFFER_POOL|ingress_lossless_pool]", + "size":"0", + "static_th":"32744448" + }, + "egress_lossy_profile": { + "pool":"[BUFFER_POOL|egress_lossy_pool]", + "size":"0", + "dynamic_th":"3" + } + }, +{%- endmacro %} + +{%- macro generate_pg_profils(port_names_active) %} + "BUFFER_PG": { + "{{ port_names_active }}|0": { + "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" + } + }, +{%- endmacro %} + +{% macro generate_queue_buffers(port_names_active) %} + "BUFFER_QUEUE": { + "{{ port_names_active }}|0-6": { + "profile" : "[BUFFER_PROFILE|egress_lossy_profile]" + } + } +{% endmacro %} + diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/buffers_defaults_t1.j2 b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/buffers_defaults_t1.j2 index b054c50d48b..c31728e4654 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/buffers_defaults_t1.j2 +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/buffers_defaults_t1.j2 @@ -1,22 +1,15 @@ {%- set default_cable = '40m' %} -{%- macro generate_port_lists(PORT_ALL) %} - {# Generate list of ports #} - {%- for port_idx in range(0,32) %} - {%- if PORT_ALL.append("Ethernet%d" % (port_idx*4)) %}{%- endif %} - {%- endfor %} -{%- endmacro %} - {%- macro generate_buffer_pool_and_profiles() %} "BUFFER_POOL": { "ingress_lossless_pool": { - "size": "33554432", + "size": "32744448", "type": "ingress", - "mode": "dynamic" + "mode": "static" }, "egress_lossy_pool": { - "size": "32786432", + "size": "32744448", "type": "egress", "mode": "dynamic" } @@ -25,11 +18,11 @@ "ingress_lossy_profile": { "pool":"[BUFFER_POOL|ingress_lossless_pool]", "size":"0", - "dynamic_th":"3" + "static_th":"32744448" }, "egress_lossy_profile": { "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"1518", + "size":"0", "dynamic_th":"3" } }, @@ -45,7 +38,7 @@ {% macro generate_queue_buffers(port_names_active) %} "BUFFER_QUEUE": { - "{{ port_names_active }}|0-7": { + "{{ port_names_active }}|0-6": { "profile" : "[BUFFER_PROFILE|egress_lossy_profile]" } } diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/pg_profile_lookup.ini b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/pg_profile_lookup.ini deleted file mode 100644 index aedda37a887..00000000000 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/pg_profile_lookup.ini +++ /dev/null @@ -1,17 +0,0 @@ -# PG lossless profiles. -# speed cable size xon xoff threshold xon_offset - 10000 5m 1248 2288 35776 -3 2288 - 25000 5m 1248 2288 53248 -3 2288 - 40000 5m 1248 2288 66560 -3 2288 - 50000 5m 1248 2288 90272 -3 2288 - 100000 5m 1248 2288 165568 -3 2288 - 10000 40m 1248 2288 37024 -3 2288 - 25000 40m 1248 2288 53248 -3 2288 - 40000 40m 1248 2288 71552 -3 2288 - 50000 40m 1248 2288 96096 -3 2288 - 100000 40m 1248 2288 177632 -3 2288 - 10000 300m 1248 2288 46176 -3 2288 - 25000 300m 1248 2288 79040 -3 2288 - 40000 300m 1248 2288 108160 -3 2288 - 50000 300m 1248 2288 141856 -3 2288 - 100000 300m 1248 2288 268736 -3 2288 diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/qos.json.j2 b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/qos.json.j2 index ca6f5e739c0..d2b3d2b0131 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/qos.json.j2 +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/qos.json.j2 @@ -36,7 +36,7 @@ {{- generate_tc_to_pg_map() }} {% else %} "TC_TO_PRIORITY_GROUP_MAP": { - "AZURE": { + "DEFAULT": { "0": "0", "1": "0", "2": "0", @@ -44,12 +44,12 @@ "4": "0", "5": "0", "6": "0", - "7": "0" + "7": "7" } }, {% endif %} "MAP_PFC_PRIORITY_TO_QUEUE": { - "AZURE": { + "DEFAULT": { "0": "0", "1": "1", "2": "2", @@ -61,7 +61,7 @@ } }, "TC_TO_QUEUE_MAP": { - "AZURE": { + "DEFAULT": { "0": "0", "1": "1", "2": "2", @@ -73,7 +73,7 @@ } }, "DSCP_TO_TC_MAP": { - "AZURE": { + "DEFAULT": { "0" : "0", "1" : "0", "2" : "0", @@ -174,19 +174,11 @@ "weight": "50" } }, -{% if asic_type in pfc_to_pg_map_supported_asics %} - "PFC_PRIORITY_TO_PRIORITY_GROUP_MAP": { - "AZURE": { - "3": "3", - "4": "4" - } - }, -{% endif %} "PORT_QOS_MAP": { "{{ port_names_active }}": { - "dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]", - "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]", - "tc_to_pg_map" : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]" + "dscp_to_tc_map" : "[DSCP_TO_TC_MAP|DEFAULT]", + "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|DEFAULT]", + "tc_to_pg_map" : "[TC_TO_PRIORITY_GROUP_MAP|DEFAULT]" } }, "QUEUE": { diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm index 964046c808a..533e19aca1c 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-100G/td3-s5232f-32x100G.config.bcm @@ -37,7 +37,6 @@ l3_max_ecmp_mode=1 bcm_tunnel_term_compatible_mode=1 ifp_inports_support_enable=1 -mmu_init_config="MSFT-TD3-Tier1" stable_size=0x5500000 @@ -542,4 +541,4 @@ dport_map_port_129=126 dport_map_port_66=127 dport_map_port_130=128 - +mmu_init_config="TD3-DEFAULT" diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/buffers_defaults_t0.j2 b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/buffers_defaults_t0.j2 new file mode 100644 index 00000000000..c31728e4654 --- /dev/null +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/buffers_defaults_t0.j2 @@ -0,0 +1,46 @@ + +{%- set default_cable = '40m' %} + +{%- macro generate_buffer_pool_and_profiles() %} + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "32744448", + "type": "ingress", + "mode": "static" + }, + "egress_lossy_pool": { + "size": "32744448", + "type": "egress", + "mode": "dynamic" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"[BUFFER_POOL|ingress_lossless_pool]", + "size":"0", + "static_th":"32744448" + }, + "egress_lossy_profile": { + "pool":"[BUFFER_POOL|egress_lossy_pool]", + "size":"0", + "dynamic_th":"3" + } + }, +{%- endmacro %} + +{%- macro generate_pg_profils(port_names_active) %} + "BUFFER_PG": { + "{{ port_names_active }}|0": { + "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" + } + }, +{%- endmacro %} + +{% macro generate_queue_buffers(port_names_active) %} + "BUFFER_QUEUE": { + "{{ port_names_active }}|0-6": { + "profile" : "[BUFFER_PROFILE|egress_lossy_profile]" + } + } +{% endmacro %} + diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/buffers_defaults_t1.j2 b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/buffers_defaults_t1.j2 index b054c50d48b..c31728e4654 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/buffers_defaults_t1.j2 +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/buffers_defaults_t1.j2 @@ -1,22 +1,15 @@ {%- set default_cable = '40m' %} -{%- macro generate_port_lists(PORT_ALL) %} - {# Generate list of ports #} - {%- for port_idx in range(0,32) %} - {%- if PORT_ALL.append("Ethernet%d" % (port_idx*4)) %}{%- endif %} - {%- endfor %} -{%- endmacro %} - {%- macro generate_buffer_pool_and_profiles() %} "BUFFER_POOL": { "ingress_lossless_pool": { - "size": "33554432", + "size": "32744448", "type": "ingress", - "mode": "dynamic" + "mode": "static" }, "egress_lossy_pool": { - "size": "32786432", + "size": "32744448", "type": "egress", "mode": "dynamic" } @@ -25,11 +18,11 @@ "ingress_lossy_profile": { "pool":"[BUFFER_POOL|ingress_lossless_pool]", "size":"0", - "dynamic_th":"3" + "static_th":"32744448" }, "egress_lossy_profile": { "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"1518", + "size":"0", "dynamic_th":"3" } }, @@ -45,7 +38,7 @@ {% macro generate_queue_buffers(port_names_active) %} "BUFFER_QUEUE": { - "{{ port_names_active }}|0-7": { + "{{ port_names_active }}|0-6": { "profile" : "[BUFFER_PROFILE|egress_lossy_profile]" } } diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/qos.json.j2 b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/qos.json.j2 index ca6f5e739c0..d2b3d2b0131 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/qos.json.j2 +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/qos.json.j2 @@ -36,7 +36,7 @@ {{- generate_tc_to_pg_map() }} {% else %} "TC_TO_PRIORITY_GROUP_MAP": { - "AZURE": { + "DEFAULT": { "0": "0", "1": "0", "2": "0", @@ -44,12 +44,12 @@ "4": "0", "5": "0", "6": "0", - "7": "0" + "7": "7" } }, {% endif %} "MAP_PFC_PRIORITY_TO_QUEUE": { - "AZURE": { + "DEFAULT": { "0": "0", "1": "1", "2": "2", @@ -61,7 +61,7 @@ } }, "TC_TO_QUEUE_MAP": { - "AZURE": { + "DEFAULT": { "0": "0", "1": "1", "2": "2", @@ -73,7 +73,7 @@ } }, "DSCP_TO_TC_MAP": { - "AZURE": { + "DEFAULT": { "0" : "0", "1" : "0", "2" : "0", @@ -174,19 +174,11 @@ "weight": "50" } }, -{% if asic_type in pfc_to_pg_map_supported_asics %} - "PFC_PRIORITY_TO_PRIORITY_GROUP_MAP": { - "AZURE": { - "3": "3", - "4": "4" - } - }, -{% endif %} "PORT_QOS_MAP": { "{{ port_names_active }}": { - "dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]", - "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]", - "tc_to_pg_map" : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]" + "dscp_to_tc_map" : "[DSCP_TO_TC_MAP|DEFAULT]", + "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|DEFAULT]", + "tc_to_pg_map" : "[TC_TO_PRIORITY_GROUP_MAP|DEFAULT]" } }, "QUEUE": { diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-96x10G+8x100G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-96x10G+8x100G.config.bcm index cd7dfd2fea5..0da20afc220 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-96x10G+8x100G.config.bcm +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/td3-s5232f-96x10G+8x100G.config.bcm @@ -37,7 +37,6 @@ l3_max_ecmp_mode=1 bcm_tunnel_term_compatible_mode=1 ifp_inports_support_enable=1 -mmu_init_config="MSFT-TD3-Tier1" stable_size=0x5500000 @@ -615,4 +614,4 @@ dport_map_port_129=126 dport_map_port_66=127 dport_map_port_130=128 - +mmu_init_config="TD3-DEFAULT" diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/buffers_defaults_t0.j2 b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/buffers_defaults_t0.j2 new file mode 100644 index 00000000000..c31728e4654 --- /dev/null +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/buffers_defaults_t0.j2 @@ -0,0 +1,46 @@ + +{%- set default_cable = '40m' %} + +{%- macro generate_buffer_pool_and_profiles() %} + "BUFFER_POOL": { + "ingress_lossless_pool": { + "size": "32744448", + "type": "ingress", + "mode": "static" + }, + "egress_lossy_pool": { + "size": "32744448", + "type": "egress", + "mode": "dynamic" + } + }, + "BUFFER_PROFILE": { + "ingress_lossy_profile": { + "pool":"[BUFFER_POOL|ingress_lossless_pool]", + "size":"0", + "static_th":"32744448" + }, + "egress_lossy_profile": { + "pool":"[BUFFER_POOL|egress_lossy_pool]", + "size":"0", + "dynamic_th":"3" + } + }, +{%- endmacro %} + +{%- macro generate_pg_profils(port_names_active) %} + "BUFFER_PG": { + "{{ port_names_active }}|0": { + "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]" + } + }, +{%- endmacro %} + +{% macro generate_queue_buffers(port_names_active) %} + "BUFFER_QUEUE": { + "{{ port_names_active }}|0-6": { + "profile" : "[BUFFER_PROFILE|egress_lossy_profile]" + } + } +{% endmacro %} + diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/buffers_defaults_t1.j2 b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/buffers_defaults_t1.j2 index b054c50d48b..c31728e4654 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/buffers_defaults_t1.j2 +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/buffers_defaults_t1.j2 @@ -1,22 +1,15 @@ {%- set default_cable = '40m' %} -{%- macro generate_port_lists(PORT_ALL) %} - {# Generate list of ports #} - {%- for port_idx in range(0,32) %} - {%- if PORT_ALL.append("Ethernet%d" % (port_idx*4)) %}{%- endif %} - {%- endfor %} -{%- endmacro %} - {%- macro generate_buffer_pool_and_profiles() %} "BUFFER_POOL": { "ingress_lossless_pool": { - "size": "33554432", + "size": "32744448", "type": "ingress", - "mode": "dynamic" + "mode": "static" }, "egress_lossy_pool": { - "size": "32786432", + "size": "32744448", "type": "egress", "mode": "dynamic" } @@ -25,11 +18,11 @@ "ingress_lossy_profile": { "pool":"[BUFFER_POOL|ingress_lossless_pool]", "size":"0", - "dynamic_th":"3" + "static_th":"32744448" }, "egress_lossy_profile": { "pool":"[BUFFER_POOL|egress_lossy_pool]", - "size":"1518", + "size":"0", "dynamic_th":"3" } }, @@ -45,7 +38,7 @@ {% macro generate_queue_buffers(port_names_active) %} "BUFFER_QUEUE": { - "{{ port_names_active }}|0-7": { + "{{ port_names_active }}|0-6": { "profile" : "[BUFFER_PROFILE|egress_lossy_profile]" } } diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/qos.json.j2 b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/qos.json.j2 index ca6f5e739c0..d2b3d2b0131 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/qos.json.j2 +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/qos.json.j2 @@ -36,7 +36,7 @@ {{- generate_tc_to_pg_map() }} {% else %} "TC_TO_PRIORITY_GROUP_MAP": { - "AZURE": { + "DEFAULT": { "0": "0", "1": "0", "2": "0", @@ -44,12 +44,12 @@ "4": "0", "5": "0", "6": "0", - "7": "0" + "7": "7" } }, {% endif %} "MAP_PFC_PRIORITY_TO_QUEUE": { - "AZURE": { + "DEFAULT": { "0": "0", "1": "1", "2": "2", @@ -61,7 +61,7 @@ } }, "TC_TO_QUEUE_MAP": { - "AZURE": { + "DEFAULT": { "0": "0", "1": "1", "2": "2", @@ -73,7 +73,7 @@ } }, "DSCP_TO_TC_MAP": { - "AZURE": { + "DEFAULT": { "0" : "0", "1" : "0", "2" : "0", @@ -174,19 +174,11 @@ "weight": "50" } }, -{% if asic_type in pfc_to_pg_map_supported_asics %} - "PFC_PRIORITY_TO_PRIORITY_GROUP_MAP": { - "AZURE": { - "3": "3", - "4": "4" - } - }, -{% endif %} "PORT_QOS_MAP": { "{{ port_names_active }}": { - "dscp_to_tc_map" : "[DSCP_TO_TC_MAP|AZURE]", - "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|AZURE]", - "tc_to_pg_map" : "[TC_TO_PRIORITY_GROUP_MAP|AZURE]" + "dscp_to_tc_map" : "[DSCP_TO_TC_MAP|DEFAULT]", + "tc_to_queue_map" : "[TC_TO_QUEUE_MAP|DEFAULT]", + "tc_to_pg_map" : "[TC_TO_PRIORITY_GROUP_MAP|DEFAULT]" } }, "QUEUE": { diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-96x25G+8x100G.config.bcm b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-96x25G+8x100G.config.bcm index f76764e2756..47cbb41f407 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-96x25G+8x100G.config.bcm +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/td3-s5232f-96x25G+8x100G.config.bcm @@ -37,7 +37,6 @@ l3_max_ecmp_mode=1 bcm_tunnel_term_compatible_mode=1 ifp_inports_support_enable=1 -mmu_init_config="MSFT-TD3-Tier1" stable_size=0x5500000 @@ -615,4 +614,4 @@ dport_map_port_129=126 dport_map_port_66=127 dport_map_port_130=128 - +mmu_init_config="TD3-DEFAULT" From d2a3384756935ad4dd8aeb74536c75fe9104f895 Mon Sep 17 00:00:00 2001 From: ashokd Date: Tue, 6 Aug 2019 23:26:10 +0000 Subject: [PATCH 6/6] Correted the configuration file name --- .../DellEMC-S5232f-P-10G/sai.profile | 2 +- .../DellEMC-S5232f-P-25G/sai.profile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/sai.profile b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/sai.profile index 9315096e872..947af7ebacc 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/sai.profile +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-10G/sai.profile @@ -1 +1 @@ -SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-s5232f-8x100G-96x10G.config.bcm +SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-s5232f-96x10G+8x100G.config.bcm diff --git a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/sai.profile b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/sai.profile index a597925a820..ae09492f0e7 100644 --- a/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/sai.profile +++ b/device/dell/x86_64-dellemc_s5232f_c3538-r0/DellEMC-S5232f-P-25G/sai.profile @@ -1 +1 @@ -SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-s5232f-8x100G-96x25G.config.bcm +SAI_INIT_CONFIG_FILE=/usr/share/sonic/hwsku/td3-s5232f-96x25G+8x100G.config.bcm