matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove the divide by 4 operation to the under the hood SAI (#1532)

Browse Source 
* 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 <wenni@microsoft.com>

* 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 <wenni@microsoft.com>

* Add more TH/TH2 hwskus

Signed-off-by: Wenda Ni <wenni@microsoft.com>

* Update config test

Signed-off-by: Wenda Ni <wenni@microsoft.com>

* Add TH2 ingress lossy profile

Signed-off-by: Wenda Ni <wenni@microsoft.com>

* Move the divide by 4 operation to SAI internal

Signed-off-by: Wenda Ni <wenni@microsoft.com>

* [bcm SAI] Upgrade Broadcom SAI to version 3.5.3.1-15

- Broadcom SAI 3.5 GA release 20190924.

Signed-off-by: Ying Xie <ying.xie@microsoft.com>
This commit is contained in:
Wenda Ni 2019-09-25 15:57:07 -07:00 committed by Ying Xie
parent d059bda21c
commit 7b0a5ba6ae
19 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffers_defaults_t0.j2
View File

@ -36,7 +36,7 @@
"egress_lossless_profile": { "egress_lossless_profile": {
"pool":"[BUFFER_POOL|egress_lossless_pool]", "pool":"[BUFFER_POOL|egress_lossless_pool]",
"size":"1518", "size":"1518",
"static_th":"3995680" "static_th":"15982720"
}, },
"egress_lossy_profile": { "egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]", "pool":"[BUFFER_POOL|egress_lossy_pool]",

2
device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-C32/buffers_defaults_t1.j2
View File

@ -36,7 +36,7 @@
"egress_lossless_profile": { "egress_lossless_profile": {
"pool":"[BUFFER_POOL|egress_lossless_pool]", "pool":"[BUFFER_POOL|egress_lossless_pool]",
"size":"1518", "size":"1518",
"static_th":"3995680" "static_th":"15982720"
}, },
"egress_lossy_profile": { "egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]", "pool":"[BUFFER_POOL|egress_lossy_pool]",

2
device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-D48C8/buffers_defaults_t0.j2
View File

@ -50,7 +50,7 @@
"egress_lossless_profile": { "egress_lossless_profile": {
"pool":"[BUFFER_POOL|egress_lossless_pool]", "pool":"[BUFFER_POOL|egress_lossless_pool]",
"size":"1518", "size":"1518",
"static_th":"3995680" "static_th":"15982720"
}, },
"egress_lossy_profile": { "egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]", "pool":"[BUFFER_POOL|egress_lossy_pool]",

2
device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q24C8/buffers_defaults_t0.j2
View File

@ -50,7 +50,7 @@
"egress_lossless_profile": { "egress_lossless_profile": {
"pool":"[BUFFER_POOL|egress_lossless_pool]", "pool":"[BUFFER_POOL|egress_lossless_pool]",
"size":"1518", "size":"1518",
"static_th":"3995680" "static_th":"15982720"
}, },
"egress_lossy_profile": { "egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]", "pool":"[BUFFER_POOL|egress_lossy_pool]",

2
device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffers_defaults_t0.j2
View File

@ -36,7 +36,7 @@
"egress_lossless_profile": { "egress_lossless_profile": {
"pool":"[BUFFER_POOL|egress_lossless_pool]", "pool":"[BUFFER_POOL|egress_lossless_pool]",
"size":"1518", "size":"1518",
"static_th":"3995680" "static_th":"15982720"
}, },
"egress_lossy_profile": { "egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]", "pool":"[BUFFER_POOL|egress_lossy_pool]",

2
device/arista/x86_64-arista_7060_cx32s/Arista-7060CX-32S-Q32/buffers_defaults_t1.j2
View File

@ -36,7 +36,7 @@
"egress_lossless_profile": { "egress_lossless_profile": {
"pool":"[BUFFER_POOL|egress_lossless_pool]", "pool":"[BUFFER_POOL|egress_lossless_pool]",
"size":"1518", "size":"1518",
"static_th":"3995680" "static_th":"15982720"
}, },
"egress_lossy_profile": { "egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]", "pool":"[BUFFER_POOL|egress_lossy_pool]",

4
device/arista/x86_64-arista_7170_64c/Arista-7170-64C/buffers_defaults_t0.j2
View File

@ -30,12 +30,12 @@
"ingress_lossy_profile": { "ingress_lossy_profile": {
"pool":"[BUFFER_POOL|ingress_lossless_pool]", "pool":"[BUFFER_POOL|ingress_lossless_pool]",
"size":"0", "size":"0",
"static_th":"11075584" "static_th":"44302336"
}, },
"egress_lossless_profile": { "egress_lossless_profile": {
"pool":"[BUFFER_POOL|egress_lossless_pool]", "pool":"[BUFFER_POOL|egress_lossless_pool]",
"size":"0", "size":"0",
"static_th":"10587408" "static_th":"42349632"
}, },
"egress_lossy_profile": { "egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]", "pool":"[BUFFER_POOL|egress_lossy_pool]",

4
device/arista/x86_64-arista_7170_64c/Arista-7170-Q59S20/buffers_defaults_t0.j2
View File

@ -42,12 +42,12 @@
"ingress_lossy_profile": { "ingress_lossy_profile": {
"pool":"[BUFFER_POOL|ingress_lossless_pool]", "pool":"[BUFFER_POOL|ingress_lossless_pool]",
"size":"0", "size":"0",
"static_th":"11075584" "static_th":"44302336"
}, },
"egress_lossless_profile": { "egress_lossless_profile": {
"pool":"[BUFFER_POOL|egress_lossless_pool]", "pool":"[BUFFER_POOL|egress_lossless_pool]",
"size":"0", "size":"0",
"static_th":"10587408" "static_th":"42349632"
}, },
"egress_lossy_profile": { "egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]", "pool":"[BUFFER_POOL|egress_lossy_pool]",

4
device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-D108C8/buffers_defaults_t0.j2
View File

@ -38,12 +38,12 @@
"ingress_lossy_profile": { "ingress_lossy_profile": {
"pool":"[BUFFER_POOL|ingress_lossless_pool]", "pool":"[BUFFER_POOL|ingress_lossless_pool]",
"size":"0", "size":"0",
"static_th":"11075584" "static_th":"44302336"
}, },
"egress_lossless_profile": { "egress_lossless_profile": {
"pool":"[BUFFER_POOL|egress_lossless_pool]", "pool":"[BUFFER_POOL|egress_lossless_pool]",
"size":"0", "size":"0",
"static_th":"10587408" "static_th":"42349632"
}, },
"egress_lossy_profile": { "egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]", "pool":"[BUFFER_POOL|egress_lossy_pool]",

4
device/arista/x86_64-arista_7260cx3_64/Arista-7260CX3-Q64/buffers_defaults_t0.j2
View File

@ -30,12 +30,12 @@
"ingress_lossy_profile": { "ingress_lossy_profile": {
"pool":"[BUFFER_POOL|ingress_lossless_pool]", "pool":"[BUFFER_POOL|ingress_lossless_pool]",
"size":"0", "size":"0",
"static_th":"11075584" "static_th":"44302336"
}, },
"egress_lossless_profile": { "egress_lossless_profile": {
"pool":"[BUFFER_POOL|egress_lossless_pool]", "pool":"[BUFFER_POOL|egress_lossless_pool]",
"size":"0", "size":"0",
"static_th":"10587408" "static_th":"42349632"
}, },
"egress_lossy_profile": { "egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]", "pool":"[BUFFER_POOL|egress_lossy_pool]",

2
device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/buffers_defaults_t0.j2
View File

@ -43,7 +43,7 @@
"egress_lossless_profile": { "egress_lossless_profile": {
"pool":"[BUFFER_POOL|egress_lossless_pool]", "pool":"[BUFFER_POOL|egress_lossless_pool]",
"size":"1518", "size":"1518",
"static_th":"3995680" "static_th":"15982720"
}, },
"egress_lossy_profile": { "egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]", "pool":"[BUFFER_POOL|egress_lossy_pool]",

2
device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-C32/buffers_defaults_t1.j2
View File

@ -43,7 +43,7 @@
"egress_lossless_profile": { "egress_lossless_profile": {
"pool":"[BUFFER_POOL|egress_lossless_pool]", "pool":"[BUFFER_POOL|egress_lossless_pool]",
"size":"1518", "size":"1518",
"static_th":"3995680" "static_th":"15982720"
}, },
"egress_lossy_profile": { "egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]", "pool":"[BUFFER_POOL|egress_lossy_pool]",

2
device/celestica/x86_64-cel_seastone-r0/Celestica-DX010-D48C8/buffers_defaults_t0.j2
View File

@ -58,7 +58,7 @@
"egress_lossless_profile": { "egress_lossless_profile": {
"pool":"[BUFFER_POOL|egress_lossless_pool]", "pool":"[BUFFER_POOL|egress_lossless_pool]",
"size":"1518", "size":"1518",
"static_th":"3995680" "static_th":"15982720"
}, },
"egress_lossy_profile": { "egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]", "pool":"[BUFFER_POOL|egress_lossy_pool]",

2
device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers_defaults_t0.j2
View File

@ -36,7 +36,7 @@
"egress_lossless_profile": { "egress_lossless_profile": {
"pool":"[BUFFER_POOL|egress_lossless_pool]", "pool":"[BUFFER_POOL|egress_lossless_pool]",
"size":"1518", "size":"1518",
"static_th":"3995680" "static_th":"15982720"
}, },
"egress_lossy_profile": { "egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]", "pool":"[BUFFER_POOL|egress_lossy_pool]",

2
device/dell/x86_64-dell_s6100_c2538-r0/Force10-S6100/buffers_defaults_t1.j2
View File

@ -36,7 +36,7 @@
"egress_lossless_profile": { "egress_lossless_profile": {
"pool":"[BUFFER_POOL|egress_lossless_pool]", "pool":"[BUFFER_POOL|egress_lossless_pool]",
"size":"1518", "size":"1518",
"static_th":"3995680" "static_th":"15982720"
}, },
"egress_lossy_profile": { "egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]", "pool":"[BUFFER_POOL|egress_lossy_pool]",

2
device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100-C32/buffers_defaults_t1.j2
View File

@ -36,7 +36,7 @@
"egress_lossless_profile": { "egress_lossless_profile": {
"pool":"[BUFFER_POOL|egress_lossless_pool]", "pool":"[BUFFER_POOL|egress_lossless_pool]",
"size":"1518", "size":"1518",
"static_th":"3995680" "static_th":"15982720"
}, },
"egress_lossy_profile": { "egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]", "pool":"[BUFFER_POOL|egress_lossy_pool]",

2
device/dell/x86_64-dell_z9100_c2538-r0/Force10-Z9100-C8D48/buffers_defaults_t0.j2
View File

@ -50,7 +50,7 @@
"egress_lossless_profile": { "egress_lossless_profile": {
"pool":"[BUFFER_POOL|egress_lossless_pool]", "pool":"[BUFFER_POOL|egress_lossless_pool]",
"size":"1518", "size":"1518",
"static_th":"3995680" "static_th":"15982720"
}, },
"egress_lossy_profile": { "egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]", "pool":"[BUFFER_POOL|egress_lossy_pool]",

8
platform/broadcom/sai.mk
View File

@ -1,9 +1,9 @@
BRCM_SAI = libsaibcm_3.5.2.3_amd64.deb BRCM_SAI = libsaibcm_3.5.3.1-15_amd64.deb
$(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" $(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"
BRCM_SAI_DEV = libsaibcm-dev_3.5.2.3_amd64.deb BRCM_SAI_DEV = libsaibcm-dev_3.5.3.1-15_amd64.deb
$(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV))) $(eval $(call add_derived_package,$(BRCM_SAI),$(BRCM_SAI_DEV)))
$(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" $(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"
SONIC_ONLINE_DEBS += $(BRCM_SAI) SONIC_ONLINE_DEBS += $(BRCM_SAI)
$(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI) $(BRCM_SAI_DEV)_DEPENDS += $(BRCM_SAI)

2
src/sonic-config-engine/tests/sample_output/buffers-dell6100.json
View File

@ -96,7 +96,7 @@
"egress_lossless_profile": { "egress_lossless_profile": {
"pool":"[BUFFER_POOL|egress_lossless_pool]", "pool":"[BUFFER_POOL|egress_lossless_pool]",
"size":"1518", "size":"1518",
"static_th":"3995680" "static_th":"15982720"
}, },
"egress_lossy_profile": { "egress_lossy_profile": {
"pool":"[BUFFER_POOL|egress_lossy_pool]", "pool":"[BUFFER_POOL|egress_lossy_pool]",