From patchwork Fri May 3 02:29:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Joel Stanley X-Patchwork-Id: 163286 Delivered-To: patch@linaro.org Received: by 2002:a92:7e86:0:0:0:0:0 with SMTP id q6csp104343ill; Thu, 2 May 2019 19:31:35 -0700 (PDT) X-Google-Smtp-Source: APXvYqxHIF6vTgwJb/Mq8tQ/ui7PXfuJJJSYWh3DW/4dqR4zrplD0GVSMVy8ZN2ssBkS0CS3lJHb X-Received: by 2002:a1c:1fc3:: with SMTP id f186mr4461385wmf.27.1556850695163; Thu, 02 May 2019 19:31:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556850695; cv=none; d=google.com; s=arc-20160816; b=MM2nBxIhfeMAHeidxIrXOdFkxG99m+FacGAdn9Sh5RsxdVdkhiesnq7uBEG1m7AbYR 1ywzPyIOaVGf+TSFqLwRXhljH0RCJhiJYTq4v72CBCoHV7hTecCo1O3dztdSzY5ygItJ oWl6KVX1QPcfl7pXbdteXhKEWfmMr7sEF/eoU7djPzH/HNOXgF1xBoYILoozXq5RCNlA NUQpZRPYXUIwc1kZTb+3DjdmqrGOE8ljcwaO0nX7RLUj+3UDLbI94jGhPDtR2wS4SjQr 82imWowqwjHgoHx7nOgTP81yrDoDZTvdckgrc0ey5CwFSQXab3usuTjZRBF0Lso/05DK A/pw== 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:message-id:date:to:from :dkim-signature; bh=ImFcpEK++OdN2NYNnGGENQUJu5nKLClznJohWQ/wzxg=; b=PDgRoMDCWV9yuntTEhteEB7d0dWSXVXaPOtwPEO3UScJDftFdooEzoIBV31L8lL2/R EbvEiEphMQMgtEko5htZ8DEt9qGXaqdIP+TnoglKklMOwq0FF+TydOxKkqRymlHMs5vA gO6tZdXzN3qciwmG6PAuhkbu7ToS06TWG9X61VtYVQGSkifegniw8VoOfegRoxFzBbdh d4VHRn/lTFBkdqQdHJk/3kWkHHJEXYuXluM8P4xS7ve/T5vGPN3UW1ZJIW1iaMGw1f+C uuz/0OWC0lVghgfcpB3724MX6ooOolBZmPz4DMlgHrQDlFagmCuyMJgPybzFPD/KH/oQ 1Otg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=qB+bd1Tg; 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 s11si447049wmf.187.2019.05.02.19.31.34 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 02 May 2019 19:31:35 -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=fail header.i=@gmail.com header.s=20161025 header.b=qB+bd1Tg; 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 ([127.0.0.1]:33208 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hMNz4-0004wj-7k for patch@linaro.org; Thu, 02 May 2019 22:31:34 -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) 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-Received: by 2002:aa7:8186:: with SMTP id g6mr7921827pfi.126.1556850606977; Thu, 02 May 2019 19:30:06 -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 From: Joel Stanley To: =?utf-8?q?C=C3=A9dric_Le_Goater?= , 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 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+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 --- 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(+) -- 2.20.1 Reviewed-by: Philippe Mathieu-Daudé 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" static struct arm_boot_info aspeed_board_binfo = { .board_id = -1, /* device-tree-only board */ @@ -331,6 +332,9 @@ static void aspeed_machine_class_init(ObjectClass *oc, void *data) mc->no_floppy = 1; mc->no_cdrom = 1; mc->no_parallel = 1; + if (board->ram) { + mc->default_ram_size = board->ram; + } amc->board = board; } @@ -352,6 +356,7 @@ static const AspeedBoardConfig aspeed_boards[] = { .spi_model = "mx25l25635e", .num_cs = 1, .i2c_init = palmetto_bmc_i2c_init, + .ram = 256 * MiB, }, { .name = MACHINE_TYPE_NAME("ast2500-evb"), .desc = "Aspeed AST2500 EVB (ARM1176)", @@ -361,6 +366,7 @@ static const AspeedBoardConfig aspeed_boards[] = { .spi_model = "mx25l25635e", .num_cs = 1, .i2c_init = ast2500_evb_i2c_init, + .ram = 512 * MiB, }, { .name = MACHINE_TYPE_NAME("romulus-bmc"), .desc = "OpenPOWER Romulus BMC (ARM1176)", @@ -370,6 +376,7 @@ static const AspeedBoardConfig aspeed_boards[] = { .spi_model = "mx66l1g45g", .num_cs = 2, .i2c_init = romulus_bmc_i2c_init, + .ram = 512 * MiB, }, { .name = MACHINE_TYPE_NAME("witherspoon-bmc"), .desc = "OpenPOWER Witherspoon BMC (ARM1176)", @@ -379,6 +386,7 @@ static const AspeedBoardConfig aspeed_boards[] = { .spi_model = "mx66l1g45g", .num_cs = 2, .i2c_init = witherspoon_bmc_i2c_init, + .ram = 512 * MiB, }, }; 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; #define TYPE_ASPEED_MACHINE MACHINE_TYPE_NAME("aspeed")