commit 58a9eca3ab508133c0f6a210b25086e9a2cb8b43
author Sheetal Tigadoli <sheetal.tigadoli@broadcom.com> Wed Dec 18 20:05:09 2019 +0530
committer Sheetal Tigadoli <sheetal.tigadoli@broadcom.com> Fri Apr 03 17:12:42 2020 +0530
tree 866d49452ecd51adb47380d50357d286e3e49306
parent ad0943e22a1be520cbf8d9782adfe4ea90296244

Add BL31 support for Broadcom stingray platform

Change-Id: Icfef5b6923dc292e637001045a334c499d346fe9
Signed-off-by: Sheetal Tigadoli <sheetal.tigadoli@broadcom.com>

plat/brcm/board/stingray/src/brcm_pm_ops.c

diff --git a/plat/brcm/board/stingray/src/brcm_pm_ops.c b/plat/brcm/board/stingray/src/brcm_pm_ops.c
index 81d2ccf..090fbca 100644
--- a/plat/brcm/board/stingray/src/brcm_pm_ops.c
+++ b/plat/brcm/board/stingray/src/brcm_pm_ops.c
@@ -16,9 +16,11 @@
 #include <lib/spinlock.h>
 
 #include <brcm_scpi.h>
+#include <chimp.h>
 #include <cmn_plat_util.h>
 #include <plat_brcm.h>
 #include <platform_def.h>
+#include <sr_utils.h>
 
 #include "m0_cfg.h"
 
@@ -280,7 +282,14 @@
 
 static void __dead2 brcm_system_reset(void)
 {
-	brcm_scp_sys_reset(SOFT_SYS_RESET_L1);
+	unsigned int reset_type;
+
+	if (bcm_chimp_is_nic_mode())
+		reset_type = SOFT_RESET_L3;
+	else
+		reset_type = SOFT_SYS_RESET_L1;
+
+	brcm_scp_sys_reset(reset_type);
 }
 
 static int brcm_system_reset2(int is_vendor, int reset_type,
@@ -289,6 +298,11 @@
 	if (!is_vendor) {
 		/* Architectural warm boot: only warm reset is supported */
 		reset_type = SOFT_RESET_L3;
+	} else {
+		uint32_t boot_source = (uint32_t)cookie;
+
+		boot_source &= BOOT_SOURCE_MASK;
+		brcm_stingray_set_straps(boot_source);
 	}
 	brcm_scp_sys_reset(reset_type);