From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:39848) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGeDw-0000av-1I for qemu-devel@nongnu.org; Wed, 28 Jan 2015 20:48:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YGeDu-0000ZN-G5 for qemu-devel@nongnu.org; Wed, 28 Jan 2015 20:48:47 -0500 Received: from ozlabs.org ([2401:3900:2:1::2]:41973) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YGeDt-0000YP-To for qemu-devel@nongnu.org; Wed, 28 Jan 2015 20:48:46 -0500 Date: Thu, 29 Jan 2015 12:16:09 +1100 From: David Gibson Message-ID: <20150129011609.GP14681@voom> References: <1420697420-16053-1-git-send-email-bharata@linux.vnet.ibm.com> <1420697420-16053-6-git-send-email-bharata@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="lG9v85r552aFjg4G" Content-Disposition: inline In-Reply-To: <1420697420-16053-6-git-send-email-bharata@linux.vnet.ibm.com> Subject: Re: [Qemu-devel] [RFC PATCH v1 05/13] spapr: Support ibm, lrdr-capacity device tree property 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 --lG9v85r552aFjg4G Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Thu, Jan 08, 2015 at 11:40:12AM +0530, Bharata B Rao wrote: > Add support for ibm,lrdr-capacity since this is needed by the guest > kernel to know about the possible hot-pluggable CPUs and Memory. >=20 > Define minimum hotpluggable memory size as 256MB and start storing maximum > possible memory for the guest in sPAPREnvironment. >=20 > Signed-off-by: Bharata B Rao > --- > hw/ppc/spapr.c | 3 ++- > hw/ppc/spapr_rtas.c | 28 ++++++++++++++++++++++++++-- > include/hw/ppc/spapr.h | 6 ++++-- > 3 files changed, 32 insertions(+), 5 deletions(-) >=20 > diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c > index f49b0fa..515d770 100644 > --- a/hw/ppc/spapr.c > +++ b/hw/ppc/spapr.c > @@ -775,7 +775,7 @@ static void spapr_finalize_fdt(sPAPREnvironment *spap= r, > } > =20 > /* RTAS */ > - ret =3D spapr_rtas_device_tree_setup(fdt, rtas_addr, rtas_size); > + ret =3D spapr_rtas_device_tree_setup(spapr, fdt, rtas_addr, rtas_siz= e); > if (ret < 0) { > fprintf(stderr, "Couldn't set up RTAS device tree properties\n"); > } > @@ -1473,6 +1473,7 @@ static void ppc_spapr_init(MachineState *machine) > =20 > /* allocate RAM */ > spapr->ram_limit =3D ram_size; > + spapr->maxram_limit =3D machine->maxram_size; There's now a bunch of duplication between sPAPREnvironment and MachineState - it looks like we should really fold sPAPREnvironment into a subclass of MachineState, but that's probably a project for another day. > memory_region_allocate_system_memory(ram, NULL, "ppc_spapr.ram", > spapr->ram_limit); > memory_region_add_subregion(sysmem, 0, ram); > diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c > index d847f45..e8a0f21 100644 > --- a/hw/ppc/spapr_rtas.c > +++ b/hw/ppc/spapr_rtas.c > @@ -29,6 +29,7 @@ > #include "sysemu/char.h" > #include "hw/qdev.h" > #include "sysemu/device_tree.h" > +#include "sysemu/cpus.h" > =20 > #include "hw/ppc/spapr.h" > #include "hw/ppc/spapr_vio.h" > @@ -551,11 +552,12 @@ void spapr_rtas_register(int token, const char *nam= e, spapr_rtas_fn fn) > rtas_table[token].fn =3D fn; > } > =20 > -int spapr_rtas_device_tree_setup(void *fdt, hwaddr rtas_addr, > - hwaddr rtas_size) > +int spapr_rtas_device_tree_setup(sPAPREnvironment *spapr, void *fdt, > + hwaddr rtas_addr, hwaddr rtas_size) > { > int ret; > int i; > + uint32_t lrdr_capacity[5]; > =20 > ret =3D fdt_add_mem_rsv(fdt, rtas_addr, rtas_size); > if (ret < 0) { > @@ -604,6 +606,28 @@ int spapr_rtas_device_tree_setup(void *fdt, hwaddr r= tas_addr, > } > =20 > } > + > + ret =3D qemu_fdt_setprop_cell(fdt, "/rtas", "#address-cells", 0x2); > + if (ret < 0) { > + fprintf(stderr, "Couldn't add #address-cells rtas property\n"); > + } > + > + ret =3D qemu_fdt_setprop_cell(fdt, "/rtas", "#size-cells", 0x2); > + if (ret < 0) { > + fprintf(stderr, "Couldn't add #size-cells rtas property\n"); > + } It's not clear what adding #address-cells and #size-cells has to do with this, and these properties generally don't make sense on a node without children. > + lrdr_capacity[0] =3D cpu_to_be32(spapr->maxram_limit >> 32); > + lrdr_capacity[1] =3D cpu_to_be32(spapr->maxram_limit & 0xffffffff); > + lrdr_capacity[2] =3D 0; > + lrdr_capacity[3] =3D cpu_to_be32(SPAPR_MIN_MEMORY_BLOCK_SIZE); > + lrdr_capacity[4] =3D cpu_to_be32(max_cpus/smp_threads); > + ret =3D qemu_fdt_setprop(fdt, "/rtas", "ibm,lrdr-capacity", lrdr_cap= acity, > + sizeof(lrdr_capacity)); > + if (ret < 0) { > + fprintf(stderr, "Couldn't add ibm,lrdr-capacity rtas property\n"= ); > + } > + > return 0; > } > =20 > diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h > index 831db6b..ae8b4e1 100644 > --- a/include/hw/ppc/spapr.h > +++ b/include/hw/ppc/spapr.h > @@ -18,6 +18,7 @@ typedef struct sPAPREnvironment { > XICSState *icp; > =20 > hwaddr ram_limit; > + hwaddr maxram_limit; > void *htab; > uint32_t htab_shift; > hwaddr rma_size; > @@ -444,8 +445,8 @@ void spapr_rtas_register(int token, const char *name,= spapr_rtas_fn fn); > target_ulong spapr_rtas_call(PowerPCCPU *cpu, sPAPREnvironment *spapr, > uint32_t token, uint32_t nargs, target_ulon= g args, > uint32_t nret, target_ulong rets); > -int spapr_rtas_device_tree_setup(void *fdt, hwaddr rtas_addr, > - hwaddr rtas_size); > +int spapr_rtas_device_tree_setup(sPAPREnvironment *spapr, void *fdt, > + hwaddr rtas_addr, hwaddr rtas_size); > =20 > #define SPAPR_TCE_PAGE_SHIFT 12 > #define SPAPR_TCE_PAGE_SIZE (1ULL << SPAPR_TCE_PAGE_SHIFT) > @@ -479,6 +480,7 @@ struct sPAPRTCETable { > }; > =20 > #define TIMEBASE_FREQ 512000000ULL > +#define SPAPR_MIN_MEMORY_BLOCK_SIZE (1 << 28) /* 256MB */ > =20 > void spapr_events_init(sPAPREnvironment *spapr); > void spapr_events_fdt_skel(void *fdt, uint32_t epow_irq); --=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 --lG9v85r552aFjg4G Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iQIcBAEBAgAGBQJUyYnZAAoJEGw4ysog2bOSRFQQAMMjBZfB3h3Zzynxd9CSOpV+ CmyAa9+9xqPMDcQGtTVvmpF7V2kHJNYuG1HiGaHORHfNP21Jg/RViR5OtMwoBkgM nCRC5MHtXRv2pYi4Z+SDyAI/u+gVdDIeh3mnvOttIfuBo8DwGyx+rOcf711c6TXD ctd/nWFfVk6/j5k0E2UI/y5pipqxuN0KoJFmI0aKzS5p1qBu2pP2hlFZ8DjnxqTP FJstZFDxbJYoQ4LxkNrbJC45oh4BAMj9pDh1NpeHxAVaKuVAiB7u7uQ9FcU2qQ/e JAW3Sk5g8sD8LWUMLbJo4Uuf79ZM+nv6Gn8q693Yq6Y1rt6/hLf9JOHAWLRSA2j4 aR+czJN5I4kWFh1vv+oBjCIXHUDE2sHKcjJtYDWgUQfA6h1OgGXjwlDRfufK5gHQ fioIajPxIgkjbhCs44+d05RkW9jQMEU7XzIm8P22qbpZjYs8+Er9j+eNiVaUfyQX iSFgokM0AbsRKD9Qw6uJGw+LOnh4EGkYIgJpxikK0nGoIehO/oeL6C0dKVzrr/36 XZ1oZP7X9O6ciWaCHw8F6f1tcHNHgsmH459L0xYsRT9WiUSaviQq1YZKuHl4W+jN iMoBubmMRQG6WAQ5Bvnyei1bhD4IzBaFPmSNIgDWQ2/4wRqUr7gICOPL/onJvR3r oJMYG2MmQp5wBLUsLH4H =FnPt -----END PGP SIGNATURE----- --lG9v85r552aFjg4G--