Re: [Qemu-ppc] [PATCH v3] PPC: e500: Fix duplicate kernel load and device tree overlap

[David Engraf]

Am 02.03.2018 um 10:11 schrieb Mark Cave-Ayland:
> On 02/03/18 08:53, David Engraf wrote:
>
> > Am 02.03.2018 um 02:45 schrieb David Gibson:
> > > On Thu, Feb 15, 2018 at 10:36:00AM +0100, David Engraf wrote:
> > > > This patch fixes an incorrect behavior when the -kernel argument has 
> > > > been
> > > > specified without -bios. In this case the kernel was loaded twice. 
> > > > At address
> > > > 32M as a raw image and afterwards by load_elf/load_uimage at the
> > > > corresponding load address. In this case the region for the device 
> > > > tree and
> > > > the raw kernel image may overlap.
> > > >
> > > > The patch fixes the behavior by loading the kernel image once with
> > > > load_elf/load_uimage and skips loading the raw image.
> > > >
> > > > When here do not use bios_name/size for the kernel and use a more 
> > > > generic
> > > > name called payload_name/size.
> > > >
> > > > New in v3: dtb must be stored between kernel and initrd because 
> > > > Linux can
> > > >             handle the dtb only within the first 64MB. Add a comment to
> > > >             clarify the behavior.
> > > >
> > > > Signed-off-by: David Engraf <address@hidden>
> > >
> > > Sorry I've taken so long to reply to this.  It looks fine to me,
> > > however, other changes mean it longer quite applies to the
> > > ppc-for-2.12 tree.  Can you fix that up and repost please.
> >
> > What other changes do you mean? In v3 I just restored the old behavior 
> > by putting the dtb right after the kernel image. This behavior has 
> > been changed by mistake in v1/v2. v3 now uses the correct storage 
> > location again.
>
> Hi David,
>
> I think what David means is that when he tried to apply your v3 patch to 
> his ppc-for-2.12 tree at 
> https://github.com/dgibson/qemu/commits/ppc-for-2.12 using git-am then 
> it failed - presumably because someone else has made other changes to 
> that code since you submitted your v3 patch.
>
> Please can you submit a v4 rebased on top of the current ppc-for-2.12 
> branch?

Hi Mark,

thanks for the info. I will provide an updated version.

Best regards
- David