July 2019 - U-Boot

[U-Boot] [PATCH] ARM: renesas: Update Gen3 PCIe dma-ranges before boot
by Marek Vasut 09 Jul '19

09 Jul '19

Update "dma-ranges" DT property of all PCIe controllers in the system with the up-to-date DRAM layout. This allows the PCIe controller take full advantage of all the available DRAM, at least in theory. This patch only populates up to two dma-ranges entry though, this is because older versions of Linux kernel would fail to probe the PCIe driver if there are more regions in the DT than the PCIe IP can use. Signed-off-by: Marek Vasut <marek.vasut+renesas(a)gmail.com> Cc: Nobuhiro Iwamatsu <iwamatsu(a)nigauri.org> --- arch/arm/mach-rmobile/Kconfig | 1 + board/renesas/rcar-common/common.c | 53 ++++++++++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/arch/arm/mach-rmobile/Kconfig b/arch/arm/mach-rmobile/Kconfig index aafeb355ef..52ab891425 100644 --- a/arch/arm/mach-rmobile/Kconfig +++ b/arch/arm/mach-rmobile/Kconfig @@ -21,6 +21,7 @@ config RCAR_GEN3 imply CMD_GPT imply CMD_UUID imply CMD_MMC_SWRITE if MMC + imply OF_BOARD_SETUP if PCI imply SUPPORT_EMMC_RPMB if MMC imply SPL imply SPL_BOARD_INIT diff --git a/board/renesas/rcar-common/common.c b/board/renesas/rcar-common/common.c index 292867e496..17127d4124 100644 --- a/board/renesas/rcar-common/common.c +++ b/board/renesas/rcar-common/common.c @@ -8,6 +8,8 @@ */ #include <common.h> +#include <dm.h> +#include <dm/uclass-internal.h> #include <asm/arch/rmobile.h> #ifdef CONFIG_RCAR_GEN3 @@ -46,4 +48,55 @@ int dram_init_banksize(void) return 0; } + +#if CONFIG_IS_ENABLED(OF_BOARD_SETUP) && CONFIG_IS_ENABLED(PCI) +int ft_board_setup(void *blob, bd_t *bd) +{ + struct udevice *dev; + struct uclass *uc; + fdt_addr_t regs_addr; + int i, off, ret; + + ret = uclass_get(UCLASS_PCI, &uc); + if (ret) + return ret; + + uclass_foreach_dev(dev, uc) { + struct pci_controller hose = { 0 }; + + /* + * Limit the number of memory regions to 2, which is the + * maximum that older Linux kernel versions can handle + * without aborting. + */ + for (i = 0; i < min(CONFIG_NR_DRAM_BANKS, 2); i++) { + if (hose.region_count == MAX_PCI_REGIONS) { + printf("maximum number of regions parsed, aborting\n"); + break; + } + + if (bd->bi_dram[i].size) { + pci_set_region(&hose.regions[hose.region_count++], + bd->bi_dram[i].start, + bd->bi_dram[i].start, + bd->bi_dram[i].size, + PCI_REGION_MEM | + PCI_REGION_SYS_MEMORY); + } + } + + regs_addr = devfdt_get_addr_index(dev, 0); + off = fdt_node_offset_by_compat_reg(blob, + "renesas,pcie-rcar-gen3", regs_addr); + if (off < 0) { + printf("Failed to find PCIe node@%llx\n", regs_addr); + return off; + } + + fdt_pci_dma_ranges(blob, off, &hose); + } + + return 0; +} +#endif #endif -- 2.20.1

1 0

[U-Boot] [PULL] u-boot-mips
by Daniel Schwierzeck 08 Jul '19

08 Jul '19

Hi Tom, please pull a fix for network instability on MT7688 Gardena Smart Gateway. This should go into 2019.07, thanks. The following changes since commit 1f83431f0053f6fb20c511c391ffc687433848cf: board: amlogic: add mailing-list to MAINTAINERS (2019-07-04 11:36:52 -0400) are available in the Git repository at: git://git.denx.de/u-boot-mips.git tags/mips-fixes-for-2019.07 for you to fetch changes up to 9814fb272f59fc07c0856a6e034e34b361cade18: mips: mt76xx: Implement new d-cache fix in last_stage_init() (2019-07-05 17:12:27 +0200) ---------------------------------------------------------------- - mtmips: network stability fixes for gardena-smart-gateway ---------------------------------------------------------------- Stefan Roese (1): mips: mt76xx: Implement new d-cache fix in last_stage_init() arch/mips/Kconfig | 2 +- arch/mips/mach-mtmips/cpu.c | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 1 deletion(-)

3 2

[U-Boot] What is the status of rk3066 support?
by Arthur Helfstein Fragoso 08 Jul '19

