2018-05-06 21:58:06 +00:00
|
|
|
// SPDX-License-Identifier: GPL-2.0+
|
2013-12-14 03:47:37 +00:00
|
|
|
/*
|
|
|
|
* (C) Copyright 2013
|
|
|
|
* David Feng <fenghua@phytium.com.cn>
|
|
|
|
* Sharma Bhupesh <bhupesh.sharma@freescale.com>
|
|
|
|
*/
|
|
|
|
#include <common.h>
|
2019-12-28 17:45:01 +00:00
|
|
|
#include <cpu_func.h>
|
2017-05-17 23:18:03 +00:00
|
|
|
#include <dm.h>
|
2020-05-10 17:40:02 +00:00
|
|
|
#include <init.h>
|
2013-12-14 03:47:37 +00:00
|
|
|
#include <malloc.h>
|
|
|
|
#include <errno.h>
|
2020-05-10 17:39:56 +00:00
|
|
|
#include <net.h>
|
2013-12-14 03:47:37 +00:00
|
|
|
#include <netdev.h>
|
2020-10-31 03:38:53 +00:00
|
|
|
#include <asm/global_data.h>
|
2013-12-14 03:47:37 +00:00
|
|
|
#include <asm/io.h>
|
|
|
|
#include <linux/compiler.h>
|
2022-03-04 16:30:16 +00:00
|
|
|
#include <linux/sizes.h>
|
2015-01-31 03:55:29 +00:00
|
|
|
#include <dm/platform_data/serial_pl01x.h>
|
2015-10-19 10:08:32 +00:00
|
|
|
#include "pcie.h"
|
2016-03-04 00:09:51 +00:00
|
|
|
#include <asm/armv8/mmu.h>
|
2021-11-11 09:26:03 +00:00
|
|
|
#ifdef CONFIG_VIRTIO_NET
|
|
|
|
#include <virtio_types.h>
|
|
|
|
#include <virtio.h>
|
|
|
|
#endif
|
2013-12-14 03:47:37 +00:00
|
|
|
|
|
|
|
DECLARE_GLOBAL_DATA_PTR;
|
|
|
|
|
2020-12-03 23:55:23 +00:00
|
|
|
static const struct pl01x_serial_plat serial_plat = {
|
2015-01-31 03:55:29 +00:00
|
|
|
.base = V2M_UART0,
|
|
|
|
.type = TYPE_PL011,
|
2022-12-04 15:13:30 +00:00
|
|
|
.clock = CFG_PL011_CLOCK,
|
2015-01-31 03:55:29 +00:00
|
|
|
};
|
|
|
|
|
2020-12-29 03:34:54 +00:00
|
|
|
U_BOOT_DRVINFO(vexpress_serials) = {
|
2015-01-31 03:55:29 +00:00
|
|
|
.name = "serial_pl01x",
|
2020-12-03 23:55:23 +00:00
|
|
|
.plat = &serial_plat,
|
2015-01-31 03:55:29 +00:00
|
|
|
};
|
|
|
|
|
2016-03-04 00:09:51 +00:00
|
|
|
static struct mm_region vexpress64_mem_map[] = {
|
|
|
|
{
|
2022-03-04 16:30:16 +00:00
|
|
|
.virt = V2M_PA_BASE,
|
|
|
|
.phys = V2M_PA_BASE,
|
|
|
|
.size = SZ_2G,
|
2016-03-04 00:09:51 +00:00
|
|
|
.attrs = PTE_BLOCK_MEMTYPE(MT_DEVICE_NGNRNE) |
|
|
|
|
PTE_BLOCK_NON_SHARE |
|
|
|
|
PTE_BLOCK_PXN | PTE_BLOCK_UXN
|
|
|
|
}, {
|
2022-03-04 16:30:16 +00:00
|
|
|
.virt = V2M_DRAM_BASE,
|
|
|
|
.phys = V2M_DRAM_BASE,
|
|
|
|
.size = SZ_2G,
|
|
|
|
.attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
|
|
|
|
PTE_BLOCK_INNER_SHARE
|
|
|
|
}, {
|
|
|
|
/*
|
|
|
|
* DRAM beyond 2 GiB is located high. Let's map just some
|
|
|
|
* of it, although U-Boot won't realistically use it, and
|
|
|
|
* the actual available amount might be smaller on the model.
|
|
|
|
*/
|
|
|
|
.virt = 0x880000000UL, /* 32 + 2 GiB */
|
|
|
|
.phys = 0x880000000UL,
|
|
|
|
.size = 6UL * SZ_1G,
|
2016-03-04 00:09:51 +00:00
|
|
|
.attrs = PTE_BLOCK_MEMTYPE(MT_NORMAL) |
|
|
|
|
PTE_BLOCK_INNER_SHARE
|
|
|
|
}, {
|
|
|
|
/* List terminator */
|
|
|
|
0,
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
struct mm_region *mem_map = vexpress64_mem_map;
|
|
|
|
|
2015-11-18 10:39:06 +00:00
|
|
|
/* This function gets replaced by platforms supporting PCIe.
|
|
|
|
* The replacement function, eg. on Juno, initialises the PCIe bus.
|
|
|
|
*/
|
|
|
|
__weak void vexpress64_pcie_init(void)
|
|
|
|
{
|
|
|
|
}
|
|
|
|
|
2013-12-14 03:47:37 +00:00
|
|
|
int board_init(void)
|
|
|
|
{
|
2015-10-19 10:08:32 +00:00
|
|
|
vexpress64_pcie_init();
|
2021-11-11 09:26:03 +00:00
|
|
|
#ifdef CONFIG_VIRTIO_NET
|
|
|
|
virtio_init();
|
|
|
|
#endif
|
2013-12-14 03:47:37 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int dram_init(void)
|
|
|
|
{
|
2022-03-04 16:30:17 +00:00
|
|
|
return fdtdec_setup_mem_size_base();
|
2013-12-14 03:47:37 +00:00
|
|
|
}
|
|
|
|
|
2017-03-31 14:40:32 +00:00
|
|
|
int dram_init_banksize(void)
|
2015-10-19 10:08:31 +00:00
|
|
|
{
|
2022-03-04 16:30:17 +00:00
|
|
|
return fdtdec_setup_memory_banksize();
|
2015-10-19 10:08:31 +00:00
|
|
|
}
|
|
|
|
|
2021-11-11 09:26:02 +00:00
|
|
|
/* Assigned in lowlevel_init.S
|
|
|
|
* Push the variable into the .data section so that it
|
|
|
|
* does not get cleared later.
|
|
|
|
*/
|
vexpress64: also consider DTB pointer in x1
Commit c0fce929564f("vexpress64: fvp: enable OF_CONTROL") added code to
consider a potential DTB address being passed in the x0 register, or
revert to the built-in DTB otherwise.
The former case was used when using the boot-wrapper, to which we sell
U-Boot as a Linux kernel. The latter was meant for TF-A, for which we
couldn't find an easy way to use the DTB it uses itself. We have some
quirk to filter for a valid DTB, as TF-A happens to pass a pointer to
some special devicetree blob in x0 as well.
Now the TF-A case is broken, when enabling proper emulation of secure
memory (-C bp.secure_memory=1). TF-A carves out some memory at the top
of the first DRAM bank for its own purposes, and configures the
TrustZone DRAM controller to make this region secure-only. U-Boot will
then hang when it tries to relocate itself exactly to the end of DRAM.
TF-A announces this by carving out that region of the /memory node, in
the DT it passes on to BL33 in x1, but we miss that so far.
Instead of repeating this carveout in our DT copy, let's try to look for
a DTB at the address x1 points to as well. This will let U-Boot pick up
the DTB provided by TF-A, which has the correct carveout in place,
avoiding the hang.
While we are at it, make the detection more robust: the length test (is
the DT larger than 256 bytes?) is too fragile, in fact the TF-A port for
a new FVP model already exceeds this. So we test x1 first, consider 0
an invalid address, and also require a /memory node to detect a valid DTB.
And for the records:
Some asking around revealed what is really going on with TF-A and that
ominous DTB pointer in x0: TF-A expects EDK-2 as its non-secure payload
(BL33), and there apparently was some long-standing ad-hoc boot protocol
defined just between the two: x0 would carry the MPIDR register value of
the boot CPU, and the hardware DTB address would be stored in x1.
Now the MPIDR of CPU 0 is typically 0, plus bit 31 set, which is defined
as RES1 in the ARMv7 and ARMv8 architectures. This gives 0x80000000,
which is the same value as the address of the beginning of DRAM (2GB).
And coincidentally TF-A put some DTB structure exactly there, for its
own purposes (passing it between stages). So U-Boot was trying to use
this DTB, which requires the quirk to check for its validity.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Tested-by: Peter Hoyes <peter.hoyes@arm.com>
2022-09-21 17:09:46 +00:00
|
|
|
unsigned long __section(".data") prior_stage_fdt_address[2];
|
2021-11-11 09:26:02 +00:00
|
|
|
|
arm: juno: Enable OF_CONTROL
The Arm Juno board was still somewhat stuck in "hardcoded land", even
though there are stable DTs around, and one happens to actually be on
the memory mapped NOR flash.
Enable the configuration options to let the board use OF_CONTROL, and
add a routine to find the address of the DTB partition in NOR
flash, to use that for U-Boot's own purposes.
This can also passed on via $fdtcontroladdr to any kernel or EFI
application, removing the need to actually load a device tree.
Since the existing "afs" command and its flash routines require
flash_init() to be called before being usable, and this is done much
later in the boot process, we introduce a stripped-down partition finder
routine in vexpress64.c, to scan the NOR flash partitions for the
DT partition. This location is then used for U-Boot to find and probe
devices.
The name of the partition can be configured, if needed, but defaults
to "board.dtb", which is used by Linaro's firmware image provided.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
2020-04-27 18:18:01 +00:00
|
|
|
#ifdef CONFIG_OF_BOARD
|
2021-11-11 09:26:02 +00:00
|
|
|
|
|
|
|
#ifdef CONFIG_TARGET_VEXPRESS64_JUNO
|
arm: juno: Enable OF_CONTROL
The Arm Juno board was still somewhat stuck in "hardcoded land", even
though there are stable DTs around, and one happens to actually be on
the memory mapped NOR flash.
Enable the configuration options to let the board use OF_CONTROL, and
add a routine to find the address of the DTB partition in NOR
flash, to use that for U-Boot's own purposes.
This can also passed on via $fdtcontroladdr to any kernel or EFI
application, removing the need to actually load a device tree.
Since the existing "afs" command and its flash routines require
flash_init() to be called before being usable, and this is done much
later in the boot process, we introduce a stripped-down partition finder
routine in vexpress64.c, to scan the NOR flash partitions for the
DT partition. This location is then used for U-Boot to find and probe
devices.
The name of the partition can be configured, if needed, but defaults
to "board.dtb", which is used by Linaro's firmware image provided.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
2020-04-27 18:18:01 +00:00
|
|
|
#define JUNO_FLASH_SEC_SIZE (256 * 1024)
|
|
|
|
static phys_addr_t find_dtb_in_nor_flash(const char *partname)
|
|
|
|
{
|
2022-11-16 18:10:41 +00:00
|
|
|
phys_addr_t sector = CFG_SYS_FLASH_BASE;
|
arm: juno: Enable OF_CONTROL
The Arm Juno board was still somewhat stuck in "hardcoded land", even
though there are stable DTs around, and one happens to actually be on
the memory mapped NOR flash.
Enable the configuration options to let the board use OF_CONTROL, and
add a routine to find the address of the DTB partition in NOR
flash, to use that for U-Boot's own purposes.
This can also passed on via $fdtcontroladdr to any kernel or EFI
application, removing the need to actually load a device tree.
Since the existing "afs" command and its flash routines require
flash_init() to be called before being usable, and this is done much
later in the boot process, we introduce a stripped-down partition finder
routine in vexpress64.c, to scan the NOR flash partitions for the
DT partition. This location is then used for U-Boot to find and probe
devices.
The name of the partition can be configured, if needed, but defaults
to "board.dtb", which is used by Linaro's firmware image provided.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
2020-04-27 18:18:01 +00:00
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0;
|
|
|
|
i < CONFIG_SYS_MAX_FLASH_SECT;
|
|
|
|
i++, sector += JUNO_FLASH_SEC_SIZE) {
|
|
|
|
int len = strlen(partname) + 1;
|
|
|
|
int offs;
|
|
|
|
phys_addr_t imginfo;
|
|
|
|
u32 reg;
|
|
|
|
|
|
|
|
reg = readl(sector + JUNO_FLASH_SEC_SIZE - 0x04);
|
|
|
|
/* This makes up the string "HSLFTOOF" flash footer */
|
|
|
|
if (reg != 0x464F4F54U)
|
|
|
|
continue;
|
|
|
|
reg = readl(sector + JUNO_FLASH_SEC_SIZE - 0x08);
|
|
|
|
if (reg != 0x464C5348U)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
for (offs = 0; offs < 32; offs += 4, len -= 4) {
|
|
|
|
reg = readl(sector + JUNO_FLASH_SEC_SIZE - 0x30 + offs);
|
|
|
|
if (strncmp(partname + offs, (char *)®,
|
|
|
|
len > 4 ? 4 : len))
|
|
|
|
break;
|
|
|
|
|
|
|
|
if (len > 4)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
reg = readl(sector + JUNO_FLASH_SEC_SIZE - 0x10);
|
|
|
|
imginfo = sector + JUNO_FLASH_SEC_SIZE - 0x30 - reg;
|
|
|
|
reg = readl(imginfo + 0x54);
|
|
|
|
|
2022-11-16 18:10:41 +00:00
|
|
|
return CFG_SYS_FLASH_BASE +
|
arm: juno: Enable OF_CONTROL
The Arm Juno board was still somewhat stuck in "hardcoded land", even
though there are stable DTs around, and one happens to actually be on
the memory mapped NOR flash.
Enable the configuration options to let the board use OF_CONTROL, and
add a routine to find the address of the DTB partition in NOR
flash, to use that for U-Boot's own purposes.
This can also passed on via $fdtcontroladdr to any kernel or EFI
application, removing the need to actually load a device tree.
Since the existing "afs" command and its flash routines require
flash_init() to be called before being usable, and this is done much
later in the boot process, we introduce a stripped-down partition finder
routine in vexpress64.c, to scan the NOR flash partitions for the
DT partition. This location is then used for U-Boot to find and probe
devices.
The name of the partition can be configured, if needed, but defaults
to "board.dtb", which is used by Linaro's firmware image provided.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
2020-04-27 18:18:01 +00:00
|
|
|
reg * JUNO_FLASH_SEC_SIZE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
printf("No DTB found\n");
|
|
|
|
|
|
|
|
return ~0;
|
|
|
|
}
|
2021-11-11 09:26:02 +00:00
|
|
|
#endif
|
arm: juno: Enable OF_CONTROL
The Arm Juno board was still somewhat stuck in "hardcoded land", even
though there are stable DTs around, and one happens to actually be on
the memory mapped NOR flash.
Enable the configuration options to let the board use OF_CONTROL, and
add a routine to find the address of the DTB partition in NOR
flash, to use that for U-Boot's own purposes.
This can also passed on via $fdtcontroladdr to any kernel or EFI
application, removing the need to actually load a device tree.
Since the existing "afs" command and its flash routines require
flash_init() to be called before being usable, and this is done much
later in the boot process, we introduce a stripped-down partition finder
routine in vexpress64.c, to scan the NOR flash partitions for the
DT partition. This location is then used for U-Boot to find and probe
devices.
The name of the partition can be configured, if needed, but defaults
to "board.dtb", which is used by Linaro's firmware image provided.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
2020-04-27 18:18:01 +00:00
|
|
|
|
vexpress64: also consider DTB pointer in x1
Commit c0fce929564f("vexpress64: fvp: enable OF_CONTROL") added code to
consider a potential DTB address being passed in the x0 register, or
revert to the built-in DTB otherwise.
The former case was used when using the boot-wrapper, to which we sell
U-Boot as a Linux kernel. The latter was meant for TF-A, for which we
couldn't find an easy way to use the DTB it uses itself. We have some
quirk to filter for a valid DTB, as TF-A happens to pass a pointer to
some special devicetree blob in x0 as well.
Now the TF-A case is broken, when enabling proper emulation of secure
memory (-C bp.secure_memory=1). TF-A carves out some memory at the top
of the first DRAM bank for its own purposes, and configures the
TrustZone DRAM controller to make this region secure-only. U-Boot will
then hang when it tries to relocate itself exactly to the end of DRAM.
TF-A announces this by carving out that region of the /memory node, in
the DT it passes on to BL33 in x1, but we miss that so far.
Instead of repeating this carveout in our DT copy, let's try to look for
a DTB at the address x1 points to as well. This will let U-Boot pick up
the DTB provided by TF-A, which has the correct carveout in place,
avoiding the hang.
While we are at it, make the detection more robust: the length test (is
the DT larger than 256 bytes?) is too fragile, in fact the TF-A port for
a new FVP model already exceeds this. So we test x1 first, consider 0
an invalid address, and also require a /memory node to detect a valid DTB.
And for the records:
Some asking around revealed what is really going on with TF-A and that
ominous DTB pointer in x0: TF-A expects EDK-2 as its non-secure payload
(BL33), and there apparently was some long-standing ad-hoc boot protocol
defined just between the two: x0 would carry the MPIDR register value of
the boot CPU, and the hardware DTB address would be stored in x1.
Now the MPIDR of CPU 0 is typically 0, plus bit 31 set, which is defined
as RES1 in the ARMv7 and ARMv8 architectures. This gives 0x80000000,
which is the same value as the address of the beginning of DRAM (2GB).
And coincidentally TF-A put some DTB structure exactly there, for its
own purposes (passing it between stages). So U-Boot was trying to use
this DTB, which requires the quirk to check for its validity.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Tested-by: Peter Hoyes <peter.hoyes@arm.com>
2022-09-21 17:09:46 +00:00
|
|
|
/*
|
|
|
|
* Filter for a valid DTB, as TF-A happens to provide a pointer to some
|
|
|
|
* data structure using the DTB format, which we cannot use.
|
|
|
|
* The address of the DTB cannot be 0, in fact this is the reserved value
|
|
|
|
* for x1 in the kernel boot protocol.
|
|
|
|
* And while the nt_fw_config.dtb used by TF-A is a valid DTB structure, it
|
|
|
|
* does not contain the typical nodes and properties, which we test for by
|
|
|
|
* probing for the mandatory /memory node.
|
|
|
|
*/
|
|
|
|
static bool is_valid_dtb(uintptr_t dtb_ptr)
|
|
|
|
{
|
|
|
|
if (dtb_ptr == 0 || fdt_magic(dtb_ptr) != FDT_MAGIC)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
return fdt_subnode_offset((void *)dtb_ptr, 0, "memory") >= 0;
|
|
|
|
}
|
|
|
|
|
2021-10-26 06:12:33 +00:00
|
|
|
void *board_fdt_blob_setup(int *err)
|
arm: juno: Enable OF_CONTROL
The Arm Juno board was still somewhat stuck in "hardcoded land", even
though there are stable DTs around, and one happens to actually be on
the memory mapped NOR flash.
Enable the configuration options to let the board use OF_CONTROL, and
add a routine to find the address of the DTB partition in NOR
flash, to use that for U-Boot's own purposes.
This can also passed on via $fdtcontroladdr to any kernel or EFI
application, removing the need to actually load a device tree.
Since the existing "afs" command and its flash routines require
flash_init() to be called before being usable, and this is done much
later in the boot process, we introduce a stripped-down partition finder
routine in vexpress64.c, to scan the NOR flash partitions for the
DT partition. This location is then used for U-Boot to find and probe
devices.
The name of the partition can be configured, if needed, but defaults
to "board.dtb", which is used by Linaro's firmware image provided.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
2020-04-27 18:18:01 +00:00
|
|
|
{
|
2021-11-11 09:26:02 +00:00
|
|
|
#ifdef CONFIG_TARGET_VEXPRESS64_JUNO
|
arm: juno: Enable OF_CONTROL
The Arm Juno board was still somewhat stuck in "hardcoded land", even
though there are stable DTs around, and one happens to actually be on
the memory mapped NOR flash.
Enable the configuration options to let the board use OF_CONTROL, and
add a routine to find the address of the DTB partition in NOR
flash, to use that for U-Boot's own purposes.
This can also passed on via $fdtcontroladdr to any kernel or EFI
application, removing the need to actually load a device tree.
Since the existing "afs" command and its flash routines require
flash_init() to be called before being usable, and this is done much
later in the boot process, we introduce a stripped-down partition finder
routine in vexpress64.c, to scan the NOR flash partitions for the
DT partition. This location is then used for U-Boot to find and probe
devices.
The name of the partition can be configured, if needed, but defaults
to "board.dtb", which is used by Linaro's firmware image provided.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
2020-04-27 18:18:01 +00:00
|
|
|
phys_addr_t fdt_rom_addr = find_dtb_in_nor_flash(CONFIG_JUNO_DTB_PART);
|
|
|
|
|
2021-10-26 06:12:33 +00:00
|
|
|
*err = 0;
|
|
|
|
if (fdt_rom_addr == ~0UL) {
|
|
|
|
*err = -ENXIO;
|
arm: juno: Enable OF_CONTROL
The Arm Juno board was still somewhat stuck in "hardcoded land", even
though there are stable DTs around, and one happens to actually be on
the memory mapped NOR flash.
Enable the configuration options to let the board use OF_CONTROL, and
add a routine to find the address of the DTB partition in NOR
flash, to use that for U-Boot's own purposes.
This can also passed on via $fdtcontroladdr to any kernel or EFI
application, removing the need to actually load a device tree.
Since the existing "afs" command and its flash routines require
flash_init() to be called before being usable, and this is done much
later in the boot process, we introduce a stripped-down partition finder
routine in vexpress64.c, to scan the NOR flash partitions for the
DT partition. This location is then used for U-Boot to find and probe
devices.
The name of the partition can be configured, if needed, but defaults
to "board.dtb", which is used by Linaro's firmware image provided.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
2020-04-27 18:18:01 +00:00
|
|
|
return NULL;
|
2021-10-26 06:12:33 +00:00
|
|
|
}
|
arm: juno: Enable OF_CONTROL
The Arm Juno board was still somewhat stuck in "hardcoded land", even
though there are stable DTs around, and one happens to actually be on
the memory mapped NOR flash.
Enable the configuration options to let the board use OF_CONTROL, and
add a routine to find the address of the DTB partition in NOR
flash, to use that for U-Boot's own purposes.
This can also passed on via $fdtcontroladdr to any kernel or EFI
application, removing the need to actually load a device tree.
Since the existing "afs" command and its flash routines require
flash_init() to be called before being usable, and this is done much
later in the boot process, we introduce a stripped-down partition finder
routine in vexpress64.c, to scan the NOR flash partitions for the
DT partition. This location is then used for U-Boot to find and probe
devices.
The name of the partition can be configured, if needed, but defaults
to "board.dtb", which is used by Linaro's firmware image provided.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
2020-04-27 18:18:01 +00:00
|
|
|
|
|
|
|
return (void *)fdt_rom_addr;
|
2021-11-11 09:26:02 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#ifdef VEXPRESS_FDT_ADDR
|
|
|
|
if (fdt_magic(VEXPRESS_FDT_ADDR) == FDT_MAGIC) {
|
|
|
|
*err = 0;
|
|
|
|
return (void *)VEXPRESS_FDT_ADDR;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
vexpress64: also consider DTB pointer in x1
Commit c0fce929564f("vexpress64: fvp: enable OF_CONTROL") added code to
consider a potential DTB address being passed in the x0 register, or
revert to the built-in DTB otherwise.
The former case was used when using the boot-wrapper, to which we sell
U-Boot as a Linux kernel. The latter was meant for TF-A, for which we
couldn't find an easy way to use the DTB it uses itself. We have some
quirk to filter for a valid DTB, as TF-A happens to pass a pointer to
some special devicetree blob in x0 as well.
Now the TF-A case is broken, when enabling proper emulation of secure
memory (-C bp.secure_memory=1). TF-A carves out some memory at the top
of the first DRAM bank for its own purposes, and configures the
TrustZone DRAM controller to make this region secure-only. U-Boot will
then hang when it tries to relocate itself exactly to the end of DRAM.
TF-A announces this by carving out that region of the /memory node, in
the DT it passes on to BL33 in x1, but we miss that so far.
Instead of repeating this carveout in our DT copy, let's try to look for
a DTB at the address x1 points to as well. This will let U-Boot pick up
the DTB provided by TF-A, which has the correct carveout in place,
avoiding the hang.
While we are at it, make the detection more robust: the length test (is
the DT larger than 256 bytes?) is too fragile, in fact the TF-A port for
a new FVP model already exceeds this. So we test x1 first, consider 0
an invalid address, and also require a /memory node to detect a valid DTB.
And for the records:
Some asking around revealed what is really going on with TF-A and that
ominous DTB pointer in x0: TF-A expects EDK-2 as its non-secure payload
(BL33), and there apparently was some long-standing ad-hoc boot protocol
defined just between the two: x0 would carry the MPIDR register value of
the boot CPU, and the hardware DTB address would be stored in x1.
Now the MPIDR of CPU 0 is typically 0, plus bit 31 set, which is defined
as RES1 in the ARMv7 and ARMv8 architectures. This gives 0x80000000,
which is the same value as the address of the beginning of DRAM (2GB).
And coincidentally TF-A put some DTB structure exactly there, for its
own purposes (passing it between stages). So U-Boot was trying to use
this DTB, which requires the quirk to check for its validity.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Tested-by: Peter Hoyes <peter.hoyes@arm.com>
2022-09-21 17:09:46 +00:00
|
|
|
if (is_valid_dtb(prior_stage_fdt_address[1])) {
|
|
|
|
*err = 0;
|
|
|
|
return (void *)prior_stage_fdt_address[1];
|
|
|
|
} else if (is_valid_dtb(prior_stage_fdt_address[0])) {
|
2021-11-11 09:26:02 +00:00
|
|
|
*err = 0;
|
vexpress64: also consider DTB pointer in x1
Commit c0fce929564f("vexpress64: fvp: enable OF_CONTROL") added code to
consider a potential DTB address being passed in the x0 register, or
revert to the built-in DTB otherwise.
The former case was used when using the boot-wrapper, to which we sell
U-Boot as a Linux kernel. The latter was meant for TF-A, for which we
couldn't find an easy way to use the DTB it uses itself. We have some
quirk to filter for a valid DTB, as TF-A happens to pass a pointer to
some special devicetree blob in x0 as well.
Now the TF-A case is broken, when enabling proper emulation of secure
memory (-C bp.secure_memory=1). TF-A carves out some memory at the top
of the first DRAM bank for its own purposes, and configures the
TrustZone DRAM controller to make this region secure-only. U-Boot will
then hang when it tries to relocate itself exactly to the end of DRAM.
TF-A announces this by carving out that region of the /memory node, in
the DT it passes on to BL33 in x1, but we miss that so far.
Instead of repeating this carveout in our DT copy, let's try to look for
a DTB at the address x1 points to as well. This will let U-Boot pick up
the DTB provided by TF-A, which has the correct carveout in place,
avoiding the hang.
While we are at it, make the detection more robust: the length test (is
the DT larger than 256 bytes?) is too fragile, in fact the TF-A port for
a new FVP model already exceeds this. So we test x1 first, consider 0
an invalid address, and also require a /memory node to detect a valid DTB.
And for the records:
Some asking around revealed what is really going on with TF-A and that
ominous DTB pointer in x0: TF-A expects EDK-2 as its non-secure payload
(BL33), and there apparently was some long-standing ad-hoc boot protocol
defined just between the two: x0 would carry the MPIDR register value of
the boot CPU, and the hardware DTB address would be stored in x1.
Now the MPIDR of CPU 0 is typically 0, plus bit 31 set, which is defined
as RES1 in the ARMv7 and ARMv8 architectures. This gives 0x80000000,
which is the same value as the address of the beginning of DRAM (2GB).
And coincidentally TF-A put some DTB structure exactly there, for its
own purposes (passing it between stages). So U-Boot was trying to use
this DTB, which requires the quirk to check for its validity.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Tested-by: Peter Hoyes <peter.hoyes@arm.com>
2022-09-21 17:09:46 +00:00
|
|
|
return (void *)prior_stage_fdt_address[0];
|
2021-11-11 09:26:02 +00:00
|
|
|
}
|
|
|
|
|
vexpress64: fvp: enable OF_CONTROL
The FVP base model is relying on a DT for Linux operation, so there is
no reason we would need to rely on hardcoded information for U-Boot.
Letting U-Boot use a DT will open up the usage of actual peripherals,
beyond the support for semihosting only.
Enable OF_CONTROL in the Kconfig, and use the latest dts files from
Linux. Depending on whether we use the boot-wrapper or TF-A, there is
already a DTB provided or not, respectively.
To cover the boot-wrapper, we add an arm64 Linux kernel header, which
allows the boot-wrapper to treat U-Boot like a Linux kernel. U-Boot will
find the pointer to the DTB in x0, and will use it.
Even though TF-A carries a DT, at the moment this is not made available
to non-secure world, so to not break users, we use the U-Boot provided
DTB copy in that case. For some reason TF-A puts some DT like structure
at the address x0 is pointing at, but that is very small and doesn't
carry any hardware information. Make the code to ignore those small DTBs.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
2022-03-04 16:30:11 +00:00
|
|
|
if (fdt_magic(gd->fdt_blob) == FDT_MAGIC) {
|
|
|
|
*err = 0;
|
|
|
|
return (void *)gd->fdt_blob;
|
|
|
|
}
|
|
|
|
|
2021-11-11 09:26:02 +00:00
|
|
|
*err = -ENXIO;
|
|
|
|
return NULL;
|
arm: juno: Enable OF_CONTROL
The Arm Juno board was still somewhat stuck in "hardcoded land", even
though there are stable DTs around, and one happens to actually be on
the memory mapped NOR flash.
Enable the configuration options to let the board use OF_CONTROL, and
add a routine to find the address of the DTB partition in NOR
flash, to use that for U-Boot's own purposes.
This can also passed on via $fdtcontroladdr to any kernel or EFI
application, removing the need to actually load a device tree.
Since the existing "afs" command and its flash routines require
flash_init() to be called before being usable, and this is done much
later in the boot process, we introduce a stripped-down partition finder
routine in vexpress64.c, to scan the NOR flash partitions for the
DT partition. This location is then used for U-Boot to find and probe
devices.
The name of the partition can be configured, if needed, but defaults
to "board.dtb", which is used by Linaro's firmware image provided.
Signed-off-by: Andre Przywara <andre.przywara@arm.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>
2020-04-27 18:18:01 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2020-04-27 18:18:02 +00:00
|
|
|
/* Actual reset is done via PSCI. */
|
2020-12-15 15:47:52 +00:00
|
|
|
void reset_cpu(void)
|
2013-12-14 03:47:37 +00:00
|
|
|
{
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Board specific ethernet initialization routine.
|
|
|
|
*/
|
2020-06-26 06:13:33 +00:00
|
|
|
int board_eth_init(struct bd_info *bis)
|
2013-12-14 03:47:37 +00:00
|
|
|
{
|
|
|
|
int rc = 0;
|
2020-06-11 11:03:18 +00:00
|
|
|
#ifndef CONFIG_DM_ETH
|
2015-02-17 10:35:25 +00:00
|
|
|
#ifdef CONFIG_SMC911X
|
2023-01-10 16:19:45 +00:00
|
|
|
rc = smc911x_initialize(0, CFG_SMC911X_BASE);
|
2020-06-11 11:03:18 +00:00
|
|
|
#endif
|
2013-12-14 03:47:37 +00:00
|
|
|
#endif
|
|
|
|
return rc;
|
|
|
|
}
|