From e8c7a7c61eb88898e506fe975965fc779ee46935 Mon Sep 17 00:00:00 2001
From: Dror Prital <76714716+dprital@users.noreply.github.com>
Date: Thu, 8 Dec 2022 12:16:54 +0200
Subject: [PATCH] [202012][Mellanox] Update SDK/FW to version
 4.5.3196/2010_3196 (#12989)

- Why I did it
Update SDK/FW version - 4.5.3196/2010_3196 in order to have the following fixes:

1. ON SPC2/3 in some cases, after many ACL region resize will corrupt internal DB that in return will fail future ACLs configuration
2.. Lag Port as Analyzer Port | when removing port from distributer list SDK does not reselect another port for mirroring
3. Due to critical race at initial configuration, SDK RDQ test may test RDQ configured for WJH and fail the test

Add support for new HW SKU of SN4700

- How I did it
Update pointer for the SDK/FW

- How to verify it
Run regression tests
---
 platform/mellanox/fw.mk                                | 6 +++---
 platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers | 2 +-
 platform/mellanox/sdk.mk                               | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/platform/mellanox/fw.mk b/platform/mellanox/fw.mk
index 0b1cacd67b94..faef8e6f9395 100644
--- a/platform/mellanox/fw.mk
+++ b/platform/mellanox/fw.mk
@@ -11,17 +11,17 @@ else
 FW_FROM_URL = n
 endif
 
-MLNX_SPC_FW_VERSION = 13.2010.3186
+MLNX_SPC_FW_VERSION = 13.2010.3196
 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)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC_FW_FILE)
 
-MLNX_SPC2_FW_VERSION = 29.2010.3186
+MLNX_SPC2_FW_VERSION = 29.2010.3196
 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)_URL = $(MLNX_FW_BASE_URL)/$(MLNX_SPC2_FW_FILE)
 
-MLNX_SPC3_FW_VERSION = 30.2010.3186
+MLNX_SPC3_FW_VERSION = 30.2010.3196
 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)
diff --git a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
index d44d801b60fa..a12968f165f6 160000
--- a/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
+++ b/platform/mellanox/sdk-src/sx-kernel/Switch-SDK-drivers
@@ -1 +1 @@
-Subproject commit d44d801b60fa49f0dcc1129baeef13ac64d48e2d
+Subproject commit a12968f165f623ff3c27d6ebaabd34cc6316497e
diff --git a/platform/mellanox/sdk.mk b/platform/mellanox/sdk.mk
index c74f086c0a07..06c067cc1984 100644
--- a/platform/mellanox/sdk.mk
+++ b/platform/mellanox/sdk.mk
@@ -1,6 +1,6 @@
 MLNX_SDK_BASE_PATH = $(PLATFORM_PATH)/sdk-src/sx-kernel/Switch-SDK-drivers/bin/
 MLNX_SDK_PKG_BASE_PATH = $(MLNX_SDK_BASE_PATH)/$(BLDENV)/$(CONFIGURED_ARCH)/
-MLNX_SDK_VERSION = 4.5.3186
+MLNX_SDK_VERSION = 4.5.3196
 MLNX_SDK_ISSU_VERSION = 101
 
 MLNX_SDK_DEB_VERSION = $(subst -,.,$(subst _,.,$(MLNX_SDK_VERSION)))