andrius
/
arm-trusted-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tegra: memctrl_v2: TZRAM aperture configuration settings 

This patch enables the configuration settings for the TZRAM
aperture by programming the base/size of the aperture and
restricting access to it. We allow only the CPU to read/write
by programming the access configuration registers to 0.

Change-Id: Ie16ad29f4c5ec7aafa972b0a0230b4790ad5619e
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
This commit is contained in:
Varun Wadekar 2016-05-25 16:35:04 -07:00
parent 512da21af1
commit 2f583f8e6d
3 changed files with 69 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
plat/nvidia/tegra/common/drivers/memctrl/memctrl_v2.c
View File

@ -641,33 +641,55 @@ void tegra_memctrl_tzdram_setup(uint64_t phys_base, uint32_t size_in_bytes)
*/ */
void tegra_memctrl_tzram_setup(uint64_t phys_base, uint32_t size_in_bytes) void tegra_memctrl_tzram_setup(uint64_t phys_base, uint32_t size_in_bytes)
{ {
uint64_t tzram_end = phys_base + size_in_bytes - 1; uint32_t index;
uint32_t total_128kb_blocks = size_in_bytes >> 17;
uint32_t residual_4kb_blocks = (size_in_bytes & 0x1FFFF) >> 12;
uint32_t val; uint32_t val;
/* /*
* Check if the TZRAM is locked already. * Reset the access configuration registers to restrict access
* to the TZRAM aperture
*/ */
if (tegra_mc_read_32(MC_TZRAM_REG_CTRL) == DISABLE_TZRAM_ACCESS) for (index = MC_TZRAM_CARVEOUT_CLIENT_ACCESS_CFG0;
return; index <= MC_TZRAM_CARVEOUT_FORCE_INTERNAL_ACCESS5;
index += 4)
tegra_mc_write_32(index, 0);
/* /*
* Setup the Memory controller to allow only secure accesses to * Allow CPU read/write access to the aperture
* the TZRAM carveout
*/ */
INFO("Configuring TrustZone RAM (SysRAM) Memory Carveout\n"); tegra_mc_write_32(MC_TZRAM_CARVEOUT_CLIENT_ACCESS_CFG1,
TZRAM_CARVEOUT_CPU_WRITE_ACCESS_BIT |
TZRAM_CARVEOUT_CPU_READ_ACCESS_BIT);
/* Program the base and end values */ /*
tegra_mc_write_32(MC_TZRAM_BASE, (uint32_t)phys_base); * Set the TZRAM base. TZRAM base must be 4k aligned, at least.
tegra_mc_write_32(MC_TZRAM_END, (uint32_t)tzram_end); */
assert(!(phys_base & 0xFFF));
tegra_mc_write_32(MC_TZRAM_BASE_LO, (uint32_t)phys_base);
tegra_mc_write_32(MC_TZRAM_BASE_HI,
(uint32_t)(phys_base >> 32) & TZRAM_BASE_HI_MASK);
/* Extract the high address bits from the base/end values */ /*
val = (uint32_t)(phys_base >> 32) & TZRAM_ADDR_HI_BITS_MASK; * Set the TZRAM size
val |= (((uint32_t)(tzram_end >> 32) & TZRAM_ADDR_HI_BITS_MASK) << *
TZRAM_END_HI_BITS_SHIFT); * total size = (number of 128KB blocks) + (number of remaining 4KB
tegra_mc_write_32(MC_TZRAM_HI_ADDR_BITS, val); * blocks)
*
*/
val = (residual_4kb_blocks << TZRAM_SIZE_RANGE_4KB_SHIFT) |
total_128kb_blocks;
tegra_mc_write_32(MC_TZRAM_SIZE, val);
/* Disable further writes to the TZRAM setup registers */ /*
tegra_mc_write_32(MC_TZRAM_REG_CTRL, DISABLE_TZRAM_ACCESS); * Lock the configuration settings by disabling TZ-only lock
* and locking the configuration against any future changes
* at all.
*/
val = tegra_mc_read_32(MC_TZRAM_CARVEOUT_CFG);
val &= ~TZRAM_ENABLE_TZ_LOCK_BIT;
val |= TZRAM_LOCK_CFG_SETTINGS_BIT;
tegra_mc_write_32(MC_TZRAM_CARVEOUT_CFG, val);
/* /*
* MCE propogates the security configuration values across the * MCE propogates the security configuration values across the

38
plat/nvidia/tegra/include/drivers/memctrl_v2.h
View File

@ -350,7 +350,7 @@ typedef struct mc_streamid_security_cfg {
.override_enable = OVERRIDE_ ## access \ .override_enable = OVERRIDE_ ## access \
} }
#endif /* __ASSMEBLY__ */ #endif /* __ASSEMBLY__ */
/******************************************************************************* /*******************************************************************************
* TZDRAM carveout configuration registers * TZDRAM carveout configuration registers
@ -367,15 +367,35 @@ typedef struct mc_streamid_security_cfg {
#define MC_VIDEO_PROTECT_SIZE_MB 0x64c #define MC_VIDEO_PROTECT_SIZE_MB 0x64c
/******************************************************************************* /*******************************************************************************
* TZRAM carveout configuration registers * TZRAM carveout (MC_SECURITY_CARVEOUT11) configuration registers
******************************************************************************/ ******************************************************************************/
#define MC_TZRAM_BASE 0x1850 #define MC_TZRAM_BASE_LO 0x2194
#define MC_TZRAM_END 0x1854 #define TZRAM_BASE_LO_SHIFT 12
#define MC_TZRAM_HI_ADDR_BITS 0x1588 #define TZRAM_BASE_LO_MASK 0xFFFFF
#define TZRAM_ADDR_HI_BITS_MASK 0x3 #define MC_TZRAM_BASE_HI 0x2198
#define TZRAM_END_HI_BITS_SHIFT 8 #define TZRAM_BASE_HI_SHIFT 0
#define MC_TZRAM_REG_CTRL 0x185c #define TZRAM_BASE_HI_MASK 3
#define DISABLE_TZRAM_ACCESS 1 #define MC_TZRAM_SIZE 0x219C
#define TZRAM_SIZE_RANGE_4KB_SHIFT 27
#define MC_TZRAM_CARVEOUT_CFG 0x2190
#define TZRAM_LOCK_CFG_SETTINGS_BIT (1 << 1)
#define TZRAM_ENABLE_TZ_LOCK_BIT (1 << 0)
#define MC_TZRAM_CARVEOUT_CLIENT_ACCESS_CFG0 0x21A0
#define MC_TZRAM_CARVEOUT_CLIENT_ACCESS_CFG1 0x21A4
#define TZRAM_CARVEOUT_CPU_WRITE_ACCESS_BIT (1 << 25)
#define TZRAM_CARVEOUT_CPU_READ_ACCESS_BIT (1 << 7)
#define MC_TZRAM_CARVEOUT_CLIENT_ACCESS_CFG2 0x21A8
#define MC_TZRAM_CARVEOUT_CLIENT_ACCESS_CFG3 0x21AC
#define MC_TZRAM_CARVEOUT_CLIENT_ACCESS_CFG4 0x21B0
#define MC_TZRAM_CARVEOUT_CLIENT_ACCESS_CFG5 0x21B4
#define MC_TZRAM_CARVEOUT_FORCE_INTERNAL_ACCESS0 0x21B8
#define MC_TZRAM_CARVEOUT_FORCE_INTERNAL_ACCESS1 0x21BC
#define MC_TZRAM_CARVEOUT_FORCE_INTERNAL_ACCESS2 0x21C0
#define MC_TZRAM_CARVEOUT_FORCE_INTERNAL_ACCESS3 0x21C4
#define MC_TZRAM_CARVEOUT_FORCE_INTERNAL_ACCESS4 0x21C8
#define MC_TZRAM_CARVEOUT_FORCE_INTERNAL_ACCESS5 0x21CC
/******************************************************************************* /*******************************************************************************
* Memory Controller Reset Control registers * Memory Controller Reset Control registers

2
plat/nvidia/tegra/include/t186/tegra_def.h
View File

@ -165,6 +165,6 @@
* Tegra TZRAM constants * Tegra TZRAM constants
******************************************************************************/ ******************************************************************************/
#define TEGRA_TZRAM_BASE 0x30000000 #define TEGRA_TZRAM_BASE 0x30000000
#define TEGRA_TZRAM_SIZE 0x50000 #define TEGRA_TZRAM_SIZE 0x40000
#endif /* __TEGRA_DEF_H__ */ #endif /* __TEGRA_DEF_H__ */