Skip to content

Commit

Permalink
update mellanox components (built with new kernel) (#7)
Browse files Browse the repository at this point in the history 
* update mellanox components (built with new kernel)
* [mlnx] add make files for SDK WJH libs
  • Loading branch information
@stepanblyschak @qiluo-msft
stepanblyschak authored and qiluo-msft committed Jun 13, 2019
1 parent bb61ce3 commit 193c433
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 10 deletions.
4 changes: 2 additions & 2 deletions platform/mellanox/fw.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

MLNX_FW_BASE_URL = $(MLNX_SDK_BASE_URL)

MLNX_SPC_FW_VERSION = 13.2000.1140
MLNX_SPC_FW_VERSION = 13.2000.1420
MLNX_SPC_FW_FILE = fw-SPC-rel-$(subst .,_,$(MLNX_SPC_FW_VERSION))-EVB.mfa
$(MLNX_SPC_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
SONIC_ONLINE_FILES += $(MLNX_SPC_FW_FILE)

MLNX_SPC2_FW_VERSION = 29.2000.1140
MLNX_SPC2_FW_VERSION = 29.2000.1420
MLNX_SPC2_FW_FILE = fw-SPC2-rel-$(subst .,_,$(MLNX_SPC2_FW_VERSION))-EVB.mfa
$(MLNX_SPC2_FW_FILE)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
SONIC_ONLINE_FILES += $(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.14.0-master
MLNX_SAI_VERSION = SAIRel1.14.1-master

export MLNX_SAI_VERSION

Expand Down
2 changes: 1 addition & 1 deletion platform/mellanox/mlnx-sai/SAI-Implementation
Submodule SAI-Implementation updated 58 files
+1 −1 mlnx_sai/debian/changelog
+17 −2 mlnx_sai/inc/fx_base_api.h
+10 −7 mlnx_sai/inc/mlnx_flex_bitmap.h
+38 −2 mlnx_sai/inc/mlnx_sai.h
+60 −0 mlnx_sai/src/dbgdump/mlnx_sai_dbg_mirror.c
+1 −0 mlnx_sai/src/dbgdump/mlnx_sai_dbg_policer.c
+196 −144 mlnx_sai/src/fx_base_api.c
+1,167 −309 mlnx_sai/src/mlnx_sai_acl.c
+113 −92 mlnx_sai/src/mlnx_sai_bmtor.c
+1 −1 mlnx_sai/src/mlnx_sai_bridge.c
+42 −11 mlnx_sai/src/mlnx_sai_hash.c
+211 −2 mlnx_sai/src/mlnx_sai_mirror.c
+147 −0 mlnx_sai/src/mlnx_sai_policer.c
+121 −4 mlnx_sai/src/mlnx_sai_port.c
+11 −5 mlnx_sai/src/mlnx_sai_switch.c
+222 −48 mlnx_sai/src/mlnx_sai_tunnel.c
+12 −4 release notes.txt
+7 −4 sdk/README.md
+ − sdk/applibs-dev_1.mlnx.4.3.1104_amd64.deb
+ − sdk/applibs-dev_1.mlnx.4.3.1420_amd64.deb
+ − sdk/applibs_1.mlnx.4.3.1104_amd64.deb
+ − sdk/applibs_1.mlnx.4.3.1420_amd64.deb
+ − sdk/fw-SPC-rel-13_2000_1140-EVB.mfa
+ − sdk/fw-SPC-rel-13_2000_1420-EVB.mfa
+ − sdk/fw-SPC2-rel-29_2000_1140-EVB.mfa
+ − sdk/fw-SPC2-rel-29_2000_1420-EVB.mfa
+ − sdk/iproute2-dev_1.mlnx.4.3.1420_amd64.deb
+ − sdk/iproute2_1.mlnx.4.3.1420_amd64.deb
+ − sdk/python-sdk-api_1.mlnx.4.3.1104_amd64.deb
+ − sdk/python-sdk-api_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sx-complib-dev-static_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sx-complib-dev_1.mlnx.4.3.1104_amd64.deb
+ − sdk/sx-complib-dev_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sx-complib_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sx-examples-dev_1.mlnx.4.3.1104_amd64.deb
+ − sdk/sx-examples-dev_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sx-examples_1.mlnx.4.3.1104_amd64.deb
+ − sdk/sx-examples_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sx-gen-utils-dev_1.mlnx.4.3.1104_amd64.deb
+ − sdk/sx-gen-utils-dev_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sx-gen-utils_1.mlnx.4.3.1104_amd64.deb
+ − sdk/sx-gen-utils_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sx-kernel-dev_1.mlnx.4.3.1104_amd64.deb
+ − sdk/sx-kernel-dev_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sx-kernel_1.mlnx.4.3.1104_amd64.deb
+ − sdk/sx-kernel_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sx-scew-dev-static_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sx-scew-dev_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sx-scew_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sxd-libs-dev-static_1.mlnx.4.3.1104_amd64.deb
+ − sdk/sxd-libs-dev-static_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sxd-libs-dev_1.mlnx.4.3.1104_amd64.deb
+ − sdk/sxd-libs-dev_1.mlnx.4.3.1420_amd64.deb
+ − sdk/sxd-libs_1.mlnx.4.3.1104_amd64.deb
+ − sdk/sxd-libs_1.mlnx.4.3.1420_amd64.deb
+ − sdk/wjh-libs-dev-static_1.mlnx.4.3.1420_amd64.deb
+ − sdk/wjh-libs-dev_1.mlnx.4.3.1420_amd64.deb
+ − sdk/wjh-libs_1.mlnx.4.3.1420_amd64.deb
28 changes: 28 additions & 0 deletions platform/mellanox/sdk-src/wjh-libs/Makefile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
.ONESHELL:
SHELL = /bin/bash

MAIN_TARGET = wjh-libs_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
DERIVED_TARGETS = wjh-libs-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb \
wjh-libs-dev-static_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
PACKAGE_NAME = wjh_libs

$(addprefix $(DEST)/, $(MAIN_TARGET)): $(DEST)/% :
# get sources
rm -rf $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)

wget -c $(MLNX_SDK_SOURCE_BASE_URL)/$(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION).tar.gz -O - | tar -xz

# build
pushd $(PACKAGE_NAME)-$(MLNX_SDK_VERSION)-$(MLNX_SDK_ISSU_VERSION)

if [ -f autogen.sh ]; then
./autogen.sh
fi

debuild -b -us -uc -j$(SONIC_CONFIG_MAKE_JOBS)

popd

mv $(DERIVED_TARGETS) $* $(DEST)/

$(addprefix $(DEST)/, $(DERIVED_TARGETS)): $(DEST)/% : $(DEST)/$(MAIN_TARGET)
19 changes: 13 additions & 6 deletions platform/mellanox/sdk.mk
View file
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/e7da154ddf8447c04b852195f43c83802c6934c9/sdk
MLNX_SDK_VERSION = 4.3.1104
MLNX_SDK_ISSU_VERSION = 100
MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/ee4aab2c7e90c10c52925ba72d43eda393b50634/sdk
MLNX_SDK_VERSION = 4.3.1420
MLNX_SDK_ISSU_VERSION = 101

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

# Place here URL where SDK sources exist
MLNX_SDK_SOURCE_BASE_URL =
MLNX_SDK_SOURCE_BASE_URL =

export MLNX_SDK_SOURCE_BASE_URL MLNX_SDK_VERSION MLNX_SDK_ISSU_VERSION MLNX_SDK_DEB_VERSION

MLNX_SDK_RDEBS += $(APPLIBS) $(IPROUTE2_MLNX) $(SX_ACL_RM) $(SX_COMPLIB) \
$(SX_EXAMPLES) $(SX_GEN_UTILS) $(SX_SCEW) $(SXD_LIBS)
$(SX_EXAMPLES) $(SX_GEN_UTILS) $(SX_SCEW) $(SXD_LIBS) $(WJH_LIBS)

MLNX_SDK_DEBS += $(APPLIBS_DEV) $(IPROUTE2_MLNX_DEV) $(SX_ACL_RM_DEV) \
$(SX_COMPLIB_DEV) $(SX_COMPLIB_DEV_STATIC) $(SX_EXAMPLES_DEV) \
$(SX_GEN_UTILS_DEV) $(SX_SCEW_DEV) $(SX_SCEW_DEV_STATIC) \
$(SXD_LIBS_DEV) $(SXD_LIBS_DEV_STATIC)
$(SXD_LIBS_DEV) $(SXD_LIBS_DEV_STATIC) $(WJH_LIBS_DEV)

APPLIBS = applibs_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
$(APPLIBS)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/applibs
Expand Down Expand Up @@ -71,6 +71,13 @@ $(SX_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel
SX_KERNEL_DEV = sx-kernel-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
$(eval $(call add_derived_package,$(SX_KERNEL),$(SX_KERNEL_DEV)))

WJH_LIBS = wjh-libs_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
$(WJH_LIBS)_SRC_PATH = $(PLATFORM_PATH)/sdk-src/wjh-libs
$(WJH_LIBS)_DEPENDS += $(SX_COMPLIB_DEV) $(SXD_LIBS_DEV) $(APPLIBS_DEV)
$(WJH_LIBS)_RDEPENDS += $(SX_COMPLIB) $(PYTHON_SDK_API)
WJH_LIBS_DEV = wjh-libs-dev_1.mlnx.$(MLNX_SDK_DEB_VERSION)_amd64.deb
$(eval $(call add_derived_package,$(WJH_LIBS),$(WJH_LIBS_DEV)))

define make_url
$(1)_URL = $(MLNX_SDK_BASE_URL)/$(1)

Expand Down

0 comments on commit 193c433

Please sign in to comment.