leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: OMAP2+: Add omap_secure_init callback hook for secure initialization

Browse Source 
This can be used for detecting secure features or making early device
init sequence changes based on device security type.

Signed-off-by: Andrew F. Davis <afd@ti.com>
Reviewed-by: Lokesh Vutla <lokeshvutla@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>
This commit is contained in:
Andrew F. Davis 2020-01-02 16:19:40 -05:00 committed by Tony Lindgren
parent 4601832f40
commit db711893ea
3 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arch/arm/mach-omap2/io.c
View File

@ -51,6 +51,7 @@
#include "prm33xx.h" #include "prm33xx.h"
#include "prm44xx.h" #include "prm44xx.h"
#include "opp2xxx.h" #include "opp2xxx.h"
#include "omap-secure.h"
/* /*
* omap_clk_soc_init: points to a function that does the SoC-specific * omap_clk_soc_init: points to a function that does the SoC-specific
@ -430,6 +431,7 @@ void __init omap2420_init_early(void)
omap_hwmod_init_postsetup(); omap_hwmod_init_postsetup();
omap_clk_soc_init = omap2420_dt_clk_init; omap_clk_soc_init = omap2420_dt_clk_init;
rate_table = omap2420_rate_table; rate_table = omap2420_rate_table;
omap_secure_init();
} }
void __init omap2420_init_late(void) void __init omap2420_init_late(void)
@ -454,6 +456,7 @@ void __init omap2430_init_early(void)
omap_hwmod_init_postsetup(); omap_hwmod_init_postsetup();
omap_clk_soc_init = omap2430_dt_clk_init; omap_clk_soc_init = omap2430_dt_clk_init;
rate_table = omap2430_rate_table; rate_table = omap2430_rate_table;
omap_secure_init();
} }
void __init omap2430_init_late(void) void __init omap2430_init_late(void)
@ -481,6 +484,7 @@ void __init omap3_init_early(void)
omap3xxx_clockdomains_init(); omap3xxx_clockdomains_init();
omap3xxx_hwmod_init(); omap3xxx_hwmod_init();
omap_hwmod_init_postsetup(); omap_hwmod_init_postsetup();
omap_secure_init();
} }
void __init omap3430_init_early(void) void __init omap3430_init_early(void)
@ -533,6 +537,7 @@ void __init ti814x_init_early(void)
dm814x_hwmod_init(); dm814x_hwmod_init();
omap_hwmod_init_postsetup(); omap_hwmod_init_postsetup();
omap_clk_soc_init = dm814x_dt_clk_init; omap_clk_soc_init = dm814x_dt_clk_init;
omap_secure_init();
} }
void __init ti816x_init_early(void) void __init ti816x_init_early(void)
@ -549,6 +554,7 @@ void __init ti816x_init_early(void)
dm816x_hwmod_init(); dm816x_hwmod_init();
omap_hwmod_init_postsetup(); omap_hwmod_init_postsetup();
omap_clk_soc_init = dm816x_dt_clk_init; omap_clk_soc_init = dm816x_dt_clk_init;
omap_secure_init();
} }
#endif #endif
@ -566,6 +572,7 @@ void __init am33xx_init_early(void)
am33xx_hwmod_init(); am33xx_hwmod_init();
omap_hwmod_init_postsetup(); omap_hwmod_init_postsetup();
omap_clk_soc_init = am33xx_dt_clk_init; omap_clk_soc_init = am33xx_dt_clk_init;
omap_secure_init();
} }
void __init am33xx_init_late(void) void __init am33xx_init_late(void)
@ -589,6 +596,7 @@ void __init am43xx_init_early(void)
omap_hwmod_init_postsetup(); omap_hwmod_init_postsetup();
omap_l2_cache_init(); omap_l2_cache_init();
omap_clk_soc_init = am43xx_dt_clk_init; omap_clk_soc_init = am43xx_dt_clk_init;
omap_secure_init();
} }
void __init am43xx_init_late(void) void __init am43xx_init_late(void)
@ -617,6 +625,7 @@ void __init omap4430_init_early(void)
omap_hwmod_init_postsetup(); omap_hwmod_init_postsetup();
omap_l2_cache_init(); omap_l2_cache_init();
omap_clk_soc_init = omap4xxx_dt_clk_init; omap_clk_soc_init = omap4xxx_dt_clk_init;
omap_secure_init();
} }
void __init omap4430_init_late(void) void __init omap4430_init_late(void)
@ -643,6 +652,7 @@ void __init omap5_init_early(void)
omap54xx_hwmod_init(); omap54xx_hwmod_init();
omap_hwmod_init_postsetup(); omap_hwmod_init_postsetup();
omap_clk_soc_init = omap5xxx_dt_clk_init; omap_clk_soc_init = omap5xxx_dt_clk_init;
omap_secure_init();
} }
void __init omap5_init_late(void) void __init omap5_init_late(void)
@ -666,6 +676,7 @@ void __init dra7xx_init_early(void)
dra7xx_hwmod_init(); dra7xx_hwmod_init();
omap_hwmod_init_postsetup(); omap_hwmod_init_postsetup();
omap_clk_soc_init = dra7xx_dt_clk_init; omap_clk_soc_init = dra7xx_dt_clk_init;
omap_secure_init();
} }
void __init dra7xx_init_late(void) void __init dra7xx_init_late(void)

4
arch/arm/mach-omap2/omap-secure.c
View File

@ -163,3 +163,7 @@ u32 rx51_secure_rng_call(u32 ptr, u32 count, u32 flag)
NO_FLAG, NO_FLAG,
3, ptr, count, flag, 0); 3, ptr, count, flag, 0);
} }
void __init omap_secure_init(void)
{
}

2
arch/arm/mach-omap2/omap-secure.h
View File

@ -72,6 +72,8 @@ extern u32 rx51_secure_dispatcher(u32 idx, u32 process, u32 flag, u32 nargs,
extern u32 rx51_secure_update_aux_cr(u32 set_bits, u32 clear_bits); extern u32 rx51_secure_update_aux_cr(u32 set_bits, u32 clear_bits);
extern u32 rx51_secure_rng_call(u32 ptr, u32 count, u32 flag); extern u32 rx51_secure_rng_call(u32 ptr, u32 count, u32 flag);
void omap_secure_init(void);
#ifdef CONFIG_SOC_HAS_REALTIME_COUNTER #ifdef CONFIG_SOC_HAS_REALTIME_COUNTER
void set_cntfreq(void); void set_cntfreq(void);
#else #else