Skip to content

Commit 0d597b8

Browse files
committed
[202211_SPC4] Revert "Remove support to Mellanox SPC4 ASIC (sonic-net#13932) (sonic-net#13957)"
This reverts commit 18bc044
1 parent 59efea1 commit 0d597b8

File tree

4 files changed

+18
-1
lines changed

4 files changed

+18
-1
lines changed

files/build_templates/sonic_debian_extension.j2

+1
Original file line numberDiff line numberDiff line change
@@ -941,6 +941,7 @@ declare -rA FW_FILE_MAP=( \
941941
[$MLNX_SPC_FW_FILE]="fw-SPC.mfa" \
942942
[$MLNX_SPC2_FW_FILE]="fw-SPC2.mfa" \
943943
[$MLNX_SPC3_FW_FILE]="fw-SPC3.mfa" \
944+
[$MLNX_SPC4_FW_FILE]="fw-SPC4.mfa" \
944945
)
945946
sudo mkdir -p $FILESYSTEM_ROOT/$PLATFORM_DIR/fw/asic/
946947
sudo mkdir -p $FILESYSTEM_ROOT_ETC/mlnx/

platform/mellanox/fw.dep

+4
Original file line numberDiff line numberDiff line change
@@ -14,3 +14,7 @@ $(MLNX_SPC2_FW_FILE)_DEP_FILES := $(DEP_FILES)
1414
$(MLNX_SPC3_FW_FILE)_CACHE_MODE := GIT_CONTENT_SHA
1515
$(MLNX_SPC3_FW_FILE)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
1616
$(MLNX_SPC3_FW_FILE)_DEP_FILES := $(DEP_FILES)
17+
18+
$(MLNX_SPC4_FW_FILE)_CACHE_MODE := GIT_CONTENT_SHA
19+
$(MLNX_SPC4_FW_FILE)_DEP_FLAGS := $(SONIC_COMMON_FLAGS_LIST)
20+
$(MLNX_SPC4_FW_FILE)_DEP_FILES := $(DEP_FILES)

platform/mellanox/fw.mk

+7-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,12 @@ MLNX_SPC3_FW_FILE = fw-SPC3-rel-$(subst .,_,$(MLNX_SPC3_FW_VERSION))-EVB.mfa
4747
$(MLNX_SPC3_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
4848
$(MLNX_SPC3_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC3_FW_FILE)
4949

50-
MLNX_FW_FILES = $(MLNX_SPC_FW_FILE) $(MLNX_SPC2_FW_FILE) $(MLNX_SPC3_FW_FILE)
50+
MLNX_SPC4_FW_VERSION = 34.2010.4150
51+
MLNX_SPC4_FW_FILE = fw-SPC4-rel-$(subst .,_,$(MLNX_SPC4_FW_VERSION))-EVB.mfa
52+
$(MLNX_SPC4_FW_FILE)_PATH = $(MLNX_FW_BASE_PATH)
53+
$(MLNX_SPC4_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC4_FW_FILE)
54+
55+
MLNX_FW_FILES = $(MLNX_SPC_FW_FILE) $(MLNX_SPC2_FW_FILE) $(MLNX_SPC3_FW_FILE) $(MLNX_SPC4_FW_FILE)
5156

5257
ifeq ($(FW_FROM_URL),n)
5358
SONIC_COPY_FILES += $(MLNX_FW_FILES)
@@ -60,3 +65,4 @@ MLNX_FILES += $(MLNX_FW_FILES)
6065
export MLNX_SPC_FW_FILE
6166
export MLNX_SPC2_FW_FILE
6267
export MLNX_SPC3_FW_FILE
68+
export MLNX_SPC4_FW_FILE

platform/mellanox/mlnx-fw-upgrade.j2

+6
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,15 @@ declare -r LIST_CONTENT_FILE="/tmp/mlxfwmanager-list-content.log"
2828
declare -r SPC1_ASIC="spc1"
2929
declare -r SPC2_ASIC="spc2"
3030
declare -r SPC3_ASIC="spc3"
31+
declare -r SPC4_ASIC="spc4"
3132
declare -r UNKN_ASIC="unknown"
3233
declare -r UNKN_MST="unknown"
3334

3435
declare -rA FW_FILE_MAP=( \
3536
[$SPC1_ASIC]="fw-SPC.mfa" \
3637
[$SPC2_ASIC]="fw-SPC2.mfa" \
3738
[$SPC3_ASIC]="fw-SPC3.mfa" \
39+
[$SPC4_ASIC]="fw-SPC4.mfa" \
3840
)
3941

4042
IMAGE_UPGRADE="${NO_PARAM}"
@@ -160,6 +162,7 @@ function GetAsicType() {
160162
local -r SPC1_PRODUCT_ID="cb84"
161163
local -r SPC2_PRODUCT_ID="cf6c"
162164
local -r SPC3_PRODUCT_ID="cf70"
165+
local -r SPC4_PRODUCT_ID="cf80"
163166

164167
if lspci -n | grep "${VENDOR_ID}:${SPC1_PRODUCT_ID}" &>/dev/null; then
165168
echo "${SPC1_ASIC}"
@@ -170,6 +173,9 @@ function GetAsicType() {
170173
elif lspci -n | grep "${VENDOR_ID}:${SPC3_PRODUCT_ID}" &>/dev/null; then
171174
echo "${SPC3_ASIC}"
172175
exit "${EXIT_SUCCESS}"
176+
elif lspci -n | grep "${VENDOR_ID}:${SPC4_PRODUCT_ID}" &>/dev/null; then
177+
echo "${SPC4_ASIC}"
178+
exit "${EXIT_SUCCESS}"
173179
fi
174180

175181
echo "${UNKN_ASIC}"

0 commit comments

Comments
 (0)