From nobody Tue Apr 8 03:28:26 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
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=fail(p=none dis=none) header.from=eik.bme.hu
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1740246839801320.4888143281041;
Sat, 22 Feb 2025 09:53:59 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tltgA-0000cX-6C; Sat, 22 Feb 2025 12:52:42 -0500
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 <balaton@eik.bme.hu>)
id 1tltg3-0000af-NB; Sat, 22 Feb 2025 12:52:35 -0500
Received: from zero.eik.bme.hu ([2001:738:2001:2001::2001])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <balaton@eik.bme.hu>)
id 1tltg1-0008FY-HN; Sat, 22 Feb 2025 12:52:35 -0500
Received: from zero.eik.bme.hu (localhost [127.0.0.1])
by zero.eik.bme.hu (Postfix) with ESMTP id 172CA4E6039;
Sat, 22 Feb 2025 18:52:32 +0100 (CET)
Received: from zero.eik.bme.hu ([127.0.0.1])
by zero.eik.bme.hu (zero.eik.bme.hu [127.0.0.1]) (amavisd-new, port 10028)
with ESMTP id gjIonS40rlZe; Sat, 22 Feb 2025 18:52:30 +0100 (CET)
Received: by zero.eik.bme.hu (Postfix, from userid 432)
id 2CC4F4E6001; Sat, 22 Feb 2025 18:52:30 +0100 (CET)
X-Virus-Scanned: amavisd-new at eik.bme.hu
Message-Id:
<f1b53e0822111c6c557797adcc75f8d2c7eed17f.1740243918.git.balaton@eik.bme.hu>
In-Reply-To: <cover.1740243918.git.balaton@eik.bme.hu>
References: <cover.1740243918.git.balaton@eik.bme.hu>
From: BALATON Zoltan <balaton@eik.bme.hu>
Subject: [PATCH 3/4] ppc/amigaone: Add default environment
To: qemu-devel@nongnu.org,
qemu-ppc@nongnu.org
Cc: Nicholas Piggin <npiggin@gmail.com>
Date: Sat, 22 Feb 2025 18:52:30 +0100 (CET)
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=lists.gnu.org;
Received-SPF: pass client-ip=2001:738:2001:2001::2001;
envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu
X-Spam_score_int: -18
X-Spam_score: -1.9
X-Spam_bar: -
X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, 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-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZM-MESSAGEID: 1740246841578019100
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Initialise empty NVRAM with default values. This also enables IDE UDMA
mode in AmigaOS that is faster but has to be enabled in environment
due to problems with real hardware but that does not affect emulation
so we can use faster defaults here.
Signed-off-by: BALATON Zoltan <balaton@eik.bme.hu>
---
hw/ppc/amigaone.c | 37 ++++++++++++++++++++++++++++++++++++-
1 file changed, 36 insertions(+), 1 deletion(-)
diff --git a/hw/ppc/amigaone.c b/hw/ppc/amigaone.c
index 5273543460..35e4075cc3 100644
--- a/hw/ppc/amigaone.c
+++ b/hw/ppc/amigaone.c
@@ -52,6 +52,28 @@ static const char dummy_fw[] =3D {
#define NVRAM_ADDR 0xfd0e0000
#define NVRAM_SIZE (4 * KiB)
=20
+static char default_env[] =3D
+ "baudrate=3D115200\0"
+ "stdout=3Dvga\0"
+ "stdin=3Dps2kbd\0"
+ "bootcmd=3Dboota; menu; run menuboot_cmd\0"
+ "boot1=3Dide\0"
+ "boot2=3Dcdrom\0"
+ "boota_timeout=3D3\0"
+ "ide_doreset=3Don\0"
+ "pci_irqa=3D9\0"
+ "pci_irqa_select=3Dlevel\0"
+ "pci_irqb=3D10\0"
+ "pci_irqb_select=3Dlevel\0"
+ "pci_irqc=3D11\0"
+ "pci_irqc_select=3Dlevel\0"
+ "pci_irqd=3D7\0"
+ "pci_irqd_select=3Dlevel\0"
+ "a1ide_irq=3D1111\0"
+ "a1ide_xfer=3DFFFF\0";
+#define CRC32_DEFAULT_ENV 0xb5548481
+#define CRC32_ALL_ZEROS 0x603b0489
+
#define TYPE_A1_NVRAM "a1-nvram"
OBJECT_DECLARE_SIMPLE_TYPE(A1NVRAMState, A1_NVRAM)
=20
@@ -97,7 +119,7 @@ static void nvram_realize(DeviceState *dev, Error **errp)
{
A1NVRAMState *s =3D A1_NVRAM(dev);
void *p;
- uint32_t *c;
+ uint32_t crc, *c;
=20
memory_region_init_rom_device(&s->mr, NULL, &nvram_ops, s, "nvram",
NVRAM_SIZE, &error_fatal);
@@ -116,12 +138,25 @@ static void nvram_realize(DeviceState *dev, Error **e=
rrp)
return;
}
}
+ crc =3D crc32(0, p + 4, NVRAM_SIZE - 4);
+ if (crc =3D=3D CRC32_ALL_ZEROS) { /* If env is uninitialized set defau=
lt */
+ *c =3D cpu_to_be32(CRC32_DEFAULT_ENV);
+ /* Also copies terminating \0 as env is terminated by \0\0 */
+ memcpy(p + 4, default_env, sizeof(default_env));
+ if (s->blk) {
+ blk_pwrite(s->blk, 0, sizeof(crc) + sizeof(default_env), p, 0);
+ }
+ return;
+ }
if (*c =3D=3D 0) {
*c =3D cpu_to_be32(crc32(0, p + 4, NVRAM_SIZE - 4));
if (s->blk) {
blk_pwrite(s->blk, 0, 4, p, 0);
}
}
+ if (be32_to_cpu(*c) !=3D crc) {
+ warn_report("NVRAM checksum mismatch");
+ }
}
=20
static const Property nvram_properties[] =3D {
--=20
2.30.9