1. Patchew
  2. QEMU
  3. View series

[Qemu-devel] [PATCH v2] hw/sparc/leon3: Allow load of uImage firmwares

Philippe Mathieu-Daudé posted 1 patch 5 years ago
Test checkpatch passed
Test asan passed
Test docker-clang@ubuntu passed
Test docker-mingw@fedora passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20190427162922.4207-1-f4bug@amsat.org
hw/sparc/leon3.c | 4 ++++
1 file changed, 4 insertions(+)
[Qemu-devel] [PATCH v2] hw/sparc/leon3: Allow load of uImage firmwares
Posted by Philippe Mathieu-Daudé 5 years ago 
Currently the Leon3 machine doesn't allow to load legacy u-boot images:

  $ qemu-system-sparc -M leon3_generic -d in_asm \
      -kernel HelenOS-0.6.0-sparc32-leon3.bin
  qemu-system-sparc: could not load kernel 'HelenOS-0.6.0-sparc32-leon3.bin'

  $ file HelenOS-0.6.0-sparc32-leon3.bin
  HelenOS-0.6.0-sparc32-leon3.bin: u-boot legacy uImage, HelenOS-0.6.0,\
    Linux/ARM, OS Kernel Image (Not compressed), 2424229 bytes,\
    Sun Dec 21 19:18:09 2014,\
    Load Address: 0x40000000, Entry Point: 0x40000000,\
    Header CRC: 0x8BCFA236, Data CRC: 0x37AD87DF

Since QEMU can load uImages, add the necessary code,
so the Leon3 machine can load these images:

  $ qemu-system-sparc -M leon3_generic -d in_asm \
      -kernel HelenOS-0.6.0-sparc32-leon3.bin
  ----------------
  IN:
  0x40000000:  b  0x400007a8
  0x40000004:  nop
  ----------------
  IN:
  0x400007a8:  save  %sp, -136, %sp
  0x400007ac:  call  0x40000020
  0x400007b0:  sethi  %hi(0x4000b800), %i1
  ...

Tested with the following firmware:
http://www.helenos.org/releases/HelenOS-0.6.0-sparc32-leon3.bin

Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
v2: Fixed GIT_AUTHOR_EMAIL
---
 hw/sparc/leon3.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
index 774639af33..0383b17c29 100644
--- a/hw/sparc/leon3.c
+++ b/hw/sparc/leon3.c
@@ -193,6 +193,10 @@ static void leon3_generic_hw_init(MachineState *machine)
         kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
                                &entry, NULL, NULL,
                                1 /* big endian */, EM_SPARC, 0, 0);
