From patchwork Fri Apr 8 05:05:18 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 8780841 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 25BE2C0553 for ; Fri, 8 Apr 2016 05:04:25 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 80AA420222 for ; Fri, 8 Apr 2016 05:04:24 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D4A02201B9 for ; Fri, 8 Apr 2016 05:04:23 +0000 (UTC) Received: from localhost ([::1]:53942 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoOaj-0006YP-Vv for patchwork-qemu-devel@patchwork.kernel.org; Fri, 08 Apr 2016 01:04:21 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53936) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoOaY-0006Wi-PM for qemu-devel@nongnu.org; Fri, 08 Apr 2016 01:04:11 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aoOaV-0004pW-Jr for qemu-devel@nongnu.org; Fri, 08 Apr 2016 01:04:10 -0400 Received: from ozlabs.org ([103.22.144.67]:37180) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aoOaU-0004pC-Qx; Fri, 08 Apr 2016 01:04:07 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 3qh6nG5hT9z9t5q; Fri, 8 Apr 2016 15:04:02 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1460091842; bh=o1BGdY99P/i7ii2Tkz0mdnWTi4nSqPUjrsJT/AV2H/Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=kdo941FE7/u0I3mUZdZ8A7gYEPv1rWn7BpsxyVF3dnslCNnJEtqPVzy5mCh0N0Y/X 4hR5JXrbuhVa7dJi1dHjR3xYTQgk3WWBKNCbIzF/hGKlHp6/DDqZin3vRNnVZmyu4a 5Io/iNr/A2rdyjLZhjj41Cczyvs8bwPWzFaPKna8= From: David Gibson To: peter.maydell@linaro.org Date: Fri, 8 Apr 2016 15:05:18 +1000 Message-Id: <1460091918-8803-2-git-send-email-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1460091918-8803-1-git-send-email-david@gibson.dropbear.id.au> References: <1460091918-8803-1-git-send-email-david@gibson.dropbear.id.au> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 103.22.144.67 Subject: [Qemu-devel] [PULL 1/1] spapr: Fix ibm,lrdr-capacity X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Bharata B Rao , qemu-ppc@nongnu.org, agraf@suse.de, David Gibson , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Spam-Status: No, score=-6.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Bharata B Rao ibm,lrdr-capacity has a field to describe the maximum address in bytes and therefore, the most memory that can be allocated to this guest. We are using maxmem for this field, but instead should use the actual RAM address corresponding to the end of hotplug region. Signed-off-by: Bharata B Rao Signed-off-by: David Gibson --- hw/ppc/spapr_rtas.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hw/ppc/spapr_rtas.c b/hw/ppc/spapr_rtas.c index 2db2292..f073258 100644 --- a/hw/ppc/spapr_rtas.c +++ b/hw/ppc/spapr_rtas.c @@ -684,6 +684,9 @@ int spapr_rtas_device_tree_setup(void *fdt, hwaddr rtas_addr, int i; uint32_t lrdr_capacity[5]; MachineState *machine = MACHINE(qdev_get_machine()); + sPAPRMachineState *spapr = SPAPR_MACHINE(machine); + uint64_t max_hotplug_addr = spapr->hotplug_memory.base + + memory_region_size(&spapr->hotplug_memory.mr); ret = fdt_add_mem_rsv(fdt, rtas_addr, rtas_size); if (ret < 0) { @@ -733,8 +736,8 @@ int spapr_rtas_device_tree_setup(void *fdt, hwaddr rtas_addr, } - lrdr_capacity[0] = cpu_to_be32(((uint64_t)machine->maxram_size) >> 32); - lrdr_capacity[1] = cpu_to_be32(machine->maxram_size & 0xffffffff); + lrdr_capacity[0] = cpu_to_be32(max_hotplug_addr >> 32); + lrdr_capacity[1] = cpu_to_be32(max_hotplug_addr & 0xffffffff); lrdr_capacity[2] = 0; lrdr_capacity[3] = cpu_to_be32(SPAPR_MEMORY_BLOCK_SIZE); lrdr_capacity[4] = cpu_to_be32(max_cpus/smp_threads);