From 0e03f92230a4e492aff7f5cd6e1acc84fbe9ccbe Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Thu, 20 Apr 2017 21:21:30 +0000
Subject: [PATCH 1/5] Update Mellanox firmware, SDK, SAI 1.0.1

---
 platform/mellanox/docker-syncd-mlnx/Dockerfile.j2      |  2 +-
 platform/mellanox/docker-syncd-mlnx/mlnx-fw-upgrade.sh |  4 ++--
 platform/mellanox/fw.mk                                |  2 +-
 platform/mellanox/mlnx-sai.mk                          |  4 ++--
 platform/mellanox/sdk.mk                               | 10 ++--------
 rules/swss.mk                                          |  4 ++--
 6 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2 b/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
index 0736df044162..4f8dd621e93d 100755
--- a/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
+++ b/platform/mellanox/docker-syncd-mlnx/Dockerfile.j2
@@ -20,7 +20,7 @@ debs/{{ deb }}{{' '}}
 
 COPY ["start.sh", "mlnx-fw-upgrade.sh", "/usr/bin/"]
 COPY ["supervisord.conf", "/etc/supervisor/conf.d/"]
-COPY ["/debs/fw-SPC.mfa", "/etc/mlnx/"]
+COPY ["/debs/fw-SPC-rel-13_1300_0130-EVB.mfa", "/etc/mlnx/"]
 
 ## Clean up
 RUN apt-get clean -y; apt-get autoclean -y; apt-get autoremove -y
diff --git a/platform/mellanox/docker-syncd-mlnx/mlnx-fw-upgrade.sh b/platform/mellanox/docker-syncd-mlnx/mlnx-fw-upgrade.sh
index eee5d5a45ef8..62a9c8625234 100755
--- a/platform/mellanox/docker-syncd-mlnx/mlnx-fw-upgrade.sh
+++ b/platform/mellanox/docker-syncd-mlnx/mlnx-fw-upgrade.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 query_retry_count_max="10"
-required_fw_version="13.1220.0130"
-fw_file=/etc/mlnx/fw-SPC.mfa
+required_fw_version="13.1300.0130"
+fw_file=/etc/mlnx/fw-SPC-rel-13_1300_0130-EVB.mfa
 
 run_or_fail() {
 	$1
diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
index 6f03c0fca221..964c4c30bc04 100644
--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@@ -1,5 +1,5 @@
 # mellanox firmware
 
-MLNX_FW = fw-SPC.mfa
+MLNX_FW = fw-SPC-rel-13_1300_0130-EVB.mfa
 $(MLNX_FW)_URL = $(MLNX_SDK_BASE_URL)/$(MLNX_FW)
 SONIC_ONLINE_FILES += $(MLNX_FW)
diff --git a/platform/mellanox/mlnx-sai.mk b/platform/mellanox/mlnx-sai.mk
index 67bc173ae8a6..3dbf1e8f293e 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 = 579c19acf3b9bed181ac713fcf92302f4ebae422
+MLNX_SAI_VERSION = SAIRel1.8.1-master
+MLNX_SAI_REVISION = b3e60a3e3eee45a783579616e98e378815ee5591
 
 export MLNX_SAI_VERSION MLNX_SAI_REVISION
 
diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk
index 71b3d218418b..08deb4517597 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/35e5e8739bec80c19053b7bb9cf6d083b8144fb5/sdk
-MLNX_SDK_VERSION = 4.2.3102
+MLNX_SDK_BASE_URL = https://github.com/Mellanox/SAI-Implementation/raw/f3a5883f93d7ef6ad8aa002e4e5abaa22fb7adfd/sdk
+MLNX_SDK_VERSION = 4.2.4000
 MLNX_SDK_RDEBS += $(APPLIBS) $(IPROUTE2) $(SX_ACL_RM) $(SX_COMPLIB) \
 		  $(SX_EXAMPLES) $(SX_GEN_UTILS) $(SX_SCEW) $(SX_SDN_HAL) \
 		  $(SXD_LIBS) $(TESTX)
@@ -20,8 +20,6 @@ $(eval $(call add_derived_package,$(IPROUTE2),$(IPROUTE2_DEV)))
 SX_COMPLIB = sx-complib_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb
 SX_COMPLIB_DEV = sx-complib-dev_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb
 $(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
@@ -33,13 +31,9 @@ $(eval $(call add_derived_package,$(SX_GEN_UTILS),$(SX_GEN_UTILS_DEV)))
 SX_SCEW = sx-scew_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb
 SX_SCEW_DEV = sx-scew-dev_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb
 $(eval $(call add_derived_package,$(SX_SCEW),$(SX_SCEW_DEV)))
-SX_SCEW_DEV_STATIC = sx-scew-dev-static_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb
-$(eval $(call add_derived_package,$(SX_SCEW),$(SX_SCEW_DEV_STATIC)))
 SXD_LIBS = sxd-libs_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb
 SXD_LIBS_DEV = sxd-libs-dev_1.mlnx.$(MLNX_SDK_VERSION)_amd64.deb
 $(eval $(call add_derived_package,$(SXD_LIBS),$(SXD_LIBS_DEV)))
-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)
diff --git a/rules/swss.mk b/rules/swss.mk
index c3f50e617e92..e5b99bfc9a1e 100644
--- a/rules/swss.mk
+++ b/rules/swss.mk
@@ -2,9 +2,9 @@
 
 SWSS = swss_1.0.0_amd64.deb
 $(SWSS)_SRC_PATH = $(SRC_PATH)/sonic-swss
-$(SWSS)_DEPENDS += $(LIBSAIREDIS_DEV) $(LIBSAIMETADATA_DEV) $(LIBTEAM_DEV) \
+$(SWSS)_DEPENDS += $(MLNX_SAI) $(LIBTEAM_DEV) \
     $(LIBTEAMDCT) $(LIBTEAM_UTILS) $(LIBSWSSCOMMON_DEV)
-$(SWSS)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA) $(LIBTEAM) $(LIBSWSSCOMMON)
+$(SWSS)_RDEPENDS += $(LIBTEAM) $(LIBSWSSCOMMON) $(MLNX_SAI)
 SONIC_DPKG_DEBS += $(SWSS)
 
 SWSS_DBG = swss-dbg_1.0.0_amd64.deb

