SoC security setup for CSS platforms in BL1

This patch adds support for secure setup of the SoC on CSS
platforms in BL1.

This change is required to provide memory access to normal
world images that take part in upcoming Firmware Update feature.

Change-Id: Ib202fb6cb82622c1874b700637d82ea72575e6fe

diff --git a/plat/arm/css/common/css_bl1_setup.c b/plat/arm/css/common/css_bl1_setup.c
new file mode 100644 (file)
index 0000000..2abed3b
--- /dev/null
+++ b/plat/arm/css/common/css_bl1_setup.c
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2015, ARM Limited and Contributors. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of ARM nor the names of its contributors may be used
+ * to endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <bl_common.h>
+#include <debug.h>
+#include <plat_arm.h>
+#include <soc_css.h>
+
+void bl1_platform_setup(void)
+{
+       arm_bl1_platform_setup();
+       /*
+        * Do ARM CSS SoC security setup.
+        * BL1 needs to enable normal world access to memory.
+        */
+       soc_css_security_setup();
+}
+

diff --git a/plat/arm/css/common/css_common.mk b/plat/arm/css/common/css_common.mk
index 63941979850bd00ebec01ea5d080be13a3b91836..d79c956f28ab60a1073fbe874c91c230c2523d78 100644 (file)
--- a/plat/arm/css/common/css_common.mk
+++ b/plat/arm/css/common/css_common.mk
@@ -34,7 +34,7 @@ PLAT_INCLUDES         +=      -Iinclude/plat/arm/css/common                   \
 
 PLAT_BL_COMMON_SOURCES +=      plat/arm/css/common/aarch64/css_helpers.S
 
-#BL1_SOURCES           +=
+BL1_SOURCES            +=      plat/arm/css/common/css_bl1_setup.c
 
 BL2_SOURCES            +=      plat/arm/css/common/css_bl2_setup.c             \
                                plat/arm/css/common/css_mhu.c                   \

diff --git a/plat/arm/soc/common/soc_css.mk b/plat/arm/soc/common/soc_css.mk
index d8a99a8c4a20960550c6779e460b8ef224c71f47..f80cbcebef92349d597a2cd3816ba948859fbe32 100644 (file)
--- a/plat/arm/soc/common/soc_css.mk
+++ b/plat/arm/soc/common/soc_css.mk
@@ -32,8 +32,7 @@ PLAT_INCLUDES         +=      -Iinclude/plat/arm/soc/common/
 
 #PLAT_BL_COMMON_SOURCES        +=
 
-
-#BL1_SOURCES           +=
+BL1_SOURCES            +=      plat/arm/soc/common/soc_css_security.c
 
 BL2_SOURCES            +=      plat/arm/soc/common/soc_css_security.c