From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:42687) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEPjE-0004zk-2b for qemu-devel@nongnu.org; Thu, 22 Jan 2015 16:55:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YEPjA-0007Sc-Lh for qemu-devel@nongnu.org; Thu, 22 Jan 2015 16:55:51 -0500 Received: from e8.ny.us.ibm.com ([32.97.182.138]:57863) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YEPjA-0007SV-Hm for qemu-devel@nongnu.org; Thu, 22 Jan 2015 16:55:48 -0500 Received: from /spool/local by e8.ny.us.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 22 Jan 2015 16:55:45 -0500 Received: from b01cxnp23032.gho.pok.ibm.com (b01cxnp23032.gho.pok.ibm.com [9.57.198.27]) by d01dlp02.pok.ibm.com (Postfix) with ESMTP id 8F08F6E8048 for ; Thu, 22 Jan 2015 16:47:35 -0500 (EST) Received: from d01av03.pok.ibm.com (d01av03.pok.ibm.com [9.56.224.217]) by b01cxnp23032.gho.pok.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t0MLtgWQ29229254 for ; Thu, 22 Jan 2015 21:55:42 GMT Received: from d01av03.pok.ibm.com (localhost [127.0.0.1]) by d01av03.pok.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t0MLtgQp021023 for ; Thu, 22 Jan 2015 16:55:42 -0500 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Roth In-Reply-To: <1420697420-16053-6-git-send-email-bharata@linux.vnet.ibm.com> References: <1420697420-16053-1-git-send-email-bharata@linux.vnet.ibm.com> <1420697420-16053-6-git-send-email-bharata@linux.vnet.ibm.com> Message-ID: <20150122215540.30063.92317@loki> Date: Thu, 22 Jan 2015 15:55:40 -0600 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 , qemu-devel@nongnu.org Cc: imammedo@redhat.com, agraf@suse.de Quoting Bharata B Rao (2015-01-08 00:10:12) > Add support for ibm,lrdr-capacity since this is needed by the guest > kernel to know about the possible hot-pluggable CPUs and Memory. > = > Define minimum hotpluggable memory size as 256MB and start storing maximum > possible memory for the guest in sPAPREnvironment. > = > 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(-) > = > 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, > } > = > /* 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) > = > /* allocate RAM */ > spapr->ram_limit =3D ram_size; > + spapr->maxram_limit =3D machine->maxram_size; > 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" > = > #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; > } > = > -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]; > = > 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, > } > = > } > + > + 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"); > + } > + > + 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"= ); > + } > + The property seems simple enough, but would be worthwhile to add a descript= ion of how/when it's used in a new section of docs/specs/ppc-spapr-hotplug.txt = to keep the documentation complete > return 0; > } > = > 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; > = > 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); > = > #define SPAPR_TCE_PAGE_SHIFT 12 > #define SPAPR_TCE_PAGE_SIZE (1ULL << SPAPR_TCE_PAGE_SHIFT) > @@ -479,6 +480,7 @@ struct sPAPRTCETable { > }; > = > #define TIMEBASE_FREQ 512000000ULL > +#define SPAPR_MIN_MEMORY_BLOCK_SIZE (1 << 28) /* 256MB */ Is this actually the min, or a set increment size? Documentation suggests the latter, in which case the naming is a little confusing. > = > void spapr_events_init(sPAPREnvironment *spapr); > void spapr_events_fdt_skel(void *fdt, uint32_t epow_irq); > -- = > 2.1.0