From nobody Sat Feb 7 12:52:03 2026 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 ARC-Seal: i=1; a=rsa-sha256; t=1592010682; cv=none; d=zohomail.com; s=zohoarc; b=LtSWMsbEHJvF83gmVqyX8l1Xkq9srS4H3KD+qIJGEkbKIQ7EzYRkGcJIkvo/aUKuv/LA6qY1dSLN0K2CaawdY18S4RBaigZ2pWsvbsSVw9CXh7oFSWwfyc0dOnxvofRGGckGWyzFx56dBkvaBcIeBeeH+h2mZAKdrrFVNmG0m8w= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592010682; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=EKbpbAvytdI7o0BIU+tkORLyu5HG/bbwU9wsWevO9v8=; b=cC+C2mA2Lyh/Ygr5wsTNDnE+T3Y8mu1qwda1Mmly1YZ79LAVUfhADytnsxWC9w8v7LixdwpVVmevHEEqaW8olqhHtx1SazM28v6yEnvpDgsx+JvwdiBMK9WxbVNjIBZBcY6eRu3owqjQtg3onEZLWVI94fSdJTaYiIEA6830qXE= ARC-Authentication-Results: i=1; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1592010682751671.7284370842556; Fri, 12 Jun 2020 18:11:22 -0700 (PDT) Received: from localhost ([::1]:51370 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjuhd-0007yy-9u for importer@patchew.org; Fri, 12 Jun 2020 21:11:21 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32768) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjugY-0006eU-Dh for qemu-devel@nongnu.org; Fri, 12 Jun 2020 21:10:14 -0400 Received: from zero.eik.bme.hu ([2001:738:2001:2001::2001]:45861) by eggs.gnu.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjugT-0001cE-Vr for qemu-devel@nongnu.org; Fri, 12 Jun 2020 21:10:14 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 8AF2B748DD8; Sat, 13 Jun 2020 03:10:03 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 187A77482C8; Sat, 13 Jun 2020 03:10:03 +0200 (CEST) Message-Id: <4a304a01a87fc8154023bc8f48e22811d7cfcaf0.1592009699.git.balaton@eik.bme.hu> In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH 1/2] mac_oldworld: Allow loading binary ROM image Date: Sat, 13 Jun 2020 02:54:59 +0200 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org X-Spam-Probability: 8% 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-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: , Cc: Howard Spoelstra , Mark Cave-Ayland , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The G3 beige machine has a 4MB firmware ROM. Fix the size of the rom region and allow loading a binary image with -bios. This makes it possible to test emulation with a ROM image from real hardware. Signed-off-by: BALATON Zoltan --- hw/ppc/mac_oldworld.c | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 0b4c1c6373..3812adc441 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -59,6 +59,8 @@ #define NDRV_VGA_FILENAME "qemu_vga.ndrv" =20 #define GRACKLE_BASE 0xfec00000 +#define PROM_BASE 0xffc00000 +#define PROM_SIZE (4 * MiB) =20 static void fw_cfg_boot_set(void *opaque, const char *boot_device, Error **errp) @@ -127,24 +129,28 @@ static void ppc_heathrow_init(MachineState *machine) =20 memory_region_add_subregion(sysmem, 0, machine->ram); =20 - /* allocate and load BIOS */ - memory_region_init_rom(bios, NULL, "ppc_heathrow.bios", BIOS_SIZE, + /* allocate and load firmware ROM */ + memory_region_init_rom(bios, NULL, "ppc_heathrow.bios", PROM_SIZE, &error_fatal); + memory_region_add_subregion(sysmem, PROM_BASE, bios); =20 - if (bios_name =3D=3D NULL) + if (!bios_name) { bios_name =3D PROM_FILENAME; + } filename =3D qemu_find_file(QEMU_FILE_TYPE_BIOS, bios_name); - memory_region_add_subregion(sysmem, PROM_ADDR, bios); - - /* Load OpenBIOS (ELF) */ if (filename) { - bios_size =3D load_elf(filename, NULL, 0, NULL, NULL, NULL, NULL, = NULL, - 1, PPC_ELF_MACHINE, 0, 0); + /* Load OpenBIOS (ELF) */ + bios_size =3D load_elf(filename, NULL, NULL, NULL, NULL, NULL, NUL= L, + NULL, 1, PPC_ELF_MACHINE, 0, 0); + if (bios_size <=3D 0) { + /* or load binary ROM image */ + bios_size =3D load_image_targphys(filename, PROM_BASE, PROM_SI= ZE); + } g_free(filename); } else { bios_size =3D -1; } - if (bios_size < 0 || bios_size > BIOS_SIZE) { + if (bios_size < 0 || bios_size > PROM_SIZE) { error_report("could not load PowerPC bios '%s'", bios_name); exit(1); } --=20 2.21.3 From nobody Sat Feb 7 12:52:03 2026 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 ARC-Seal: i=1; a=rsa-sha256; t=1592010684; cv=none; d=zohomail.com; s=zohoarc; b=H/KzVNFhy06UAPUTFj1N6BzCCq9onTTw9/4z8PQKuu2Egug2pxpOeWppm6l9sYbV1fXY0UYdul4Lb1E08QeoekbkZCevmqI7mc0YYnLjuCt08gLL/IK2jaQB5qJznToQtdm+iUAw3xkChOt2ANW3OJBPWWZYWg4UHc0RitFQBjc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592010684; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=fz6eGL9VWXJAfRc8SHv5o2efJkZK9/hXB+2YfkTErhw=; b=Mmm3+bszrCcXOxYzY0GdLXqW4IAa2xWDfI/ldmxTb8xBKXNTd5evqZ7zQn0fLG5Q9ep7uvSBehyLRiqrqB/LMj+yommTK58mVExR5c46jN8R7KaUbqEeQU2fG9BLWJACjHYqW/fu/uwCqsgSKFIsC+TWO6OgdXyOCfvRJsYXeBM= ARC-Authentication-Results: i=1; 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 Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 159201068428211.382379046316146; Fri, 12 Jun 2020 18:11:24 -0700 (PDT) Received: from localhost ([::1]:51476 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jjuhe-00081U-W2 for importer@patchew.org; Fri, 12 Jun 2020 21:11:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:32804) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjugc-0006he-VT for qemu-devel@nongnu.org; Fri, 12 Jun 2020 21:10:19 -0400 Received: from zero.eik.bme.hu ([2001:738:2001:2001::2001]:45866) by eggs.gnu.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jjugb-0001cq-8V for qemu-devel@nongnu.org; Fri, 12 Jun 2020 21:10:18 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 75EDA748DDA; Sat, 13 Jun 2020 03:10:11 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 1CAA0748DD0; Sat, 13 Jun 2020 03:10:03 +0200 (CEST) Message-Id: In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH 2/2] mac_oldworld: Add machine ID register Date: Sat, 13 Jun 2020 02:54:59 +0200 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable To: qemu-devel@nongnu.org, qemu-ppc@nongnu.org X-Spam-Probability: 8% 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-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. 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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=_AUTOLEARN 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: , Cc: Howard Spoelstra , Mark Cave-Ayland , David Gibson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" Content-Type: text/plain; charset="utf-8" The G3 beige machine has a machine ID register that is accessed by the firmware to deternine the board config. Add basic emulation of it. Signed-off-by: BALATON Zoltan --- hw/ppc/mac_oldworld.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 3812adc441..4dd872c1a3 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -80,6 +80,15 @@ static void ppc_heathrow_reset(void *opaque) cpu_reset(CPU(cpu)); } =20 +static uint64_t machine_id_read(void *opaque, hwaddr addr, unsigned size) +{ + return (addr =3D=3D 0 && size =3D=3D 2 ? 0x3d8c : 0); +} + +const MemoryRegionOps machine_id_reg_ops =3D { + .read =3D machine_id_read, +}; + static void ppc_heathrow_init(MachineState *machine) { ram_addr_t ram_size =3D machine->ram_size; @@ -93,6 +102,7 @@ static void ppc_heathrow_init(MachineState *machine) char *filename; int linux_boot, i; MemoryRegion *bios =3D g_new(MemoryRegion, 1); + MemoryRegion *machine_id =3D g_new(MemoryRegion, 1); uint32_t kernel_base, initrd_base, cmdline_base =3D 0; int32_t kernel_size, initrd_size; PCIBus *pci_bus; @@ -227,6 +237,10 @@ static void ppc_heathrow_init(MachineState *machine) } } =20 + memory_region_init_io(machine_id, OBJECT(machine), &machine_id_reg_ops, + NULL, "machine_id", 2); + memory_region_add_subregion(get_system_memory(), 0xff000004, machine_i= d); + /* XXX: we register only 1 output pin for heathrow PIC */ pic_dev =3D qdev_create(NULL, TYPE_HEATHROW); qdev_init_nofail(pic_dev); --=20 2.21.3