08 Jul '19

Hello, I found Paweł Jarosz sent patches for rk3066 support: https://lists.denx.de/pipermail/u-boot/2017-August/302895.html I tried to search for its status at the patchwork tool mentioned in the website, but I could not find it listed. I can find some code that contains the "rk3066" string in the repository, but there is no full support for it, I could not find files at /board nor at /configs. I have this rikomagic mk808b device with rk3066 processor. I tried to apply the patches myself and saw that some parts of the code has changed and I would have to adapt the patches and I have limited knowledge in hardware/kernel programming. So I wonder if there are still plans to implementing it. Many thanks, Arthur Fragoso

1 1

Re: [U-Boot] [PATCH] riscv: image: save space on the magic number field
by Atish Patra 08 Jul '19

08 Jul '19

On Mon, 2019-07-08 at 11:27 +0000, Chester Lin wrote: > Change the symbol from "RISCV" to "RSCV" so the magic number can be > 32-bit > long, which is consistent with other architectures. This change can > also > be compatible with grub because grub defines this field as 32-bit > long. > It is incompatible with Linux kernel header. So booti will fail to work with this patch unless a corresponding patch is sent to Linux kernel. The kernel patch should be part of 5.3-rc1 (which also includes some compatible field updates). We can revisit all of the changes together once the kernel patch is merged. > Signed-off-by: Chester Lin <clin(a)suse.com> > --- > arch/riscv/lib/image.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/riscv/lib/image.c b/arch/riscv/lib/image.c > index d063beb7df..e8a8cb7190 100644 > --- a/arch/riscv/lib/image.c > +++ b/arch/riscv/lib/image.c > @@ -14,8 +14,8 @@ > > DECLARE_GLOBAL_DATA_PTR; > > -/* ASCII version of "RISCV" defined in Linux kernel */ > -#define LINUX_RISCV_IMAGE_MAGIC 0x5643534952 > +/* ASCII version of "RSCV" defined in Linux kernel */ > +#define LINUX_RISCV_IMAGE_MAGIC 0x56435352 > > struct linux_image_h { > uint32_t code0; /* Executable code */ > @@ -25,8 +25,8 @@ struct linux_image_h { > uint64_t res1; /* reserved */ > uint64_t res2; /* reserved */ > uint64_t res3; /* reserved */ > - uint64_t magic; /* Magic number */ > - uint32_t res4; /* reserved */ > + uint64_t res4; /* reserved */ > + uint32_t magic; /* Magic number */ > uint32_t res5; /* reserved */ > }; > -- Regards, Atish

1 0

[U-Boot] [PATCH v2 3/8] x86: slimbootloader: Add memory configuration
by Park, Aiden 08 Jul '19

08 Jul '19

