From nobody Thu May 16 18:43:46 2024 Delivered-To: importer@patchew.org Received-SPF: temperror (zoho.com: Error in retrieving data from DNS) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1556850690; cv=none; d=zoho.com; s=zohoarc; b=dazfkMaWVe0rOELPVtCbhe05Gc5+c/nzK7foL0r5aORzs4wR0ZgIXsP2Hp61rbyKIVurPeRp90pKTBKt63Rp2SCcwNaId7tgyo8RUE9yHaG0lk21UVsOD1odwqME/R7e4MyS8k3atSytFHjdkUAZpz9uk/tWqj11P+eDJO+uk7E= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556850690; h=Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=ImFcpEK++OdN2NYNnGGENQUJu5nKLClznJohWQ/wzxg=; b=V9Ef7tIj78bunorpqNi/krW+i90cOGDPIx5z0dCOblPTYAsD3rIPB/E8n5qEo/iI7iCZ9YUPw7QQ+zML2gwmZIx+SVAMkZMjmKIPMjwUE+FDg883ARSdTpCSsUcA7NSP52kMkqA/vAjZ2h1yCcSgVdms3ZnZfpsjF/svWk5FuqI= ARC-Authentication-Results: i=1; mx.zoho.com; dkim=fail; spf=temperror (zoho.com: Error in retrieving data from DNS) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556850690725203.15221627681024; Thu, 2 May 2019 19:31:30 -0700 (PDT) Received: from localhost ([127.0.0.1]:33206 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMNyk-0004ce-N9 for importer@patchew.org; Thu, 02 May 2019 22:31:14 -0400 Received: from eggs.gnu.org ([209.51.188.92]:53717) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMNxk-0004Aw-IE for qemu-devel@nongnu.org; Thu, 02 May 2019 22:30:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hMNxj-0004Y8-GR for qemu-devel@nongnu.org; Thu, 02 May 2019 22:30:12 -0400 Received: from mail-pf1-x444.google.com ([2607:f8b0:4864:20::444]:41862) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hMNxg-0004WJ-Ry; Thu, 02 May 2019 22:30:09 -0400 Received: by mail-pf1-x444.google.com with SMTP id 188so2098873pfd.8; Thu, 02 May 2019 19:30:08 -0700 (PDT) Received: from voyager.jms.id.au ([36.255.48.244]) by smtp.gmail.com with ESMTPSA id m16sm723566pfi.29.2019.05.02.19.30.03 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 02 May 2019 19:30:06 -0700 (PDT) Received: by voyager.jms.id.au (sSMTP sendmail emulation); Fri, 03 May 2019 11:59:59 +0930 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ImFcpEK++OdN2NYNnGGENQUJu5nKLClznJohWQ/wzxg=; b=qB+bd1TgqAjM7SFH+Xp8Fc3sBEeemrNRxcysNjEgKXS7Zn0qkTlJniIKtlR61PiVE2 TtvWOPaUitfiiCAn/s0UOSfjzOhy1gbiyonJBQZSREEZTyv8/uWLhQYra1k5mEduimu+ w7LH8rMXV1bHVc3Mql4+6slRcdUWJsC4EQsB2XfIRVfB0poH8V/K96jww8Et5zYbnaul WS3ne7g8LGcD9PdAOA224bt5RvgleigZM/CaMkuNQtENddmnsNUvCScbpkMNMHxgmbbr mHlswBk74NNscdRVLz0/gvodcTUonOe04QUO5pFn1kNFyKQ5UXK6EaOyv/oSvuoZYBF5 W+Tw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=ImFcpEK++OdN2NYNnGGENQUJu5nKLClznJohWQ/wzxg=; b=QJqtk4zog4K4Qk76waXNLd8VmZXPRPTmbi4Dcv5MUM7EFnWzV5wH07Gh9/tBh6kUx9 vYOQABiBzK/7fZ3Ms+3bczSTsrmsmKsEqVytWIUs5O9GgOeWkSbfdm8+PNkeD1B76Rcj T/7VtbzeANZKvnKohuJS1M9Q+h+lLmaE7dinBvOZ6dW+eMUVezndgAl4vP5MrTP1UibI zunhslfernxn0QrTugGlfqnvnEU/ll21GWkhdqYStrvN7tkJGy9kK7RUfPcyHDBPT4lf AHYivHaWiBmqIcJv6mmvpxQUyMczNDvpUcjAJ6xYz2g9ALaDJWrYjoRhqiQGiqPwSq+y sh0Q== X-Gm-Message-State: APjAAAU8C/7cg7xan4eGX/xhEAr35yZMQAUxMtXRUHJNTjSoPImqrNbW BKVWjWojYLMcGhcC/ll4JrY= X-Google-Smtp-Source: APXvYqxoITmXnnDOx5xofKCXBEsD0wXqMA6SM14nNKoAehaoA6FG03zDzbqzaAe008KBxL8gbeA4FA== X-Received: by 2002:aa7:8186:: with SMTP id g6mr7921827pfi.126.1556850606977; Thu, 02 May 2019 19:30:06 -0700 (PDT) From: Joel Stanley To: =?UTF-8?q?C=C3=A9dric=20Le=20Goater?= , Peter Maydell Date: Fri, 3 May 2019 11:59:57 +0930 Message-Id: <20190503022958.1394-1-joel@jms.id.au> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:4864:20::444 Subject: [Qemu-devel] [PATCH v2] arm: aspeed: Set SDRAM size 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: Andrew Jeffery , qemu-arm@nongnu.org, Richard Henderson , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" We currently use Qemu's default of 128MB. As we know how much ram each machine ships with, make it easier on users by setting a default. It can still be overridden with -m on the command line. Signed-off-by: Joel Stanley Reviewed-by: Andrew Jeffery Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- v2: - Fix 'if' style issue. Thanks patchew - Use units.h defines hw/arm/aspeed.c | 8 ++++++++ include/hw/arm/aspeed.h | 1 + 2 files changed, 9 insertions(+) diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c index 1c23ebd99252..29d225ed1405 100644 --- a/hw/arm/aspeed.c +++ b/hw/arm/aspeed.c @@ -25,6 +25,7 @@ #include "sysemu/block-backend.h" #include "hw/loader.h" #include "qemu/error-report.h" +#include "qemu/units.h" =20 static struct arm_boot_info aspeed_board_binfo =3D { .board_id =3D -1, /* device-tree-only board */ @@ -331,6 +332,9 @@ static void aspeed_machine_class_init(ObjectClass *oc, = void *data) mc->no_floppy =3D 1; mc->no_cdrom =3D 1; mc->no_parallel =3D 1; + if (board->ram) { + mc->default_ram_size =3D board->ram; + } amc->board =3D board; } =20 @@ -352,6 +356,7 @@ static const AspeedBoardConfig aspeed_boards[] =3D { .spi_model =3D "mx25l25635e", .num_cs =3D 1, .i2c_init =3D palmetto_bmc_i2c_init, + .ram =3D 256 * MiB, }, { .name =3D MACHINE_TYPE_NAME("ast2500-evb"), .desc =3D "Aspeed AST2500 EVB (ARM1176)", @@ -361,6 +366,7 @@ static const AspeedBoardConfig aspeed_boards[] =3D { .spi_model =3D "mx25l25635e", .num_cs =3D 1, .i2c_init =3D ast2500_evb_i2c_init, + .ram =3D 512 * MiB, }, { .name =3D MACHINE_TYPE_NAME("romulus-bmc"), .desc =3D "OpenPOWER Romulus BMC (ARM1176)", @@ -370,6 +376,7 @@ static const AspeedBoardConfig aspeed_boards[] =3D { .spi_model =3D "mx66l1g45g", .num_cs =3D 2, .i2c_init =3D romulus_bmc_i2c_init, + .ram =3D 512 * MiB, }, { .name =3D MACHINE_TYPE_NAME("witherspoon-bmc"), .desc =3D "OpenPOWER Witherspoon BMC (ARM1176)", @@ -379,6 +386,7 @@ static const AspeedBoardConfig aspeed_boards[] =3D { .spi_model =3D "mx66l1g45g", .num_cs =3D 2, .i2c_init =3D witherspoon_bmc_i2c_init, + .ram =3D 512 * MiB, }, }; =20 diff --git a/include/hw/arm/aspeed.h b/include/hw/arm/aspeed.h index 325c091d09e4..02073a6b4d61 100644 --- a/include/hw/arm/aspeed.h +++ b/include/hw/arm/aspeed.h @@ -22,6 +22,7 @@ typedef struct AspeedBoardConfig { const char *spi_model; uint32_t num_cs; void (*i2c_init)(AspeedBoardState *bmc); + uint32_t ram; } AspeedBoardConfig; =20 #define TYPE_ASPEED_MACHINE MACHINE_TYPE_NAME("aspeed") --=20 2.20.1