ARM: sunxi: Add initialization of CNTVOFF
Add the initialization of CNTVOFF for sun8i-a83t. For boot CPU, create a new machine that handles this function's call in an "init_early" callback. We need to initialize CNTVOFF before the arch timer's initialization otherwise, it will not be taken into account and fails to boot correctly. Because of that, this function can't be called in SMP's early_initcall function which is called after timer's init. For secondary CPUs, add this function into secondary_startup assembly entry. Signed-off-by: Mylène Josserand <mylene.josserand@bootlin.com> Reviewed-by: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
This commit is contained in:
parent
7c607944bc
commit
46ebbfcb9f
|
@ -71,6 +71,7 @@ ENDPROC(sunxi_mc_smp_cluster_cache_enable)
|
|||
|
||||
ENTRY(sunxi_mc_smp_secondary_startup)
|
||||
bl sunxi_mc_smp_cluster_cache_enable
|
||||
bl secure_cntvoff_init
|
||||
b secondary_startup
|
||||
ENDPROC(sunxi_mc_smp_secondary_startup)
|
||||
|
||||
|
|
|
@ -16,6 +16,7 @@
|
|||
#include <linux/platform_device.h>
|
||||
|
||||
#include <asm/mach/arch.h>
|
||||
#include <asm/secure_cntvoff.h>
|
||||
|
||||
static const char * const sunxi_board_dt_compat[] = {
|
||||
"allwinner,sun4i-a10",
|
||||
|
@ -62,7 +63,6 @@ MACHINE_END
|
|||
static const char * const sun8i_board_dt_compat[] = {
|
||||
"allwinner,sun8i-a23",
|
||||
"allwinner,sun8i-a33",
|
||||
"allwinner,sun8i-a83t",
|
||||
"allwinner,sun8i-h2-plus",
|
||||
"allwinner,sun8i-h3",
|
||||
"allwinner,sun8i-r40",
|
||||
|
@ -75,6 +75,24 @@ DT_MACHINE_START(SUN8I_DT, "Allwinner sun8i Family")
|
|||
.dt_compat = sun8i_board_dt_compat,
|
||||
MACHINE_END
|
||||
|
||||
static void __init sun8i_a83t_cntvoff_init(void)
|
||||
{
|
||||
#ifdef CONFIG_SMP
|
||||
secure_cntvoff_init();
|
||||
#endif
|
||||
}
|
||||
|
||||
static const char * const sun8i_a83t_cntvoff_board_dt_compat[] = {
|
||||
"allwinner,sun8i-a83t",
|
||||
NULL,
|
||||
};
|
||||
|
||||
DT_MACHINE_START(SUN8I_A83T_CNTVOFF_DT, "Allwinner A83t board")
|
||||
.init_early = sun8i_a83t_cntvoff_init,
|
||||
.init_time = sun6i_timer_init,
|
||||
.dt_compat = sun8i_a83t_cntvoff_board_dt_compat,
|
||||
MACHINE_END
|
||||
|
||||
static const char * const sun9i_board_dt_compat[] = {
|
||||
"allwinner,sun9i-a80",
|
||||
NULL,
|
||||
|
|
Loading…
Reference in a new issue