[Qemu-devel] RE: [PATCH 2/5] Fix booke registers init

[Liu Yu-B13201]

> -----Original Message-----
> From: address@hidden [mailto:address@hidden 
> Sent: Saturday, July 25, 2009 6:05 PM
> To: Liu Yu-B13201
> Cc: qemu-devel; Hollis Blanchard; kvm-ppc; Nathan Froyd
> Subject: Re: [PATCH 2/5] Fix booke registers init
> 
> Liu Yu wrote:
> > Commit 8d2ba1fb9c8e7006e10d71fa51a020977f14c8b0
> > introduces a new new reset order.
> > 
> > So that we have to synchronize registers explicitly.
> > 
> > Signed-off-by: Liu Yu 
> <address@hidden>
> > ---
> >  hw/ppc440_bamboo.c     |    4 +++-
> >  hw/ppce500_mpc8544ds.c |    4 +++-
> >  2 files changed, 6 insertions(+), 2 deletions(-)
> > 
> > diff --git a/hw/ppc440_bamboo.c b/hw/ppc440_bamboo.c
> > index d9ef3ec..f1ba130 100644
> > --- a/hw/ppc440_bamboo.c
> > +++ b/hw/ppc440_bamboo.c
> > @@ -182,8 +182,10 @@ static void bamboo_init(ram_addr_t ram_size,
> >          /* XXX we currently depend on KVM to create some 
> initial TLB entries. */
> >      }
> >  
> > -    if (kvm_enabled())
> > +    if (kvm_enabled()) {
> > +        kvm_arch_put_registers(env);
> >          kvmppc_init();
> > +    }
> >  }
> >  
> >  static QEMUMachine bamboo_machine = {
> > diff --git a/hw/ppce500_mpc8544ds.c b/hw/ppce500_mpc8544ds.c
> > index c0e367d..f1b3c1a 100644
> > --- a/hw/ppce500_mpc8544ds.c
> > +++ b/hw/ppce500_mpc8544ds.c
> > @@ -276,8 +276,10 @@ static void mpc8544ds_init(ram_addr_t ram_size,
> >          /* XXX we currently depend on KVM to create some 
> initial TLB entries. */
> >      }
> >  
> > -    if (kvm_enabled())
> > +    if (kvm_enabled()) {
> > +        kvm_arch_put_registers(env);
> >          kvmppc_init();
> > +    }
> >  
> >      return;
> >  }
> 
> These are required when loading a device tree and, thus, changing some
> registers after cpu_init, right? 

Because we don't support bootloader for booke kvm, so we put necessary init 
work in qemu instead.

> Then please add cpu_synchronize_state(env, 1) to the corresponding code 
> blocks instead
> of this explicit, kvm-specific loading.

Fixed.