From patchwork Thu Aug 29 06:08:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Gibson X-Patchwork-Id: 172539 Delivered-To: patch@linaro.org Received: by 2002:a92:d204:0:0:0:0:0 with SMTP id y4csp1763751ily; Wed, 28 Aug 2019 23:10:16 -0700 (PDT) X-Google-Smtp-Source: APXvYqxf4kmCZYwFiWu3zXOMYQ5JNyi+4dHZfA5bcv6Y4g250NscKbtAdAx4QPqdRjBSqZlJ2KF6 X-Received: by 2002:aa7:c353:: with SMTP id j19mr8049582edr.292.1567059012814; Wed, 28 Aug 2019 23:10:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1567059012; cv=none; d=google.com; s=arc-20160816; b=ebJlm5BEI84GN2Cyi87QX/hwyMNFazT/GAa3G7KG+/mMDZo8rv+kcWzEsGNwAnzQOx LkuUT7RtC7RDcPPEMJiIV7WVTxe9rml7VwKKkh4Dry/9jIm89LgmNXSfFn279ay4oaJK eDNABN2Y3bN1uzK+pn32jvund7/XC9PFxFrYkvyYeM84HzxGzUQRvMu6WlVJomy4q5K3 KOvni9q18hb0Yvz9o3gyMBhzzGrhNi64ND/HB+M8Grz4HfUnL5arqvdPBc8SF8wRSy6d j5XIS4EPEomnfpFipoIX306L0OE0Vmws65KC8QIuuwazxbNBqzQ8+Vajk/fpz3HH3SWU /PVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=cq4rqkeDWti77QALTfBrBZ/i+Ayk+MlpB9lLU2tPRTU=; b=tHQYHCI3jJ5sqZdT+DvBj+thVxHiPEkAUbSu5tA4vxszrKTNYRqwOGlUjakEC/t9gV ZoRgERY05fcI2L1IGXb9De+2FgtztuSsuzsAqmatX2lYft8LTnAX1qE8bKxDcVDbPAbq vw7FZSIVepHRnf3mR31MYyeRmNwBUuFhgZcDGBkyGssykXv9cRumSHtxG/9TjTHGitUz oDsEpm6HH9mUTB25ut6Gpswrxg/FOqDgksui/MyRds1pnrC09I64Xb2Fois02ed17FZK w1DhZXLN/jiRdCuZzlCbqN/uwBYFYaJXF2s0zUgUx7IYhGJCwSeLPxCYIzYYxn3Kc/f3 Nj7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gibson.dropbear.id.au header.s=201602 header.b=CC24AIYb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id y50si67026edb.108.2019.08.28.23.10.12 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Aug 2019 23:10:12 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gibson.dropbear.id.au header.s=201602 header.b=CC24AIYb; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org" Received: from localhost ([::1]:45636 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i3DdL-0004Dv-8l for patch@linaro.org; Thu, 29 Aug 2019 02:10:11 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35165) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i3Dbw-0004CN-SS for qemu-devel@nongnu.org; Thu, 29 Aug 2019 02:08:45 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i3Dbu-0003aP-Fp for qemu-devel@nongnu.org; Thu, 29 Aug 2019 02:08:44 -0400 Received: from ozlabs.org ([203.11.71.1]:37933) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1i3Dbt-0003Wv-FA; Thu, 29 Aug 2019 02:08:42 -0400 Received: by ozlabs.org (Postfix, from userid 1007) id 46JscM1DQSz9sMr; Thu, 29 Aug 2019 16:08:33 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gibson.dropbear.id.au; s=201602; t=1567058915; bh=V/Zfp67/iq6KWTKIKpQ6RPh2BzF2cTYSd2pn1KZUde8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CC24AIYbIk4TjsqUXe+W3SklQqux1k9tXTCOMcoMZXgaRKmZhEd6nDx8FSAuHKPfG 6YCLynAsln93xc805lqswYzRwZ+GPF/L8SeRvrbKAPPeFP++78oQoyofSpd3/oLXIS dyoQxtDGGeu1cVGS8lVR/ptVA9NK2LukPC8nBVJQ= From: David Gibson To: peter.maydell@linaro.org Date: Thu, 29 Aug 2019 16:08:09 +1000 Message-Id: <20190829060827.25731-2-david@gibson.dropbear.id.au> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190829060827.25731-1-david@gibson.dropbear.id.au> References: <20190829060827.25731-1-david@gibson.dropbear.id.au> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 203.11.71.1 Subject: [Qemu-devel] [PULL 01/19] ppc/pnv: Set default ram size to 1.75GB X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: lvivier@redhat.com, aik@ozlabs.ru, groug@kaod.org, qemu-devel@nongnu.org, qemu-ppc@nongnu.org, Joel Stanley , David Gibson Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Joel Stanley This makes the powernv machine easier for end users as the default initrd address (1.5GB) is now within RAM. This uses less than 2GB of RAM to ensure 32 bit Qemu still works. Signed-off-by: Joel Stanley Message-Id: <20190821030945.473-1-joel@jms.id.au> [dwg: Fix comment style for checkpatch] Signed-off-by: David Gibson --- hw/ppc/pnv.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) -- 2.21.0 diff --git a/hw/ppc/pnv.c b/hw/ppc/pnv.c index d95086fbbd..6ead82aaa7 100644 --- a/hw/ppc/pnv.c +++ b/hw/ppc/pnv.c @@ -1361,7 +1361,11 @@ static void pnv_machine_class_init(ObjectClass *oc, void *data) * storage */ mc->no_parallel = 1; mc->default_boot_order = NULL; - mc->default_ram_size = 1 * GiB; + /* + * RAM defaults to less than 2048 for 32-bit hosts, and large + * enough to fit the maximum initrd size at it's load address + */ + mc->default_ram_size = INITRD_LOAD_ADDR + INITRD_MAX_SIZE; xic->icp_get = pnv_icp_get; xic->ics_get = pnv_ics_get; xic->ics_resend = pnv_ics_resend;