[Mellanox] [SKU] Fix the shared headroom for 4600C-C64 SKU (#8242)

Removed ingress_lossy_pool from the BUFFER_POOL list Fx the the egress_lossless_pool_size value Signed-off-by: Vivek Reddy Karri <vkarri@nvidia.com>
sonic-net · Aug 3, 2021 · 1eaa951 · 1eaa951
1 parent 2a41adc
commit 1eaa951
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 22 deletions.
diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t0.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t0.j2
@@ -1,7 +1,7 @@
 {% set default_cable = '5m' %}
 {% set ingress_lossless_pool_size =  '53379072' %}
-{% set ingress_lossy_pool_size =  '1540096' %}
-{% set egress_lossless_pool_size =  '60817408' %}
+{% set ingress_lossless_xoff_size  =  '1540096' %}
+{% set egress_lossless_pool_size =  '60817392' %}
 {% set egress_lossy_pool_size =  '53379072' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
@@ -16,13 +16,7 @@
         "ingress_lossless_pool": {
             {%- if dynamic_mode is not defined %}
             "size": "{{ ingress_lossless_pool_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "ingress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossy_pool_size }}",
+            "xoff": "{{ ingress_lossless_xoff_size }}",
             {%- endif %}
             "type": "ingress",
             "mode": "dynamic"
@@ -47,7 +41,7 @@
             "dynamic_th":"7"
         },
         "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
             "dynamic_th":"3"
         },
@@ -73,7 +67,7 @@
     "BUFFER_PORT_INGRESS_PROFILE_LIST": {
 {% for port in port_names.split(',') %}
         "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
         }{% if not loop.last %},{% endif %}
 
 {% endfor %}

diff --git a/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2 b/device/mellanox/x86_64-mlnx_msn4600c-r0/Mellanox-SN4600C-C64/buffers_defaults_t1.j2
@@ -1,7 +1,7 @@
 {% set default_cable = '5m' %}
 {% set ingress_lossless_pool_size =  '52723712' %}
-{% set ingress_lossless_pool_xoff =  '2195456' %}
-{% set egress_lossless_pool_size =  '60817408' %}
+{% set ingress_lossless_xoff_size  =  '2195456' %}
+{% set egress_lossless_pool_size =  '60817392' %}
 {% set egress_lossy_pool_size =  '52723712' %}
 
 {%- macro generate_port_lists(PORT_ALL) %}
@@ -16,13 +16,7 @@
         "ingress_lossless_pool": {
             {%- if dynamic_mode is not defined %}
             "size": "{{ ingress_lossless_pool_size }}",
-            {%- endif %}
-            "type": "ingress",
-            "mode": "dynamic"
-        },
-        "ingress_lossy_pool": {
-            {%- if dynamic_mode is not defined %}
-            "size": "{{ ingress_lossy_pool_size }}",
+            "xoff": "{{ ingress_lossless_xoff_size }}",
             {%- endif %}
             "type": "ingress",
             "mode": "dynamic"
@@ -47,7 +41,7 @@
             "dynamic_th":"7"
         },
         "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossy_pool]",
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
             "dynamic_th":"3"
         },
@@ -73,7 +67,7 @@
     "BUFFER_PORT_INGRESS_PROFILE_LIST": {
 {% for port in port_names.split(',') %}
         "{{ port }}": {
-            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile],[BUFFER_PROFILE|ingress_lossy_profile]"
+            "profile_list" : "[BUFFER_PROFILE|ingress_lossless_profile]"
         }{% if not loop.last %},{% endif %}
 
 {% endfor %}