[coreboot-gerrit] Patch set updated for coreboot: 66c9a8c tegra132: add support for TZ carve-out

[Marc Jones (marc.jones@se-eng.com)]

Marc Jones (marc.jones at se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8593

-gerrit

commit 66c9a8c5cbe85c1a384ac40db98a40c679407e78
Author: Aaron Durbin <adurbin at chromium.org>
Date:   Mon Jul 14 15:00:41 2014 -0500

    tegra132: add support for TZ carve-out
    
    The TrustZone carve-out needs to be taken into account when
    determining the memory layout. However, things are complicated
    by the fact that TZ carve-out registers are not accessible by
    the AVP.
    
    BUG=chrome-os-partner:30572
    BRANCH=None
    TEST=Built and booted to end of ramstage. Noted that denver cores
         can read TZ registers while AVP doesn't bother.
    
    Original-Change-Id: I2d2d27e33a334bf639af52260b99d8363906c646
    Original-Signed-off-by: Aaron Durbin <adurbin at chromium.org>
    Original-Reviewed-on: https://chromium-review.googlesource.com/207835
    Original-Reviewed-by: Furquan Shaikh <furquan at chromium.org>
    Original-Reviewed-by: Tom Warren <twarren at nvidia.com>
    (cherry picked from commit a4d792f4ed6a0c39eab09d90f4454d3d5dc3db26)
    Signed-off-by: Marc Jones <marc.jones at se-eng.com>
    
    Change-Id: I8fbef03d5ac42d300e1e41aeba9b86c929e01494
---
 src/soc/nvidia/tegra132/addressmap.c     |  8 ++++++++
 src/soc/nvidia/tegra132/cbmem.c          |  7 +++++++
 src/soc/nvidia/tegra132/include/soc/id.h | 35 ++++++++++++++++++++++++++++++++
 src/soc/nvidia/tegra132/mc.h             |  4 +++-
 4 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/src/soc/nvidia/tegra132/addressmap.c b/src/soc/nvidia/tegra132/addressmap.c
index 7620b1f..bb35a87 100644
--- a/src/soc/nvidia/tegra132/addressmap.c
+++ b/src/soc/nvidia/tegra132/addressmap.c
@@ -23,6 +23,7 @@
 #include <console/console.h>
 #include <soc/addressmap.h>
 #include <soc/display.h>
+#include <soc/id.h>
 #include "mc.h"
 #include "sdram.h"
 
@@ -70,6 +71,13 @@ void carveout_range(int id, uintptr_t *base_mib, size_t *size_mib)
 
 	switch (id) {
 	case CARVEOUT_TZ:
+		/* AVP does not have access to the TZ carveout registers. */
+		if (context_avp())
+			return;
+		carveout_from_regs(base_mib, size_mib,
+					read32(&mc->security_cfg0),
+					0,
+					read32(&mc->security_cfg1));
 		break;
 	case CARVEOUT_SEC:
 		carveout_from_regs(base_mib, size_mib,
diff --git a/src/soc/nvidia/tegra132/cbmem.c b/src/soc/nvidia/tegra132/cbmem.c
index ee95ba9..da08520 100644
--- a/src/soc/nvidia/tegra132/cbmem.c
+++ b/src/soc/nvidia/tegra132/cbmem.c
@@ -25,6 +25,13 @@ void *cbmem_top(void)
 	static uintptr_t addr;
 	size_t fb_size;
 
+	/*
+	 * FIXME(adurbin): The TZ registers are not accessible to the AVP.
+	 * Therefore, if there is a TZ carveout then it needs to be handled
+	 * here while executing on the AVP in order to properly place the
+	 * CBMEM region.
+	 */
+
 	/* CBMEM starts downwards from the framebuffer. */
 	if (addr == 0)
 		addr = framebuffer_attributes(&fb_size);
diff --git a/src/soc/nvidia/tegra132/include/soc/id.h b/src/soc/nvidia/tegra132/include/soc/id.h
new file mode 100644
index 0000000..6ce3df5
--- /dev/null
+++ b/src/soc/nvidia/tegra132/include/soc/id.h
@@ -0,0 +1,35 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright 2014 Google Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef __SOC_NVIDIA_TEGRA132_INCLUDE_SOC_ID_H__
+#define __SOC_NVIDIA_TEGRA132_INCLUDE_SOC_ID_H__
+
+
+#include <arch/io.h>
+#include <soc/addressmap.h>
+
+static inline int context_avp(void)
+{
+	const uint32_t avp_id = 0xaaaaaaaa;
+	void * const uptag = (void *)(uintptr_t)TEGRA_PG_UP_BASE;
+
+	return read32(uptag) == avp_id;
+}
+
+#endif /* define __SOC_NVIDIA_TEGRA132_INCLUDE_SOC_ID_H__ */
diff --git a/src/soc/nvidia/tegra132/mc.h b/src/soc/nvidia/tegra132/mc.h
index a881553..c9faa49 100644
--- a/src/soc/nvidia/tegra132/mc.h
+++ b/src/soc/nvidia/tegra132/mc.h
@@ -42,7 +42,9 @@ struct tegra_mc_regs {
 	uint32_t emem_adr_cfg_bank_mask_0;	/* 0x64 */
 	uint32_t emem_adr_cfg_bank_mask_1;	/* 0x68 */
 	uint32_t emem_adr_cfg_bank_mask_2;	/* 0x6c */
-	uint32_t rsvd_0x70[8];			/* 0x70 */
+	uint32_t security_cfg0;			/* 0x70 */
+	uint32_t security_cfg1;			/* 0x74 */
+	uint32_t rsvd_0x78[6];			/* 0x78 */
 	uint32_t emem_arb_cfg;			/* 0x90 */
 	uint32_t emem_arb_outstanding_req;	/* 0x94 */
 	uint32_t emem_arb_timing_rcd;		/* 0x98 */