- Get memory size from the memory map info hob - Set ram top for U-Boot relocation lower than 4GB - Provide e820 entries from the memory map info hob Signed-off-by: Aiden Park <aiden.park(a)intel.com> --- arch/x86/cpu/slimbootloader/Makefile | 2 +- arch/x86/cpu/slimbootloader/dram.c | 139 ++++++++++++++++++ .../asm/arch-slimbootloader/slimbootloader.h | 38 +++++ 3 files changed, 178 insertions(+), 1 deletion(-) create mode 100644 arch/x86/cpu/slimbootloader/dram.c diff --git a/arch/x86/cpu/slimbootloader/Makefile b/arch/x86/cpu/slimbootloader/Makefile index 620fc8a139..4b0b3e71c9 100644 --- a/arch/x86/cpu/slimbootloader/Makefile +++ b/arch/x86/cpu/slimbootloader/Makefile @@ -2,4 +2,4 @@ # # Copyright (C) 2019 Intel Corporation <www.intel.com> -obj-y += car.o slimbootloader.o hob.o +obj-y += car.o slimbootloader.o hob.o dram.o diff --git a/arch/x86/cpu/slimbootloader/dram.c b/arch/x86/cpu/slimbootloader/dram.c new file mode 100644 index 0000000000..1defdad1c9 --- /dev/null +++ b/arch/x86/cpu/slimbootloader/dram.c @@ -0,0 +1,139 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Intel Corporation <www.intel.com> + */ + +#include <common.h> +#include <linux/sizes.h> +#include <asm/e820.h> +#include <asm/arch/slimbootloader.h> + +DECLARE_GLOBAL_DATA_PTR; + +/** + * This returns a data pointer of memory map info from the guid hob. + * + * @return: A data pointer of memory map info hob + */ +static void *get_memory_map_info(void) +{ + const struct efi_guid guid = LOADER_MEMORY_MAP_INFO_GUID; + + return get_next_guid_hob_data(&guid, gd->arch.hob_list); +} + +/** + * This is to give usable memory region information for u-boot relocation. + * so search usable memory region lower than 4GB. + * The memory map entries from Slim Bootloader hob are already sorted. + * + * @total_size: The memory size that u-boot occupies + * @return : The top available memory address lower than 4GB + */ +ulong board_get_usable_ram_top(ulong total_size) +{ + struct memory_map_info *data = NULL; + int i = 0; + phys_addr_t addr_start = 0; + phys_addr_t addr_end = 0; + ulong ram_top = 0; + + data = (struct memory_map_info *)get_memory_map_info(); + if (!data) + panic("memory map info hob not found\n"); + + /* sorted memory map entries, so reversed search */ + for (i = data->count - 1; i >= 0; i--) { + if (data->entry[i].type != E820_RAM) + continue; + + addr_start = data->entry[i].addr; + addr_end = addr_start + data->entry[i].size; + + if (addr_start > SZ_4G) + continue; + + if (addr_end > SZ_4G) + addr_end = SZ_4G; + + if (addr_end < total_size) + continue; + + /* to relocate u-boot at 4K aligned memory */ + addr_end = rounddown(addr_end - total_size, SZ_4K); + if (addr_end >= addr_start) { + ram_top = (ulong)addr_end + total_size; + break; + } + } + + if (!ram_top) + panic("failed to find available memory for relocation!"); + + return ram_top; +} + +/** + * The memory initialization has already been done in previous Slim Bootloader + * stage thru FSP-M. Instead, this sets the ram_size from the memory map info + * hob. + */ +int dram_init(void) +{ + struct memory_map_info *data = NULL; + int i = 0; + phys_size_t ram_size = 0; + + data = (struct memory_map_info *)get_memory_map_info(); + if (!data) + panic("memory map info hob not found\n"); + + /* sorted memory map entries, so reversed search */ + for (i = data->count - 1; i >= 0; i--) { + if (data->entry[i].type != E820_RAM) + continue; + + /* simply use the highest usable memory address as ram size */ + ram_size = data->entry[i].addr + data->entry[i].size; + break; + } + + if (!ram_size) + panic("failed to detect memory size"); + + gd->ram_size = ram_size; + return 0; +} + +int dram_init_banksize(void) +{ + /* simply use a single bank to have whole size for now */ + if (CONFIG_NR_DRAM_BANKS) { + gd->bd->bi_dram[0].start = 0; + gd->bd->bi_dram[0].size = gd->ram_size; + } + return 0; +} + +unsigned int install_e820_map(unsigned int max_entries, + struct e820_entry *entries) +{ + struct memory_map_info *data = NULL; + int i = 0; + unsigned int num_entries = 0; + + data = (struct memory_map_info *)get_memory_map_info(); + if (!data) { + debug("memory map info hob not found\n"); + return 0; + } + + for (i = 0; i < data->count; i++) { + entries[num_entries].addr = data->entry[i].addr; + entries[num_entries].size = data->entry[i].size; + entries[num_entries].type = data->entry[i].type; + num_entries++; + } + + return num_entries; +} diff --git a/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h b/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h index bd1f4ee374..c85201e711 100644 --- a/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h +++ b/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h @@ -10,6 +10,44 @@ #include <asm/fsp/fsp_types.h> #include <asm/fsp/fsp_hob.h> +#define LOADER_MEMORY_MAP_INFO_GUID \ + { \ + 0xa1ff7424, 0x7a1a, 0x478e, \ + { 0xa9, 0xe4, 0x92, 0xf3, 0x57, 0xd1, 0x28, 0x32 } \ + } + +/** + * A single entry of memory map information + * + * @addr: start address of a memory map entry + * @size: size of a memory map entry + * @type: ram:1, reserved:2, acpi:3, nvs:4, unusable:5 + * @flag: only used in Slim Bootloader + * @rsvd: padding for alignment + */ +struct memory_map_entry { + phys_addr_t addr; + phys_size_t size; + u8 type; + u8 flag; + u8 rsvd[6]; +} __packed; + +/** + * This includes all memory map entries which are sorted. + * + * @rev : revision of memory_map_info structure. currently 1. + * @rsvd : padding for alignment + * @count: the number of memory map entries + * @entry: array of all memory map entries + */ +struct memory_map_info { + u8 rev; + u8 rsvd[3]; + u32 count; + struct memory_map_entry entry[0]; +} __packed; + /** * This returns a pointer to hob data buffer if the given guid hob is found. * -- 2.20.1

2 2

[U-Boot] [PATCH v2 4/8] x86: slimbootloader: Add serial driver
by Park, Aiden 08 Jul '19

08 Jul '19

