From patchwork Fri Mar 5 17:15:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 393579 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp663256jai; Fri, 5 Mar 2021 10:30:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJzZwmtVgNa1R1RMx0Syh/DBGqD1Z8/8ukqmg67ciIYwkajthu1pAMxG4o5n8YrRqxqLYXP5 X-Received: by 2002:a92:cda6:: with SMTP id g6mr9997658ild.274.1614969012021; Fri, 05 Mar 2021 10:30:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1614969012; cv=none; d=google.com; s=arc-20160816; b=Mhn7tD+f6wli2ecsJVoiktgNMcXd8hATkfiSR0JjuMVGVK9G31QJQdybT4gJcC5bZ6 G2lGSiwPU+W0V3zOMOKKvDxBCdnrmg3mpcQDq+MGI6A5DxRDs0r5l5A0wMuPVcBBqjWb AUR+FEVp6TTa3yezkg845+rZOqQjHSxoA7zrY4HTcUPit60LEquDYexXfHRZAG5iQBya m9JFnW3Yq6JvvUG/uTBH+g4KQLjOGJu3Mhnj//yPFRP7c04ufVfj/5k4XJiuddLdPVZS YifA3auuHXO70I5ekfm0b/fOw3AO5fKaVBRUjC5f+/jhrAOMemWhzWoYLwgQUZ2iu50M iYAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=sSQp2d6jwLb6DcuGgX9lcMaIg2ApAQ9naMb0a9sdWEA=; b=BKYIZAMmSnGF+1U9e6BeLnniUO/1HDSbbWHkEtkB8hisQX9TO8IgSa7scy+/vg7RLw HwtzsZEoJG+7RpZWzhMsL6jbQwFsQttOM5K1PbFJnfJUkdQySf4GyzlqzN46AFIns9U5 R/IJGVoolRY/PaxLz8rxBNUbDuoqsnRR0ovt8uuO2DMTZlsz0JM0HzqAp/ppCFBKKhHF P114Gpzpqx9RgyRVD5DGTw33dNOpxLiRgGOaZLtSUtT7eLSmaJhWrJDIqcOGdFBR8gNV Ga6QkAmjwusZvHZ78SofmY4D9Pw5JAu3O/qA70Y2rhPurL98VGlX3JH0erwEP5e6u4wN ypRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=fMG96Crp; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id v7si3408686jat.21.2021.03.05.10.30.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 05 Mar 2021 10:30:12 -0800 (PST) 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=pass header.i=@linaro.org header.s=google header.b=fMG96Crp; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35656 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lIFDH-0001SB-FC for patch@linaro.org; Fri, 05 Mar 2021 13:30:11 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:38676) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lIE41-0007Sk-Se for qemu-devel@nongnu.org; Fri, 05 Mar 2021 12:16:33 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]:45524) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lIE3M-0007io-F3 for qemu-devel@nongnu.org; Fri, 05 Mar 2021 12:16:33 -0500 Received: by mail-wr1-x430.google.com with SMTP id e10so2862301wro.12 for ; Fri, 05 Mar 2021 09:15:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=sSQp2d6jwLb6DcuGgX9lcMaIg2ApAQ9naMb0a9sdWEA=; b=fMG96CrpnLNsEwDfbyYlUf9l4ZS/JTKcPypHOrTtjgQEJ25pICPvoX/vMHcbTj8W7M Op2GOBbzSEhjR1xCnUjMqezPL/56q/25VClRdBa/dmilwlb2zDBobO5Ij9YSXHKMA6zy pb6r6svAl7cYEFnfdN+eWw3zAEvXRzcHwKkdo8I4z6NxuNvp7hUS0WfbiEnv26YZujdb ZIdwYGsEDUlAMTeWBIuDM03FUfmNx3pUW1rVlFW9MbSDaJKZPVaeO55DXNhBwRFQ6d7+ YYS8rVUmInmZr10aqZoSVThMkTcfqRobsK9NC9ECPttANYDpggTiKuW2ydkJsYUfToI0 cUQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=sSQp2d6jwLb6DcuGgX9lcMaIg2ApAQ9naMb0a9sdWEA=; b=sTk5NiDiaxqGfJTK4qICix/x3fpv8SQYQJPOHLJNEfFVe/pdWfMAi/yyq8h7b+qYou z2d3ltSF6V/NbMjzbV05z9oDpsCMf3qq4bEvLoRQQptK/Bi/yR3V+t+lPTwKRRo+rT1E btUyAefHhcStx9+IEMGwForXEPZOJIx1dwcY3OX8ibnWMX7JNTaiFKMLSXLVlfuz1aYW 8BG5fFjojEfMZk5Ehc5Wi3e+SYeWe5rrKej885mlMzrZLX2MtouY+nALYZhDlONcQHPa X8AFyFMC2rV7LBiqUQWycgvzhp5X6+3PY6I6YxYINDD6hRASFX3gFa6lAy77tI7xzBZL MesQ== X-Gm-Message-State: AOAM531WN1ATYBgGrKNWUcmazSQY4eIcir92idfwi2LN3ovzWqw4Geso lBTx7oNUqi33xmVIY+NhyrWRVVVflFlgTA== X-Received: by 2002:a5d:620d:: with SMTP id y13mr10613456wru.88.1614964546606; Fri, 05 Mar 2021 09:15:46 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [81.2.115.148]) by smtp.gmail.com with ESMTPSA id m132sm5942357wmf.45.2021.03.05.09.15.46 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 09:15:46 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 42/49] hw/arm/mps2-tz: Set MachineClass default_ram info from RAMInfo data Date: Fri, 5 Mar 2021 17:15:08 +0000 Message-Id: <20210305171515.1038-43-peter.maydell@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20210305171515.1038-1-peter.maydell@linaro.org> References: <20210305171515.1038-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=peter.maydell@linaro.org; helo=mail-wr1-x430.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action 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: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Instead of hardcoding the MachineClass default_ram_size and default_ram_id fields, set them on class creation by finding the entry in the RAMInfo array which is marked as being the QEMU system RAM. Signed-off-by: Peter Maydell Reviewed-by: Richard Henderson Message-id: 20210215115138.20465-18-peter.maydell@linaro.org --- hw/arm/mps2-tz.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) -- 2.20.1 diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c index 26a52b72eec..eaa430e9537 100644 --- a/hw/arm/mps2-tz.c +++ b/hw/arm/mps2-tz.c @@ -811,8 +811,26 @@ static void mps2tz_class_init(ObjectClass *oc, void *data) mc->init = mps2tz_common_init; iic->check = mps2_tz_idau_check; - mc->default_ram_size = 16 * MiB; - mc->default_ram_id = "mps.ram"; +} + +static void mps2tz_set_default_ram_info(MPS2TZMachineClass *mmc) +{ + /* + * Set mc->default_ram_size and default_ram_id from the + * information in mmc->raminfo. + */ + MachineClass *mc = MACHINE_CLASS(mmc); + const RAMInfo *p; + + for (p = mmc->raminfo; p->name; p++) { + if (p->mrindex < 0) { + /* Found the entry for "system memory" */ + mc->default_ram_size = p->size; + mc->default_ram_id = p->name; + return; + } + } + g_assert_not_reached(); } static void mps2tz_an505_class_init(ObjectClass *oc, void *data) @@ -835,6 +853,7 @@ static void mps2tz_an505_class_init(ObjectClass *oc, void *data) mmc->numirq = 92; mmc->raminfo = an505_raminfo; mmc->armsse_type = TYPE_IOTKIT; + mps2tz_set_default_ram_info(mmc); } static void mps2tz_an521_class_init(ObjectClass *oc, void *data) @@ -857,6 +876,7 @@ static void mps2tz_an521_class_init(ObjectClass *oc, void *data) mmc->numirq = 92; mmc->raminfo = an505_raminfo; /* AN521 is the same as AN505 here */ mmc->armsse_type = TYPE_SSE200; + mps2tz_set_default_ram_info(mmc); } static const TypeInfo mps2tz_info = {