| Message ID | 20190501200731.9858-1-atish.patra@wdc.com |
|---|---|
| State | Superseded |
| Delegated to: | Andes |
| Headers | show |
| Series | [U-Boot,v3] RISCV: image: Add booti support. | expand |
On Wed, May 01, 2019 at 01:07:31PM -0700, Atish Patra wrote: > This patch adds booti support for RISC-V Linux kernel. The existing > bootm method will also continue to work as it is. > > It depends on the following kernel patch which adds the header to the > flat Image. Gzip compressed Image (Image.gz) support is not enabled with > this patch. > > https://patchwork.kernel.org/patch/10925543/ > > Tested on HiFive Unleashed and QEMU. > > Signed-off-by: Atish Patra <atish.patra@wdc.com> > -- > Changes from v2->v3 > 1. Updated the image header structure as per kernel patch. > 2. Removed Image.gz support as it will be added as separate RFC patch. Reviewed-by: Tom Rini <trini@konsulko.com>
On Wed, May 01, 2019 at 01:07:31PM -0700, Atish Patra wrote: > This patch adds booti support for RISC-V Linux kernel. The existing > bootm method will also continue to work as it is. > > It depends on the following kernel patch which adds the header to the > flat Image. Gzip compressed Image (Image.gz) support is not enabled with > this patch. > > https://patchwork.kernel.org/patch/10925543/ > > Tested on HiFive Unleashed and QEMU. > > Signed-off-by: Atish Patra <atish.patra@wdc.com> Hello, the patch (both directly from my inbox as well as from patchwork) appears to be mangled and doesn't apply cleanly: Applying: RISCV: image: Add booti support. error: patch failed: cmd/booti.c:77 error: cmd/booti.c: patch does not apply Patch failed at 0001 RISCV: image: Add booti support. I have manually applied the changes on top of 2019.07-rc1 and run a number of tests together with the corresponding kernel patch (https://patchwork.kernel.org/patch/10925543/). With the patch applied I can successfully boot a kernel and an initramfs with booti on a qemu-system-riscv64 "virt" machine: OpenSBI v0.3 (May 4 2019 20:32:00) ____ _____ ____ _____ / __ \ / ____| _ \_ _| | | | |_ __ ___ _ __ | (___ | |_) || | | | | | '_ \ / _ \ '_ \ \___ \| _ < | | | |__| | |_) | __/ | | |____) | |_) || |_ \____/| .__/ \___|_| |_|_____/|____/_____| | | |_| Platform Name : QEMU Virt Machine Platform HART Features : RV64ACDFIMSU Platform Max HARTs : 8 Current Hart : 0 Firmware Base : 0x80000000 Firmware Size : 100 KB Runtime SBI Version : 0.1 PMP0: 0x0000000080000000-0x000000008001ffff (A) PMP1: 0x0000000000000000-0xffffffffffffffff (A,R,W,X) U-Boot 2019.07-rc1-00001-g6b6a8d27ea-dirty (May 05 2019 - 01:05:15 +0200) CPU: rv64imafdcsu Model: riscv-virtio,qemu DRAM: 8 GiB In: uart@10000000 Out: uart@10000000 Err: uart@10000000 Net: Warning: virtio-net#2 using MAC address from ROM eth0: virtio-net#2 Hit any key to stop autoboot: 0 => load virtio 0:1 ${kernel_addr_r} /boot/vmlinux-5.0.0-trunk-riscv64 9073676 bytes read in 5 ms (1.7 GiB/s) => load virtio 0:1 ${ramdisk_addr_r} /boot/initrd.img-5.0.0-trunk-riscv64 45823535 bytes read in 14 ms (3 GiB/s) => booti ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdtcontroladdr} ## Flattened Device Tree blob at ff77bd30 Booting using the fdt blob at 0xff77bd30 Using Device Tree in place at 00000000ff77bd30, end 00000000ff77fda5 Starting kernel ... [ 0.000000] OF: fdt: Ignoring memory range 0x80000000 - 0x80200000 [ 0.000000] No DTB passed to the kernel [ 0.000000] Linux version 5.0.0-trunk-riscv64 (debian-kernel@lists.debian.org) (gcc version 8.3.0 (Debian 8.3.0-7)) #1 SMP Debian 5.0.10-1~exp1 (2019-03-22) [ 0.000000] Initial ramdisk at: 0x(____ptrval____) (45823535 bytes) [...] Tested-by: Karsten Merker <merker@debian.org> Regards, Karsten
On 5/5/19 4:07 AM, Karsten Merker wrote: > On Wed, May 01, 2019 at 01:07:31PM -0700, Atish Patra wrote: >> This patch adds booti support for RISC-V Linux kernel. The existing >> bootm method will also continue to work as it is. >> >> It depends on the following kernel patch which adds the header to the >> flat Image. Gzip compressed Image (Image.gz) support is not enabled with >> this patch. >> >> https://patchwork.kernel.org/patch/10925543/ >> >> Tested on HiFive Unleashed and QEMU. >> >> Signed-off-by: Atish Patra <atish.patra@wdc.com> > > Hello, > > the patch (both directly from my inbox as well as from > patchwork) appears to be mangled and doesn't apply cleanly: > > Applying: RISCV: image: Add booti support. > error: patch failed: cmd/booti.c:77 > error: cmd/booti.c: patch does not apply > Patch failed at 0001 RISCV: image: Add booti support. > I have fixed the patch and sent a v4. That should cleanly apply on top of master. > I have manually applied the changes on top of 2019.07-rc1 and > run a number of tests together with the corresponding kernel > patch (https://patchwork.kernel.org/patch/10925543/). With > the patch applied I can successfully boot a kernel and an > initramfs with booti on a qemu-system-riscv64 "virt" machine: > Thanks for testing the patch. Regards, Atish > OpenSBI v0.3 (May 4 2019 20:32:00) > ____ _____ ____ _____ > / __ \ / ____| _ \_ _| > | | | |_ __ ___ _ __ | (___ | |_) || | > | | | | '_ \ / _ \ '_ \ \___ \| _ < | | > | |__| | |_) | __/ | | |____) | |_) || |_ > \____/| .__/ \___|_| |_|_____/|____/_____| > | | > |_| > > Platform Name : QEMU Virt Machine > Platform HART Features : RV64ACDFIMSU > Platform Max HARTs : 8 > Current Hart : 0 > Firmware Base : 0x80000000 > Firmware Size : 100 KB > Runtime SBI Version : 0.1 > > PMP0: 0x0000000080000000-0x000000008001ffff (A) > PMP1: 0x0000000000000000-0xffffffffffffffff (A,R,W,X) > > > U-Boot 2019.07-rc1-00001-g6b6a8d27ea-dirty (May 05 2019 - 01:05:15 +0200) > > CPU: rv64imafdcsu > Model: riscv-virtio,qemu > DRAM: 8 GiB > In: uart@10000000 > Out: uart@10000000 > Err: uart@10000000 > Net: > Warning: virtio-net#2 using MAC address from ROM > eth0: virtio-net#2 > Hit any key to stop autoboot: 0 > => load virtio 0:1 ${kernel_addr_r} /boot/vmlinux-5.0.0-trunk-riscv64 > 9073676 bytes read in 5 ms (1.7 GiB/s) > => load virtio 0:1 ${ramdisk_addr_r} /boot/initrd.img-5.0.0-trunk-riscv64 > 45823535 bytes read in 14 ms (3 GiB/s) > => booti ${kernel_addr_r} ${ramdisk_addr_r}:${filesize} ${fdtcontroladdr} > ## Flattened Device Tree blob at ff77bd30 > Booting using the fdt blob at 0xff77bd30 > Using Device Tree in place at 00000000ff77bd30, end 00000000ff77fda5 > > Starting kernel ... > > [ 0.000000] OF: fdt: Ignoring memory range 0x80000000 - 0x80200000 > [ 0.000000] No DTB passed to the kernel > [ 0.000000] Linux version 5.0.0-trunk-riscv64 (debian-kernel@lists.debian.org) (gcc version 8.3.0 (Debian 8.3.0-7)) #1 SMP Debian 5.0.10-1~exp1 (2019-03-22) > [ 0.000000] Initial ramdisk at: 0x(____ptrval____) (45823535 bytes) > [...] > > Tested-by: Karsten Merker <merker@debian.org> > > Regards, > Karsten >
diff --git a/arch/riscv/lib/Makefile b/arch/riscv/lib/Makefile index 1c332db436a9..6ae6ebbeafda 100644 --- a/arch/riscv/lib/Makefile +++ b/arch/riscv/lib/Makefile @@ -7,6 +7,7 @@ # Rick Chen, Andes Technology Corporation <rick@andestech.com> obj-$(CONFIG_CMD_BOOTM) += bootm.o +obj-$(CONFIG_CMD_BOOTI) += bootm.o image.o obj-$(CONFIG_CMD_GO) += boot.o obj-y += cache.o obj-$(CONFIG_RISCV_RDTIME) += rdtime.o diff --git a/arch/riscv/lib/image.c b/arch/riscv/lib/image.c new file mode 100644 index 000000000000..d063beb7dfbe --- /dev/null +++ b/arch/riscv/lib/image.c @@ -0,0 +1,55 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright (C) 2019 Western Digital Corporation or its affiliates. + * Authors: + * Atish Patra <atish.patra@wdc.com> + * Based on arm/lib/image.c + */ + +#include <common.h> +#include <mapmem.h> +#include <errno.h> +#include <linux/sizes.h> +#include <linux/stddef.h> + +DECLARE_GLOBAL_DATA_PTR; + +/* ASCII version of "RISCV" defined in Linux kernel */ +#define LINUX_RISCV_IMAGE_MAGIC 0x5643534952 + +struct linux_image_h { + uint32_t code0; /* Executable code */ + uint32_t code1; /* Executable code */ + uint64_t text_offset; /* Image load offset */ + uint64_t image_size; /* Effective Image size */ + uint64_t res1; /* reserved */ + uint64_t res2; /* reserved */ + uint64_t res3; /* reserved */ + uint64_t magic; /* Magic number */ + uint32_t res4; /* reserved */ + uint32_t res5; /* reserved */ +}; + +int booti_setup(ulong image, ulong *relocated_addr, ulong *size, + bool force_reloc) +{ + struct linux_image_h *lhdr; + + lhdr = (struct linux_image_h *)map_sysmem(image, 0); + + if (lhdr->magic != LINUX_RISCV_IMAGE_MAGIC) { + puts("Bad Linux RISCV Image magic!\n"); + return -EINVAL; + } + + if (lhdr->image_size == 0) { + puts("Image lacks image_size field, error!\n"); + return -EINVAL; + } + *size = lhdr->image_size; + *relocated_addr = gd->ram_base + lhdr->text_offset; + + unmap_sysmem(lhdr); + + return 0; +} diff --git a/cmd/Kconfig b/cmd/Kconfig index 2bdbfcb3d091..d427b66d3714 100644 --- a/cmd/Kconfig +++ b/cmd/Kconfig @@ -212,7 +212,7 @@ config CMD_BOOTZ config CMD_BOOTI bool "booti" - depends on ARM64 + depends on ARM64 || RISCV default y help Boot an AArch64 Linux Kernel image from memory. diff --git a/cmd/booti.c b/cmd/booti.c index 04353b68eccc..c22ba9bae2e4 100644 --- a/cmd/booti.c +++ b/cmd/booti.c @@ -77,7 +77,11 @@ int do_booti(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) bootm_disable_interrupts(); images.os.os = IH_OS_LINUX; + #ifdef CONFIG_RISCV_SMODE + images.os.arch = IH_ARCH_RISCV; + #elif CONFIG_ARM64 images.os.arch = IH_ARCH_ARM64; + #endif ret = do_bootm_states(cmdtp, flag, argc, argv, #ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH BOOTM_STATE_RAMDISK | @@ -92,7 +96,7 @@ int do_booti(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #ifdef CONFIG_SYS_LONGHELP static char booti_help_text[] = "[addr [initrd[:size]] [fdt]]\n" - " - boot arm64 Linux Image stored in memory\n" + " - boot arm64/riscv Linux Image stored in memory\n" "\tThe argument 'initrd' is optional and specifies the address\n" "\tof an initrd in memory. The optional parameter ':size' allows\n" "\tspecifying the size of a RAW initrd.\n" @@ -107,5 +111,5 @@ static char booti_help_text[] = U_BOOT_CMD( booti, CONFIG_SYS_MAXARGS, 1, do_booti, - "boot arm64 Linux Image image from memory", booti_help_text + "boot arm64/riscv Linux Image image from memory", booti_help_text );
This patch adds booti support for RISC-V Linux kernel. The existing bootm method will also continue to work as it is. It depends on the following kernel patch which adds the header to the flat Image. Gzip compressed Image (Image.gz) support is not enabled with this patch. https://patchwork.kernel.org/patch/10925543/ Tested on HiFive Unleashed and QEMU. Signed-off-by: Atish Patra <atish.patra@wdc.com> -- Changes from v2->v3 1. Updated the image header structure as per kernel patch. 2. Removed Image.gz support as it will be added as separate RFC patch. --- arch/riscv/lib/Makefile | 1 + arch/riscv/lib/image.c | 55 +++++++++++++++++++++++++++++++++++++++++ cmd/Kconfig | 2 +- cmd/booti.c | 8 ++++-- 4 files changed, 63 insertions(+), 3 deletions(-) create mode 100644 arch/riscv/lib/image.c