- Get serial port information from the serial port info hob - Leverage ns16550 driver with slimbootloader specific platform data Signed-off-by: Aiden Park <aiden.park(a)intel.com> --- arch/x86/cpu/slimbootloader/Makefile | 2 +- arch/x86/cpu/slimbootloader/serial.c | 62 +++++++++++++++++++ .../asm/arch-slimbootloader/slimbootloader.h | 33 ++++++++++ 3 files changed, 96 insertions(+), 1 deletion(-) create mode 100644 arch/x86/cpu/slimbootloader/serial.c diff --git a/arch/x86/cpu/slimbootloader/Makefile b/arch/x86/cpu/slimbootloader/Makefile index 4b0b3e71c9..3e62f564cd 100644 --- a/arch/x86/cpu/slimbootloader/Makefile +++ b/arch/x86/cpu/slimbootloader/Makefile @@ -2,4 +2,4 @@ # # Copyright (C) 2019 Intel Corporation <www.intel.com> -obj-y += car.o slimbootloader.o hob.o dram.o +obj-y += car.o slimbootloader.o hob.o dram.o serial.o diff --git a/arch/x86/cpu/slimbootloader/serial.c b/arch/x86/cpu/slimbootloader/serial.c new file mode 100644 index 0000000000..186c7a79ef --- /dev/null +++ b/arch/x86/cpu/slimbootloader/serial.c @@ -0,0 +1,62 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Intel Corporation <www.intel.com> + */ + +#include <common.h> +#include <dm.h> +#include <ns16550.h> +#include <serial.h> +#include <asm/arch/slimbootloader.h> + +int slimbootloader_serial_ofdata_to_platdata(struct udevice *dev) +{ + const struct efi_guid guid = LOADER_SERIAL_PORT_INFO_GUID; + struct serial_port_info *serial_info = NULL; + struct ns16550_platdata *plat = dev->platdata; + + serial_info = (struct serial_port_info *) + get_next_guid_hob_data(&guid, gd->arch.hob_list); + + if (!serial_info) { + debug("failed to get serial port information\n"); + return -ENOENT; + } + debug("type:%d base=0x%08x baudrate=%d stride=%d clk=%d\n", + serial_info->type, + serial_info->base, + serial_info->baud, + serial_info->stride, + serial_info->clk); + + /* + * The serial_info->type provides port io or mmio access type info, + * but the access type will be controlled by + * CONFIG_SYS_NS16550_PORT_MAPPED or CONFIG_SYS_NS16550_MEM32. + * + * TBD: ns16550 access type configuration in runtime. + * ex) plat->access_type = serial_info->type + */ + plat->base = serial_info->base; + /* ns16550 uses reg_shift, then covert stride to shift */ + plat->reg_shift = (serial_info->stride >> 1); + plat->clock = serial_info->clk; + + return 0; +} + +static const struct udevice_id slimbootloader_serial_ids[] = { + { .compatible = "intel,slimbootloader-uart" }, + {} +}; + +U_BOOT_DRIVER(serial_slimbootloader) = { + .name = "serial_slimbootloader", + .id = UCLASS_SERIAL, + .of_match = slimbootloader_serial_ids, + .ofdata_to_platdata = slimbootloader_serial_ofdata_to_platdata, + .platdata_auto_alloc_size = sizeof(struct ns16550_platdata), + .priv_auto_alloc_size = sizeof(struct NS16550), + .probe = ns16550_serial_probe, + .ops = &ns16550_serial_ops, +}; diff --git a/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h b/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h index c85201e711..b05e527148 100644 --- a/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h +++ b/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h @@ -16,6 +16,12 @@ { 0xa9, 0xe4, 0x92, 0xf3, 0x57, 0xd1, 0x28, 0x32 } \ } +#define LOADER_SERIAL_PORT_INFO_GUID \ + { \ + 0x6c6872fe, 0x56a9, 0x4403, \ + { 0xbb, 0x98, 0x95, 0x8d, 0x62, 0xde, 0x87, 0xf1 } \ + } + /** * A single entry of memory map information * @@ -48,6 +54,33 @@ struct memory_map_info { struct memory_map_entry entry[0]; } __packed; +/** + * This includes serial port info which has already been initialized in previous + * Slim Bootloader stage. + * The Slim Bootloader initializes serial port regardless of debug/release build + * modes, and it passes the information to a payload thru hob. So, a payload can + * re-use the serial information without re-initializing serial port. + * + * @rev : revision of serial_port_info structure. currently 1. + * @rsvd : padding for alignment + * @type : port io: 1, mmio: 2 + * @base : io base address. ex) 0x3f8, 0x80001000 + * @baud : uart baud rate + * @stride: register stride in Bytes + * @clk : uart frequency in Hz + * @rsvd1 : reserved + */ +struct serial_port_info { + u8 rev; + u8 rsvd[3]; + u32 type; + u32 base; + u32 baud; + u32 stride; + u32 clk; + u32 rsvd1; +} __packed; + /** * This returns a pointer to hob data buffer if the given guid hob is found. * -- 2.20.1

