mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-18 10:48:51 +00:00
a0018fc820
Commit40686c394e("riscv: Clean up IPI initialization code") caused U-Boot failed to boot on SiFive HiFive Unleashed board. The codes inside arch_cpu_init_dm() may call U-Boot timer APIs before the call to riscv_init_ipi(). At that time the timer register base (e.g.: the SiFive CLINT device in this case) is unknown yet. It might be the name riscv_init_ipi() that misleads people to only consider it is related to IPI, but in fact the timer capability is provided by the same SiFive CLINT device that provides the IPI. Timer capability is needed for both UP and SMP. Considering that the original refactor does have benefits, that it makes the IPI code more similar to U-Boot initialization idioms. It also removes some quite ugly macros. Let's do the minimal revert instead of a complete revert, plus a fixes to arch_cpu_init_dm() to consider the SPL case. Fixes:40686c394e("riscv: Clean up IPI initialization code") Signed-off-by: Bin Meng <bin.meng@windriver.com> Reviewed-by: Sean Anderson <seanga2@gmail.com> Tested-by: Leo Liang <ycliang@andestech.com>
91 lines
1.8 KiB
C
91 lines
1.8 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (C) 2018, Bin Meng <bmeng.cn@gmail.com>
|
|
*
|
|
* U-Boot syscon driver for SiFive's Core Local Interruptor (CLINT).
|
|
* The CLINT block holds memory-mapped control and status registers
|
|
* associated with software and timer interrupts.
|
|
*/
|
|
|
|
#include <common.h>
|
|
#include <dm.h>
|
|
#include <regmap.h>
|
|
#include <syscon.h>
|
|
#include <asm/io.h>
|
|
#include <asm/syscon.h>
|
|
#include <linux/err.h>
|
|
|
|
/* MSIP registers */
|
|
#define MSIP_REG(base, hart) ((ulong)(base) + (hart) * 4)
|
|
/* mtime compare register */
|
|
#define MTIMECMP_REG(base, hart) ((ulong)(base) + 0x4000 + (hart) * 8)
|
|
/* mtime register */
|
|
#define MTIME_REG(base) ((ulong)(base) + 0xbff8)
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
int riscv_get_time(u64 *time)
|
|
{
|
|
/* ensure timer register base has a sane value */
|
|
riscv_init_ipi();
|
|
|
|
*time = readq((void __iomem *)MTIME_REG(gd->arch.clint));
|
|
|
|
return 0;
|
|
}
|
|
|
|
int riscv_set_timecmp(int hart, u64 cmp)
|
|
{
|
|
/* ensure timer register base has a sane value */
|
|
riscv_init_ipi();
|
|
|
|
writeq(cmp, (void __iomem *)MTIMECMP_REG(gd->arch.clint, hart));
|
|
|
|
return 0;
|
|
}
|
|
|
|
int riscv_init_ipi(void)
|
|
{
|
|
if (!gd->arch.clint) {
|
|
long *ret = syscon_get_first_range(RISCV_SYSCON_CLINT);
|
|
|
|
if (IS_ERR(ret))
|
|
return PTR_ERR(ret);
|
|
gd->arch.clint = ret;
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
int riscv_send_ipi(int hart)
|
|
{
|
|
writel(1, (void __iomem *)MSIP_REG(gd->arch.clint, hart));
|
|
|
|
return 0;
|
|
}
|
|
|
|
int riscv_clear_ipi(int hart)
|
|
{
|
|
writel(0, (void __iomem *)MSIP_REG(gd->arch.clint, hart));
|
|
|
|
return 0;
|
|
}
|
|
|
|
int riscv_get_ipi(int hart, int *pending)
|
|
{
|
|
*pending = readl((void __iomem *)MSIP_REG(gd->arch.clint, hart));
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct udevice_id sifive_clint_ids[] = {
|
|
{ .compatible = "riscv,clint0", .data = RISCV_SYSCON_CLINT },
|
|
{ }
|
|
};
|
|
|
|
U_BOOT_DRIVER(sifive_clint) = {
|
|
.name = "sifive_clint",
|
|
.id = UCLASS_SYSCON,
|
|
.of_match = sifive_clint_ids,
|
|
.flags = DM_FLAG_PRE_RELOC,
|
|
};
|