LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

powerpc/mpc85xx: SECURE BOOT - Bypass PAMU in case of secure boot 

By default, PAMU's (IOMMU) are enabled in case of secure boot.
Disable/bypass them once the control reaches the bootloader.

For non-secure boot, PAMU's are already bypassed in the default
SoC configuration.

Signed-off-by: Ruchika Gupta <ruchika.gupta@freescale.com>
Reviewed-by: York Sun <yorksun@freescale.com>
This commit is contained in:
Ruchika Gupta 2014-09-29 11:35:33 +05:30 committed by York Sun
parent 4ba4a095da
commit 7cad2e38d6
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/powerpc/cpu/mpc85xx/cpu_init.c
View File

@ -426,7 +426,8 @@ ulong cpu_init_f(void)
{ {
ulong flag = 0; ulong flag = 0;
extern void m8560_cpm_reset (void); extern void m8560_cpm_reset (void);
#ifdef CONFIG_SYS_DCSRBAR_PHYS #if defined(CONFIG_SYS_DCSRBAR_PHYS) || \
(defined(CONFIG_SECURE_BOOT) && defined(CONFIG_FSL_CORENET))
ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR); ccsr_gur_t *gur = (void *)(CONFIG_SYS_MPC85xx_GUTS_ADDR);
#endif #endif
#if defined(CONFIG_SECURE_BOOT) #if defined(CONFIG_SECURE_BOOT)
@ -458,6 +459,12 @@ ulong cpu_init_f(void)
#if defined(CONFIG_SYS_CPC_REINIT_F) #if defined(CONFIG_SYS_CPC_REINIT_F)
disable_cpc_sram(); disable_cpc_sram();
#endif #endif
#if defined(CONFIG_FSL_CORENET)
/* Put PAMU in bypass mode */
out_be32(&gur->pamubypenr, FSL_CORENET_PAMU_BYPASS);
#endif
#endif #endif
#ifdef CONFIG_CPM2 #ifdef CONFIG_CPM2

1
arch/powerpc/include/asm/immap_85xx.h
View File

@ -1912,6 +1912,7 @@ defined(CONFIG_PPC_T1020) || defined(CONFIG_PPC_T1022)
u8 res24[64]; u8 res24[64];
u32 pblsr; /* Preboot loader status */ u32 pblsr; /* Preboot loader status */
u32 pamubypenr; /* PAMU bypass enable */ u32 pamubypenr; /* PAMU bypass enable */
#define FSL_CORENET_PAMU_BYPASS 0xffff0000
u32 dmacr1; /* DMA control */ u32 dmacr1; /* DMA control */
u8 res25[4]; u8 res25[4];
u32 gensr1; /* General status */ u32 gensr1; /* General status */