2 2

[U-Boot] [PATCH v2 2/8] x86: slimbootloader: Add a function to access HOB
by Park, Aiden 08 Jul '19

08 Jul '19

- Added a function to get a GUID HOB data pointer from hob_list Signed-off-by: Aiden Park <aiden.park(a)intel.com> --- arch/x86/cpu/slimbootloader/Makefile | 2 +- arch/x86/cpu/slimbootloader/hob.c | 97 +++++++++++++++++++ .../asm/arch-slimbootloader/slimbootloader.h | 14 +++ 3 files changed, 112 insertions(+), 1 deletion(-) create mode 100644 arch/x86/cpu/slimbootloader/hob.c diff --git a/arch/x86/cpu/slimbootloader/Makefile b/arch/x86/cpu/slimbootloader/Makefile index 627a721e8c..620fc8a139 100644 --- a/arch/x86/cpu/slimbootloader/Makefile +++ b/arch/x86/cpu/slimbootloader/Makefile @@ -2,4 +2,4 @@ # # Copyright (C) 2019 Intel Corporation <www.intel.com> -obj-y += car.o slimbootloader.o +obj-y += car.o slimbootloader.o hob.o diff --git a/arch/x86/cpu/slimbootloader/hob.c b/arch/x86/cpu/slimbootloader/hob.c new file mode 100644 index 0000000000..dff86b696e --- /dev/null +++ b/arch/x86/cpu/slimbootloader/hob.c @@ -0,0 +1,97 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Intel Corporation <www.intel.com> + */ + +#include <common.h> +#include <asm/arch/slimbootloader.h> + +/* + * This compares two guids and returns its result(0 or others). + * + * @guid1: A pointer to a 128 bit guid + * @guid2: A pointer to a 128 bit guid + * + * @return: 0 if guid1 and guid2 are identical. Otherwise it returns none 0. + */ +static int compare_guid(const struct efi_guid *guid1, + const struct efi_guid *guid2) +{ + return memcmp(guid1, guid2, sizeof(struct efi_guid)); +} + +/** + * This returns a hob header pointer which has a specific type from the given + * hob list. + * + * @type: A specific hob type + * @hob_list: A pointer to a hob list + * + * @return: A hob header pointer if the specified type is found. + * Otherwise, this returns NULL. + */ +static const struct hob_header *get_next_hob_from_hdr(uint type, + const void *hob_list) +{ + const struct hob_header *hdr; + + hdr = hob_list; + + /* Parse the HOB list until end of list or matching type is found */ + while (!end_of_hob(hdr)) { + if (hdr->type == type) + return hdr; + + hdr = get_next_hob(hdr); + } + + return NULL; +} + +/** + * This returns a hob header pointer which has a specific guid from the given + * hob list. + * + * @guid: A pointer to a 128 bit guid + * @hob_list: A pointer to a hob list + * + * @return: A hob header pointer if the specified guid hob entry is found. + * Otherwise, this returns NULL. + */ +static const struct hob_header *get_next_guid_hob(const struct efi_guid *guid, + const void *hob_list) +{ + const struct hob_header *hdr; + struct hob_guid *guid_hob; + + hdr = hob_list; + while ((hdr = get_next_hob_from_hdr(HOB_TYPE_GUID_EXT, hdr))) { + guid_hob = (struct hob_guid *)hdr; + if (!compare_guid(guid, &guid_hob->name)) + break; + hdr = get_next_hob(hdr); + } + + return hdr; +} + +/** + * This returns a pointer to hob data buffer if the given guid hob is found. + * + * @guid: A pointer to a 128 bit guid + * @hob_list: A pointer to a hob list + * + * @return: A pointer to hob data buffer if the specified guid hob entry is + * found. Otherwise, this returns NULL. + */ +void *get_next_guid_hob_data(const struct efi_guid *guid, + const void *hob_list) +{ + const struct hob_header *guid_hob; + + guid_hob = get_next_guid_hob(guid, hob_list); + if (!guid_hob) + return NULL; + + return get_guid_hob_data(guid_hob); +} diff --git a/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h b/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h index 7309a83724..bd1f4ee374 100644 --- a/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h +++ b/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h @@ -7,5 +7,19 @@ #define __SLIMBOOTLOADER_ARCH_H__ #include <common.h> +#include <asm/fsp/fsp_types.h> +#include <asm/fsp/fsp_hob.h> + +/** + * This returns a pointer to hob data buffer if the given guid hob is found. + * + * @guid: A pointer to a 128 bit guid + * @hob_list: A pointer to a hob list + * + * @return: A pointer to hob data buffer if the specified guid hob entry is + * found. Otherwise, this returns NULL. + */ +void *get_next_guid_hob_data(const struct efi_guid *guid, + const void *hob_list); #endif -- 2.20.1