From 4385f55f1789b731a183301a231a8c913024d882 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Thu, 8 Jun 2017 21:38:22 +0000
Subject: [PATCH 2/5] Update submodules: sonic-sairedis, sonic-swss

---
 src/sonic-sairedis | 2 +-
 src/sonic-swss     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/sonic-sairedis b/src/sonic-sairedis
index f02e667d03f7..d71c50554003 160000
--- a/src/sonic-sairedis
+++ b/src/sonic-sairedis
@@ -1 +1 @@
-Subproject commit f02e667d03f7840132c9dd210254cff2b2e0ad1d
+Subproject commit d71c505540039c218218d728888075b131720234
diff --git a/src/sonic-swss b/src/sonic-swss
index b893b4f70b79..61ad2d14aad2 160000
--- a/src/sonic-swss
+++ b/src/sonic-swss
@@ -1 +1 @@
-Subproject commit b893b4f70b79f5a87674e3a67a64accff0dd9437
+Subproject commit 61ad2d14aad28839880654581724818d5260a061

From 159b2dab5b7f69e1a67819dc1bd1516181379d00 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Fri, 9 Jun 2017 00:17:35 +0000
Subject: [PATCH 3/5] Fix swss dependencies

---
 rules/swss.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/swss.mk b/rules/swss.mk
index e5b99bfc9a1e..c3f50e617e92 100644
--- a/rules/swss.mk
+++ b/rules/swss.mk
@@ -2,9 +2,9 @@
 
 SWSS = swss_1.0.0_amd64.deb
 $(SWSS)_SRC_PATH = $(SRC_PATH)/sonic-swss
-$(SWSS)_DEPENDS += $(MLNX_SAI) $(LIBTEAM_DEV) \
+$(SWSS)_DEPENDS += $(LIBSAIREDIS_DEV) $(LIBSAIMETADATA_DEV) $(LIBTEAM_DEV) \
     $(LIBTEAMDCT) $(LIBTEAM_UTILS) $(LIBSWSSCOMMON_DEV)
-$(SWSS)_RDEPENDS += $(LIBTEAM) $(LIBSWSSCOMMON) $(MLNX_SAI)
+$(SWSS)_RDEPENDS += $(LIBSAIREDIS) $(LIBSAIMETADATA) $(LIBTEAM) $(LIBSWSSCOMMON)
 SONIC_DPKG_DEBS += $(SWSS)
 
 SWSS_DBG = swss-dbg_1.0.0_amd64.deb

From b00f7e9427e60a4ede52082f4ad6078a0f040821 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Wed, 14 Jun 2017 22:24:46 +0000
Subject: [PATCH 4/5] orchagent doesn't need to wait HIDDEN key

---
 dockers/docker-orchagent/start.sh | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/dockers/docker-orchagent/start.sh b/dockers/docker-orchagent/start.sh
index 40ef66441c02..446b52852f0a 100755
--- a/dockers/docker-orchagent/start.sh
+++ b/dockers/docker-orchagent/start.sh
@@ -11,17 +11,6 @@ rm -f /var/run/rsyslogd.pid
 
 supervisorctl start rsyslogd
 
-# Wait for syncd to start
-while true; do
-    RESULT=$(echo -en "SELECT 1\nHLEN HIDDEN" | redis-cli | sed -n 2p)
-
-    if [ "$RESULT" != "0" ]; then
-        break
-    fi
-
-    sleep 1
-done
-
 supervisorctl start orchagent
 
 supervisorctl start portsyncd

