From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45933) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y96J7-0001yu-72 for qemu-devel@nongnu.org; Thu, 08 Jan 2015 01:10:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Y96J1-0006fi-5V for qemu-devel@nongnu.org; Thu, 08 Jan 2015 01:10:57 -0500 Received: from e28smtp01.in.ibm.com ([122.248.162.1]:55018) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Y96J0-0006fE-Gq for qemu-devel@nongnu.org; Thu, 08 Jan 2015 01:10:51 -0500 Received: from /spool/local by e28smtp01.in.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Thu, 8 Jan 2015 11:40:47 +0530 Received: from d28relay05.in.ibm.com (d28relay05.in.ibm.com [9.184.220.62]) by d28dlp01.in.ibm.com (Postfix) with ESMTP id 8358BE0044 for ; Thu, 8 Jan 2015 11:41:47 +0530 (IST) Received: from d28av03.in.ibm.com (d28av03.in.ibm.com [9.184.220.65]) by d28relay05.in.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id t086BMfM45154374 for ; Thu, 8 Jan 2015 11:41:22 +0530 Received: from d28av03.in.ibm.com (localhost [127.0.0.1]) by d28av03.in.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id t086Ae2Z032060 for ; Thu, 8 Jan 2015 11:40:40 +0530 From: Bharata B Rao Date: Thu, 8 Jan 2015 11:40:18 +0530 Message-Id: <1420697420-16053-12-git-send-email-bharata@linux.vnet.ibm.com> In-Reply-To: <1420697420-16053-1-git-send-email-bharata@linux.vnet.ibm.com> References: <1420697420-16053-1-git-send-email-bharata@linux.vnet.ibm.com> Subject: [Qemu-devel] [RFC PATCH v1 11/13] spapr: Initialize hotplug memory address space List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: imammedo@redhat.com, Bharata B Rao , mdroth@linux.vnet.ibm.com, agraf@suse.de Initialize a hotplug memory region under which all the hotplugged memory is accommodated. Also enable memory hotplug by setting CONFIG_MEM_HOTPLUG. Modelled on i386 memory hotplug. Signed-off-by: Bharata B Rao --- default-configs/ppc64-softmmu.mak | 1 + hw/ppc/spapr.c | 26 ++++++++++++++++++++++++++ include/hw/ppc/spapr.h | 3 +++ 3 files changed, 30 insertions(+) diff --git a/default-configs/ppc64-softmmu.mak b/default-configs/ppc64-softmmu.mak index bd30d69..03210de 100644 --- a/default-configs/ppc64-softmmu.mak +++ b/default-configs/ppc64-softmmu.mak @@ -60,3 +60,4 @@ CONFIG_I82374=y CONFIG_I8257=y CONFIG_MC146818RTC=y CONFIG_ISA_TESTDEV=y +CONFIG_MEM_HOTPLUG=y diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 44405b2..9ff08ff 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -120,6 +120,8 @@ struct sPAPRMachineState { /*< public >*/ char *kvm_type; + ram_addr_t hotplug_memory_base; + MemoryRegion hotplug_memory; }; sPAPREnvironment *spapr; @@ -1403,6 +1405,7 @@ static void ppc_spapr_init(MachineState *machine) bool kernel_le = false; char *filename; int smt = kvmppc_smt_threads(); + sPAPRMachineState *ms = SPAPR_MACHINE(machine); msi_supported = true; @@ -1492,6 +1495,29 @@ static void ppc_spapr_init(MachineState *machine) memory_region_add_subregion(sysmem, 0, rma_region); } + if (machine->ram_size < machine->maxram_size) { + ram_addr_t hotplug_mem_size = machine->maxram_size - machine->ram_size; + + if (machine->ram_slots > SPAPR_MAX_RAM_SLOTS) { + error_report("unsupported amount of memory slots: %"PRIu64, + machine->ram_slots); + exit(EXIT_FAILURE); + } + + ms->hotplug_memory_base = ROUND_UP(machine->ram_size, 1ULL << 30); + + if ((ms->hotplug_memory_base + hotplug_mem_size) < hotplug_mem_size) { + error_report("unsupported amount of maximum memory: " RAM_ADDR_FMT, + machine->maxram_size); + exit(EXIT_FAILURE); + } + + memory_region_init(&ms->hotplug_memory, OBJECT(ms), + "hotplug-memory", hotplug_mem_size); + memory_region_add_subregion(sysmem, ms->hotplug_memory_base, + &ms->hotplug_memory); + } + filename = qemu_find_file(QEMU_FILE_TYPE_BIOS, "spapr-rtas.bin"); spapr->rtas_size = get_image_size(filename); spapr->rtas_blob = g_malloc(spapr->rtas_size); diff --git a/include/hw/ppc/spapr.h b/include/hw/ppc/spapr.h index ae8b4e1..64681c4 100644 --- a/include/hw/ppc/spapr.h +++ b/include/hw/ppc/spapr.h @@ -482,6 +482,9 @@ struct sPAPRTCETable { #define TIMEBASE_FREQ 512000000ULL #define SPAPR_MIN_MEMORY_BLOCK_SIZE (1 << 28) /* 256MB */ +/* Support a min of 1TB hotplug memory assuming 256MB per slot */ +#define SPAPR_MAX_RAM_SLOTS (1ULL << 12) + 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); -- 2.1.0