Skip to content

Commit

Permalink
Update SDK to 4.3.3052 (sonic-net#4153)
Browse files Browse the repository at this point in the history 
update FW to xx_2000_3298
update SAI to 1.16.0

update Spectrum-1 and Spectrum-2 buffer pool size according to the new SDK default config change.

	modified:   ../../device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t0.j2
	modified:   ../../device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t1.j2
	modified:   ../../device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/buffers_defaults_t0.j2
	modified:   ../../device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/buffers_defaults_t1.j2
	modified:   fw.mk
	modified:   mlnx-sai.mk
	modified:   mlnx-sai/SAI-Implementation
	modified:   sdk-src/sx-kernel/Switch-SDK-drivers
	modified:   sdk.mk

signed-off by kebol@mellanox.com
  • Loading branch information
@keboliu @pphuchar
keboliu authored and pphuchar committed Mar 9, 2020
1 parent 7cdbcd9 commit 99cf058
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 22 deletions.
8 changes: 4 additions & 4 deletions device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t0.j2
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% set default_cable = '5m' %}
{% set ingress_lossless_pool_size = '4194304' %}
{% set ingress_lossy_pool_size = '7340032' %}
{% set egress_lossless_pool_size = '16777152' %}
{% set egress_lossy_pool_size = '7340032' %}
{% set ingress_lossless_pool_size = '5029836' %}
{% set ingress_lossy_pool_size = '5029836' %}
{% set egress_lossless_pool_size = '14024599' %}
{% set egress_lossy_pool_size = '5029836' %}

{%- macro generate_port_lists(PORT_ALL) %}
{# Generate list of ports #}
Expand Down
8 changes: 4 additions & 4 deletions device/mellanox/x86_64-mlnx_msn2700-r0/ACS-MSN2700/buffers_defaults_t1.j2
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% set default_cable = '5m' %}
{% set ingress_lossless_pool_size = '2097152' %}
{% set ingress_lossy_pool_size = '5242880' %}
{% set egress_lossless_pool_size = '16777152' %}
{% set egress_lossy_pool_size = '5242880' %}
{% set ingress_lossless_pool_size = '2097100' %}
{% set ingress_lossy_pool_size = '2097100' %}
{% set egress_lossless_pool_size = '14024599' %}
{% set egress_lossy_pool_size = '2097100' %}

{%- macro generate_port_lists(PORT_ALL) %}
{# Generate list of ports #}
Expand Down
8 changes: 4 additions & 4 deletions device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/buffers_defaults_t0.j2
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% set default_cable = '5m' %}
{% set ingress_lossless_pool_size = '8224768' %}
{% set ingress_lossy_pool_size = '8224768' %}
{% set egress_lossless_pool_size = '35966016' %}
{% set egress_lossy_pool_size = '8224768' %}
{% set ingress_lossless_pool_size = '14983147' %}
{% set ingress_lossy_pool_size = '14983147' %}
{% set egress_lossless_pool_size = '34340822' %}
{% set egress_lossy_pool_size = '14983147' %}

