From cde7bbc8140d44cc457d04100948481adb08c5bf Mon Sep 17 00:00:00 2001 From: Oleksandr Ivantsiv Date: Tue, 20 Dec 2016 14:05:35 +0200 Subject: [PATCH 1/3] Update Mellanox SAI and SDK version. Add SDK installation dependencies --- platform/mellanox/mlnx-sai.mk | 2 +- platform/mellanox/sdk.mk | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/platform/mellanox/mlnx-sai.mk b/platform/mellanox/mlnx-sai.mk index a80bd87a029..3b8db59e7fc 100644 --- a/platform/mellanox/mlnx-sai.mk +++ b/platform/mellanox/mlnx-sai.mk @@ -1,7 +1,7 @@ # Mellanox SAI MLNX_SAI_VERSION = 161120 -MLNX_SAI_REVISION = c7ccc8a8ba9864b62b0c038ad57d6dd94771f5ee +MLNX_SAI_REVISION = 35e5e8739bec80c19053b7bb9cf6d083b8144fb5 export MLNX_SAI_VERSION MLNX_SAI_REVISION diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk index e9f4524dda5..8d67e90d30e 100644 --- a/platform/mellanox/sdk.mk +++ b/platform/mellanox/sdk.mk @@ -1,5 +1,5 @@ -MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/9ae5a29e344e23cd4ce92805f990f8ce8fab292a/sdk -MLNX_SDK_VERSION = 4.2.3002 +MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/35e5e8739bec80c19053b7bb9cf6d083b8144fb5/sdk +MLNX_SDK_VERSION = 4.2.3102 MLNX_SDK_RDEBS += $(APPLIBS) $(IPROUTE2) $(SX_ACL_RM) $(SX_COMPLIB) \ $(SX_EXAMPLES) $(SX_GEN_UTILS) $(SX_SCEW) $(SX_SDN_HAL) \ $(SXD_LIBS) $(TESTX) @@ -11,6 +11,7 @@ MLNX_SDK_DEBS += $(APPLIBS_DEV) $(IPROUTE2_DEV) $(SX_ACL_RM_DEV) \ $(SXD_LIBS_DEV_STATIC) $(TESTX_DEV) APPLIBS = applibs_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb +$(APPLIBS)_DEPENDS += $(SX_COMPLIB) $(SX_GEN_UTILS) $(SXD_LIBS) $(LIBNL3) APPLIBS_DEV = applibs-dev_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb $(eval $(call add_derived_package,$(APPLIBS),$(APPLIBS_DEV))) IPROUTE2 = iproute2_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb @@ -22,9 +23,11 @@ $(eval $(call add_derived_package,$(SX_COMPLIB),$(SX_COMPLIB_DEV))) SX_COMPLIB_DEV_STATIC = sx-complib-dev-static_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb $(eval $(call add_derived_package,$(SX_COMPLIB),$(SX_COMPLIB_DEV_STATIC))) SX_EXAMPLES = sx-examples_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb +$(SX_EXAMPLES)_DEPENDS += $(APPLIBS) $(SX_SCEW) $(SXD_LIBS) SX_EXAMPLES_DEV = sx-examples-dev_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb $(eval $(call add_derived_package,$(SX_EXAMPLES),$(SX_EXAMPLES_DEV))) SX_GEN_UTILS = sx-gen-utils_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb +$(SX_GEN_UTILS)_DEPENDS += $(SX_COMPLIB) SX_GEN_UTILS_DEV = sx-gen-utils-dev_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb $(eval $(call add_derived_package,$(SX_GEN_UTILS),$(SX_GEN_UTILS_DEV))) SX_SCEW = sx-scew_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb @@ -39,6 +42,7 @@ SXD_LIBS_DEV_STATIC = sxd-libs-dev-static_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb $(eval $(call add_derived_package,$(SXD_LIBS),$(SXD_LIBS_DEV_STATIC))) #packages that are required for runtime only PYTHON_SDK_API = python-sdk-api_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb +$(PYTHON_SDK_API)_DEPENDS += $(APPLIBS) $(SXD_LIBS) SX_KERNEL = sx-kernel_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb SX_KERNEL_DEV = sx-kernel-dev_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb $(eval $(call add_derived_package,$(SX_KERNEL),$(SX_KERNEL_DEV))) From 2598822f49f2b781dfdbbe7be3dc47ad0f477516 Mon Sep 17 00:00:00 2001 From: Oleksandr Ivantsiv Date: Tue, 20 Dec 2016 14:06:17 +0200 Subject: [PATCH 2/3] Update Mellanox Fimware version. --- platform/mellanox/docker-syncd-mlnx/mlnx-fw-upgrade.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/mellanox/docker-syncd-mlnx/mlnx-fw-upgrade.sh b/platform/mellanox/docker-syncd-mlnx/mlnx-fw-upgrade.sh index 81514f77b06..eee5d5a45ef 100755 --- a/platform/mellanox/docker-syncd-mlnx/mlnx-fw-upgrade.sh +++ b/platform/mellanox/docker-syncd-mlnx/mlnx-fw-upgrade.sh @@ -1,7 +1,7 @@ #!/bin/bash query_retry_count_max="10" -required_fw_version="13.1200.0116" +required_fw_version="13.1220.0130" fw_file=/etc/mlnx/fw-SPC.mfa run_or_fail() { From f20b31868ace8a937bc8be4a701c799b600eb4d7 Mon Sep 17 00:00:00 2001 From: Oleksandr Ivantsiv Date: Tue, 20 Dec 2016 18:55:24 +0200 Subject: [PATCH 3/3] Update sdk.mk --- platform/mellanox/sdk.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk index 8d67e90d30e..71b3d218418 100644 --- a/platform/mellanox/sdk.mk +++ b/platform/mellanox/sdk.mk @@ -11,7 +11,7 @@ MLNX_SDK_DEBS += $(APPLIBS_DEV) $(IPROUTE2_DEV) $(SX_ACL_RM_DEV) \ $(SXD_LIBS_DEV_STATIC) $(TESTX_DEV) APPLIBS = applibs_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb -$(APPLIBS)_DEPENDS += $(SX_COMPLIB) $(SX_GEN_UTILS) $(SXD_LIBS) $(LIBNL3) +$(APPLIBS)_DEPENDS += $(SX_COMPLIB) $(SX_GEN_UTILS) $(SXD_LIBS) $(LIBNL3) $(LIBNL_GENL3) APPLIBS_DEV = applibs-dev_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb $(eval $(call add_derived_package,$(APPLIBS),$(APPLIBS_DEV))) IPROUTE2 = iproute2_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb