From patchwork Mon Jun 16 07:53:51 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexey Kardashevskiy X-Patchwork-Id: 359967 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 8F8F4140085 for ; Mon, 16 Jun 2014 17:58:59 +1000 (EST) Received: from localhost ([::1]:42072 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwRoc-0007w6-0W for incoming@patchwork.ozlabs.org; Mon, 16 Jun 2014 03:58:54 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35312) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwRkI-0001A4-K2 for qemu-devel@nongnu.org; Mon, 16 Jun 2014 03:54:34 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WwRjx-000633-DA for qemu-devel@nongnu.org; Mon, 16 Jun 2014 03:54:26 -0400 Received: from e23smtp01.au.ibm.com ([202.81.31.143]:43714) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WwRjw-00061g-Kc for qemu-devel@nongnu.org; Mon, 16 Jun 2014 03:54:05 -0400 Received: from /spool/local by e23smtp01.au.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted for from ; Mon, 16 Jun 2014 17:54:02 +1000 Received: from d23dlp02.au.ibm.com (202.81.31.213) by e23smtp01.au.ibm.com (202.81.31.207) with IBM ESMTP SMTP Gateway: Authorized Use Only! Violators will be prosecuted; Mon, 16 Jun 2014 17:53:59 +1000 Received: from d23relay03.au.ibm.com (d23relay03.au.ibm.com [9.190.235.21]) by d23dlp02.au.ibm.com (Postfix) with ESMTP id 0B5B92BB0052; Mon, 16 Jun 2014 17:53:59 +1000 (EST) Received: from d23av01.au.ibm.com (d23av01.au.ibm.com [9.190.234.96]) by d23relay03.au.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id s5G7rheB54657082; Mon, 16 Jun 2014 17:53:43 +1000 Received: from d23av01.au.ibm.com (localhost [127.0.0.1]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVout) with ESMTP id s5G7rwKM010749; Mon, 16 Jun 2014 17:53:58 +1000 Received: from ozlabs.au.ibm.com (ozlabs.au.ibm.com [9.190.163.12]) by d23av01.au.ibm.com (8.14.4/8.14.4/NCO v10.0 AVin) with ESMTP id s5G7rw2W010744; Mon, 16 Jun 2014 17:53:58 +1000 Received: from bran.ozlabs.ibm.com (haven.au.ibm.com [9.190.164.82]) by ozlabs.au.ibm.com (Postfix) with ESMTP id 6396BA01FB; Mon, 16 Jun 2014 17:53:58 +1000 (EST) Received: from ka1.ozlabs.ibm.com (ka1.ozlabs.ibm.com [10.61.145.11]) by bran.ozlabs.ibm.com (Postfix) with ESMTP id BEAC416AB67; Mon, 16 Jun 2014 17:53:57 +1000 (EST) From: Alexey Kardashevskiy To: qemu-devel@nongnu.org Date: Mon, 16 Jun 2014 17:53:51 +1000 Message-Id: <1402905233-26510-6-git-send-email-aik@ozlabs.ru> X-Mailer: git-send-email 2.0.0 In-Reply-To: <1402905233-26510-1-git-send-email-aik@ozlabs.ru> References: <1402905233-26510-1-git-send-email-aik@ozlabs.ru> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 14061607-1618-0000-0000-00000068B0B7 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 202.81.31.143 Cc: Alexey Kardashevskiy , Nishanth Aravamudan , qemu-ppc@nongnu.org, Alexander Graf Subject: [Qemu-devel] [PATCH 5/7] spapr: Add a helper for node0_size calculation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org In multiple places there is a node0_size variable calculation which assumes that NUMA node #0 and memory node #0 are the same things which they are not. Since we are going to change it and do not want to change it in multiple places, let's make a helper. This adds a spapr_node0_size() helper and makes use of it. Signed-off-by: Alexey Kardashevskiy --- hw/ppc/spapr.c | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 10202e2..00ef7a1 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -351,6 +351,20 @@ static size_t create_page_sizes_prop(CPUPPCState *env, uint32_t *prop, return (p - prop) * sizeof(uint32_t); } +static hwaddr spapr_node0_size(void) +{ + if (nb_numa_nodes > 1) { + int i; + for (i = 0; i < nb_numa_nodes; ++i) { + if (node_mem[i]) { + return MIN(pow2floor(node_mem[i]), ram_size); + } + } + return ram_size; + } + return ram_size; +} + #define _FDT(exp) \ do { \ int ret = (exp); \ @@ -851,8 +865,8 @@ static void spapr_reset_htab(sPAPREnvironment *spapr) /* Update the RMA size if necessary */ if (spapr->vrma_adjust) { - hwaddr node0_size = (nb_numa_nodes > 1) ? node_mem[0] : ram_size; - spapr->rma_size = kvmppc_rma_size(node0_size, spapr->htab_shift); + spapr->rma_size = kvmppc_rma_size(spapr_node0_size(), + spapr->htab_shift); } } @@ -1284,7 +1298,7 @@ static void ppc_spapr_init(MachineState *machine) MemoryRegion *sysmem = get_system_memory(); MemoryRegion *ram = g_new(MemoryRegion, 1); hwaddr rma_alloc_size; - hwaddr node0_size = (nb_numa_nodes > 1) ? node_mem[0] : ram_size; + hwaddr node0_size = spapr_node0_size(); uint32_t initrd_base = 0; long kernel_size = 0, initrd_size = 0; long load_limit, rtas_limit, fw_size;