+        if (kernel_size < 0) {
+            kernel_size = load_uimage(kernel_filename, NULL, &entry,
+                                      NULL, NULL, NULL);
+        }
         if (kernel_size < 0) {
             error_report("could not load kernel '%s'", kernel_filename);
             exit(1);
-- 
2.19.1
Re: [Qemu-devel] [PATCH v2] hw/sparc/leon3: Allow load of uImage firmwares
Posted by KONRAD Frederic 5 years ago 
Hi Philippe,

Le 4/27/19 à 6:29 PM, Philippe Mathieu-Daudé a écrit :
> Currently the Leon3 machine doesn't allow to load legacy u-boot images:
> 
>    $ qemu-system-sparc -M leon3_generic -d in_asm \
>        -kernel HelenOS-0.6.0-sparc32-leon3.bin
>    qemu-system-sparc: could not load kernel 'HelenOS-0.6.0-sparc32-leon3.bin'
> 
>    $ file HelenOS-0.6.0-sparc32-leon3.bin
>    HelenOS-0.6.0-sparc32-leon3.bin: u-boot legacy uImage, HelenOS-0.6.0,\
>      Linux/ARM, OS Kernel Image (Not compressed), 2424229 bytes,\
>      Sun Dec 21 19:18:09 2014,\
>      Load Address: 0x40000000, Entry Point: 0x40000000,\
>      Header CRC: 0x8BCFA236, Data CRC: 0x37AD87DF
> 
> Since QEMU can load uImages, add the necessary code,
> so the Leon3 machine can load these images:
> 
>    $ qemu-system-sparc -M leon3_generic -d in_asm \
>        -kernel HelenOS-0.6.0-sparc32-leon3.bin
>    ----------------
>    IN:
>    0x40000000:  b  0x400007a8
>    0x40000004:  nop
>    ----------------
>    IN:
>    0x400007a8:  save  %sp, -136, %sp
>    0x400007ac:  call  0x40000020
>    0x400007b0:  sethi  %hi(0x4000b800), %i1
>    ...
> 
> Tested with the following firmware:
> http://www.helenos.org/releases/HelenOS-0.6.0-sparc32-leon3.bin
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>

It doesn't go through the whole boot of this HelenOS but we have the same wrong
behavior with the Linux *SMP* kernel.

qemu: fatal: Trap 0x06 while interrupts disabled, Error state
pc: 400009e4  npc: 40000010
%g0-7: 00000000 00000018 80000000 00000018 4000a548 00000000 00000000 00000000
%o0-7: 00000018 00000000 000000e2 4000a0a8 4000a0a0 0000ffff 47ffff78 400009e0
%l0-7: 4000a000 00000024 47ffffd8 80a00000 00000000 00000000 00000000 00000000
%i0-7: 80a00000 4000ba00 47ffffd4 80a00000 00000000 4000a000 48000000 00000000
%f00:  0000000000000000 0000000000000000 0000000000000000 0000000000000000
%f08:  0000000000000000 0000000000000000 0000000000000000 0000000000000000
%f16:  0000000000000000 0000000000000000 0000000000000000 0000000000000000
%f24:  0000000000000000 0000000000000000 0000000000000000 0000000000000000
psr: f30000c7 (icc: ---- SPE: SP-) wim: 00000001
fsr: 00000000 y: 00000000

But this has nothing to do with the uImage loading so it seems ok to me.

Reviewed-by: KONRAD Frederic <frederic.konrad@adacore.com>
Tested-by: KONRAD Frederic <frederic.konrad@adacore.com>

> ---
> v2: Fixed GIT_AUTHOR_EMAIL
> ---
>   hw/sparc/leon3.c | 4 ++++
>   1 file changed, 4 insertions(+)
> 
> diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
> index 774639af33..0383b17c29 100644
> --- a/hw/sparc/leon3.c
> +++ b/hw/sparc/leon3.c
> @@ -193,6 +193,10 @@ static void leon3_generic_hw_init(MachineState *machine)
>           kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
>                                  &entry, NULL, NULL,
>                                  1 /* big endian */, EM_SPARC, 0, 0);
> +        if (kernel_size < 0) {
> +            kernel_size = load_uimage(kernel_filename, NULL, &entry,
> +                                      NULL, NULL, NULL);
> +        }
>           if (kernel_size < 0) {
>               error_report("could not load kernel '%s'", kernel_filename);
>               exit(1);
>
Re: [Qemu-devel] [Qemu-trivial] [PATCH v2] hw/sparc/leon3: Allow load of uImage firmwares
Posted by Laurent Vivier 5 years ago 
On 27/04/2019 18:29, Philippe Mathieu-Daudé wrote:
> Currently the Leon3 machine doesn't allow to load legacy u-boot images:
> 
>   $ qemu-system-sparc -M leon3_generic -d in_asm \
>       -kernel HelenOS-0.6.0-sparc32-leon3.bin
>   qemu-system-sparc: could not load kernel 'HelenOS-0.6.0-sparc32-leon3.bin'
> 
>   $ file HelenOS-0.6.0-sparc32-leon3.bin
>   HelenOS-0.6.0-sparc32-leon3.bin: u-boot legacy uImage, HelenOS-0.6.0,\
>     Linux/ARM, OS Kernel Image (Not compressed), 2424229 bytes,\
>     Sun Dec 21 19:18:09 2014,\
>     Load Address: 0x40000000, Entry Point: 0x40000000,\
>     Header CRC: 0x8BCFA236, Data CRC: 0x37AD87DF
> 
> Since QEMU can load uImages, add the necessary code,
> so the Leon3 machine can load these images:
> 
>   $ qemu-system-sparc -M leon3_generic -d in_asm \
>       -kernel HelenOS-0.6.0-sparc32-leon3.bin
>   ----------------
>   IN:
>   0x40000000:  b  0x400007a8
>   0x40000004:  nop
>   ----------------
>   IN:
>   0x400007a8:  save  %sp, -136, %sp
>   0x400007ac:  call  0x40000020
>   0x400007b0:  sethi  %hi(0x4000b800), %i1
>   ...
> 
> Tested with the following firmware:
> http://www.helenos.org/releases/HelenOS-0.6.0-sparc32-leon3.bin
> 
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> v2: Fixed GIT_AUTHOR_EMAIL
> ---
>  hw/sparc/leon3.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/hw/sparc/leon3.c b/hw/sparc/leon3.c
> index 774639af33..0383b17c29 100644
> --- a/hw/sparc/leon3.c
> +++ b/hw/sparc/leon3.c
> @@ -193,6 +193,10 @@ static void leon3_generic_hw_init(MachineState *machine)
>          kernel_size = load_elf(kernel_filename, NULL, NULL, NULL,
>                                 &entry, NULL, NULL,
>                                 1 /* big endian */, EM_SPARC, 0, 0);
> +        if (kernel_size < 0) {
> +            kernel_size = load_uimage(kernel_filename, NULL, &entry,
> +                                      NULL, NULL, NULL);
> +        }
>          if (kernel_size < 0) {
>              error_report("could not load kernel '%s'", kernel_filename);
>              exit(1);
> 

Applied to my trivial-patches branch.

Thanks,
Laurent

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.