[device/dell] Add dynamic buffer pg lookup tbl (#1366)

This commit adds new support for dynamic buffer configuation. Adding pg_profile lookup table for supporting the buffer profile using cable length and port speed. Lookup table entries are calculated based on formula for different cable length and speed. The 50G entries needs to be updated once again as we are waiting for the interface sublayer MAC delay values. Additionally fixed some issues in the buffers.json.j2 file. Signed-off-by: Harish Venkatraman <Harish_Venkatraman@dell.com>
sonic-net · Feb 2, 2018 · b34bd1f · b34bd1f
1 parent 162089d
commit b34bd1f
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 8 deletions.
diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers.json.j2 b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers.json.j2
@@ -68,7 +68,7 @@
     }
     },
     "BUFFER_POOL": {
-        "ingress_lossless_lossy_pool": {
+        "ingress_lossless_pool": {
             "size": "10443264",
             "type": "ingress",
             "mode": "dynamic",
@@ -87,14 +87,14 @@
     },
     "BUFFER_PROFILE": {
         "ingress_lossless_profile": {
-            "pool": "[BUFFER_POOL|ingress_lossless_lossy_pool]",
+            "pool": "[BUFFER_POOL|ingress_lossless_pool]",
             "xon": "4096",
             "xoff": "58448",
             "size": "1248",
             "dynamic_th": "-4"
         },
         "ingress_lossy_profile": {
-            "pool":"[BUFFER_POOL|ingress_lossless_lossy_pool]",
+            "pool":"[BUFFER_POOL|ingress_lossless_pool]",
             "size":"0",
             "dynamic_th":"3"
         },
@@ -110,16 +110,18 @@
         }
     },
     "BUFFER_PG": {
-        "{{ port_names }}:3-4": {
+        "{{ port_names }}|3-4": {
             "profile" : "[BUFFER_PROFILE|ingress_lossless_profile]"
         },
-        "{{ port_names }}:0-1": {
+        "{{ port_names }}|0-1": {
             "profile" : "[BUFFER_PROFILE|ingress_lossy_profile]"
-        },
-        "BUFFER_QUEUE_TABLE:{{ port_names }}:3-4": {
+        }
+    },
+    "BUFFER_QUEUE": {
+        "{{ port_names }}|3-4": {
             "profile" : "[BUFFER_PROFILE|egress_lossless_profile]"
         },
-        "BUFFER_QUEUE_TABLE:{{ port_names }}:0-1": {
+        "{{ port_names }}|0-1": {
             "profile" : "[BUFFER_PROFILE|egress_lossy_profile]"
         }
     }

diff --git a/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/pg_profile_lookup.ini b/device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/pg_profile_lookup.ini
@@ -0,0 +1,17 @@
+# PG lossless profiles.
+# speed cable size    xon  xoff threshold
+  10000  5m   1248    2288 35776  -4
+  25000  5m   1248    2288 53248  -4
+  40000  5m   1248    2288 66560  -4
+  50000  5m   1248    2288 90272  -4
+ 100000  5m   1248    2288 165568 -4
+  10000  40m  1248    2288 37024  -4
+  25000  40m  1248    2288 53248  -4
+  40000  40m  1248    2288 71552  -4
+  50000  40m  1248    2288 96096  -4
+ 100000  40m  1248    2288 177632 -4
+  10000  300m 1248    2288 46176  -4
+  25000  300m 1248    2288 79040  -4
+  40000  300m 1248    2288 108160 -4
+  50000  300m 1248    2288 141856 -4
+ 100000  300m 1248    2288 268736 -4