{%- macro generate_port_lists(PORT_ALL) %}
{# Generate list of ports #}
Expand Down
8 changes: 4 additions & 4 deletions device/mellanox/x86_64-mlnx_msn3700-r0/ACS-MSN3700/buffers_defaults_t1.j2
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{% set default_cable = '5m' %}
{% set ingress_lossless_pool_size = '12042240' %}
{% set ingress_lossy_pool_size = '12042240' %}
{% set egress_lossless_pool_size = '35966016' %}
{% set egress_lossy_pool_size = '12042240' %}
{% set ingress_lossless_pool_size = '9158635' %}
{% set ingress_lossy_pool_size = '9158635' %}
{% set egress_lossless_pool_size = '34340822' %}
{% set egress_lossy_pool_size = '9158635' %}

{%- macro generate_port_lists(PORT_ALL) %}
{# Generate list of ports #}
Expand Down
4 changes: 2 additions & 2 deletions platform/mellanox/fw.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,12 @@ else
FW_FROM_URL = n
endif

MLNX_SPC_FW_VERSION = 13.2000.2720
MLNX_SPC_FW_VERSION = 13.2000.3298
MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
$(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
$(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)

MLNX_SPC2_FW_VERSION = 29.2000.2720
MLNX_SPC2_FW_VERSION = 29.2000.3298
MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
$(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
$(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
Expand Down
2 changes: 1 addition & 1 deletion platform/mellanox/mlnx-sai.mk
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Mellanox SAI

MLNX_SAI_VERSION = SAIRel1.15.5-master
MLNX_SAI_VERSION = SAIRel1.16.0-master

export MLNX_SAI_VERSION

Expand Down
2 changes: 1 addition & 1 deletion platform/mellanox/mlnx-sai/SAI-Implementation
Submodule SAI-Implementation updated 35 files
+2 −2 README.md
+1 −1 mlnx_sai/debian/changelog
+11 −6 mlnx_sai/inc/mlnx_sai.h
+6 −1 mlnx_sai/src/Makefile.am
+0 −4 mlnx_sai/src/dbgdump/mlnx_sai_dbg_acl.c
+9 −11 mlnx_sai/src/dbgdump/mlnx_sai_dbg_debug_counter.c
+4 −4 mlnx_sai/src/dbgdump/mlnx_sai_dbg_hash.c
+1 −1 mlnx_sai/src/dbgdump/mlnx_sai_dbg_mirror.c
+12 −6 mlnx_sai/src/dbgdump/mlnx_sai_dbg_port.c
+4 −4 mlnx_sai/src/dbgdump/mlnx_sai_dbg_tunnel.c
+3 −3 mlnx_sai/src/fx_base_api.c
+327 −282 mlnx_sai/src/mlnx_sai_acl.c
+11 −67 mlnx_sai/src/mlnx_sai_bmtor.c
+8 −7 mlnx_sai/src/mlnx_sai_bridge.c
+70 −33 mlnx_sai/src/mlnx_sai_buffer.c
+292 −235 mlnx_sai/src/mlnx_sai_debug_counter.c
+33 −33 mlnx_sai/src/mlnx_sai_hash.c
+28 −19 mlnx_sai/src/mlnx_sai_host_interface.c
+21 −13 mlnx_sai/src/mlnx_sai_interfacequery.c
+51 −34 mlnx_sai/src/mlnx_sai_lag.c
+9 −10 mlnx_sai/src/mlnx_sai_mirror.c
+4 −4 mlnx_sai/src/mlnx_sai_neighbor.c
+7 −8 mlnx_sai/src/mlnx_sai_object.c
+46 −23 mlnx_sai/src/mlnx_sai_policer.c
+203 −122 mlnx_sai/src/mlnx_sai_port.c
+6 −10 mlnx_sai/src/mlnx_sai_rif.c
+363 −58 mlnx_sai/src/mlnx_sai_switch.c
+163 −121 mlnx_sai/src/mlnx_sai_tunnel.c
+10 −10 mlnx_sai/src/mlnx_sai_utils.c
+244 −0 mlnx_sai/src/sai_4700.xml
+244 −0 mlnx_sai/src/sai_4700_1G.xml
+34 −0 mlnx_sai/src/sai_4700_pld.xml
+48 −0 mlnx_sai/src/sai_4700_pld_4.xml
+468 −0 mlnx_sai/src/sai_4800.xml
+12 −3 release notes.txt
2 changes: 1 addition & 1 deletion platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
Submodule Switch-SDK-drivers updated 110 files
2 changes: 1 addition & 1 deletion platform/mellanox/sdk.mk
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
MLNX_SDK_VERSION = 4.3.2908
MLNX_SDK_VERSION = 4.3.3052
MLNX_SDK_ISSU_VERSION = 101

MLNX_SDK_DEB_VERSION = $(subst _,.,$(MLNX_SDK_VERSION))
Expand Down

0 comments on commit 99cf058

Please sign in to comment.