Re: [Qemu-devel] [RFC v1 3/5] hw/riscv: Extend the kernel loading support
On Wed, Jun 19, 2019 at 2:01 PM Alistair Francis wrote:
>
> On Wed, Jun 19, 2019 at 8:16 AM Bin Meng wrote:
> >
> > On Wed, Jun 19, 2019 at 8:56 AM Alistair Francis
> > wrote:
> > >
> > > Extend the RISC-V kernel loader to support uImage and Image files.
> > > A Linux kernel can now be booted with:
> > >
> > > qemu-system-riscv64 -machine virt -bios fw_jump.elf -kernel Image
> > >
> > > Signed-off-by: Alistair Francis
> > > ---
> > > hw/riscv/boot.c | 19 ++-
> > > 1 file changed, 14 insertions(+), 5 deletions(-)
> > >
> > > diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
> > > index 392ca0cb2e..7f68035a3f 100644
> > > --- a/hw/riscv/boot.c
> > > +++ b/hw/riscv/boot.c
> > > @@ -67,13 +67,22 @@ target_ulong riscv_load_kernel(MachineState *machine,
> > > uint64_t kernel_entry, kernel_high;
> > >
> > > if (load_elf(kernel_filename, NULL, kernel_translate, machine,
> > > - _entry, NULL, _high,
> > > - 0, EM_RISCV, 1, 0) < 0) {
> > > -error_report("could not load kernel '%s'", kernel_filename);
> > > -exit(1);
> > > + _entry, NULL, _high, 0, EM_RISCV, 1, 0) >
> > > 0) {
> > > +return kernel_entry;
> > > +}
> > > +
> > > +if (load_uimage_as(kernel_filename, _entry, NULL, NULL,
> > > + kernel_translate, machine, NULL) > 0) {
> >
> > We should not set the 'kernel_translate' here for uImage.
> >
> > In fact, the whole kernel_translate() is not necessary.
>
> I have removed the kernel_translate() function. I tested loading
> uImage files though and they don't seem to work as the image is loaded
> at the wrong address.
>
> I have removed uImage loading support from this series. We can look at
> it in the future if we decide we want it.
Ah, my mistake, it looks like my uImage wasn't built correctly. I'll
keep this in.
Alistair
>
> Alistair
>
> >
> > > +return kernel_entry;
> > > +}
> > > +
> >
> > Regards,
> > Bin
Re: [Qemu-devel] [RFC v1 3/5] hw/riscv: Extend the kernel loading support
On Wed, Jun 19, 2019 at 8:16 AM Bin Meng wrote:
>
> On Wed, Jun 19, 2019 at 8:56 AM Alistair Francis
> wrote:
> >
> > Extend the RISC-V kernel loader to support uImage and Image files.
> > A Linux kernel can now be booted with:
> >
> > qemu-system-riscv64 -machine virt -bios fw_jump.elf -kernel Image
> >
> > Signed-off-by: Alistair Francis
> > ---
> > hw/riscv/boot.c | 19 ++-
> > 1 file changed, 14 insertions(+), 5 deletions(-)
> >
> > diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
> > index 392ca0cb2e..7f68035a3f 100644
> > --- a/hw/riscv/boot.c
> > +++ b/hw/riscv/boot.c
> > @@ -67,13 +67,22 @@ target_ulong riscv_load_kernel(MachineState *machine,
> > uint64_t kernel_entry, kernel_high;
> >
> > if (load_elf(kernel_filename, NULL, kernel_translate, machine,
> > - _entry, NULL, _high,
> > - 0, EM_RISCV, 1, 0) < 0) {
> > -error_report("could not load kernel '%s'", kernel_filename);
> > -exit(1);
> > + _entry, NULL, _high, 0, EM_RISCV, 1, 0) >
> > 0) {
> > +return kernel_entry;
> > +}
> > +
> > +if (load_uimage_as(kernel_filename, _entry, NULL, NULL,
> > + kernel_translate, machine, NULL) > 0) {
>
> We should not set the 'kernel_translate' here for uImage.
>
> In fact, the whole kernel_translate() is not necessary.
I have removed the kernel_translate() function. I tested loading
uImage files though and they don't seem to work as the image is loaded
at the wrong address.
I have removed uImage loading support from this series. We can look at
it in the future if we decide we want it.
Alistair
>
> > +return kernel_entry;
> > +}
> > +
>
> Regards,
> Bin
Re: [Qemu-devel] [RFC v1 3/5] hw/riscv: Extend the kernel loading support
On Wed, Jun 19, 2019 at 8:56 AM Alistair Francis
wrote:
>
> Extend the RISC-V kernel loader to support uImage and Image files.
> A Linux kernel can now be booted with:
>
> qemu-system-riscv64 -machine virt -bios fw_jump.elf -kernel Image
>
> Signed-off-by: Alistair Francis
> ---
> hw/riscv/boot.c | 19 ++-
> 1 file changed, 14 insertions(+), 5 deletions(-)
>
> diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
> index 392ca0cb2e..7f68035a3f 100644
> --- a/hw/riscv/boot.c
> +++ b/hw/riscv/boot.c
> @@ -67,13 +67,22 @@ target_ulong riscv_load_kernel(MachineState *machine,
> uint64_t kernel_entry, kernel_high;
>
> if (load_elf(kernel_filename, NULL, kernel_translate, machine,
> - _entry, NULL, _high,
> - 0, EM_RISCV, 1, 0) < 0) {
> -error_report("could not load kernel '%s'", kernel_filename);
> -exit(1);
> + _entry, NULL, _high, 0, EM_RISCV, 1, 0) > 0) {
> +return kernel_entry;
> +}
> +
> +if (load_uimage_as(kernel_filename, _entry, NULL, NULL,
> + kernel_translate, machine, NULL) > 0) {
We should not set the 'kernel_translate' here for uImage.
In fact, the whole kernel_translate() is not necessary.
> +return kernel_entry;
> +}
> +
Regards,
Bin
[Qemu-devel] [RFC v1 3/5] hw/riscv: Extend the kernel loading support
Extend the RISC-V kernel loader to support uImage and Image files.
A Linux kernel can now be booted with:
qemu-system-riscv64 -machine virt -bios fw_jump.elf -kernel Image
Signed-off-by: Alistair Francis
---
hw/riscv/boot.c | 19 ++-
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/hw/riscv/boot.c b/hw/riscv/boot.c
index 392ca0cb2e..7f68035a3f 100644
--- a/hw/riscv/boot.c
+++ b/hw/riscv/boot.c
@@ -67,13 +67,22 @@ target_ulong riscv_load_kernel(MachineState *machine,
uint64_t kernel_entry, kernel_high;
if (load_elf(kernel_filename, NULL, kernel_translate, machine,
- _entry, NULL, _high,
- 0, EM_RISCV, 1, 0) < 0) {
-error_report("could not load kernel '%s'", kernel_filename);
-exit(1);
+ _entry, NULL, _high, 0, EM_RISCV, 1, 0) > 0) {
+return kernel_entry;
+}
+
+if (load_uimage_as(kernel_filename, _entry, NULL, NULL,
+ kernel_translate, machine, NULL) > 0) {
+return kernel_entry;
+}
+
+if (load_image_targphys_as(kernel_filename, KERNEL_BOOT_ADDRESS,
+ ram_size, NULL) > 0) {
+return kernel_entry;
}
-return kernel_entry;
+error_report("could not load kernel '%s'", kernel_filename);
+exit(1);
}
hwaddr riscv_load_initrd(const char *filename, uint64_t mem_size,
--
2.22.0
