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

[Mellanox] Add sdk 4.4.0542 (#4227)

Browse Source 
* [Mellanox] Add sdk 4.4.0542

* fix typo
This commit is contained in:
Junchao-Mellanox 2020-03-09 23:58:49 +08:00 committed by GitHub
parent 590caaf5cf
commit 67f520ff5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 28 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
platform/mellanox/fw.mk
View File

@ -11,20 +11,27 @@ else
FW_FROM_URL = n FW_FROM_URL = n
endif 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 = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
$(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH) $(MLNX_SPC_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
$(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE) $(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 = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
$(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH) $(MLNX_SPC2_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
$(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE) $(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) ifeq ($(FW_FROM_URL),n)
SONIC_COPY_FILES += $(MLNX_SPC_FW_FILE) $(MLNX_SPC2_FW_FILE) SONIC_COPY_FILES += $(MLNX_FW_FILES)
else else
SONIC_ONLINE_FILES += $(MLNX_SPC_FW_FILE) $(MLNX_SPC2_FW_FILE) SONIC_ONLINE_FILES += $(MLNX_FW_FILES)
endif endif
export MLNX_SPC_FW_VERSION export MLNX_SPC_FW_VERSION
@ -32,3 +39,8 @@ export MLNX_SPC_FW_FILE
export MLNX_SPC2_FW_VERSION export MLNX_SPC2_FW_VERSION
export MLNX_SPC2_FW_FILE export MLNX_SPC2_FW_FILE
export MLNX_SPC3_FW_VERSION
export MLNX_SPC3_FW_FILE
export MLNX_FW_FILES

7
platform/mellanox/mlnx-fw-upgrade.j2
View File

@ -25,15 +25,18 @@ declare -r QUERY_FILE="/tmp/mlxfwmanager-query.log"
declare -r SPC1_ASIC="spc1" declare -r SPC1_ASIC="spc1"
declare -r SPC2_ASIC="spc2" declare -r SPC2_ASIC="spc2"
declare -r SPC3_ASIC="spc3"
declare -r UNKN_ASIC="unknown" declare -r UNKN_ASIC="unknown"
declare -rA FW_FILE_MAP=( \ declare -rA FW_FILE_MAP=( \
[$SPC1_ASIC]="/etc/mlnx/fw-SPC.mfa" \ [$SPC1_ASIC]="/etc/mlnx/fw-SPC.mfa" \
[$SPC2_ASIC]="/etc/mlnx/fw-SPC2.mfa" \ [$SPC2_ASIC]="/etc/mlnx/fw-SPC2.mfa" \
[$SPC3_ASIC]="/etc/mlnx/fw-SPC3.mfa" \
) )
declare -rA FW_REQUIRED_MAP=( \ declare -rA FW_REQUIRED_MAP=( \
[$SPC1_ASIC]="{{ MLNX_SPC_FW_VERSION }}" \ [$SPC1_ASIC]="{{ MLNX_SPC_FW_VERSION }}" \
[$SPC2_ASIC]="{{ MLNX_SPC2_FW_VERSION }}" \ [$SPC2_ASIC]="{{ MLNX_SPC2_FW_VERSION }}" \
[$SPC3_ASIC]="{{ MLNX_SPC3_FW_VERSION }}" \
) )
IMAGE_UPGRADE="${NO_PARAM}" IMAGE_UPGRADE="${NO_PARAM}"
@ -135,6 +138,7 @@ function GetAsicType() {
local -r SPC1_PRODUCT_ID="cb84" local -r SPC1_PRODUCT_ID="cb84"
local -r SPC2_PRODUCT_ID="cf6c" local -r SPC2_PRODUCT_ID="cf6c"
local -r SPC3_PRODUCT_ID="cf70"
if lspci -n | grep "${VENDOR_ID}:${SPC1_PRODUCT_ID}" &>/dev/null; then if lspci -n | grep "${VENDOR_ID}:${SPC1_PRODUCT_ID}" &>/dev/null; then
echo "${SPC1_ASIC}" echo "${SPC1_ASIC}"
@ -142,6 +146,9 @@ function GetAsicType() {
elif lspci -n | grep "${VENDOR_ID}:${SPC2_PRODUCT_ID}" &>/dev/null; then elif lspci -n | grep "${VENDOR_ID}:${SPC2_PRODUCT_ID}" &>/dev/null; then
echo "${SPC2_ASIC}" echo "${SPC2_ASIC}"
exit "${EXIT_SUCCESS}" exit "${EXIT_SUCCESS}"
elif lspci -n | grep "${VENDOR_ID}:${SPC3_PRODUCT_ID}" &>/dev/null; then
echo "${SPC3_ASIC}"
exit "${EXIT_SUCCESS}"
fi fi
echo "${UNKN_ASIC}" echo "${UNKN_ASIC}"

2
platform/mellanox/mlnx-sai.mk
View File

@ -1,6 +1,6 @@
# Mellanox SAI # Mellanox SAI
MLNX_SAI_VERSION = SAIRel1.16.0-master MLNX_SAI_VERSION = SAIRel1.16.1-master
export MLNX_SAI_VERSION export MLNX_SAI_VERSION

2
platform/mellanox/mlnx-sai/SAI-Implementation

@ -1 +1 @@
Subproject commit df052a4062556e0f3a1e695fa73efccf81d32a9d Subproject commit ef47a5592190c08d2f127d3fe8fa5a77ee4087ba

2
platform/mellanox/one-image.mk
View File

@ -11,5 +11,5 @@ $(SONIC_ONE_IMAGE)_DOCKERS += $(filter-out $(patsubst %-$(DBG_IMAGE_MARK).gz,%.g
else else
$(SONIC_ONE_IMAGE)_DOCKERS = $(SONIC_INSTALL_DOCKER_IMAGES) $(SONIC_ONE_IMAGE)_DOCKERS = $(SONIC_INSTALL_DOCKER_IMAGES)
endif 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) SONIC_INSTALLERS += $(SONIC_ONE_IMAGE)

2
platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers

@ -1 +1 @@
Subproject commit fa26ae9d24b4d1ff162f56d83d944c2fc2bcea0b Subproject commit 07425a0957d100405e3781f8bb633c462f37a92c

2
platform/mellanox/sdk.mk
View File

@ -1,5 +1,5 @@
MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/ 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_ISSU_VERSION = 101
MLNX_SDK_DEB_VERSION = $(subst _,.,$(MLNX_SDK_VERSION)) MLNX_SDK_DEB_VERSION = $(subst _,.,$(MLNX_SDK_VERSION))