From nobody Tue Nov 26 21:35:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1704741703496343.37970534752424; Mon, 8 Jan 2024 11:21:43 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMvAp-000769-KS; Mon, 08 Jan 2024 14:20:35 -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 ) id 1rMvAo-00072m-3B for qemu-devel@nongnu.org; Mon, 08 Jan 2024 14:20:34 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMvAm-0002vv-Gd for qemu-devel@nongnu.org; Mon, 08 Jan 2024 14:20:33 -0500 Received: from [2a00:23c4:8bb1:9800:102b:b374:b08c:8889] (helo=localhost.localdomain) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rMvAC-0000nV-2i; Mon, 08 Jan 2024 19:20:00 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=CWD1RWZn0JyYjmI8Ws09PfuEYZ6K711mm6AOuu5s5gE=; b=AvIl4xBcocQz3ftZ4dnlRu6h4C HiVVf3KiV+vljX05ZBf6SFrOSFkViiW03h/7jSiN7q0yoHXxBlPhQoPYw40jLBFZL+JmXTktuBU50 ONKcRRkPWgsyCLN58r3KkWwz2OPXYexay+lap+9Y0ReZClSZneP8CXrGgCgRBe0aHcjhjK0Ng990o qZ3JPenjquZe+iIHVYCoIivDxoJhKIb4GIdomu4Mtv9lmdcnof2T2XJHdFlV/XHCduscww2Mgu70f +e04QyWeLiht8JluCZC7AWp7zKlKetxJzmXqs/M6k22s2S9oTEVovpkmOj349K7p5zhq3dGsv4Nnl ilUIlHluc3wcolqPKrZLy1HAkyZHdZsrLRUo1r8Mm7LT8TTBmqKsCZlXkd3hiGQDc9GurV8+ilKEk LhpAPpIWcDZAiOYAv7WxfzFdZ6WNrmPLlOJ0e67SWF0EpDCeLIFDB1oSpKaW68nTr4KZnljUUfplb ToQK0eqKVPomm1Ic1aVNxXkkcMvoVzunuW1ZY9/StDpKTz6wHARvCvEaH6Xnw5A1DdqpChFRRcyKY AlYM/NOL5Vxu7PKTSVnZUw1fT+DM4wIxKX2259X4Lwhnn+C7xdBBf2JenVYHCmN8wRMMO1TCUou3w BZAhT51hIhKLbLHiRb4KEb5q5spCX0bdykwihAV/Q=; From: Mark Cave-Ayland To: laurent@vivier.eu, qemu-devel@nongnu.org, elliotnunn@fastmail.com Date: Mon, 8 Jan 2024 19:20:12 +0000 Message-Id: <20240108192013.272112-2-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240108192013.272112-1-mark.cave-ayland@ilande.co.uk> References: <20240108192013.272112-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8bb1:9800:102b:b374:b08c:8889 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 1/2] nubus-device: round Declaration ROM memory region address to qemu_target_page_size() X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) 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:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1704741705041100003 Content-Type: text/plain; charset="utf-8" Declaration ROM binary images can be any arbitrary size, however if a host = ROM memory region is not aligned to qemu_target_page_size() then we fail the "assert(!(iotlb & ~TARGET_PAGE_MASK))" check in tlb_set_page_full(). Ensure that the host ROM memory region is aligned to qemu_target_page_size() and adjust the offset at which the Declaration ROM image is loaded, since N= ubus ROM images are unusual in that they are aligned to the end of the slot addr= ess space. Signed-off-by: Mark Cave-Ayland Reviewed-by: Philippe Mathieu-Daud=C3=A9 --- hw/nubus/nubus-device.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/hw/nubus/nubus-device.c b/hw/nubus/nubus-device.c index 49008e4938..e4f824d58b 100644 --- a/hw/nubus/nubus-device.c +++ b/hw/nubus/nubus-device.c @@ -10,6 +10,7 @@ =20 #include "qemu/osdep.h" #include "qemu/datadir.h" +#include "exec/target_page.h" #include "hw/irq.h" #include "hw/loader.h" #include "hw/nubus/nubus.h" @@ -30,7 +31,7 @@ static void nubus_device_realize(DeviceState *dev, Error = **errp) NubusDevice *nd =3D NUBUS_DEVICE(dev); char *name, *path; hwaddr slot_offset; - int64_t size; + int64_t size, align_size; int ret; =20 /* Super */ @@ -76,16 +77,23 @@ static void nubus_device_realize(DeviceState *dev, Erro= r **errp) } =20 name =3D g_strdup_printf("nubus-slot-%x-declaration-rom", nd->slot= ); - memory_region_init_rom(&nd->decl_rom, OBJECT(dev), name, size, + + /* + * Ensure ROM memory region is aligned to target page size regardl= ess + * of the size of the Declaration ROM image + */ + align_size =3D ROUND_UP(size, qemu_target_page_size()); + memory_region_init_rom(&nd->decl_rom, OBJECT(dev), name, align_siz= e, &error_abort); - ret =3D load_image_mr(path, &nd->decl_rom); + ret =3D load_image_size(path, memory_region_get_ram_ptr(&nd->decl_= rom) + + (uintptr_t)align_size - size, size); g_free(path); g_free(name); if (ret < 0) { error_setg(errp, "could not load romfile \"%s\"", nd->romfile); return; } - memory_region_add_subregion(&nd->slot_mem, NUBUS_SLOT_SIZE - size, + memory_region_add_subregion(&nd->slot_mem, NUBUS_SLOT_SIZE - align= _size, &nd->decl_rom); } } --=20 2.39.2 From nobody Tue Nov 26 21:35:03 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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=ilande.co.uk Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1704741703588635.9208346434323; Mon, 8 Jan 2024 11:21:43 -0800 (PST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rMvAr-000779-6h; Mon, 08 Jan 2024 14:20:37 -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 ) id 1rMvAq-00076Y-06 for qemu-devel@nongnu.org; Mon, 08 Jan 2024 14:20:36 -0500 Received: from mail.ilande.co.uk ([2001:41c9:1:41f::167]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rMvAo-000310-2w for qemu-devel@nongnu.org; Mon, 08 Jan 2024 14:20:35 -0500 Received: from [2a00:23c4:8bb1:9800:102b:b374:b08c:8889] (helo=localhost.localdomain) by mail.ilande.co.uk with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rMvAG-0000nV-94; Mon, 08 Jan 2024 19:20:03 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=ilande.co.uk; s=20220518; h=Subject:Content-Transfer-Encoding:MIME-Version: References:In-Reply-To:Message-Id:Date:To:From:Sender:Reply-To:Cc: Content-Type:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help: List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=dr06ePIVgTeo8NJyEhCmNprRIYjT235U71iyeZuVs0E=; b=0uRQuFyocJOJPLvUQT9HBw+XB/ op0u4W7L6VzNd6XHl6KMDiD+yaE2Mr8sIYh4dZ+/sXQWru4JdOnzlxaaeS8RV8Dv4DZlNxOpDi6zk KMitoiTzkwxgAM2ChBKJXo1yMiM7nipSF6Dih+nE1rL7Eu79VJvtXl6rVDXu72lULrCsCRbBxYPt3 u/93TIK4Oprtn6wUggg92jSWWrOiGS5Ps8TJ7B2GigoX3MIkqak4fJ9WZ7Fu8Wi87VypMhACwq9cx iRCZyTtOX3Gi65j/qOinVTwecb4r7YmuJRtDD3liWKcfZqLCyO08Agv998aZMzwOnQjaZhW1fxB2n yKjv+HlbJqValLFPyzDOoQ/ac696wThg3PqbpJ5kB3QEWQH7L7ED7mss+ji44VaVtFUabJ3naE9n6 dp2MpbeHnby4Q6d4Qttgiq8uyqiu6Iwb20/phJHNUdi0gib/92sfHMvt8g1OF13Kb/DUaWKkwXfXm Aphge5nwOFp8klRiWkisw+L/zJytX/C/3XaTVMEnSHCi6nzOONEffhPmJfY9ULh1/tq0UNPzgjZ5J 91oDUg6YXYgrs/AAo7HxYgaHkzAUOTNUM8UPno73YMSS0ljlF0p5P485JphLez40JgnG54a9w84dW rwdxI6KpcTEa+E8Lgmie9kJi7kubIZ0dph1XwCdiE=; From: Mark Cave-Ayland To: laurent@vivier.eu, qemu-devel@nongnu.org, elliotnunn@fastmail.com Date: Mon, 8 Jan 2024 19:20:13 +0000 Message-Id: <20240108192013.272112-3-mark.cave-ayland@ilande.co.uk> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240108192013.272112-1-mark.cave-ayland@ilande.co.uk> References: <20240108192013.272112-1-mark.cave-ayland@ilande.co.uk> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-SA-Exim-Connect-IP: 2a00:23c4:8bb1:9800:102b:b374:b08c:8889 X-SA-Exim-Mail-From: mark.cave-ayland@ilande.co.uk Subject: [PATCH v2 2/2] nubus: add nubus-virtio-mmio device X-SA-Exim-Version: 4.2.1 (built Wed, 08 May 2019 21:11:16 +0000) X-SA-Exim-Scanned: Yes (on mail.ilande.co.uk) 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:41c9:1:41f::167; envelope-from=mark.cave-ayland@ilande.co.uk; helo=mail.ilande.co.uk 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZM-MESSAGEID: 1704741704995100001 Content-Type: text/plain; charset="utf-8" The nubus-virtio-mmio device is a Nubus card that contains a set of 32 virt= io-mmio devices and a goldfish PIC similar to the m68k virt machine that can be plu= gged into the m68k q800 machine. There are currently a number of drivers under development that can be used = in conjunction with this device to provide accelerated and/or additional hyper= visor services to 68k Classic MacOS. Signed-off-by: Mark Cave-Ayland --- hw/nubus/meson.build | 1 + hw/nubus/nubus-virtio-mmio.c | 102 +++++++++++++++++++++++++++ include/hw/nubus/nubus-virtio-mmio.h | 36 ++++++++++ 3 files changed, 139 insertions(+) create mode 100644 hw/nubus/nubus-virtio-mmio.c create mode 100644 include/hw/nubus/nubus-virtio-mmio.h diff --git a/hw/nubus/meson.build b/hw/nubus/meson.build index e7ebda8993..9a7a12ea68 100644 --- a/hw/nubus/meson.build +++ b/hw/nubus/meson.build @@ -2,6 +2,7 @@ nubus_ss =3D ss.source_set() nubus_ss.add(files('nubus-device.c')) nubus_ss.add(files('nubus-bus.c')) nubus_ss.add(files('nubus-bridge.c')) +nubus_ss.add(files('nubus-virtio-mmio.c')) nubus_ss.add(when: 'CONFIG_Q800', if_true: files('mac-nubus-bridge.c')) =20 system_ss.add_all(when: 'CONFIG_NUBUS', if_true: nubus_ss) diff --git a/hw/nubus/nubus-virtio-mmio.c b/hw/nubus/nubus-virtio-mmio.c new file mode 100644 index 0000000000..58a63c84d0 --- /dev/null +++ b/hw/nubus/nubus-virtio-mmio.c @@ -0,0 +1,102 @@ +/* + * QEMU Macintosh Nubus Virtio MMIO card + * + * Copyright (c) 2024 Mark Cave-Ayland + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "hw/nubus/nubus-virtio-mmio.h" + + +#define NUBUS_VIRTIO_MMIO_PIC_OFFSET 0 +#define NUBUS_VIRTIO_MMIO_DEV_OFFSET 0x200 + + +static void nubus_virtio_mmio_set_input_irq(void *opaque, int n, int level) +{ + NubusDevice *nd =3D NUBUS_DEVICE(opaque); + + nubus_set_irq(nd, level); +} + +static void nubus_virtio_mmio_realize(DeviceState *dev, Error **errp) +{ + NubusVirtioMMIODeviceClass *nvmdc =3D NUBUS_VIRTIO_MMIO_GET_CLASS(dev); + NubusVirtioMMIO *s =3D NUBUS_VIRTIO_MMIO(dev); + NubusDevice *nd =3D NUBUS_DEVICE(dev); + SysBusDevice *sbd; + int i, offset; + + nvmdc->parent_realize(dev, errp); + if (*errp) { + return; + } + + /* Goldfish PIC */ + sbd =3D SYS_BUS_DEVICE(&s->pic); + if (!sysbus_realize(sbd, errp)) { + return; + } + memory_region_add_subregion(&nd->slot_mem, NUBUS_VIRTIO_MMIO_PIC_OFFSE= T, + sysbus_mmio_get_region(sbd, 0)); + sysbus_connect_irq(sbd, 0, + qdev_get_gpio_in_named(dev, "pic-input-irq", 0)); + + /* virtio-mmio devices */ + offset =3D NUBUS_VIRTIO_MMIO_DEV_OFFSET; + for (i =3D 0; i < NUBUS_VIRTIO_MMIO_NUM_DEVICES; i++) { + sbd =3D SYS_BUS_DEVICE(&s->virtio_mmio[i]); + qdev_prop_set_bit(DEVICE(sbd), "force-legacy", false); + if (!sysbus_realize_and_unref(sbd, errp)) { + return; + } + + memory_region_add_subregion(&nd->slot_mem, offset, + sysbus_mmio_get_region(sbd, 0)); + offset +=3D 0x200; + + sysbus_connect_irq(sbd, 0, qdev_get_gpio_in(DEVICE(&s->pic), i)); + } +} + +static void nubus_virtio_mmio_init(Object *obj) +{ + NubusVirtioMMIO *s =3D NUBUS_VIRTIO_MMIO(obj); + int i; + + object_initialize_child(obj, "pic", &s->pic, TYPE_GOLDFISH_PIC); + for (i =3D 0; i < NUBUS_VIRTIO_MMIO_NUM_DEVICES; i++) { + char *name =3D g_strdup_printf("virtio-mmio[%d]", i); + object_initialize_child(obj, name, &s->virtio_mmio[i], + TYPE_VIRTIO_MMIO); + g_free(name); + } + + /* Input from goldfish PIC */ + qdev_init_gpio_in_named(DEVICE(obj), nubus_virtio_mmio_set_input_irq, + "pic-input-irq", 1); +} + +static void nubus_virtio_mmio_class_init(ObjectClass *oc, void *data) +{ + DeviceClass *dc =3D DEVICE_CLASS(oc); + NubusVirtioMMIODeviceClass *nvmdc =3D NUBUS_VIRTIO_MMIO_CLASS(oc); + + device_class_set_parent_realize(dc, nubus_virtio_mmio_realize, + &nvmdc->parent_realize); +} + +static const TypeInfo nubus_virtio_mmio_types[] =3D { + { + .name =3D TYPE_NUBUS_VIRTIO_MMIO, + .parent =3D TYPE_NUBUS_DEVICE, + .instance_init =3D nubus_virtio_mmio_init, + .instance_size =3D sizeof(NubusVirtioMMIO), + .class_init =3D nubus_virtio_mmio_class_init, + .class_size =3D sizeof(NubusVirtioMMIODeviceClass), + }, +}; + +DEFINE_TYPES(nubus_virtio_mmio_types) diff --git a/include/hw/nubus/nubus-virtio-mmio.h b/include/hw/nubus/nubus-= virtio-mmio.h new file mode 100644 index 0000000000..de497b7f76 --- /dev/null +++ b/include/hw/nubus/nubus-virtio-mmio.h @@ -0,0 +1,36 @@ +/* + * QEMU Macintosh Nubus Virtio MMIO card + * + * Copyright (c) 2023 Mark Cave-Ayland + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#ifndef HW_NUBUS_VIRTIO_MMIO_H +#define HW_NUBUS_VIRTIO_MMIO_H + +#include "hw/nubus/nubus.h" +#include "qom/object.h" +#include "hw/intc/goldfish_pic.h" +#include "hw/virtio/virtio-mmio.h" + +#define TYPE_NUBUS_VIRTIO_MMIO "nubus-virtio-mmio" +OBJECT_DECLARE_TYPE(NubusVirtioMMIO, NubusVirtioMMIODeviceClass, + NUBUS_VIRTIO_MMIO) + +struct NubusVirtioMMIODeviceClass { + DeviceClass parent_class; + + DeviceRealize parent_realize; +}; + +#define NUBUS_VIRTIO_MMIO_NUM_DEVICES 32 + +struct NubusVirtioMMIO { + NubusDevice parent_obj; + + GoldfishPICState pic; + VirtIOMMIOProxy virtio_mmio[NUBUS_VIRTIO_MMIO_NUM_DEVICES]; +}; + +#endif --=20 2.39.2