From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58872) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aIs5W-0007fy-OS for qemu-devel@nongnu.org; Tue, 12 Jan 2016 01:05:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aIs5S-0005U7-BF for qemu-devel@nongnu.org; Tue, 12 Jan 2016 01:05:50 -0500 Date: Tue, 12 Jan 2016 16:41:11 +1100 From: David Gibson Message-ID: <20160112054111.GU22925@voom.redhat.com> References: <1452236119-24452-1-git-send-email-bharata@linux.vnet.ibm.com> <1452236119-24452-10-git-send-email-bharata@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="Uzkapz4/HjIvV4VZ" Content-Disposition: inline In-Reply-To: <1452236119-24452-10-git-send-email-bharata@linux.vnet.ibm.com> Subject: Re: [Qemu-devel] [PATCH v6 09/11] spapr: Enable CPU hotplug for pseries-2.6 and add CPU DRC DT entries List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Bharata B Rao Cc: mdroth@linux.vnet.ibm.com, aik@ozlabs.ru, agraf@suse.de, qemu-devel@nongnu.org, pbonzini@redhat.com, qemu-ppc@nongnu.org, tyreld@linux.vnet.ibm.com, nfont@linux.vnet.ibm.com, imammedo@redhat.com, afaerber@suse.de, ehabkost@redhat.com --Uzkapz4/HjIvV4VZ Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Fri, Jan 08, 2016 at 12:25:17PM +0530, Bharata B Rao wrote: > Start supporting CPU hotplug from pseries-2.6 onwards. Add CPU > DRC (Dynamic Resource Connector) device tree entries. >=20 > Signed-off-by: Bharata B Rao Reviewed-by: David Gibson > --- > hw/ppc/spapr.c | 23 +++++++++++++++++++++++ > include/hw/ppc/spapr.h | 1 + > 2 files changed, 24 insertions(+) >=20 > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index a330169..a3ce1db 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -977,6 +977,16 @@ static void spapr_finalize_fdt(sPAPRMachineState *sp= apr, > _FDT(spapr_drc_populate_dt(fdt, 0, NULL, SPAPR_DR_CONNECTOR_TYPE= _LMB)); > } > =20 > + if (smc->dr_cpu_enabled) { > + int offset =3D fdt_path_offset(fdt, "/cpus"); > + ret =3D spapr_drc_populate_dt(fdt, offset, NULL, > + SPAPR_DR_CONNECTOR_TYPE_CPU); > + if (ret < 0) { > + fprintf(stderr, "Couldn't set up CPU DR device tree properti= es\n"); > + exit(1); > + } > + } > + > _FDT((fdt_pack(fdt))); > =20 > if (fdt_totalsize(fdt) > FDT_MAX_SIZE) { > @@ -1731,6 +1741,8 @@ static void ppc_spapr_init(MachineState *machine) > long load_limit, fw_size; > bool kernel_le =3D false; > char *filename; > + int smt =3D kvmppc_smt_threads(); > + int smp_max_cores =3D max_cpus/smp_threads; > =20 > msi_supported =3D true; > =20 > @@ -1797,6 +1809,15 @@ static void ppc_spapr_init(MachineState *machine) > spapr_validate_node_memory(machine); > } > =20 > + if (smc->dr_cpu_enabled) { > + for (i =3D 0; i < smp_max_cores; i++) { > + sPAPRDRConnector *drc =3D > + spapr_dr_connector_new(OBJECT(spapr), > + SPAPR_DR_CONNECTOR_TYPE_CPU, i * = smt); > + qemu_register_reset(spapr_drc_reset, drc); > + } > + } > + > /* init CPUs */ > if (machine->cpu_model =3D=3D NULL) { > machine->cpu_model =3D kvm_enabled() ? "host" : "POWER7"; > @@ -2299,6 +2320,7 @@ static void spapr_machine_class_init(ObjectClass *o= c, void *data) > mc->cpu_index_to_socket_id =3D spapr_cpu_index_to_socket_id; > =20 > smc->dr_lmb_enabled =3D true; > + smc->dr_cpu_enabled =3D true; > fwc->get_dev_path =3D spapr_get_fw_dev_path; > nc->nmi_monitor_handler =3D spapr_nmi; > } > @@ -2384,6 +2406,7 @@ static void spapr_machine_2_5_class_options(Machine= Class *mc) > =20 > spapr_machine_2_6_class_options(mc); > smc->use_ohci_by_default =3D true; > + smc->dr_cpu_enabled =3D false; > SET_MACHINE_COMPAT(mc, SPAPR_COMPAT_2_5); > mc->validate_smp_config =3D spapr_validate_smp_config_default; > } > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h > index 53af76a..739f9ba 100644 > --- a/include/hw/ppc/spapr.h > +++ b/include/hw/ppc/spapr.h > @@ -36,6 +36,7 @@ struct sPAPRMachineClass { > =20 > /*< public >*/ > bool dr_lmb_enabled; /* enable dynamic-reconfig/hotplug of LMB= s */ > + bool dr_cpu_enabled; /* enable dynamic-reconfig/hotplug of CPU= s */ > bool use_ohci_by_default; /* use USB-OHCI instead of XHCI */ > }; > =20 --=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 --Uzkapz4/HjIvV4VZ Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJWlJH2AAoJEGw4ysog2bOSey8P/RSXRAzkgr2JMAMfGA3jB9ws p5byvW5hmfYIYw8eGGFCRy4L7xOKyoFMEW1Em3MwkBWcIc+BGPTg3l/I+jO+STt3 2x8MeQHphWECztkVn8eT1NefUHr5SL85BiHHvjvALxUdzBSAfg72BI4F89zOYJ1M 14DAIBGytSyARl1oebqAI/qanq8LG4QcO0ii1axPA+oPDHx3IhuJ9bcBuAYSINFu 2DbvvJPwPEHlpL4mykc05y5VAgxOTTbxFb2J5cMYPoNpxy8cA7vJW8M0iEnNtYGZ I8nZutKVVkPqp9raMiXuaJqBqZkQlt7CIxstaPwS+5nsd1t4sqIbLTVxTI9cbngk xobsh0uBQNliPktfk1CpZ1wwzBx4O38MV6RUEiu2WNVOKkvO2Ze5oxycFskUZs/e V6vQNUVP4otjewPZp19ELi4ag8Hqjsv74PeU3M5Lhj38BNi0/3KfuZmGAKOTpw02 rPPXp5VvRliBqOiRL1yiI8yBnw6qvUxMA2Tfvw5pahSWolP8yFyFBFLl+UTZFjtF +YQtdgVIZ5ZswacbvcRsJQhTe7mbSr2oy5whXVJqA4m4wGHhx4yqw1rIb0LNRpET WLBPz2H/kEKZJBg8qB4o2STyc0c24bevDA3f7fvZdr8zc5qDJLR88xalgYbG6d/R u98FB67IWBDJIEVReLbu =+fwV -----END PGP SIGNATURE----- --Uzkapz4/HjIvV4VZ--