From patchwork Tue Apr 2 10:29:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 785103 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:b0:33e:7753:30bd with SMTP id p1csp4859364wrt; Tue, 2 Apr 2024 03:31:22 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV8bxWqOK/iAnE5ewysImK3THMShT3i3XC1DrOca85UMumA3ImQi2HSSppdvTWXYIFuqSl5k/NMReUfcrLMDaIV X-Google-Smtp-Source: AGHT+IG/QwYqtd2jlGx5d0fnqUm57a8aT2CRVTJDkJlBO4E4sCIagszdHaBkTglOnW0DToundcWw X-Received: by 2002:ae9:e648:0:b0:78c:79fe:9b57 with SMTP id x8-20020ae9e648000000b0078c79fe9b57mr1674680qkl.27.1712053882580; Tue, 02 Apr 2024 03:31:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1712053882; cv=none; d=google.com; s=arc-20160816; b=jFBDrapRQyF+5Ly6p2g/Bzq8AGX6YJP4w17VZxTGXe2Y9K9zNa88bIijW01ugFzyD5 +CnVkoT8FKtGO82q6xwcPaYreTlYds1A0rcGaoIG3xJbSmaoiZMoS/RlBzCnhHeFp/1H yGtBmu/edJwgMqdnnq8wVUv1a0imDtdtVFArG4DbBVCGlFpQYfKgM8KbKRhq/TG1PJ93 9JbB7rtzv3Rbjbm3HPyVY2G1YNWb1ltZ8IAzo6y9UhqqC/IhVB4JBbqqGvX+yxW0SYWI Dl47NOmx6QDWUxdzr4EvUoNfoWBGOORI4NeO704SK4KWO324nVhk7u43D+ukEjT5Xz5d SMCQ== 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=3T/JxAKeGpx7vAttG4gUgA6VW1jV4RfEeZ0Alec6FS8=; fh=PnYt+qEB9tAfMKoqBm2xjKOFpYyFFGPudh5cVIoieJM=; b=doPoWoeqMkfmMTHHlAZOuVAR9YwPJ9qfYn2kYluPrsgsc2GAPUcs1DgR6f+ACs7szp PHFnkumpWbQ4Mr0CUcrQXZc0RvWNBkHdJJVVN4Lew3GfyHCazbmiII1RqMFhIbbZFay9 doH4a9EnktDCxbu0tmpK5g26S2kSEahZahO9w3h9oUAnjaAZEKZd9grxgGneU9jm33MS dMYN30t8zPxwedVuMAml5fXmsVNZJw8eUZmR710nDWPmcvHxV1xVko4fB1Kcp4EDREXu A6o2vYbuXAAABCnmnKUUUkOA5yvCtQd0BEC3bJjNSBOdllegHT9YZveJwQE2n4hbVEdZ P2Uw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=xnTQhwas; 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 k4-20020a05620a0b8400b00789eb507830si10958369qkh.550.2024.04.02.03.31.22 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 02 Apr 2024 03:31:22 -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=pass header.i=@linaro.org header.s=google header.b=xnTQhwas; 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] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rrbP5-0008LV-3d; Tue, 02 Apr 2024 06:30:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rrbP3-0008Kc-8h for qemu-devel@nongnu.org; Tue, 02 Apr 2024 06:30:05 -0400 Received: from mail-lj1-x22f.google.com ([2a00:1450:4864:20::22f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rrbOy-0003fw-GQ for qemu-devel@nongnu.org; Tue, 02 Apr 2024 06:30:04 -0400 Received: by mail-lj1-x22f.google.com with SMTP id 38308e7fff4ca-2d52e65d4a8so69636871fa.0 for ; Tue, 02 Apr 2024 03:29:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1712053796; x=1712658596; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=3T/JxAKeGpx7vAttG4gUgA6VW1jV4RfEeZ0Alec6FS8=; b=xnTQhwaso9lY6fMPW0y/rTjCV6wR/JJyIMyB0+UwBndffM6l7fT0cGzF8w8pZJgwFj YRiVysbNVfFwC6Ed78mSpL2I/7NBczJNRyaKIAtPrug6BuwCV7c0jJG3yImH0eAQX+Aw avOlvj8cggumMZUiAElhcsJguAdCcoO3AivVH/KhtWKFhrYJQCzpP5CzOEeWKv+F9vsd GRCyD1nQLc61oJRH0w3aD9GiTvZFBxXOMsG8eoOIP6zuV6SbILGKFR0fQNfcYMvG1LDA Cqr1pyq3vQ7tf8aRRXHGoE5D3RGAuQ8TfUcpOXlH0X6mrur9KJ38Hlc84HuUjDvKlUxZ aqxQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712053796; x=1712658596; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=3T/JxAKeGpx7vAttG4gUgA6VW1jV4RfEeZ0Alec6FS8=; b=SU859G+xB/B55rj+3w88hqzJwD9lUNgMbXqPHzLQQXrvUsAzK2RwQCG/hGchKNV+k8 DwqSXydNZp7s/J4obVVkCYM+QcFyH6m6J+k6jnR5hluiM8w+LZTJryT6ZHj56nrcDjXd zmwxuQYA7/ljGcRA0tKM1PGIvHpR5Wd/PGYn9U0Q5h6eo3eE/qD7Pbzjmfo97vdStdEg JgJmlkFykC4+hQKLm2tRKBHFZexo4Cb+y1u4c9hzE759QSTJWf/xExdO7EIE/MSFndrB r59mzq8+1F/nbxjTdFA3U2UccsmrnuQT/0JXgmDvV6n2dxTDXnobLlnzW4T4VCyas3ZX UT2w== X-Gm-Message-State: AOJu0YxXpds3CvlxAB5h21WlgYz5o3+zvI285n2ouwgRZ/DwihsrXdOw 4UuNZRNTkMZV9cKf+SP3mWtqDcQ768BffpgL3yvgPSYTw4naiDrvFH+oa0vfc3YeAVa3+aOUwqx f X-Received: by 2002:a2e:b705:0:b0:2d6:ef1e:90f8 with SMTP id j5-20020a2eb705000000b002d6ef1e90f8mr7317956ljo.49.1712053795894; Tue, 02 Apr 2024 03:29:55 -0700 (PDT) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id o15-20020a05600c4fcf00b0041488895a37sm20586175wmq.33.2024.04.02.03.29.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Apr 2024 03:29:55 -0700 (PDT) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 5/5] raspi4b: Reduce RAM to 1Gb on 32-bit hosts Date: Tue, 2 Apr 2024 11:29:51 +0100 Message-Id: <20240402102951.3099078-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240402102951.3099078-1-peter.maydell@linaro.org> References: <20240402102951.3099078-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::22f; envelope-from=peter.maydell@linaro.org; helo=mail-lj1-x22f.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.29 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-bounces+patch=linaro.org@nongnu.org From: Cédric Le Goater Change the board revision number and RAM size to 1Gb on 32-bit hosts. On these systems, RAM has a 2047 MB limit and this breaks the tests. Fixes: 7785e8ea2204 ("hw/arm: Introduce Raspberry PI 4 machine") Signed-off-by: Cédric Le Goater Message-id: 20240329150155.357043-1-clg@redhat.com Reviewed-by: Peter Maydell Signed-off-by: Peter Maydell --- hw/arm/raspi4b.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c index cb1b1f2f147..85877880fc7 100644 --- a/hw/arm/raspi4b.c +++ b/hw/arm/raspi4b.c @@ -112,7 +112,11 @@ static void raspi4b_machine_class_init(ObjectClass *oc, void *data) MachineClass *mc = MACHINE_CLASS(oc); RaspiBaseMachineClass *rmc = RASPI_BASE_MACHINE_CLASS(oc); +#if HOST_LONG_BITS == 32 + rmc->board_rev = 0xa03111; /* Revision 1.1, 1 Gb RAM */ +#else rmc->board_rev = 0xb03115; /* Revision 1.5, 2 Gb RAM */ +#endif raspi_machine_class_common_init(mc, rmc->board_rev); mc->init = raspi4b_machine_init; }