Skip to content

Commit

Permalink
[Mellanox] Add sdk 4.4.0542 (sonic-net#4227)
Browse files Browse the repository at this point in the history 
* [Mellanox] Add sdk 4.4.0542

* fix typo
  • Loading branch information
@Junchao-Mellanox @tiantianlv
Junchao-Mellanox authored and tiantianlv committed Apr 24, 2020
1 parent 659fa85 commit ff03d6a
Show file tree
Hide file tree
Showing 7 changed files with 28 additions and 9 deletions.
20 changes: 16 additions & 4 deletions platform/mellanox/fw.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,24 +11,36 @@ else
FW_FROM_URL = n
endif

MLNX_SPC_FW_VERSION = 13.2000.3298
MLNX_SPC_FW_VERSION = 13.2007.0322
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.3298
MLNX_SPC2_FW_VERSION = 29.2007.0322
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.2007.0322
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)

MLNX_FW_FILES = $(MLNX_SPC_FW_FILE) $(MLNX_SPC2_FW_FILE) $(MLNX_SPC3_FW_FILE)

ifeq ($(FW_FROM_URL),n)
SONIC_COPY_FILES += $(MLNX_SPC_FW_FILE) $(MLNX_SPC2_FW_FILE)
SONIC_COPY_FILES += $(MLNX_FW_FILES)
else
SONIC_ONLINE_FILES += $(MLNX_SPC_FW_FILE) $(MLNX_SPC2_FW_FILE)
SONIC_ONLINE_FILES += $(MLNX_FW_FILES)
endif

export MLNX_SPC_FW_VERSION
export MLNX_SPC_FW_FILE

export MLNX_SPC2_FW_VERSION
export MLNX_SPC2_FW_FILE

export MLNX_SPC3_FW_VERSION
export MLNX_SPC3_FW_FILE

export MLNX_FW_FILES
7 changes: 7 additions & 0 deletions platform/mellanox/mlnx-fw-upgrade.j2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,18 @@ declare -r QUERY_FILE="/tmp/mlxfwmanager-query.log"

declare -r SPC1_ASIC="spc1"
declare -r SPC2_ASIC="spc2"
declare -r SPC3_ASIC="spc3"
declare -r UNKN_ASIC="unknown"

declare -rA FW_FILE_MAP=( \
[$SPC1_ASIC]="/etc/mlnx/fw-SPC.mfa" \
[$SPC2_ASIC]="/etc/mlnx/fw-SPC2.mfa" \
[$SPC3_ASIC]="/etc/mlnx/fw-SPC3.mfa" \
)
declare -rA FW_REQUIRED_MAP=( \
[$SPC1_ASIC]="{{ MLNX_SPC_FW_VERSION }}" \
[$SPC2_ASIC]="{{ MLNX_SPC2_FW_VERSION }}" \
[$SPC3_ASIC]="{{ MLNX_SPC3_FW_VERSION }}" \
)