2 2

[U-Boot] [PATCH v2 1/8] x86: Add new slimbootloader CPU type
by Park, Aiden 08 Jul '19

08 Jul '19

- Added CONFIG_SYS_SLIMBOOTLOADER to enable slimbootloader CPU type - Added new arch/x86/cpu/slimbootloader directory with minimum codes - Get hob_list pointer from Slim Bootloader Signed-off-by: Aiden Park <aiden.park(a)intel.com> --- arch/x86/Kconfig | 1 + arch/x86/cpu/Makefile | 1 + arch/x86/cpu/slimbootloader/Kconfig | 23 ++++++++++ arch/x86/cpu/slimbootloader/Makefile | 5 +++ arch/x86/cpu/slimbootloader/car.S | 43 +++++++++++++++++++ arch/x86/cpu/slimbootloader/slimbootloader.c | 21 +++++++++ .../asm/arch-slimbootloader/slimbootloader.h | 11 +++++ arch/x86/include/asm/global_data.h | 2 +- arch/x86/lib/asm-offsets.c | 2 +- 9 files changed, 107 insertions(+), 2 deletions(-) create mode 100644 arch/x86/cpu/slimbootloader/Kconfig create mode 100644 arch/x86/cpu/slimbootloader/Makefile create mode 100644 arch/x86/cpu/slimbootloader/car.S create mode 100644 arch/x86/cpu/slimbootloader/slimbootloader.c create mode 100644 arch/x86/include/asm/arch-slimbootloader/slimbootloader.h diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 70f939869a..1612246dfc 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -116,6 +116,7 @@ source "arch/x86/cpu/qemu/Kconfig" source "arch/x86/cpu/quark/Kconfig" source "arch/x86/cpu/queensbay/Kconfig" source "arch/x86/cpu/tangier/Kconfig" +source "arch/x86/cpu/slimbootloader/Kconfig" # architecture-specific options below diff --git a/arch/x86/cpu/Makefile b/arch/x86/cpu/Makefile index 85fd5e616e..a5c0113fa4 100644 --- a/arch/x86/cpu/Makefile +++ b/arch/x86/cpu/Makefile @@ -48,6 +48,7 @@ obj-$(CONFIG_NORTHBRIDGE_INTEL_IVYBRIDGE) += ivybridge/ obj-$(CONFIG_INTEL_QUARK) += quark/ obj-$(CONFIG_INTEL_QUEENSBAY) += queensbay/ obj-$(CONFIG_INTEL_TANGIER) += tangier/ +obj-$(CONFIG_SYS_SLIMBOOTLOADER) += slimbootloader/ obj-$(CONFIG_APIC) += lapic.o ioapic.o obj-y += irq.o ifndef CONFIG_$(SPL_)X86_64 diff --git a/arch/x86/cpu/slimbootloader/Kconfig b/arch/x86/cpu/slimbootloader/Kconfig new file mode 100644 index 0000000000..e7513afd5b --- /dev/null +++ b/arch/x86/cpu/slimbootloader/Kconfig @@ -0,0 +1,23 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright (C) 2019 Intel Corporation <www.intel.com> + +if TARGET_SLIMBOOTLOADER + +config SYS_SLIMBOOTLOADER + bool + default y + imply SYS_NS16550 + imply AHCI_PCI + imply SCSI + imply SCSI_AHCI + imply MMC + imply MMC_PCI + imply MMC_SDHCI + imply MMC_SDHCI_SDMA + imply USB + imply USB_EHCI_HCD + imply USB_XHCI_HCD + imply USB_STORAGE + +endif diff --git a/arch/x86/cpu/slimbootloader/Makefile b/arch/x86/cpu/slimbootloader/Makefile new file mode 100644 index 0000000000..627a721e8c --- /dev/null +++ b/arch/x86/cpu/slimbootloader/Makefile @@ -0,0 +1,5 @@ +# SPDX-License-Identifier: GPL-2.0+ +# +# Copyright (C) 2019 Intel Corporation <www.intel.com> + +obj-y += car.o slimbootloader.o diff --git a/arch/x86/cpu/slimbootloader/car.S b/arch/x86/cpu/slimbootloader/car.S new file mode 100644 index 0000000000..63c5c28b33 --- /dev/null +++ b/arch/x86/cpu/slimbootloader/car.S @@ -0,0 +1,43 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2019 Intel Corporation <www.intel.com> + */ + +#include <generated/asm-offsets.h> + +.section .text + +.globl slimbootloader_start +slimbootloader_start: + /* Get hob pointer parameter from previous stage's stack */ + mov 0x4(%esp), %esi + + /* Set up global data */ + mov %esp, %eax + call board_init_f_alloc_reserve + mov %eax, %esp + call board_init_f_init_reserve + +#ifdef CONFIG_DEBUG_UART + call debug_uart_init +#endif + + /* Get address of global_data */ + mov %fs:0, %edx + movl %esi, GD_HOB_LIST(%edx) + + /* Enter u-boot with 0 bootflag */ + xorl %eax, %eax + call board_init_f + +.globl car_init +car_init: + /* + * CAR init/teardown and memory init have already been done + * in Slim Bootloader stages. Therefore, let's use this car_init as + * very first entry point of slimbootloader_start. + */ + jmp slimbootloader_start + + /* DO NOT REACH HERE */ + jmp . diff --git a/arch/x86/cpu/slimbootloader/slimbootloader.c b/arch/x86/cpu/slimbootloader/slimbootloader.c new file mode 100644 index 0000000000..9f3a61ec61 --- /dev/null +++ b/arch/x86/cpu/slimbootloader/slimbootloader.c @@ -0,0 +1,21 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Intel Corporation <www.intel.com> + */ + +#include <common.h> + +int arch_cpu_init(void) +{ + return x86_cpu_init_f(); +} + +int checkcpu(void) +{ + return 0; +} + +int print_cpuinfo(void) +{ + return default_print_cpuinfo(); +} diff --git a/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h b/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h new file mode 100644 index 0000000000..7309a83724 --- /dev/null +++ b/arch/x86/include/asm/arch-slimbootloader/slimbootloader.h @@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * Copyright (C) 2019 Intel Corporation <www.intel.com> + */ + +#ifndef __SLIMBOOTLOADER_ARCH_H__ +#define __SLIMBOOTLOADER_ARCH_H__ + +#include <common.h> + +#endif diff --git a/arch/x86/include/asm/global_data.h b/arch/x86/include/asm/global_data.h index 9398ec33b2..674efaaa01 100644 --- a/arch/x86/include/asm/global_data.h +++ b/arch/x86/include/asm/global_data.h @@ -83,7 +83,7 @@ struct arch_global_data { const struct pch_gpio_map *gpio_map; /* board GPIO map */ struct memory_info meminfo; /* Memory information */ struct pei_memory_info pei_meminfo; /* PEI memory information */ -#ifdef CONFIG_HAVE_FSP +#if defined(CONFIG_HAVE_FSP) || defined(CONFIG_SYS_SLIMBOOTLOADER) void *hob_list; /* FSP HOB list */ #endif struct mtrr_request mtrr_req[MAX_MTRR_REQUESTS]; diff --git a/arch/x86/lib/asm-offsets.c b/arch/x86/lib/asm-offsets.c index 90dce22b25..258c0bbc2c 100644 --- a/arch/x86/lib/asm-offsets.c +++ b/arch/x86/lib/asm-offsets.c @@ -17,7 +17,7 @@ int main(void) { DEFINE(GD_BIST, offsetof(gd_t, arch.bist)); -#ifdef CONFIG_HAVE_FSP +#if defined(CONFIG_HAVE_FSP) || defined(CONFIG_SYS_SLIMBOOTLOADER) DEFINE(GD_HOB_LIST, offsetof(gd_t, arch.hob_list)); #endif DEFINE(GD_TABLE, offsetof(gd_t, arch.table)); -- 2.20.1

