mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-11-17 18:28:55 +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>
100 lines
2.7 KiB
C
100 lines
2.7 KiB
C
// SPDX-License-Identifier: GPL-2.0+
|
|
/*
|
|
* Copyright (C) 2019 Fraunhofer AISEC,
|
|
* Lukas Auer <lukas.auer@aisec.fraunhofer.de>
|
|
*
|
|
* Based on common/spl/spl_atf.c
|
|
*/
|
|
#include <common.h>
|
|
#include <cpu_func.h>
|
|
#include <errno.h>
|
|
#include <hang.h>
|
|
#include <image.h>
|
|
#include <spl.h>
|
|
#include <asm/smp.h>
|
|
#include <opensbi.h>
|
|
#include <linux/libfdt.h>
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
struct fw_dynamic_info opensbi_info;
|
|
|
|
static int spl_opensbi_find_uboot_node(void *blob, int *uboot_node)
|
|
{
|
|
int fit_images_node, node;
|
|
const char *fit_os;
|
|
|
|
fit_images_node = fdt_path_offset(blob, "/fit-images");
|
|
if (fit_images_node < 0)
|
|
return -ENODEV;
|
|
|
|
fdt_for_each_subnode(node, blob, fit_images_node) {
|
|
fit_os = fdt_getprop(blob, node, FIT_OS_PROP, NULL);
|
|
if (!fit_os)
|
|
continue;
|
|
|
|
if (genimg_get_os_id(fit_os) == IH_OS_U_BOOT) {
|
|
*uboot_node = node;
|
|
return 0;
|
|
}
|
|
}
|
|
|
|
return -ENODEV;
|
|
}
|
|
|
|
void spl_invoke_opensbi(struct spl_image_info *spl_image)
|
|
{
|
|
int ret, uboot_node;
|
|
ulong uboot_entry;
|
|
void (*opensbi_entry)(ulong hartid, ulong dtb, ulong info);
|
|
|
|
if (!spl_image->fdt_addr) {
|
|
pr_err("No device tree specified in SPL image\n");
|
|
hang();
|
|
}
|
|
|
|
/* Find U-Boot image in /fit-images */
|
|
ret = spl_opensbi_find_uboot_node(spl_image->fdt_addr, &uboot_node);
|
|
if (ret) {
|
|
pr_err("Can't find U-Boot node, %d\n", ret);
|
|
hang();
|
|
}
|
|
|
|
/* Get U-Boot entry point */
|
|
uboot_entry = fdt_getprop_u32(spl_image->fdt_addr, uboot_node,
|
|
"entry-point");
|
|
if (uboot_entry == FDT_ERROR)
|
|
uboot_entry = fdt_getprop_u32(spl_image->fdt_addr, uboot_node,
|
|
"load-addr");
|
|
|
|
/* Prepare obensbi_info object */
|
|
opensbi_info.magic = FW_DYNAMIC_INFO_MAGIC_VALUE;
|
|
opensbi_info.version = FW_DYNAMIC_INFO_VERSION;
|
|
opensbi_info.next_addr = uboot_entry;
|
|
opensbi_info.next_mode = FW_DYNAMIC_INFO_NEXT_MODE_S;
|
|
opensbi_info.options = SBI_SCRATCH_NO_BOOT_PRINTS;
|
|
opensbi_info.boot_hart = gd->arch.boot_hart;
|
|
|
|
opensbi_entry = (void (*)(ulong, ulong, ulong))spl_image->entry_point;
|
|
invalidate_icache_all();
|
|
|
|
#ifdef CONFIG_SPL_SMP
|
|
/*
|
|
* Start OpenSBI on all secondary harts and wait for acknowledgment.
|
|
*
|
|
* OpenSBI first relocates itself to its link address. This is done by
|
|
* the main hart. To make sure no hart is still running U-Boot SPL
|
|
* during relocation, we wait for all secondary harts to acknowledge
|
|
* the call-function request before entering OpenSBI on the main hart.
|
|
* Otherwise, code corruption can occur if the link address ranges of
|
|
* U-Boot SPL and OpenSBI overlap.
|
|
*/
|
|
ret = smp_call_function((ulong)spl_image->entry_point,
|
|
(ulong)spl_image->fdt_addr,
|
|
(ulong)&opensbi_info, 1);
|
|
if (ret)
|
|
hang();
|
|
#endif
|
|
opensbi_entry(gd->arch.boot_hart, (ulong)spl_image->fdt_addr,
|
|
(ulong)&opensbi_info);
|
|
}
|