Patchwork PPC: E500: Put dtb after initrd

login
register
mail settings
Submitter Alexander Graf
Date Jan. 14, 2013, 7:26 p.m.
Message ID <1358191607-6837-1-git-send-email-agraf@suse.de>
Download mbox | patch
Permalink /patch/211869/
State New
Headers show

Comments

Alexander Graf - Jan. 14, 2013, 7:26 p.m.
We have 3 blobs we need to load when booting the system:

  - kernel
  - initrd
  - dtb

We place them in physical memory in that order. At least we should.
This patch fixes the dtb location up to take the initrd location into
account, fixing its offset.

Reported-by: Stuart Yoder <stuart.yoder@freescale.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
---
 hw/ppc/e500.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
Alexander Graf - Jan. 14, 2013, 7:33 p.m.
On 01/14/2013 08:26 PM, Alexander Graf wrote:
> We have 3 blobs we need to load when booting the system:
>
>    - kernel
>    - initrd
>    - dtb
>
> We place them in physical memory in that order. At least we should.
> This patch fixes the dtb location up to take the initrd location into
> account, fixing its offset.
>
> Reported-by: Stuart Yoder<stuart.yoder@freescale.com>
> Signed-off-by: Alexander Graf<agraf@suse.de>

Ignore this one :).


Alex

> ---
>   hw/ppc/e500.c |    5 +++--
>   1 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
> index 3a9e1c7..516d219 100644
> --- a/hw/ppc/e500.c
> +++ b/hw/ppc/e500.c
> @@ -460,7 +460,7 @@ void ppce500_init(PPCE500Params *params)
>       target_long kernel_size=0;
>       target_ulong dt_base = 0;
>       target_ulong initrd_base = 0;
> -    target_long initrd_size=0;
> +    target_long initrd_size = 0;
>       int i = 0, j, k;
>       unsigned int pci_irq_nrs[4] = {1, 2, 3, 4};
>       qemu_irq **irqs, *mpic;
> @@ -642,7 +642,8 @@ void ppce500_init(PPCE500Params *params)
>           struct boot_info *boot_info;
>           int dt_size;
>
> -        dt_base = (loadaddr + kernel_size + DTC_LOAD_PAD)&  ~DTC_PAD_MASK;
> +        dt_base = (loadaddr + kernel_size + initrd_size + DTC_LOAD_PAD)&
> +                  ~DTC_PAD_MASK;
>           dt_size = ppce500_load_device_tree(env, params, dt_base, initrd_base,
>                                              initrd_size);
>           if (dt_size<  0) {

Patch

diff --git a/hw/ppc/e500.c b/hw/ppc/e500.c
index 3a9e1c7..516d219 100644
--- a/hw/ppc/e500.c
+++ b/hw/ppc/e500.c
@@ -460,7 +460,7 @@  void ppce500_init(PPCE500Params *params)
     target_long kernel_size=0;
     target_ulong dt_base = 0;
     target_ulong initrd_base = 0;
-    target_long initrd_size=0;
+    target_long initrd_size = 0;
     int i = 0, j, k;
     unsigned int pci_irq_nrs[4] = {1, 2, 3, 4};
     qemu_irq **irqs, *mpic;
@@ -642,7 +642,8 @@  void ppce500_init(PPCE500Params *params)
         struct boot_info *boot_info;
         int dt_size;
 
-        dt_base = (loadaddr + kernel_size + DTC_LOAD_PAD) & ~DTC_PAD_MASK;
+        dt_base = (loadaddr + kernel_size + initrd_size + DTC_LOAD_PAD) &
+                  ~DTC_PAD_MASK;
         dt_size = ppce500_load_device_tree(env, params, dt_base, initrd_base,
                                            initrd_size);
         if (dt_size < 0) {