2 2

Re: [U-Boot] [PATCH v2] ARM: imx6: DHCOM i.MX6 PDK: Switch to DM for I2C
by Ludwig Zenz 08 Jul '19

08 Jul '19

On 7/8/19 14:50 Marek Vasut wrote: > On 7/8/19 10:21 AM, Ludwig Zenz wrote: > > On 7/5/19 14:24 PM, Marek Vasut wrote: > >> > >> On 7/5/19 12:46 PM, Ludwig Zenz wrote: > >> [...] > >> > >>> static int setup_dhcom_mac_from_fuse(void) > >>> { > >>> + struct udevice *dev; > >>> unsigned char enetaddr[6]; > >>> int ret; > >>> > >>> @@ -228,13 +142,13 @@ static int setup_dhcom_mac_from_fuse(void) > >>> return 0; > >>> } > >>> > >>> - ret = i2c_set_bus_num(2); > >>> + ret = uclass_first_device_err(UCLASS_I2C_EEPROM, &dev); > >> > >> What about uclass_find_device_by_of_node() ? Then you can specify a > >> stable fixed hardware path to the EEPROM, and no matter how many EEPROMs > >> someone connects to the board, this code won't be affected. > >> > >> [...] > >> > > > > The function uclass_find_device_by_ofnode() is used only once in U-Boot > and the > > declaration is in 'include/dh/uclass-interal.h'. I found a similar function > called > > uclass_get_device_by_ofnode(), which is used in several places. > > > > Unfortunately I didn't manage to work out the difference. > > What I don't like is that the former is from uclass-internal.h. > > -------- > > > > A possible implementation would be as follows: > > > > [...] > > struct udevice *dev; > > ofnode eeprom; > > unsigned char enetaddr[6]; > > int ret; > > > > [...] > > > > eeprom = ofnode_path("/soc/aips-bus@2100000/i2c@21a8000/eeprom@50"); > > if (!ofnode_valid(eeprom)) { > > printf("Invalid hardware path to EEPROM!\n"); > > return -ENODEV; > > } > > > > ret = uclass_get_device_by_ofnode(UCLASS_I2C_EEPROM, eeprom, &dev); > > if (ret) { > > printf("Cannot find EEPROM!\n"); > > return ret; > > } > > > > ret = i2c_eeprom_read(dev, 0xfa, enetaddr, 0x6); > > if (ret) { > > printf("Error reading configuration EEPROM!\n"); > > return ret; > > } > > > > [...] > > > > We're lucky here that the Duallite and Quad mapped the I2C controllers on > the same addresses. > > But I'm not sure if this is really a good implementation. > > > > Would it be advantageous to make a device tree entry in /chosen for the > MAC EEPROM instead? > > Then we could do something like: > > > > eeprom = ofnode_get_chosen_node("mac,eeprom"); > > > > > > I'd be happy to get feedback on that. > > The correct solution would be to add some sort of link from the ethernet > MAC to the EEPROM, maybe via nvmem or somesuch. But I don't think U-Boot > implements that. > > I don't have any better suggestion, maybe someone else does. > I will now send the solution suggested above with uclass_get_device_by_ofnode() as V3. With this I want to avoid another device tree change for now and be closer to the Linux device tree. Best regards, Ludwig Zenz

