From 88373fb822f737b60c8c71ca799ec50efaebf5bc Mon Sep 17 00:00:00 2001
From: Valentine Barshak <valentine.barshak@cogentembedded.com>
Date: Tue, 4 Jul 2017 21:09:26 +0300
Subject: [PATCH] plat: renesas: rcar: Make RPC secure settings optional

This adds RCAR_DISABLE_NONSECURE_RPC_ACCESS make variable which
disables non-secure RPC access when set to a non-zero value.

Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
---
 plat/renesas/rcar/bl2_secure_setting.c |  4 ++++
 plat/renesas/rcar/bl31_rcar_setup.c    | 16 ++++++++++++++++
 plat/renesas/rcar/platform.mk          |  6 ++++++
 3 files changed, 26 insertions(+)

diff --git a/plat/renesas/rcar/bl2_secure_setting.c b/plat/renesas/rcar/bl2_secure_setting.c
index 3ab651f..40e6a36 100644
--- a/plat/renesas/rcar/bl2_secure_setting.c
+++ b/plat/renesas/rcar/bl2_secure_setting.c
@@ -108,7 +108,9 @@ static const struct {
 	/** Security attribute setting for slave ports 13 */
 	/* Bit22: RPC slave ports. */
 	/*        0: registers can be accessed from secure resource only. */
+#if (RCAR_DISABLE_NONSECURE_RPC_ACCESS != 0)
 	{SEC_SEL13,		0xFFBFFFFFU},
+#endif
 
 	/** Security attribute setting for slave ports 14 */
 	/* Bit27: System Timer (SCMT) slave ports. */
@@ -232,8 +234,10 @@ static const struct {
 	/** Security group 1 attribute setting for slave ports 13 */
 	/* Bit22: RPC slave ports. */
 	/*        SecurityGroup3 */
+#if (RCAR_DISABLE_NONSECURE_RPC_ACCESS != 0)
 	{SEC_GRP0COND13,	0x00400000U},
 	{SEC_GRP1COND13,	0x00400000U},
+#endif
 
 	/** Security group 0 attribute setting for slave ports 14 */
 	/** Security group 1 attribute setting for slave ports 14 */
diff --git a/plat/renesas/rcar/bl31_rcar_setup.c b/plat/renesas/rcar/bl31_rcar_setup.c
index cc6ad2c..c91297d 100644
--- a/plat/renesas/rcar/bl31_rcar_setup.c
+++ b/plat/renesas/rcar/bl31_rcar_setup.c
@@ -232,3 +232,19 @@ int32_t bl31_plat_denied_cpu_off_chk(void)
 	return rc;
 }
 
+/*******************************************************************************
+ * Perform the runtime platform specific setup here.
+ ******************************************************************************/
+void bl31_plat_runtime_setup(void)
+{
+#if (RCAR_DISABLE_NONSECURE_RPC_ACCESS == 0)
+	/* Enable non-secure access to the RPC HyperFlash region. */
+	mmio_write_32(0xee2000b8, 0x155);
+	mmio_write_32(0xee200000, mmio_read_32(0xee200000) & 0x7fffffff);
+#endif
+	/*
+	 * Finish the use of console driver in BL31 so that any runtime logs
+	 * from BL31 will be suppressed.
+	 */
+	console_uninit();
+}
diff --git a/plat/renesas/rcar/platform.mk b/plat/renesas/rcar/platform.mk
index 6abc088..60f41ae 100644
--- a/plat/renesas/rcar/platform.mk
+++ b/plat/renesas/rcar/platform.mk
@@ -223,6 +223,12 @@ RCAR_GEN3_ULCB := 0
 endif
 $(eval $(call add_define,RCAR_GEN3_ULCB))
 
+# Process RCAR_DISABLE_NONSECURE_RPC_ACCESS flag
+ifndef RCAR_DISABLE_NONSECURE_RPC_ACCESS
+RCAR_DISABLE_NONSECURE_RPC_ACCESS := 0
+endif
+$(eval $(call add_define,RCAR_DISABLE_NONSECURE_RPC_ACCESS))
+
 include plat/renesas/rcar/ddr/ddr.mk
 include plat/renesas/rcar/qos/qos.mk
 include plat/renesas/rcar/pfc/pfc.mk
-- 
2.7.5