Skip to content

Commit 7b0a5ba

Browse files
wendaniyxieca
wendani
authored and
yxieca
committed
Remove the divide by 4 operation to the under the hood SAI (#1532)
* Remove the divide by 4 operation to the under the hood SAI This is to avoid the need and thus the confusion for application program to know the mmu internal architecture This change must have support from SAI change to reach the correct config Signed-off-by: Wenda <[email protected]> * Relegate the divide by 4 operation to the under the hood SAI for egress lossless pool Extend to 7060 and 6100 Signed-off-by: Wenda <[email protected]> * Add more TH/TH2 hwskus Signed-off-by: Wenda Ni <[email protected]> * Update config test Signed-off-by: Wenda Ni <[email protected]> * Add TH2 ingress lossy profile Signed-off-by: Wenda Ni <[email protected]> * Move the divide by 4 operation to SAI internal Signed-off-by: Wenda Ni <[email protected]> * [bcm SAI] Upgrade Broadcom SAI to version 3.5.3.1-15 - Broadcom SAI 3.5 GA release 20190924. Signed-off-by: Ying Xie <[email protected]>
1 parent d059bda commit 7b0a5ba

File tree

19 files changed

+26
-26
lines changed

19 files changed

+26
-26
lines changed

‎device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffers_defaults_t0.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"egress_lossless_profile": {
3737
"pool":"[BUFFER_POOL|egress_lossless_pool]",
3838
"size":"1518",
39-
"static_th":"3995680"
39+
"static_th":"15982720"
4040
},
4141
"egress_lossy_profile": {
4242
"pool":"[BUFFER_POOL|egress_lossy_pool]",

‎device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffers_defaults_t1.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"egress_lossless_profile": {
3737
"pool":"[BUFFER_POOL|egress_lossless_pool]",
3838
"size":"1518",
39-
"static_th":"3995680"
39+
"static_th":"15982720"
4040
},
4141
"egress_lossy_profile": {
4242
"pool":"[BUFFER_POOL|egress_lossy_pool]",

‎device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/buffers_defaults_t0.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"egress_lossless_profile": {
5151
"pool":"[BUFFER_POOL|egress_lossless_pool]",
5252
"size":"1518",
53-
"static_th":"3995680"
53+
"static_th":"15982720"
5454
},
5555
"egress_lossy_profile": {
5656
"pool":"[BUFFER_POOL|egress_lossy_pool]",

‎device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/buffers_defaults_t0.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"egress_lossless_profile": {
5151
"pool":"[BUFFER_POOL|egress_lossless_pool]",
5252
"size":"1518",
53-
"static_th":"3995680"
53+
"static_th":"15982720"
5454
},
5555
"egress_lossy_profile": {
5656
"pool":"[BUFFER_POOL|egress_lossy_pool]",

‎device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffers_defaults_t0.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"egress_lossless_profile": {
3737
"pool":"[BUFFER_POOL|egress_lossless_pool]",
3838
"size":"1518",
39-
"static_th":"3995680"
39+
"static_th":"15982720"
4040
},
4141
"egress_lossy_profile": {
4242
"pool":"[BUFFER_POOL|egress_lossy_pool]",

‎device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffers_defaults_t1.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"egress_lossless_profile": {
3737
"pool":"[BUFFER_POOL|egress_lossless_pool]",
3838
"size":"1518",
39-
"static_th":"3995680"
39+
"static_th":"15982720"
4040
},
4141
"egress_lossy_profile": {
4242
"pool":"[BUFFER_POOL|egress_lossy_pool]",

‎device/arista/x86_64-arista_7170_64c/Arista-7170-64C/buffers_defaults_t0.j2

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
"ingress_lossy_profile": {
3131
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
3232
"size":"0",
33-
"static_th":"11075584"
33+
"static_th":"44302336"
3434
},
3535
"egress_lossless_profile": {
3636
"pool":"[BUFFER_POOL|egress_lossless_pool]",
3737
"size":"0",
38-
"static_th":"10587408"
38+
"static_th":"42349632"
3939
},
4040
"egress_lossy_profile": {
4141
"pool":"[BUFFER_POOL|egress_lossy_pool]",

‎device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/buffers_defaults_t0.j2

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@
4242
"ingress_lossy_profile": {
4343
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
4444
"size":"0",
45-
"static_th":"11075584"
45+
"static_th":"44302336"
4646
},
4747
"egress_lossless_profile": {
4848
"pool":"[BUFFER_POOL|egress_lossless_pool]",
4949
"size":"0",
50-
"static_th":"10587408"
50+
"static_th":"42349632"
5151
},
5252
"egress_lossy_profile": {
5353
"pool":"[BUFFER_POOL|egress_lossy_pool]",

‎device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@
3838
"ingress_lossy_profile": {
3939
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
4040
"size":"0",
41-
"static_th":"11075584"
41+
"static_th":"44302336"
4242
},
4343
"egress_lossless_profile": {
4444
"pool":"[BUFFER_POOL|egress_lossless_pool]",
4545
"size":"0",
46-
"static_th":"10587408"
46+
"static_th":"42349632"
4747
},
4848
"egress_lossy_profile": {
4949
"pool":"[BUFFER_POOL|egress_lossy_pool]",

‎device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
"ingress_lossy_profile": {
3131
"pool":"[BUFFER_POOL|ingress_lossless_pool]",
3232
"size":"0",
33-
"static_th":"11075584"
33+
"static_th":"44302336"
3434
},
3535
"egress_lossless_profile": {
3636
"pool":"[BUFFER_POOL|egress_lossless_pool]",
3737
"size":"0",
38-
"static_th":"10587408"
38+
"static_th":"42349632"
3939
},
4040
"egress_lossy_profile": {
4141
"pool":"[BUFFER_POOL|egress_lossy_pool]",

‎device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/buffers_defaults_t0.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"egress_lossless_profile": {
4444
"pool":"[BUFFER_POOL|egress_lossless_pool]",
4545
"size":"1518",
46-
"static_th":"3995680"
46+
"static_th":"15982720"
4747
},
4848
"egress_lossy_profile": {
4949
"pool":"[BUFFER_POOL|egress_lossy_pool]",

‎device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/buffers_defaults_t1.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
"egress_lossless_profile": {
4444
"pool":"[BUFFER_POOL|egress_lossless_pool]",
4545
"size":"1518",
46-
"static_th":"3995680"
46+
"static_th":"15982720"
4747
},
4848
"egress_lossy_profile": {
4949
"pool":"[BUFFER_POOL|egress_lossy_pool]",

‎device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/buffers_defaults_t0.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"egress_lossless_profile": {
5959
"pool":"[BUFFER_POOL|egress_lossless_pool]",
6060
"size":"1518",
61-
"static_th":"3995680"
61+
"static_th":"15982720"
6262
},
6363
"egress_lossy_profile": {
6464
"pool":"[BUFFER_POOL|egress_lossy_pool]",

‎device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers_defaults_t0.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"egress_lossless_profile": {
3737
"pool":"[BUFFER_POOL|egress_lossless_pool]",
3838
"size":"1518",
39-
"static_th":"3995680"
39+
"static_th":"15982720"
4040
},
4141
"egress_lossy_profile": {
4242
"pool":"[BUFFER_POOL|egress_lossy_pool]",

‎device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers_defaults_t1.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"egress_lossless_profile": {
3737
"pool":"[BUFFER_POOL|egress_lossless_pool]",
3838
"size":"1518",
39-
"static_th":"3995680"
39+
"static_th":"15982720"
4040
},
4141
"egress_lossy_profile": {
4242
"pool":"[BUFFER_POOL|egress_lossy_pool]",

‎device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100-C32/buffers_defaults_t1.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
"egress_lossless_profile": {
3737
"pool":"[BUFFER_POOL|egress_lossless_pool]",
3838
"size":"1518",
39-
"static_th":"3995680"
39+
"static_th":"15982720"
4040
},
4141
"egress_lossy_profile": {
4242
"pool":"[BUFFER_POOL|egress_lossy_pool]",

‎device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100-C8D48/buffers_defaults_t0.j2

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
"egress_lossless_profile": {
5151
"pool":"[BUFFER_POOL|egress_lossless_pool]",
5252
"size":"1518",
53-
"static_th":"3995680"
53+
"static_th":"15982720"
5454
},
5555
"egress_lossy_profile": {
5656
"pool":"[BUFFER_POOL|egress_lossy_pool]",

‎platform/broadcom/sai.mk

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
BRCM_SAI = libsaibcm_3.5.2.3_amd64.deb
2-
$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/3.5/libsaibcm_3.5.2.3_amd64.deb?sv=2015-04-05&sr=b&sig=anY6TeLouYsw7L6hfpH%2BTHOkvF8M3WR%2B6P2C7Dh8sHg%3D&se=2033-02-20T17%3A19%3A46Z&sp=r"
1+
BRCM_SAI = libsaibcm_3.5.3.1-15_amd64.deb
2+
$(BRCM_SAI)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/3.5/libsaibcm_3.5.3.1-15_amd64.deb?sv=2015-04-05&sr=b&sig=zXY%2FK%2FeGlxteIFlEkPdE%2FNDRet5T%2Fc1LgL0qyX9%2FmfQ%3D&se=2033-06-03T17%3A45%3A51Z&sp=r"
33

4-
BRCM_SAI_DEV = libsaibcm-dev_3.5.2.3_amd64.deb
4+
BRCM_SAI_DEV = libsaibcm-dev_3.5.3.1-15_amd64.deb
55
$(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
6-
$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/3.5/libsaibcm-dev_3.5.2.3_amd64.deb?sv=2015-04-05&sr=b&sig=o%2BVIKwVnlNv8LAvVzcS2kIXc0%2BIKaTzmA8LIkIfsh6c%3D&se=2033-02-20T17%3A20%3A03Z&sp=r"
6+
$(BRCM_SAI_DEV)_URL = "https://sonicstorage.blob.core.windows.net/packages/bcmsai/3.5/libsaibcm-dev_3.5.3.1-15_amd64.deb?sv=2015-04-05&sr=b&sig=%2BYOVgRo6dLxv3sLb8JE1wLoD%2FneYDABadwFv5xH3XRE%3D&se=2033-06-03T17%3A46%3A14Z&sp=r"
77

88
SONIC_ONLINE_DEBS += $(BRCM_SAI)
99
$(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

‎src/sonic-config-engine/tests/sample_output/buffers-dell6100.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@
9696
"egress_lossless_profile": {
9797
"pool":"[BUFFER_POOL|egress_lossless_pool]",
9898
"size":"1518",
99-
"static_th":"3995680"
99+
"static_th":"15982720"
100100
},
101101
"egress_lossy_profile": {
102102
"pool":"[BUFFER_POOL|egress_lossy_pool]",

0 commit comments

Comments
 (0)