1 0

Re: [U-Boot] [PATCH v2] ARM: imx6: DHCOM i.MX6 PDK: Switch to DM for I2C
by Ludwig Zenz 08 Jul '19

08 Jul '19

On 7/5/19 14:24 PM, Marek Vasut wrote: > > On 7/5/19 12:46 PM, Ludwig Zenz wrote: > [...] > > > static int setup_dhcom_mac_from_fuse(void) > > { > > + struct udevice *dev; > > unsigned char enetaddr[6]; > > int ret; > > > > @@ -228,13 +142,13 @@ static int setup_dhcom_mac_from_fuse(void) > > return 0; > > } > > > > - ret = i2c_set_bus_num(2); > > + ret = uclass_first_device_err(UCLASS_I2C_EEPROM, &dev); > > What about uclass_find_device_by_of_node() ? Then you can specify a > stable fixed hardware path to the EEPROM, and no matter how many EEPROMs > someone connects to the board, this code won't be affected. > > [...] > The function uclass_find_device_by_ofnode() is used only once in U-Boot and the declaration is in 'include/dh/uclass-interal.h'. I found a similar function called uclass_get_device_by_ofnode(), which is used in several places. Unfortunately I didn't manage to work out the difference. What I don't like is that the former is from uclass-internal.h. -------- A possible implementation would be as follows: [...] struct udevice *dev; ofnode eeprom; unsigned char enetaddr[6]; int ret; [...] eeprom = ofnode_path("/soc/aips-bus@2100000/i2c@21a8000/eeprom@50"); if (!ofnode_valid(eeprom)) { printf("Invalid hardware path to EEPROM!\n"); return -ENODEV; } ret = uclass_get_device_by_ofnode(UCLASS_I2C_EEPROM, eeprom, &dev); if (ret) { printf("Cannot find EEPROM!\n"); return ret; } ret = i2c_eeprom_read(dev, 0xfa, enetaddr, 0x6); if (ret) { printf("Error reading configuration EEPROM!\n"); return ret; } [...] We're lucky here that the Duallite and Quad mapped the I2C controllers on the same addresses. But I'm not sure if this is really a good implementation. Would it be advantageous to make a device tree entry in /chosen for the MAC EEPROM instead? Then we could do something like: eeprom = ofnode_get_chosen_node("mac,eeprom"); I'd be happy to get feedback on that. regards, Ludwig Zenz

2 1