IMAGE_UPGRADE="${NO_PARAM}"
Expand Down Expand Up @@ -135,13 +138,17 @@ function GetAsicType() {

local -r SPC1_PRODUCT_ID="cb84"
local -r SPC2_PRODUCT_ID="cf6c"
local -r SPC3_PRODUCT_ID="cf70"

if lspci -n | grep "${VENDOR_ID}:${SPC1_PRODUCT_ID}" &>/dev/null; then
echo "${SPC1_ASIC}"
exit "${EXIT_SUCCESS}"
elif lspci -n | grep "${VENDOR_ID}:${SPC2_PRODUCT_ID}" &>/dev/null; then
echo "${SPC2_ASIC}"
exit "${EXIT_SUCCESS}"
elif lspci -n | grep "${VENDOR_ID}:${SPC3_PRODUCT_ID}" &>/dev/null; then
echo "${SPC3_ASIC}"
exit "${EXIT_SUCCESS}"
fi

echo "${UNKN_ASIC}"
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.16.0-master
MLNX_SAI_VERSION = SAIRel1.16.1-master

export MLNX_SAI_VERSION

Expand Down
2 changes: 1 addition & 1 deletion platform/mellanox/mlnx-sai/SAI-Implementation
Submodule SAI-Implementation updated 21 files
+1 −1 mlnx_sai/debian/changelog
+67 −2 mlnx_sai/inc/mlnx_sai.h
+2 −0 mlnx_sai/mlnx_sai.vcxproj
+6 −0 mlnx_sai/mlnx_sai.vcxproj.filters
+8 −5 mlnx_sai/src/Makefile.am
+143 −0 mlnx_sai/src/dbgdump/mlnx_sai_dbg_bfd.c
+102 −122 mlnx_sai/src/mlnx_sai_acl.c
+1,367 −0 mlnx_sai/src/mlnx_sai_bfd.c
+4 −1 mlnx_sai/src/mlnx_sai_debug_counter.c
+4 −0 mlnx_sai/src/mlnx_sai_host_interface.c
+9 −0 mlnx_sai/src/mlnx_sai_interfacequery.c
+24 −0 mlnx_sai/src/mlnx_sai_policer.c
+809 −297 mlnx_sai/src/mlnx_sai_port.c
+2 −1 mlnx_sai/src/mlnx_sai_rif.c
+1 −1 mlnx_sai/src/mlnx_sai_scheduler.c
+256 −19 mlnx_sai/src/mlnx_sai_switch.c
+2 −2 mlnx_sai/src/mlnx_sai_tunnel.c
+66 −2 mlnx_sai/src/mlnx_sai_utils.c
+32 −32 mlnx_sai/src/sai_4700.xml
+244 −0 mlnx_sai/src/sai_4700_100G.xml
+7 −5 release notes.txt
2 changes: 1 addition & 1 deletion platform/mellanox/one-image.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@ $(SONIC_ONE_IMAGE)_DOCKERS += $(filter-out $(patsubst %-$(DBG_IMAGE_MARK).gz,%.g
else
$(SONIC_ONE_IMAGE)_DOCKERS = $(SONIC_INSTALL_DOCKER_IMAGES)
endif
$(SONIC_ONE_IMAGE)_FILES += $(MLNX_SPC_FW_FILE) $(MLNX_SPC2_FW_FILE) $(MLNX_FFB_SCRIPT) $(ISSU_VERSION_FILE) $(ONIE_FW_UPDATE)
$(SONIC_ONE_IMAGE)_FILES += $(MLNX_FW_FILES) $(MLNX_FFB_SCRIPT) $(ISSU_VERSION_FILE) $(ONIE_FW_UPDATE)
SONIC_INSTALLERS += $(SONIC_ONE_IMAGE)
2 changes: 1 addition & 1 deletion platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
Submodule Switch-SDK-drivers updated 65 files
+6 −4 bin/README.md
+ − bin/applibs-dev_1.mlnx.4.3.3052_amd64.deb
+ − bin/applibs-dev_1.mlnx.4.4.0542_amd64.deb
+ − bin/applibs_1.mlnx.4.3.3052_amd64.deb
+ − bin/applibs_1.mlnx.4.4.0542_amd64.deb
+ − bin/fw-SPC-rel-13_2000_3298-EVB.mfa
+ − bin/fw-SPC-rel-13_2007_0322-EVB.mfa
+ − bin/fw-SPC2-rel-29_2000_3298-EVB.mfa
+ − bin/fw-SPC2-rel-29_2007_0322-EVB.mfa
+ − bin/fw-SPC3-rel-30_2007_0322-EVB.mfa
+ − bin/iproute2-dev_1.mlnx.4.4.0542_amd64.deb
+ − bin/iproute2_1.mlnx.4.4.0542_amd64.deb
+ − bin/python-sdk-api_1.mlnx.4.3.3052_amd64.deb
+ − bin/python-sdk-api_1.mlnx.4.4.0542_amd64.deb
+ − bin/sx-acl-helper-dev-static_1.mlnx.4.3.3052_amd64.deb
+ − bin/sx-acl-helper-dev-static_1.mlnx.4.4.0542_amd64.deb
+ − bin/sx-acl-helper-dev_1.mlnx.4.4.0542_amd64.deb
+ − bin/sx-acl-helper_1.mlnx.4.3.3052_amd64.deb
+ − bin/sx-acl-helper_1.mlnx.4.4.0542_amd64.deb
+ − bin/sx-complib-dev-static_1.mlnx.4.4.0542_amd64.deb
+ − bin/sx-complib-dev_1.mlnx.4.4.0542_amd64.deb
+ − bin/sx-complib_1.mlnx.4.4.0542_amd64.deb
+ − bin/sx-examples-dev_1.mlnx.4.3.3052_amd64.deb
+ − bin/sx-examples-dev_1.mlnx.4.4.0542_amd64.deb
+ − bin/sx-examples_1.mlnx.4.3.3052_amd64.deb
+ − bin/sx-examples_1.mlnx.4.4.0542_amd64.deb
+ − bin/sx-gen-utils-dev_1.mlnx.4.3.3052_amd64.deb
+ − bin/sx-gen-utils-dev_1.mlnx.4.4.0542_amd64.deb
+ − bin/sx-gen-utils_1.mlnx.4.3.3052_amd64.deb
+ − bin/sx-gen-utils_1.mlnx.4.4.0542_amd64.deb
+ − bin/sx-scew-dev-static_1.mlnx.4.4.0542_amd64.deb
+ − bin/sx-scew-dev_1.mlnx.4.4.0542_amd64.deb
+ − bin/sx-scew_1.mlnx.4.4.0542_amd64.deb
+ − bin/sxd-libs-dev-static_1.mlnx.4.3.3052_amd64.deb
+ − bin/sxd-libs-dev-static_1.mlnx.4.4.0542_amd64.deb
+ − bin/sxd-libs-dev_1.mlnx.4.3.3052_amd64.deb
+ − bin/sxd-libs-dev_1.mlnx.4.4.0542_amd64.deb
+ − bin/sxd-libs_1.mlnx.4.3.3052_amd64.deb
+ − bin/sxd-libs_1.mlnx.4.4.0542_amd64.deb
+ − bin/wjh-libs-dev-static_1.mlnx.4.3.3052_amd64.deb
+ − bin/wjh-libs-dev-static_1.mlnx.4.4.0542_amd64.deb
+ − bin/wjh-libs-dev_1.mlnx.4.3.3052_amd64.deb
+ − bin/wjh-libs-dev_1.mlnx.4.4.0542_amd64.deb
+ − bin/wjh-libs_1.mlnx.4.3.3052_amd64.deb
+ − bin/wjh-libs_1.mlnx.4.4.0542_amd64.deb
+1 −1 debian/changelog
+3 −3 drivers/net/mlx_sx/cmd.c
+36 −9 drivers/net/mlx_sx/cq.c
+1 −0 drivers/net/mlx_sx/fw.h
+3 −0 drivers/net/mlx_sx/fw_cmd.c
+1 −0 drivers/net/mlx_sx/fw_internal.h
+2 −2 drivers/net/mlx_sx/fw_reg.c
+8 −0 drivers/net/mlx_sx/ioctl_db.c
+13 −3 drivers/net/mlx_sx/ioctl_host_ifc.c
+2 −2 drivers/net/mlx_sx/reset.c
+11 −3 drivers/net/mlx_sx/sgmii_transaction.c
+2 −1 drivers/net/mlx_sx/sgmii_transport.c
+11 −9 drivers/net/mlx_sx/sx.h
+9 −2 drivers/net/mlx_sx/sx_core_main.c
+1 −0 drivers/net/mlx_sx/sx_proc.c
+12 −9 drivers/net/mlx_sx/trace.c
+15 −11 drivers/net/mlx_sx/trace.h
+25 −24 drivers/net/mlx_sx/trace_func.h
+3 −0 include/linux/mlx_sx/kernel_user.h
+8 −2 sx_scripts/sxdkernel
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.3052
MLNX_SDK_VERSION = 4.4.0542
MLNX_SDK_ISSU_VERSION = 101

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

0 comments on commit ff03d6a

Please sign in to comment.