From nobody Sat Feb 7 19:07:59 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=1592056157; cv=none; d=zohomail.com; s=zohoarc; b=ZpCu1/HYmd/EmDL+zMXKfM3R/6hl8GqWrbp4q9aDiCooX7xwdtwlpwo4L9i6yGv84H5e+gyZCzixI/ireE5LeDqTPS9qkr8lmupILdGSB/+qfhBqf2gKpY43McuvL0szsyJIAYdagWTzl2u1+qxT7uqwh2AckWRXk/ANeV53ak0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592056157; 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=PkbuvYGU/KVtKxlOXtYpVpjRA8aEATyE4jDC3tEtxHUlCIsFdtvbGnUsrm2vkteWzolkYL42Ucnx+137n1/ILEBfQOCCfv2p/hhmBOEGLSJD16zYB4r27f4sJxRyXa3rhgudTT9FtsvNauQ7c84owAtuCgw53kTwGtg+IxRjtio= 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 1592056157025644.1521975984193; Sat, 13 Jun 2020 06:49:17 -0700 (PDT) Received: from localhost ([::1]:42946 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jk6X5-0007f9-Qc for importer@patchew.org; Sat, 13 Jun 2020 09:49:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37888) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jk6TG-0002Um-Lu; Sat, 13 Jun 2020 09:45:18 -0400 Received: from zero.eik.bme.hu ([2001:738:2001:2001::2001]:47669) by eggs.gnu.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jk6TD-0002T0-AZ; Sat, 13 Jun 2020 09:45:18 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 9E27F748DDD; Sat, 13 Jun 2020 15:45:00 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 2499574633D; Sat, 13 Jun 2020 15:45:00 +0200 (CEST) Message-Id: <4a304a01a87fc8154023bc8f48e22811d7cfcaf0.1592055375.git.balaton@eik.bme.hu> In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH v2 1/5] mac_oldworld: Allow loading binary ROM image Date: Sat, 13 Jun 2020 15:36:15 +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 19:07:59 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=1592055997; cv=none; d=zohomail.com; s=zohoarc; b=UkVZvPH6vefx7LwNTD0MY++LsjKmb4iQ0UBaA6icAk+Z6HMZ5Yq1Us3lRZR4joefn5qpoeVTANP85rWVrK2sQW9SjC8fPJUOAKo43oCvMlGQzBgTO1zJBtiQNz2tS6gUL0OIpE48Rw6JUazFPvywLaed8FtIRBgGm96UMFRRw8U= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592055997; 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=f1B+3c3iIb2liiO3Sl+DhZUPGiZJzzY237sF2AH6Yc9sQjDE5P3t+7hSIrRfbHyLlfLz1IsljlydQoQNN2UT58rI5GE5+2nbUeHQggMj5J3kzQnWr25mI+/uy0awMsIoFNghcuLSjEdrj6wyZKmvU1bMtkHsWXbs5HLj2WS4Zf8= 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 1592055996801671.8642101719628; Sat, 13 Jun 2020 06:46:36 -0700 (PDT) Received: from localhost ([::1]:36246 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jk6UU-0004Da-Gn for importer@patchew.org; Sat, 13 Jun 2020 09:46:34 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jk6TG-0002UQ-0P; Sat, 13 Jun 2020 09:45:18 -0400 Received: from zero.eik.bme.hu ([152.66.115.2]:47677) by eggs.gnu.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jk6TD-0002VI-9X; Sat, 13 Jun 2020 09:45:17 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id D0D83748DDE; Sat, 13 Jun 2020 15:45:08 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 2884B7475FA; Sat, 13 Jun 2020 15:45:00 +0200 (CEST) Message-Id: In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH v2 2/5] mac_oldworld: Add machine ID register Date: Sat, 13 Jun 2020 15:36:15 +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=152.66.115.2; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/13 09:45:00 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, 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 From nobody Sat Feb 7 19:07:59 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=1592056252; cv=none; d=zohomail.com; s=zohoarc; b=PYyqlJr3jpAOet1M11qd5b+GJq66AOoFnlgLCHAxcO9t39e++f0vvb0aQUIohkptNYfowBM+yiHjX0kJAxMSGv6u5gqNwjgryqBqIk2hqyYP9mFbs+O1FWMFZLQOSWsVt5l7mnvvY/p2awA43wsXXvN6DIyCJ/wAMTGPEJDTZoU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592056252; 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=sAyhLKn6Pm1LlKro5M5sNdbZoX5YC7d9QVpuSmV3LhM=; b=TczrOgDyudAqff0Jpxb520lgwnMYLZoE05sJtuCR6BiQalCTihpLUcM2JbyyKhgVjyxCiDRoD6UJXmHdXt/GCgas71hChBmHzFQTrUM3Eg3VuoZK3yfCjqsqgMV0Xqmdp0m2HAQg9n7wVrv8NCHVhjW/RE5pJpI+TVegz9FoQG4= 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 1592056252581347.80207703496535; Sat, 13 Jun 2020 06:50:52 -0700 (PDT) Received: from localhost ([::1]:45354 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jk6Yd-0000nf-F2 for importer@patchew.org; Sat, 13 Jun 2020 09:50:51 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37910) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jk6TM-0002fY-4F; Sat, 13 Jun 2020 09:45:24 -0400 Received: from zero.eik.bme.hu ([152.66.115.2]:47683) by eggs.gnu.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jk6TK-0002ZK-DV; Sat, 13 Jun 2020 09:45:23 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id DEC63748DD1; Sat, 13 Jun 2020 15:45:08 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 2CA7C748DCF; Sat, 13 Jun 2020 15:45:00 +0200 (CEST) Message-Id: In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH v2 3/5] grackle: Set revision in PCI config to match hardware Date: Sat, 13 Jun 2020 15:36:15 +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=152.66.115.2; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/13 09:45:00 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, 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" Signed-off-by: BALATON Zoltan --- hw/pci-host/grackle.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/pci-host/grackle.c b/hw/pci-host/grackle.c index 4b3af0c704..48d11f13ab 100644 --- a/hw/pci-host/grackle.c +++ b/hw/pci-host/grackle.c @@ -130,7 +130,7 @@ static void grackle_pci_class_init(ObjectClass *klass, = void *data) k->realize =3D grackle_pci_realize; k->vendor_id =3D PCI_VENDOR_ID_MOTOROLA; k->device_id =3D PCI_DEVICE_ID_MOTOROLA_MPC106; - k->revision =3D 0x00; + k->revision =3D 0x40; k->class_id =3D PCI_CLASS_BRIDGE_HOST; /* * PCI-facing part of the host bridge, not usable without the --=20 2.21.3 From nobody Sat Feb 7 19:07:59 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=1592056027; cv=none; d=zohomail.com; s=zohoarc; b=Cd1L4DO9eWwFc6wEQjle4X4Edtig/TShcwKSTbLds2t3ngXK51oPORoqasvixWNjOCnaLH5N8r+VxZRCoDe469RhpFA8J++KeFOm4t+6aktiF9Pg9sjV0dngyl6foGWILsp+z/VfzTX1Agufb/AcwwethrqI82EkArqeK7vsdeI= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592056027; 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=6Q/+C9KOMBts0uA7Y3YQ3f9dC5XUw21Dv/visZmPOk0=; b=BF2COmVzC0U2DRIjjEdAGpa+Ovc7mFGcK8oKIvJQMSTaeHw5q+kRzUQgwQsXwFwCssbCuU1Nb2+vYAYbH7LwNbzUvxXF5AtRBGBF4ZHFTBY/2V7ZOC6CHRIr0lm1D9Ge/mTEGMe8U//vS1AbfXAdoPAJop21cco2tsG2viF1O0A= 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 1592056027824217.28137331080245; Sat, 13 Jun 2020 06:47:07 -0700 (PDT) Received: from localhost ([::1]:37084 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jk6Uz-0004YF-9G for importer@patchew.org; Sat, 13 Jun 2020 09:47:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37882) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jk6TG-0002US-2G; Sat, 13 Jun 2020 09:45:18 -0400 Received: from zero.eik.bme.hu ([152.66.115.2]:47663) by eggs.gnu.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jk6TD-0002Sy-9A; Sat, 13 Jun 2020 09:45:17 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 62C17748DD0; Sat, 13 Jun 2020 15:45:00 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 31259748DD1; Sat, 13 Jun 2020 15:45:00 +0200 (CEST) Message-Id: In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH v2 4/5] mac_oldworld: Rename ppc_heathrow_reset reset to ppc_heathrow_cpu_reset Date: Sat, 13 Jun 2020 15:36:15 +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=152.66.115.2; envelope-from=balaton@eik.bme.hu; helo=zero.eik.bme.hu X-detected-operating-system: by eggs.gnu.org: First seen = 2020/06/13 09:45:00 X-ACL-Warn: Detected OS = FreeBSD 9.x or newer [fuzzy] X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, 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" This function resets a CPU not the whole machine so reflect that in its name. Signed-off-by: BALATON Zoltan Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/ppc/mac_oldworld.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 4dd872c1a3..9138752ccb 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -73,7 +73,7 @@ static uint64_t translate_kernel_address(void *opaque, ui= nt64_t addr) return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR; } =20 -static void ppc_heathrow_reset(void *opaque) +static void ppc_heathrow_cpu_reset(void *opaque) { PowerPCCPU *cpu =3D opaque; =20 @@ -127,7 +127,7 @@ static void ppc_heathrow_init(MachineState *machine) =20 /* Set time-base frequency to 16.6 Mhz */ cpu_ppc_tb_init(env, TBFREQ); - qemu_register_reset(ppc_heathrow_reset, cpu); + qemu_register_reset(ppc_heathrow_cpu_reset, cpu); } =20 /* allocate RAM */ --=20 2.21.3 From nobody Sat Feb 7 19:07:59 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=1592056030; cv=none; d=zohomail.com; s=zohoarc; b=iAYQIGKk3owYV27rTQQHTpG9tV3l6KE7WqGWuKFPTnkzsEsJQslM748nK2cyDn9xWGnGOOYeeoRYphMQ73oN64Pb0qXTq3kTHIPWgaWW+T50K+uIYvCEX12+uWeppnWliJ8dTJpe/9IIrQEif3tfPqy+1x+NuuYPMJqtonboXu0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1592056030; 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=4VRbrRCHgIZXtSDXnUDNxHqE4qAEs6uCBQuOtcR/I4w=; b=NTtZAWir08gt4gDgpCJTFG6zl5+JbuxPyPUKy6t+u9epltpB7ZyGdEa3azgpNo78Zd4SdOxvtjO8n6yiTg1Mx5wkulOyTdLDG9Zql2ZzRqv5Vc2q3gMptvLVLZPtTE2FH6D7I8U7HDuHyqKOEhicW+LL7t3WN0UT8tv4/u/Pthc= 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 1592056030059438.095043478657; Sat, 13 Jun 2020 06:47:10 -0700 (PDT) Received: from localhost ([::1]:37224 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jk6V2-0004bZ-P9 for importer@patchew.org; Sat, 13 Jun 2020 09:47:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37884) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jk6TG-0002Ul-Gq; Sat, 13 Jun 2020 09:45:18 -0400 Received: from zero.eik.bme.hu ([2001:738:2001:2001::2001]:47666) by eggs.gnu.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jk6TD-0002Sz-Af; Sat, 13 Jun 2020 09:45:18 -0400 Received: from zero.eik.bme.hu (blah.eik.bme.hu [152.66.115.182]) by localhost (Postfix) with SMTP id 9B605748DDC; Sat, 13 Jun 2020 15:45:00 +0200 (CEST) Received: by zero.eik.bme.hu (Postfix, from userid 432) id 35788748DDA; Sat, 13 Jun 2020 15:45:00 +0200 (CEST) Message-Id: In-Reply-To: References: From: BALATON Zoltan Subject: [PATCH v2 5/5] mac_oldworld: Map macio to expected address at reset Date: Sat, 13 Jun 2020 15:36:15 +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" Add a reset function that maps macio to the address expected by the firmware of the board at startup. Signed-off-by: BALATON Zoltan --- hw/ppc/mac.h | 12 ++++++++++++ hw/ppc/mac_oldworld.c | 17 +++++++++++++++-- 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/hw/ppc/mac.h b/hw/ppc/mac.h index 6af87d1fa0..35a5f21163 100644 --- a/hw/ppc/mac.h +++ b/hw/ppc/mac.h @@ -57,6 +57,18 @@ #define OLDWORLD_IDE1_IRQ 0xe #define OLDWORLD_IDE1_DMA_IRQ 0x3 =20 +/* g3beige machine */ +#define TYPE_HEATHROW_MACHINE MACHINE_TYPE_NAME("g3beige") +#define HEATHROW_MACHINE(obj) OBJECT_CHECK(HeathrowMachineState, (obj), \ + TYPE_HEATHROW_MACHINE) + +typedef struct HeathrowMachineState { + /*< private >*/ + MachineState parent; + + PCIDevice *macio_pci; +} HeathrowMachineState; + /* New World IRQs */ #define NEWWORLD_CUDA_IRQ 0x19 #define NEWWORLD_PMU_IRQ 0x19 diff --git a/hw/ppc/mac_oldworld.c b/hw/ppc/mac_oldworld.c index 9138752ccb..fa9527410d 100644 --- a/hw/ppc/mac_oldworld.c +++ b/hw/ppc/mac_oldworld.c @@ -73,6 +73,15 @@ static uint64_t translate_kernel_address(void *opaque, u= int64_t addr) return (addr & 0x0fffffff) + KERNEL_LOAD_ADDR; } =20 +static void ppc_heathrow_reset(MachineState *machine) +{ + HeathrowMachineState *m =3D HEATHROW_MACHINE(machine); + + qemu_devices_reset(); + pci_default_write_config(m->macio_pci, PCI_COMMAND, PCI_COMMAND_MEMORY= , 2); + pci_default_write_config(m->macio_pci, PCI_BASE_ADDRESS_0, 0xf3000000,= 4); +} + static void ppc_heathrow_cpu_reset(void *opaque) { PowerPCCPU *cpu =3D opaque; @@ -91,6 +100,7 @@ const MemoryRegionOps machine_id_reg_ops =3D { =20 static void ppc_heathrow_init(MachineState *machine) { + HeathrowMachineState *hm =3D HEATHROW_MACHINE(machine); ram_addr_t ram_size =3D machine->ram_size; const char *kernel_filename =3D machine->kernel_filename; const char *kernel_cmdline =3D machine->kernel_cmdline; @@ -298,7 +308,8 @@ static void ppc_heathrow_init(MachineState *machine) ide_drive_get(hd, ARRAY_SIZE(hd)); =20 /* MacIO */ - macio =3D OLDWORLD_MACIO(pci_create(pci_bus, -1, TYPE_OLDWORLD_MACIO)); + hm->macio_pci =3D pci_create(pci_bus, -1, TYPE_OLDWORLD_MACIO); + macio =3D OLDWORLD_MACIO(hm->macio_pci); dev =3D DEVICE(macio); qdev_prop_set_uint64(dev, "frequency", tbfreq); object_property_set_link(OBJECT(macio), OBJECT(pic_dev), "pic", @@ -450,6 +461,7 @@ static void heathrow_class_init(ObjectClass *oc, void *= data) =20 mc->desc =3D "Heathrow based PowerMAC"; mc->init =3D ppc_heathrow_init; + mc->reset =3D ppc_heathrow_reset; mc->block_default_type =3D IF_IDE; mc->max_cpus =3D MAX_CPUS; #ifndef TARGET_PPC64 @@ -466,9 +478,10 @@ static void heathrow_class_init(ObjectClass *oc, void = *data) } =20 static const TypeInfo ppc_heathrow_machine_info =3D { - .name =3D MACHINE_TYPE_NAME("g3beige"), + .name =3D TYPE_HEATHROW_MACHINE, .parent =3D TYPE_MACHINE, .class_init =3D heathrow_class_init, + .instance_size =3D sizeof(HeathrowMachineState), .interfaces =3D (InterfaceInfo[]) { { TYPE_FW_PATH_PROVIDER }, { } --=20 2.21.3