Skip to content

Commit

Permalink
[Mellanox] Update SDK/FW to 4.5.1208/2010.1218 and SAI version to 1.2…
Browse files Browse the repository at this point in the history 
…0.2.5 (#9619)

- Why I did it
To include latest SDK fixes:
1.  On CMIS modules, after low power configuration, the firmware waited for the module state to be ModuleReady instead of ModuleLowPower causing delays.
2. When connecting SN4600C, 100GbE port with CWDM4 module (Gen 3.0), link up time is 30 seconds.

and to include SAI fixes \ changes:
1. Reduce verbosity for resource check vendor data not found
2. Fix metadata validation, check default value on conditions check
3. Add 100MB, 10MB to 2201 system
4. L3 VXLAN overlay ECMP
5. VXLAN srcport API implementation
6. Fix scheduler profile null (default values) when set on sub group scheduler group
7. Fix ACL binding restoration when port leaves a LAG
8. Fix route logic for set next hop/action and reference counter for ECMP overlay

- How I did it
1. Updated SDK/FW submodule and relevant makefiles with the required versions.
2. Update SAI submodule and relevant makefile with the required version.

- How to verify it
Build an image and run tests from "sonic-mgmt".
  • Loading branch information
@dprital @judyjoseph
dprital authored and judyjoseph committed Jan 31, 2022
1 parent fac0b11 commit 7351112
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions platform/mellanox/fw.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@ else
FW_FROM_URL = n
endif

MLNX_SPC_FW_VERSION = 13.2010.1154
MLNX_SPC_FW_VERSION = 13.2010.1218
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.2010.1154
MLNX_SPC2_FW_VERSION = 29.2010.1218
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)

MLNX_SPC3_FW_VERSION = 30.2010.1154
MLNX_SPC3_FW_VERSION = 30.2010.1218
MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
$(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
$(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_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.20.1.1
MLNX_SAI_VERSION = SAIRel1.20.2.5

export MLNX_SAI_VERSION

Expand Down
2 changes: 1 addition & 1 deletion platform/mellanox/mlnx-sai/SAI-Implementation
Submodule SAI-Implementation updated 25 files
+1 −1 mlnx_sai/debian/changelog
+217 −61 mlnx_sai/inc/mlnx_sai.h
+4 −0 mlnx_sai/mlnx_sai.vcxproj
+12 −0 mlnx_sai/mlnx_sai.vcxproj.filters
+4 −0 mlnx_sai/src/Makefile.am
+284 −0 mlnx_sai/src/dbgdump/mlnx_sai_dbg_nhg_nhgm.c
+56 −5 mlnx_sai/src/fx_base_api.c
+455 −33 mlnx_sai/src/mlnx_sai_acl.c
+65 −99 mlnx_sai/src/mlnx_sai_counter.c
+5 −452 mlnx_sai/src/mlnx_sai_interfacequery.c
+496 −0 mlnx_sai/src/mlnx_sai_interfacequery_eth.c
+349 −93 mlnx_sai/src/mlnx_sai_nexthop.c
+2,111 −1,261 mlnx_sai/src/mlnx_sai_nexthopgroup.c
+2 −108 mlnx_sai/src/mlnx_sai_object.c
+137 −0 mlnx_sai/src/mlnx_sai_object_eth.c
+93 −53 mlnx_sai/src/mlnx_sai_port.c
+147 −102 mlnx_sai/src/mlnx_sai_route.c
+15 −0 mlnx_sai/src/mlnx_sai_scheduler.c
+444 −10 mlnx_sai/src/mlnx_sai_switch.c
+565 −31 mlnx_sai/src/mlnx_sai_tunnel.c
+42 −795 mlnx_sai/src/mlnx_sai_utils.c
+822 −0 mlnx_sai/src/mlnx_sai_utils_eth.c
+49 −49 mlnx_sai/src/sai_2201.xml
+1 −1 mlnx_sai/src/sdk/sx_api_bmtor.c
+2 −2 release notes.txt
2 changes: 1 addition & 1 deletion platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
Submodule Switch-SDK-drivers updated 95 files
+6 −5 bin/README.md
+ − bin/buster/applibs-dbgsym_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/applibs-dev_1.mlnx.4.5.1158_amd64.deb
+ − bin/buster/applibs-dev_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/applibs_1.mlnx.4.5.1158_amd64.deb
+ − bin/buster/applibs_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/iproute2-dbgsym_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/iproute2-dev_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/iproute2_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/python-sdk-api-dbgsym_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/python-sdk-api_1.mlnx.4.5.1158_amd64.deb
+ − bin/buster/python-sdk-api_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/sx-acl-helper-dbgsym_1.mlnx.4.5.1158_amd64.deb
+ − bin/buster/sx-acl-helper-dbgsym_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/sx-acl-helper-dev-static_1.mlnx.4.5.1158_amd64.deb
+ − bin/buster/sx-acl-helper-dev-static_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/sx-acl-helper-dev_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/sx-acl-helper_1.mlnx.4.5.1158_amd64.deb
+ − bin/buster/sx-acl-helper_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/sx-complib-dbgsym_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/sx-complib-dev-static_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/sx-complib-dev_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/sx-complib_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/sx-examples-dbgsym_1.mlnx.4.5.1158_amd64.deb
+ − bin/buster/sx-examples-dbgsym_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/sx-examples-dev_1.mlnx.4.5.1158_amd64.deb
+ − bin/buster/sx-examples-dev_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/sx-examples_1.mlnx.4.5.1158_amd64.deb
+ − bin/buster/sx-examples_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/sx-gen-utils-dbgsym_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/sx-gen-utils-dev_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/sx-gen-utils_1.mlnx.4.5.1158_amd64.deb
+ − bin/buster/sx-gen-utils_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/sx-kernel-dev_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/sx-kernel_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/sx-scew-dbgsym_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/sx-scew-dev-static_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/sx-scew-dev_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/sx-scew_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/sxd-libs-dbgsym_1.mlnx.4.5.1158_amd64.deb
+ − bin/buster/sxd-libs-dbgsym_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/sxd-libs-dev-static_1.mlnx.4.5.1158_amd64.deb
+ − bin/buster/sxd-libs-dev-static_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/sxd-libs-dev_1.mlnx.4.5.1158_amd64.deb
+ − bin/buster/sxd-libs-dev_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/sxd-libs_1.mlnx.4.5.1158_amd64.deb
+ − bin/buster/sxd-libs_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/wjh-libs-dbgsym_1.mlnx.4.5.1158_amd64.deb
+ − bin/buster/wjh-libs-dbgsym_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/wjh-libs-dev-static_1.mlnx.4.5.1158_amd64.deb
+ − bin/buster/wjh-libs-dev-static_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/wjh-libs-dev_1.mlnx.4.5.1208_amd64.deb
+ − bin/buster/wjh-libs_1.mlnx.4.5.1158_amd64.deb
+ − bin/buster/wjh-libs_1.mlnx.4.5.1208_amd64.deb
+ − bin/fw-SPC-rel-13_2010_1154-EVB.mfa
+ − bin/fw-SPC-rel-13_2010_1218-EVB.mfa
+ − bin/fw-SPC2-rel-29_2010_1154-EVB.mfa
+ − bin/fw-SPC2-rel-29_2010_1218-EVB.mfa
+ − bin/fw-SPC3-rel-30_2010_1154-EVB.mfa
+ − bin/fw-SPC3-rel-30_2010_1218-EVB.mfa
+1 −1 debian/changelog
+3 −2 drivers/net/mlx_sx/Makefile
+52 −0 drivers/net/mlx_sx/alloc.c
+3 −0 drivers/net/mlx_sx/alloc.h
+54 −0 drivers/net/mlx_sx/auto_registers/fw_reg_auto.c
+2 −0 drivers/net/mlx_sx/auto_registers/ioctl_reg_auto.c
+483 −17 drivers/net/mlx_sx/auto_registers/reg.c
+4 −2 drivers/net/mlx_sx/ber_monitor.c
+1 −1 drivers/net/mlx_sx/bulk_cntr_db.c
+0 −211 drivers/net/mlx_sx/catas.c
+16 −9 drivers/net/mlx_sx/cq.c
+674 −0 drivers/net/mlx_sx/cr_dump.c
+2 −2 drivers/net/mlx_sx/dq.c
+4 −0 drivers/net/mlx_sx/drop_monitor.c
+15 −0 drivers/net/mlx_sx/fw_cmd.c
+828 −0 drivers/net/mlx_sx/health_check.c
+69 −0 drivers/net/mlx_sx/health_check.h
+8 −3 drivers/net/mlx_sx/intf.c
+2 −0 drivers/net/mlx_sx/ioctl.c
+20 −0 drivers/net/mlx_sx/ioctl_cmd_ifc.c
+31 −0 drivers/net/mlx_sx/ioctl_dpt.c
+3 −0 drivers/net/mlx_sx/ioctl_internal.h
+56 −48 drivers/net/mlx_sx/sx.h
+57 −16 drivers/net/mlx_sx/sx_core_main.c
+41 −11 drivers/net/mlx_sx/sx_dbg_dump_proc.c
+1 −0 drivers/net/mlx_sx/sx_dpt.h
+92 −0 drivers/net/mlx_sx/sx_proc.c
+2 −0 drivers/net/sx_netdev/sx_netdev.h
+39 −5 drivers/net/sx_netdev/sx_netdev_main.c
+3 −0 include/linux/mlx_sx/auto_registers/cmd_auto.h
+9 −0 include/linux/mlx_sx/auto_registers/kernel_cmd_access_auto.h
+341 −16 include/linux/mlx_sx/auto_registers/kernel_user_auto.h
+403 −17 include/linux/mlx_sx/auto_registers/reg.h
+7 −10 include/linux/mlx_sx/device.h
+137 −1 include/linux/mlx_sx/kernel_user.h
2 changes: 1 addition & 1 deletion platform/mellanox/sdk.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#
MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/
MLNX_SDK_VERSION = 4.5.1158
MLNX_SDK_VERSION = 4.5.1208
MLNX_SDK_ISSU_VERSION = 101

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

0 comments on commit 7351112

Please sign in to comment.