From d6a45b20a5950d8c48cf8e0589cc4cf6c2f4e941 Mon Sep 17 00:00:00 2001
From: Qi Luo <qiluo-msft@users.noreply.github.com>
Date: Fri, 9 Jun 2017 15:49:43 +0000
Subject: [PATCH 5/5] *** temp: Don't build LIBSAITHRIFT_DEV_MLNX,
 DOCKER_PTF_MLNX, PYTHON_SAITHRIFT_MLNX

---
 platform/mellanox/docker-ptf-mlnx.mk  | 2 +-
 platform/mellanox/libsaithrift-dev.mk | 2 +-
 platform/mellanox/python-saithrift.mk | 2 +-
 platform/mellanox/rules.mk            | 6 ++----
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/platform/mellanox/docker-ptf-mlnx.mk b/platform/mellanox/docker-ptf-mlnx.mk
index 7f23dc715e32..9f994f62de64 100644
--- a/platform/mellanox/docker-ptf-mlnx.mk
+++ b/platform/mellanox/docker-ptf-mlnx.mk
@@ -4,4 +4,4 @@ DOCKER_PTF_MLNX = docker-ptf-mlnx.gz
 $(DOCKER_PTF_MLNX)_PATH = $(DOCKERS_PATH)/docker-ptf-saithrift
 $(DOCKER_PTF_MLNX)_DEPENDS += $(PYTHON_SAITHRIFT_MLNX)
 $(DOCKER_PTF_MLNX)_LOAD_DOCKERS += $(DOCKER_PTF)
-SONIC_DOCKER_IMAGES += $(DOCKER_PTF_MLNX)
+#SONIC_DOCKER_IMAGES += $(DOCKER_PTF_MLNX)
diff --git a/platform/mellanox/libsaithrift-dev.mk b/platform/mellanox/libsaithrift-dev.mk
index 0fc6d3f4eb84..39222be39cab 100644
--- a/platform/mellanox/libsaithrift-dev.mk
+++ b/platform/mellanox/libsaithrift-dev.mk
@@ -4,4 +4,4 @@ LIBSAITHRIFT_DEV_MLNX = libsaithrift-dev_0.9.4_amd64.deb
 $(LIBSAITHRIFT_DEV_MLNX)_SRC_PATH = $(SRC_PATH)/SAI
 $(LIBSAITHRIFT_DEV_MLNX)_DEPENDS += $(LIBTHRIFT) $(LIBTHRIFT_DEV) $(THRIFT_COMPILER) $(MLNX_SAI) $(MLNX_SAI_DEV)
 $(LIBSAITHRIFT_DEV_MLNX)_RDEPENDS += $(LIBTHRIFT) $(MLNX_SAI)
-SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_MLNX)
+#SONIC_DPKG_DEBS += $(LIBSAITHRIFT_DEV_MLNX)
diff --git a/platform/mellanox/python-saithrift.mk b/platform/mellanox/python-saithrift.mk
index cbe5af29b3e2..59685121e02c 100644
--- a/platform/mellanox/python-saithrift.mk
+++ b/platform/mellanox/python-saithrift.mk
@@ -3,4 +3,4 @@
 PYTHON_SAITHRIFT_MLNX = python-saithrift_0.9.4_amd64.deb
 $(PYTHON_SAITHRIFT_MLNX)_SRC_PATH = $(SRC_PATH)/SAI
 $(PYTHON_SAITHRIFT_MLNX)_DEPENDS += $(MLNX_SAI_DEV) $(MLNX_SAI) $(THRIFT_COMPILER) $(PYTHON_THRIFT) $(LIBTHRIFT_DEV)
-SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_MLNX)
+#SONIC_DPKG_DEBS += $(PYTHON_SAITHRIFT_MLNX)
diff --git a/platform/mellanox/rules.mk b/platform/mellanox/rules.mk
index 6b88748c73a2..d67401df245d 100644
--- a/platform/mellanox/rules.mk
+++ b/platform/mellanox/rules.mk
@@ -12,12 +12,10 @@ include $(PLATFORM_PATH)/python-saithrift.mk
 include $(PLATFORM_PATH)/docker-ptf-mlnx.mk
 
 SONIC_ALL += $(SONIC_ONE_IMAGE) \
-             $(DOCKER_FPM) \
-             $(DOCKER_PTF_MLNX) \
-             $(DOCKER_SYNCD_MLNX_RPC)
+             $(DOCKER_FPM)
 
 # Inject mlnx sai into sairedis
-$(LIBSAIREDIS)_DEPENDS += $(MLNX_SAI) $(LIBSAITHRIFT_DEV_MLNX)
+$(LIBSAIREDIS)_DEPENDS += $(MLNX_SAI) #$(LIBSAITHRIFT_DEV_MLNX)
 
 # Runtime dependency on mlnx sai is set only for syncd
 $(SYNCD)_RDEPENDS += $(MLNX_SAI)