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

Merge pull request #258 from rmurphy-arm/rm/dma-smmu 

Juno: clear DMA-330 SMMU security state
This commit is contained in:
danh-arm 2015-02-25 09:54:01 -08:00
parent 6ff5143937 75f8261ca6
commit f578d5e1a3
2 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plat/juno/juno_def.h
View File

@ -271,4 +271,10 @@
#define PRIMARY_CPU_SHIFT 8
#define PRIMARY_CPU_MASK 0xf
/*******************************************************************************
* MMU-401 related constants
******************************************************************************/
#define MMU401_SSD_OFFSET 0x4000
#define MMU401_DMA330_BASE 0x7fb00000
#endif /* __JUNO_DEF_H__ */

16
plat/juno/plat_security.c
View File

@ -29,6 +29,7 @@
*/
#include <debug.h>
#include <mmio.h>
#include <tzc400.h>
#include "juno_def.h"
@ -93,6 +94,19 @@ static void init_tzc400(void)
tzc_enable_filters();
}
/*******************************************************************************
* Set up the MMU-401 SSD tables. The power-on configuration has all stream IDs
* assigned to Non-Secure except some for the DMA-330. Assign those back to the
* Non-Secure world as well, otherwise EL1 may end up erroneously generating
* (untranslated) Secure transactions if it turns the SMMU on.
******************************************************************************/
static void init_mmu401(void)
{
uint32_t reg = mmio_read_32(MMU401_DMA330_BASE + MMU401_SSD_OFFSET);
reg |= 0x1FF;
mmio_write_32(MMU401_DMA330_BASE + MMU401_SSD_OFFSET, reg);
}
/*******************************************************************************
* Initialize the secure environment. At this moment only the TrustZone
* Controller is initialized.
@ -101,4 +115,6 @@ void plat_security_setup(void)
{
/* Initialize the TrustZone Controller */
init_tzc400();
/* Initialize the SMMU SSD tables*/
init_mmu401();
}