From 5eea8e965e9748dc3b104c828d5169436b33fab9 Mon Sep 17 00:00:00 2001
From: tjchadaga <85581939+tjchadaga@users.noreply.github.com>
Date: Tue, 29 Mar 2022 13:41:31 -0700
Subject: [PATCH] Update Broadcom SAI version to 6.1 (#10344)

---
 platform/broadcom/sai-modules.mk                            | 4 ++--
 platform/broadcom/sai.mk                                    | 4 ++--
 platform/broadcom/saibcm-modules-dnx                        | 2 +-
 platform/broadcom/saibcm-modules/debian/changelog           | 6 ++++++
 platform/broadcom/saibcm-modules/make/Make.config           | 5 +++++
 .../saibcm-modules/systems/linux/user/common/Makefile       | 4 ++++
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/platform/broadcom/sai-modules.mk b/platform/broadcom/sai-modules.mk
index b4f28f1256..1236e06d62 100644
--- a/platform/broadcom/sai-modules.mk
+++ b/platform/broadcom/sai-modules.mk
@@ -1,6 +1,6 @@
 # Broadcom SAI modules
 
-BRCM_OPENNSL_KERNEL_VERSION = 6.0.0.13
+BRCM_OPENNSL_KERNEL_VERSION = 6.1.0.3
 
 BRCM_OPENNSL_KERNEL = opennsl-modules_$(BRCM_OPENNSL_KERNEL_VERSION)_amd64.deb
 $(BRCM_OPENNSL_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/saibcm-modules
@@ -10,7 +10,7 @@ $(BRCM_OPENNSL_KERNEL)_MACHINE = broadcom
 SONIC_DPKG_DEBS += $(BRCM_OPENNSL_KERNEL)
 
 # SAI bcm modules for DNX family ASIC
-BRCM_DNX_OPENNSL_KERNEL_VERSION = 6.0.0.13
+BRCM_DNX_OPENNSL_KERNEL_VERSION = 6.1.0.3
 
 BRCM_DNX_OPENNSL_KERNEL = opennsl-modules-dnx_$(BRCM_DNX_OPENNSL_KERNEL_VERSION)_amd64.deb
 $(BRCM_DNX_OPENNSL_KERNEL)_SRC_PATH = $(PLATFORM_PATH)/saibcm-modules-dnx
diff --git a/platform/broadcom/sai.mk b/platform/broadcom/sai.mk
index ce3470e663..1ec8d915e5 100644
--- a/platform/broadcom/sai.mk
+++ b/platform/broadcom/sai.mk
@@ -1,5 +1,5 @@
-LIBSAIBCM_VERSION = 6.0.0.13-1
-LIBSAIBCM_BRANCH_NAME = REL_6.0
+LIBSAIBCM_VERSION = 6.1.0.3
+LIBSAIBCM_BRANCH_NAME = REL_6.1
 LIBSAIBCM_URL_PREFIX = "https://sonicstorage.blob.core.windows.net/public/sai/bcmsai/$(LIBSAIBCM_BRANCH_NAME)/$(LIBSAIBCM_VERSION)"
 
 BRCM_SAI = libsaibcm_$(LIBSAIBCM_VERSION)_amd64.deb
diff --git a/platform/broadcom/saibcm-modules-dnx b/platform/broadcom/saibcm-modules-dnx
index 3fc83d5e5f..6bf58f8310 160000
--- a/platform/broadcom/saibcm-modules-dnx
+++ b/platform/broadcom/saibcm-modules-dnx
@@ -1 +1 @@
-Subproject commit 3fc83d5e5f9d1abad3ddf7fa6767b8cdd6121232
+Subproject commit 6bf58f8310bcb29168ae5b2dabed84fc942429fc
diff --git a/platform/broadcom/saibcm-modules/debian/changelog b/platform/broadcom/saibcm-modules/debian/changelog
index e9e36aaaf3..0ff357c572 100644
--- a/platform/broadcom/saibcm-modules/debian/changelog
+++ b/platform/broadcom/saibcm-modules/debian/changelog
@@ -1,3 +1,9 @@
+opennsl (6.1.0.3) unstable; urgency=medium
+
+  * Update to Broadcom SAI 6.1.0.3
+
+ -- Tejaswini Chadaga <tchadaga@microsoft.com>  Fri, 24 MAR 2022 12:30:00 +0000
+
 opennsl (6.0.0.13) unstable; urgency=medium
 
   * Update to Broadcom SAI 6.0.0.13
diff --git a/platform/broadcom/saibcm-modules/make/Make.config b/platform/broadcom/saibcm-modules/make/Make.config
index b6f42bf65c..01869634e2 100644
--- a/platform/broadcom/saibcm-modules/make/Make.config
+++ b/platform/broadcom/saibcm-modules/make/Make.config
@@ -120,7 +120,12 @@ ifndef SDKBUILD
 SDKBUILD :=build
 endif
 
+ifdef SDK_OUTDIR
+BLDROOT = ${SDK_OUTDIR}/${SDKBUILD}/$(if ${BLDCONFIG},${BLDCONFIG}/)${target}${all_suffix}${bldroot_suffix}
+export DEST_DIR := ${SDK_OUTDIR}/${SDKBUILD}$(if ${BLDCONFIG},/${BLDCONFIG})$(DEST_DIR_SUFFIX)
+else
 BLDROOT = ${SDK}/${SDKBUILD}/$(if ${BLDCONFIG},${BLDCONFIG}/)${target}${all_suffix}${bldroot_suffix}
+endif
 
 endif # ifeq "$(HOSTTYPE)" "Windows2000PC"
 
diff --git a/platform/broadcom/saibcm-modules/systems/linux/user/common/Makefile b/platform/broadcom/saibcm-modules/systems/linux/user/common/Makefile
index 3dc6425e6e..7a342f6ef6 100644
--- a/platform/broadcom/saibcm-modules/systems/linux/user/common/Makefile
+++ b/platform/broadcom/saibcm-modules/systems/linux/user/common/Makefile
@@ -69,8 +69,12 @@ kernel-override=linux-$(platform)
 ifdef BLDCONFIG
 KERN_BLDROOT=${SDK}/${SDKBUILD}/${BLDCONFIG}/$(kernel-override)$(bldroot_suffix)
 else
+ifdef SDK_OUTDIR
+KERN_BLDROOT=${SDK_OUTDIR}/${SDKBUILD}/$(kernel-override)$(bldroot_suffix)
+else
 KERN_BLDROOT=${SDK}/${SDKBUILD}/$(kernel-override)$(bldroot_suffix)
 endif
+endif
 
 ifeq (,$(kernel_version))
 kernel_version=2_4