From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39923) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGeE0-0000gh-Hj for qemu-devel@nongnu.org; Wed, 28 Jan 2015 20:48:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YGeDt-0000Y6-7r for qemu-devel@nongnu.org; Wed, 28 Jan 2015 20:48:52 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:60072) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGeDs-0000Wu-LS for qemu-devel@nongnu.org; Wed, 28 Jan 2015 20:48:45 -0500 Date: Thu, 29 Jan 2015 12:07:42 +1100 From: David Gibson Message-ID: <20150129010742.GO14681@voom> References: <1420697420-16053-1-git-send-email-bharata@linux.vnet.ibm.com> <1420697420-16053-5-git-send-email-bharata@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="K8zN2sh9fO5jmbe4" Content-Disposition: inline In-Reply-To: <1420697420-16053-5-git-send-email-bharata@linux.vnet.ibm.com> Subject: Re: [Qemu-devel] [RFC PATCH v1 04/13] spapr: Factor out CPU initialization code into realizefn List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Bharata B Rao Cc: imammedo@redhat.com, agraf@suse.de, qemu-devel@nongnu.org, mdroth@linux.vnet.ibm.com --K8zN2sh9fO5jmbe4 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jan 08, 2015 at 11:40:11AM +0530, Bharata B Rao wrote: > Move some CPU initialization code from machine init function to > CPU realizefn so that it can be used from CPU hotplug path too. >=20 > With the inclusion of ppc.h in translate_init.c, explicit *irq_init() > function definitions aren't required, remove them. >=20 > Signed-off-by: Bharata B Rao > --- > hw/ppc/spapr.c | 29 +---------------------------- > include/hw/ppc/spapr.h | 3 +++ > target-ppc/translate_init.c | 43 ++++++++++++++++++++++++++-------------= ---- > 3 files changed, 30 insertions(+), 45 deletions(-) >=20 > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index 779d364..f49b0fa 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -81,8 +81,6 @@ > =20 > #define MIN_RMA_SLOF 128UL > =20 > -#define TIMEBASE_FREQ 512000000ULL > - > #define MAX_CPUS 255 > =20 > #define PHANDLE_XICP 0x00001111 > @@ -971,7 +969,7 @@ static void ppc_spapr_reset(void) > =20 > } > =20 > -static void spapr_cpu_reset(void *opaque) > +void spapr_cpu_reset(void *opaque) > { > PowerPCCPU *cpu =3D opaque; > CPUState *cs =3D CPU(cpu); > @@ -1387,7 +1385,6 @@ static void ppc_spapr_init(MachineState *machine) > const char *initrd_filename =3D machine->initrd_filename; > const char *boot_device =3D machine->boot_order; > PowerPCCPU *cpu; > - CPUPPCState *env; > PCIHostState *phb; > int i; > MemoryRegion *sysmem =3D get_system_memory(); > @@ -1472,30 +1469,6 @@ static void ppc_spapr_init(MachineState *machine) > fprintf(stderr, "Unable to find PowerPC CPU definition\n"); > exit(1); > } > - env =3D &cpu->env; > - > - /* Set time-base frequency to 512 MHz */ > - cpu_ppc_tb_init(env, TIMEBASE_FREQ); > - > - /* PAPR always has exception vectors in RAM not ROM. To ensure t= his, > - * MSR[IP] should never be set. > - */ > - env->msr_mask &=3D ~(1 << 6); > - > - /* Tell KVM that we're in PAPR mode */ > - if (kvm_enabled()) { > - kvmppc_set_papr(cpu); > - } > - > - if (cpu->max_compat) { > - if (ppc_set_compat(cpu, cpu->max_compat) < 0) { > - exit(1); > - } > - } > - > - xics_cpu_setup(spapr->icp, cpu); > - > - qemu_register_reset(spapr_cpu_reset, cpu); > } > =20 > /* allocate RAM */ > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h > index b1a0838..831db6b 100644 > --- a/include/hw/ppc/spapr.h > +++ b/include/hw/ppc/spapr.h > @@ -478,6 +478,8 @@ struct sPAPRTCETable { > QLIST_ENTRY(sPAPRTCETable) list; > }; > =20 > +#define TIMEBASE_FREQ 512000000ULL > + > void spapr_events_init(sPAPREnvironment *spapr); > void spapr_events_fdt_skel(void *fdt, uint32_t epow_irq); > int spapr_h_cas_compose_response(target_ulong addr, target_ulong size); > @@ -494,5 +496,6 @@ int spapr_tcet_dma_dt(void *fdt, int node_off, const = char *propname, > sPAPRTCETable *tcet); > void spapr_hotplug_req_add_event(sPAPRDRConnector *drc); > void spapr_hotplug_req_remove_event(sPAPRDRConnector *drc); > +void spapr_cpu_reset(void *opaque); > =20 > #endif /* !defined (__HW_SPAPR_H__) */ > diff --git a/target-ppc/translate_init.c b/target-ppc/translate_init.c > index 72cc9d0..9c642a5 100644 > --- a/target-ppc/translate_init.c > +++ b/target-ppc/translate_init.c > @@ -30,29 +30,14 @@ > #include "qemu/error-report.h" > #include "qapi/visitor.h" > #include "hw/qdev-properties.h" > +#include "hw/ppc/spapr.h" > +#include "hw/ppc/ppc.h" > =20 > //#define PPC_DUMP_CPU > //#define PPC_DEBUG_SPR > //#define PPC_DUMP_SPR_ACCESSES > /* #define USE_APPLE_GDB */ > =20 > -/* For user-mode emulation, we don't emulate any IRQ controller */ > -#if defined(CONFIG_USER_ONLY) > -#define PPC_IRQ_INIT_FN(name) = \ > -static inline void glue(glue(ppc, name),_irq_init) (CPUPPCState *env) = \ > -{ = \ > -} > -#else > -#define PPC_IRQ_INIT_FN(name) = \ > -void glue(glue(ppc, name),_irq_init) (CPUPPCState *env); > -#endif > - > -PPC_IRQ_INIT_FN(40x); > -PPC_IRQ_INIT_FN(6xx); > -PPC_IRQ_INIT_FN(970); > -PPC_IRQ_INIT_FN(POWER7); > -PPC_IRQ_INIT_FN(e500); > - > /* Generic callbacks: > * do nothing but store/retrieve spr value > */ > @@ -8905,6 +8890,7 @@ static void ppc_cpu_realizefn(DeviceState *dev, Err= or **errp) > CPUState *cs =3D CPU(dev); > PowerPCCPU *cpu =3D POWERPC_CPU(dev); > PowerPCCPUClass *pcc =3D POWERPC_CPU_GET_CLASS(cpu); > + CPUPPCState *env =3D &cpu->env; > Error *local_err =3D NULL; > #if !defined(CONFIG_USER_ONLY) > int max_smt =3D kvm_enabled() ? kvmppc_smt_threads() : 1; > @@ -8965,6 +8951,29 @@ static void ppc_cpu_realizefn(DeviceState *dev, Er= ror **errp) > =20 > qemu_init_vcpu(cs); > =20 > + /* Set time-base frequency to 512 MHz */ > + cpu_ppc_tb_init(env, TIMEBASE_FREQ); > + > + /* PAPR always has exception vectors in RAM not ROM. To ensure this, > + * MSR[IP] should never be set. > + */ > + env->msr_mask &=3D ~(1 << 6); > + > + /* Tell KVM that we're in PAPR mode */ > + if (kvm_enabled()) { > + kvmppc_set_papr(cpu); > + } > + > + if (cpu->max_compat) { > + if (ppc_set_compat(cpu, cpu->max_compat) < 0) { > + exit(1); > + } > + } > + > + xics_cpu_setup(spapr->icp, cpu); > + > + qemu_register_reset(spapr_cpu_reset, cpu); > + > pcc->parent_realize(dev, errp); This doesn't look right. Several of these are clearly PAPR specific operations, but you're now doing them from code that isn't PAPR specific. --=20 David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson --K8zN2sh9fO5jmbe4 Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJUyYfeAAoJEGw4ysog2bOSahsP/jcDVHqnnytwdErPbet29r0j YuFQEQiSb9GoYQcuOu2n0Wcvb4DKqirAJnPYvWCEQW8FwnfFMaavBvzBcJV1XcSB EsFdGCamAPNLphXuNVJMyXNRaBtAOFOWS4NHG6OHjDRJbJYW9XWKzP+8FuMiRvGO DS3+5UlGRnvH6m5ds0iS7FqTkXceRKCol/I2E9PnHBn9M9QBwcx8yWwlCjKpBwGM WjiwJ8TDWKpn3K/xmgARIvwHknqk4wDAPQWMyAiSrKnmjiya1Ro/ssLglCHn0Dyj boFts9MxlgK+WE7gb+2sd6bU/c15jXF9wo+2uTgtLZ+asE4tiHsXhvJGzR/ryzWP neRaP008iEh4OMRQeluuszLPlAcQZnuZNs5e5dXcb3E7t5tRAkQb1McWKLNrOtKr 1t4OFnd/fQ7lCBFoIo+i7J2iWedx1/20IcDUmRNq5dE3pvAXNvQMjHfYTP8sQF6/ 9veQzHI7JzbK1r8ogi3OISmcYYzgpPc5OTTr3DW3HaW25+vHnlpd+2//fBRVenyu /fx+py/Y3xvgF37Iq8VKlazsf0hy6VuOY2T1BUeFnDnRyrAMrzxyIMjT20JlrKQT QYSXhNGb8KFoZEAp2OiZ1Qk2byVu1zGQDxGYVPzbRdGp82OwR+uXbBxg5pLOerXG xnATP2ir15PNoTV1DlIt =UUNX -----END PGP SIGNATURE----- --K8zN2sh9fO5jmbe4--