mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-17 00:33:06 +00:00
c596877ee6
In initf_bootstage() we call bootstage_mark_name() which ends up calling
timer_get_us() before timer_init(); that cause crash for stm32mp1.
This patch solve the issue without changing the initialization sequence.
See also commit 97d20f69f5 ("Enable CONFIG_TIMER_EARLY with bootstage")
for other solution when DM is activated for TIMER.
Signed-off-by: Patrick Delaunay <patrick.delaunay@st.com>
61 lines
1 KiB
C
61 lines
1 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* (C) Copyright 2012-2014
|
|
* Texas Instruments Incorporated, <www.ti.com>
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <asm/io.h>
|
|
#include <div64.h>
|
|
#include <bootstage.h>
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
#ifndef CONFIG_SYS_HZ_CLOCK
|
|
static inline u32 read_cntfrq(void)
|
|
{
|
|
u32 frq;
|
|
|
|
asm volatile("mrc p15, 0, %0, c14, c0, 0" : "=r" (frq));
|
|
return frq;
|
|
}
|
|
#endif
|
|
|
|
int timer_init(void)
|
|
{
|
|
gd->arch.tbl = 0;
|
|
gd->arch.tbu = 0;
|
|
|
|
#ifdef CONFIG_SYS_HZ_CLOCK
|
|
gd->arch.timer_rate_hz = CONFIG_SYS_HZ_CLOCK;
|
|
#else
|
|
gd->arch.timer_rate_hz = read_cntfrq();
|
|
#endif
|
|
return 0;
|
|
}
|
|
|
|
unsigned long long get_ticks(void)
|
|
{
|
|
ulong nowl, nowu;
|
|
|
|
asm volatile("mrrc p15, 0, %0, %1, c14" : "=r" (nowl), "=r" (nowu));
|
|
|
|
gd->arch.tbl = nowl;
|
|
gd->arch.tbu = nowu;
|
|
|
|
return (((unsigned long long)gd->arch.tbu) << 32) | gd->arch.tbl;
|
|
}
|
|
|
|
|
|
ulong timer_get_boot_us(void)
|
|
{
|
|
if (!gd->arch.timer_rate_hz)
|
|
timer_init();
|
|
|
|
return lldiv(get_ticks(), gd->arch.timer_rate_hz / 1000000);
|
|
}
|
|
|
|
ulong get_tbclk(void)
|
|
{
|
|
return gd->arch.timer_rate_hz;
|
|
}
|