From nobody Mon Sep 28 02:05:31 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1785076907; cv=none; d=zohomail.com; s=zohoarc; b=XdHc/R3knU912WO4f14iY5wsfE6qw6TnNhPrIrnYTRFiTYMri0Cpn1j8Qa65SwRL71dkafQaRP86n5XwQMMAyDkWJ/KhHgo7xNFhVYm6T4KjrgL2qwqcgZnykDC4vtcFDwUMqQFKFanltKcHvVzUsw8ZCiuSvhbCczZSPAB7Mek= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785076907; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=euPvdh95iQPl9fiq2XC5We3plNW5BhTWufPyosLAmNM=; b=PdQf40BLHmUUxgAyYotQlc4xOj1rJNr9+sD5KbUn9gylLcGmp4OjxkpWeqqBuYQ2MC5M09LM5i65MB9YwS2V2deG+BzrHBOFW0zfU8AEBY06bmLuK4CGMDewwSbE2G5wWjosUKjLIHPPHZIkN0etxs1FgQOEgtBZJbN8mMEDCkU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1785076907538189.74310834572088; Sun, 26 Jul 2026 07:41:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wo02b-0003Bh-Ej; Sun, 26 Jul 2026 10:41:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wo02Z-00035q-4P for qemu-devel@nongnu.org; Sun, 26 Jul 2026 10:41:19 -0400 Received: from mail-vs1-xe2a.google.com ([2607:f8b0:4864:20::e2a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wo02W-00050t-IT for qemu-devel@nongnu.org; Sun, 26 Jul 2026 10:41:18 -0400 Received: by mail-vs1-xe2a.google.com with SMTP id ada2fe7eead31-737f6e70678so1299328137.0 for ; Sun, 26 Jul 2026 07:41:16 -0700 (PDT) Received: from localhost.localdomain ([146.71.8.128]) by smtp.gmail.com with ESMTPSA id ada2fe7eead31-7503436f542sm3682735137.4.2026.07.26.07.41.14 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 26 Jul 2026 07:41:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785076875; x=1785681675; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=euPvdh95iQPl9fiq2XC5We3plNW5BhTWufPyosLAmNM=; b=MUMRiyDRYc3k2h5InpHNlVlkv65zYgBiQmdCvCUSWpG3yR/ejF86k99RvTHNsk6TFE cFy1YRZwHqC8+hpGrwxnQuQwJi4ajLpvSzchvJSRGUHEKVx6eh1AcYviTdyEKzIFSGR4 OQDphPKHIQPTD13rSlKeLSKPLg7mjCBQb2n0qu0/u+NMvBDJ0Vcv1gJVbEUscIR1pUEb wWwWcpvLzEyxlh3+uA7P3h9rBJ0W5k7L1dvYqEBlNe21sS9UE1YdvocP2R0V/3VJq9jK RgH5lkgrWBn4mtcHFF3AIemtfaZerzmMVMpJb89Vr9PLWV2ttxiigaxvrOWqh8xCviji 2/pg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785076875; x=1785681675; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=euPvdh95iQPl9fiq2XC5We3plNW5BhTWufPyosLAmNM=; b=FX9OL2RHC2vKUlgImpZw85obImNQvlHgDBMnzWvA2Qu4LOwdVZjScU4RWBRq7pVwwO hhXa4ZbE21TlKckzvru27Di4OVR3EzJzGohaTn4LSyaPbHN8L0g3PMLBuHDxCa6cCpAf V2iDxqt+jSAeWY1zTRjbVG0KC0q8El2ePnlYqtIiq69fPuHD3cymCkQ4zhuO/nD77B81 96mcZdbguIk6A4hKfkZzfo0wtOydYe7tuMHWx5+d2c+EARe3L2/zt8KFZ84t4y7dvCiX JtrsefxgsfZ46OX97pvPQAeJ7m5Af9n9YmZAzVcLGQLEnxCBRcz76zSbbv2eQnS7aNE2 pTyw== X-Gm-Message-State: AOJu0Yzp3/QiQM12YufG2CLtsBU667uwZtzlBFqMQNCQFb6eMXsfiySP 7Rr0isUwjemi5MVK9PwjZHIhzsPeqdK9O/EjRCwfqoFSryPmnhCdtRUD6WzDgw== X-Gm-Gg: AR+sD12kymhC0r4F7lOGNzV2D5Hl8k1377zT8h4oTkVmo0a4ASKoKWznJ6QPXP0ysWO 2SW7LgvvU8QeaZrfz4idMhgc2xcnkL+rDd/UZQTc0+0n5GK6uF5NwBudiSjFtPy8C00xTJXAC8+ JqNneddJpdQ799slV8jTxyOft/DAdHs7JQTZeRzQUwQGLM1x+JCHC72VXEQ6h2EArhjLDQgjdPl Euit4rb0thFEOxOvO2A8EikW04eIrFRcR5TPR7QjNvkTnO6SHU3e+pm3c6Ld4OS0OJKZu965rCd XZETeL4a3rVrg3MTjxaC51Trzpga0OQ7/aEHRJquwvF1mLTpOdOeCSxYyek5ZW3m2Fuvv2d27cV 62RGXVvEffOXDbd8FjGdQdHfS35Uj/s4eAwZasFSfRR7vyXLluIrD5ImGJ2L6wl7DluYAeULfhk RAAWjyhYEQo5Zjox4MNIu+taTtPmRAJVyc X-Received: by 2002:a05:6102:3ec8:b0:738:bf0f:d0c6 with SMTP id ada2fe7eead31-7503acf2e29mr3795651137.0.1785076875417; Sun, 26 Jul 2026 07:41:15 -0700 (PDT) From: Marcelo Manzo To: qemu-devel@nongnu.org, qemu-arm@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcelo Manzo Subject: [PATCH 1/2] hw/arm/raspi4b: fix guest never seeing more than ~1 GiB of RAM Date: Sun, 26 Jul 2026 10:41:11 -0400 Message-ID: <20260726144112.56321-2-marcelomanzo@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20260726144112.56321-1-marcelomanzo@gmail.com> References: <20260726144112.56321-1-marcelomanzo@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::e2a; envelope-from=marcelomanzo@gmail.com; helo=mail-vs1-xe2a.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, FREEMAIL_FROM=0.001, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1785076909509158500 Content-Type: text/plain; charset="utf-8" raspi4_modify_dtb() decides whether to add a second memory node above the 1 GiB peripheral hole by checking info->ram_size -- but that field is the boot loader's RAM budget for loading the kernel/initrd/dtb image, itself always capped to at most UPPER_RAM_BASE - vcram_size by raspi_base_machine_init(). Since that capped value can never exceed UPPER_RAM_BASE by construction, the condition was never true for any raspi4b configuration, and the second node was never added: the guest never saw more than ~1 GiB of its nominal RAM, regardless of the machine's actual size. board_ram_size(info->board_id), computed one line above in the same function, is the value that was actually needed -- the board's real total RAM, not the boot loader's own budget for where it's allowed to place the kernel image. Confirmed via direct measurement inside the guest ("free -h" / /proc/meminfo) on raspi4b's default 2 GiB configuration, before and after: before: MemTotal: 943524 kB (~921 MiB) after: MemTotal: 1905824 kB (~1861 MiB) Also verified against two real, unmodified Raspberry Pi OS releases (Debian 11/Bullseye and Debian 13/Trixie): both now report ~1.8 GiB of usable RAM instead of ~900 MiB, with clean boots, working SSH, and no kernel errors on either. Signed-off-by: Marcelo Manzo Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/arm/raspi4b.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/hw/arm/raspi4b.c b/hw/arm/raspi4b.c index b92840e1b6..ca246ebb35 100644 --- a/hw/arm/raspi4b.c +++ b/hw/arm/raspi4b.c @@ -64,7 +64,19 @@ static void raspi4_modify_dtb(const struct arm_boot_info= *info, void *fdt) =20 ram_size =3D board_ram_size(info->board_id); =20 - if (info->ram_size > UPPER_RAM_BASE) { + /* + * Bug: this used to compare info->ram_size (the boot-loader's RAM + * budget for loading the kernel/initrd/dtb, itself capped to at most + * UPPER_RAM_BASE - vcram_size by raspi_base_machine_init()) rather + * than the board's actual total RAM computed just above. Since that + * capped value can never exceed UPPER_RAM_BASE by construction, this + * condition was never true for any raspi4b configuration -- the + * second memory node was never added, and the guest never saw more + * than ~1 GiB regardless of the machine's nominal RAM size. Confirmed + * via direct measurement: default -m 2G returns ~916 MiB from + * "free -h" inside the guest, not 2 GiB. + */ + if (ram_size > UPPER_RAM_BASE) { raspi_add_memory_node(fdt, UPPER_RAM_BASE, ram_size - UPPER_RAM_BA= SE); } } --=20 2.47.1 From nobody Mon Sep 28 02:05:31 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1785076907; cv=none; d=zohomail.com; s=zohoarc; b=Ej+hWbRo1j1YzXvo8SKChXnwlphK2ZSLAH3WQZUXv5JJ+BqVLQQ1QF7RIYrA2ip1SPFZeDeG+DwvOqDE0YGLBeafN01e3XBmMqznm2osLBvRGaETYPCgLaXBhW/XbXJJUmYUrFOKLfYkjurCCsRqQJvQZfbKzlHrip46m57oaic= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1785076907; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=def94g1ZgIpxexyd5K9cV/aLU41QcCQ1hBKGNGZuG60=; b=ifxTjBOuAH7b7p7HXDSXPL2R2+RB/mi5+RZOWmlTSIvq1V5+9xzkKUld4VEHDSS5jRbtMlde0zASTua0MKbLXHF8mJkvtEC1rK8MWy5b4ZSOPmhZ26fDml6uFL4/nc7o2Wu0uBDi+BqLfK0qGmtYgxVg3FS4b9vmNv7baDsExCo= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists1p.gnu.org (lists1p.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1785076907696288.7565387037307; Sun, 26 Jul 2026 07:41:47 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists1p.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1wo02c-0003CP-Ks; Sun, 26 Jul 2026 10:41:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1wo02Z-00036b-Iz for qemu-devel@nongnu.org; Sun, 26 Jul 2026 10:41:19 -0400 Received: from mail-ua1-x933.google.com ([2607:f8b0:4864:20::933]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1wo02X-000516-Tl for qemu-devel@nongnu.org; Sun, 26 Jul 2026 10:41:19 -0400 Received: by mail-ua1-x933.google.com with SMTP id a1e0cc1a2514c-9693bbb962eso1317994241.2 for ; Sun, 26 Jul 2026 07:41:17 -0700 (PDT) Received: from localhost.localdomain ([146.71.8.128]) by smtp.gmail.com with ESMTPSA id ada2fe7eead31-7503436f542sm3682735137.4.2026.07.26.07.41.15 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Sun, 26 Jul 2026 07:41:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20251104; t=1785076877; x=1785681677; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=def94g1ZgIpxexyd5K9cV/aLU41QcCQ1hBKGNGZuG60=; b=b7bx8qPh2t1WeKRIlBuT3JXx3zjUpegkEEB1svuJhP72TkpFKOfk/F7I0BvBcF0bVG 4vJZXiMasPQAxMoJMGfyTDt9UGM6t04bT87uG1HWT458Zuv3P08UDFowQMggiBa4tMJ7 nsf1fREZFaoHamkzEkPeRCOOw37fod/ogAo6FotsAVhCya3lalbXG5VaSwtdPui8UXxD L5yVk2qOIyZGp1HEcsLKr0FYrujpc+t/KJnD4anJsiEccVhNsrWkalaraSwbTl+Fi69/ rcNLuevTQHw3gDlyxWPJliEdsi4w6FzKhRT4lzhbXAe525O1VAw44uJqHMlfIBwdEAF8 kaJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785076877; x=1785681677; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to:content-type; bh=def94g1ZgIpxexyd5K9cV/aLU41QcCQ1hBKGNGZuG60=; b=Us8iyIy8yEGm/VR8JdhyOBnBB7ZXBmAbeuFpnMWCnywSzg0H9c3MiiGYp4HGlLatXl gR2LZ3MfGROcxrHqIFxgrXahbSNxGUvDcbCTcfjtkOn8+63D1OL9ZX/TgdUmtOefU3cf HTDoix/0pT68YmhgZJ9qtOBZX7T9/83Bqxs2eB9T3D9qy+iL7BqwNa+k5asM/YejJSkD RJZmKgqByEqFn+YfSD4rIvDZMgFDOpb/A2n3B/9HkAptiDH3AZ8DjWENvllqFM7/mT+L MrdeQk7DYh0PxL5Zrgz39OdBrUe8UlQwMMcO3Xmkwz0lTtXuFaVH585iiW0ABjcj1OYC x7/A== X-Gm-Message-State: AOJu0YzyJ8RoNTV73IdOQMegk3INQdbUOc2WwASJ3brMVtXBjLIJSt9w hAATPz7cTkBF4yBexjVSSGKLm7y4KkY/3c1W21VbQ1+nNjFfQdeziTwbazEPrA== X-Gm-Gg: AR+sD12tQwXnTcxSm4ZJbE7P9PT0Pga4/qbVOKdgp0cyOBtEyYSUVwWJqYNpkeh/lLT w4vbVa0ZoKLNRT+T14MZctkZ3wHdTTdnrBj6C6Sli54UB+c7r0+2DDe48SEtANMY3b9Zs6BwtDL GLghn+2tuRMhmIdJTRC6Eg38bWgx4Uf0sS7IoLwNXyLpo5e+bixNRn88woRdN50xbbfvsKPsyNi ELhEUDNrePA6IcFAXggNaAWeb1ru9QXTJYnJSGuOWAJ7rdCr5fhg36R2PI1lF34ovaqkHGaPIPr 6YnbXiKADQeziD8NS3ubtyuBRMqVy/0pmkd71ePE6Vlh7F5uaEhivyFC9TJrcnmrSyxpznCZtd7 BkD0EZUzvEcksJJvKwULLyVkW/tzGFVfEHlqRXY8RcXXTdJYMEvqjGm8YoR8Gz1HXdSiQNTBY6E VoDZWHkmTHvaYkM4cemQwCVSXynfCb9pb6 X-Received: by 2002:a05:6102:4194:b0:631:2973:5c2c with SMTP id ada2fe7eead31-75040abd835mr3374524137.21.1785076876830; Sun, 26 Jul 2026 07:41:16 -0700 (PDT) From: Marcelo Manzo To: qemu-devel@nongnu.org, qemu-arm@nongnu.org Cc: Peter Maydell , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Marcelo Manzo Subject: [PATCH 2/2] tests/functional/aarch64: add raspi4b full-RAM regression test Date: Sun, 26 Jul 2026 10:41:12 -0400 Message-ID: <20260726144112.56321-3-marcelomanzo@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20260726144112.56321-1-marcelomanzo@gmail.com> References: <20260726144112.56321-1-marcelomanzo@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists1p.gnu.org; Received-SPF: pass client-ip=2607:f8b0:4864:20::933; envelope-from=marcelomanzo@gmail.com; helo=mail-ua1-x933.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, FREEMAIL_FROM=0.001, 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: qemu development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1785076909513158500 Content-Type: text/plain; charset="utf-8" Guards against the bug fixed in the previous commit: boots raspi4b's default 2 GiB configuration and checks that the guest actually sees close to that (>1.9M kB), not the ~921 MiB the bug left it capped at. Deliberately checks a threshold rather than the exact byte count of either figure, since the precise number depends on how this specific pinned kernel accounts for its own early reservations; the threshold is comfortably between the two (943524 kB broken, 1905824 kB fixed, confirmed by hand against this exact kernel/initrd). Signed-off-by: Marcelo Manzo --- tests/functional/aarch64/test_raspi4.py | 51 +++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/tests/functional/aarch64/test_raspi4.py b/tests/functional/aar= ch64/test_raspi4.py index 35ba6c24f7..55903e93d3 100755 --- a/tests/functional/aarch64/test_raspi4.py +++ b/tests/functional/aarch64/test_raspi4.py @@ -154,6 +154,57 @@ def test_arm_raspi4_rng_thermal(self): exec_command_and_wait_for_pattern(self, 'halt', 'reboot: System ha= lted') =20 =20 + def test_arm_raspi4_full_ram(self): + kernel_path =3D self.archive_extract(self.ASSET_KERNEL_20190215, + member=3D'boot/kernel8.img') + dtb_path =3D self.archive_extract(self.ASSET_KERNEL_20190215, + member=3D'boot/bcm2711-rpi-4-b.dtb= ') + initrd_path =3D self.uncompress(self.ASSET_INITRD) + + self.set_machine('raspi4b') + self.vm.set_console() + kernel_command_line =3D (self.KERNEL_COMMON_COMMAND_LINE + + 'earlycon=3Dpl011,mmio32,0xfe201000 ' + + 'console=3DttyAMA0,115200 ' + + 'panic=3D-1 noreboot ' + + 'dwc_otg.fiq_fsm_enable=3D0') + self.vm.add_args('-kernel', kernel_path, + '-dtb', dtb_path, + '-initrd', initrd_path, + '-append', kernel_command_line, + '-no-reboot') + self.vm.launch() + self.wait_for_console_pattern('Boot successful.') + + # raspi4b's default machine RAM is 2 GiB, but raspi4_modify_dtb() + # used to compare the wrong field when deciding whether to add a + # second memory node above the 1 GiB peripheral hole (it checked + # the boot-loader's kernel/initrd-loading RAM budget, which is + # itself always capped to at most 1 GiB, rather than the board's + # actual total RAM) -- so that second node was never added for any + # raspi4b configuration, and the guest never saw more than ~1 GiB + # regardless of the machine's nominal RAM size. With the bug, + # MemTotal here is 943524 kB; fixed, it is 1905824 kB. Guard + # against a regression back to the ~1 GiB figure without hardcoding + # the exact byte count of either, which depends on how this + # specific pinned kernel accounts for its own reservations. + mem_total_kb =3D None + cmd_output =3D exec_command_and_wait_for_pattern( + self, 'cat /proc/meminfo', 'MemAvailable') + for line in cmd_output.decode('ascii', errors=3D'replace').splitli= nes(): + if line.startswith('MemTotal:'): + mem_total_kb =3D int(line.split()[1]) + break + self.assertIsNotNone(mem_total_kb, 'MemTotal line not found') + self.assertGreater(mem_total_kb, 1900000, + 'guest RAM (%d kB) is far below the ~1.9 GiB ' + 'expected for a 2 GiB raspi4b -- the second ' + 'memory node above the 1 GiB peripheral hole ' + 'is probably not being added' % mem_total_kb) + + exec_command_and_wait_for_pattern(self, 'halt', 'reboot: System ha= lted') + + def test_arm_raspi4_pcie(self): kernel_path =3D self.archive_extract(self.ASSET_KERNEL_20190215, member=3D'boot/kernel8.img') --=20 2.47.1