From: "Philippe Mathieu-Daudé" <philmd@linaro.org>
To: qemu-devel@nongnu.org
Cc: qemu-ppc@nongnu.org, qemu-block@nongnu.org, qemu-arm@nongnu.org,
"Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>,
"Laurent Vivier" <laurent@vivier.eu>,
"Philippe Mathieu-Daudé" <philmd@linaro.org>
Subject: [PULL 09/30] hw/nubus: add nubus-virtio-mmio device
Date: Tue, 27 Feb 2024 09:39:25 +0100 [thread overview]
Message-ID: <20240227083948.5427-10-philmd@linaro.org> (raw)
In-Reply-To: <20240227083948.5427-1-philmd@linaro.org>
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
The nubus-virtio-mmio device is a Nubus card that contains a set of 32 virtio-mmio
devices and a goldfish PIC similar to the m68k virt machine that can be plugged
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 hypervisor
services to 68k Classic MacOS.
Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-ID: <20240111102954.449462-4-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Philippe Mathieu-Daudé <philmd@linaro.org>
---
include/hw/nubus/nubus-virtio-mmio.h | 36 ++++++++++
hw/nubus/nubus-virtio-mmio.c | 102 +++++++++++++++++++++++++++
hw/nubus/meson.build | 1 +
3 files changed, 139 insertions(+)
create mode 100644 include/hw/nubus/nubus-virtio-mmio.h
create mode 100644 hw/nubus/nubus-virtio-mmio.c
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 <mark.cave-ayland@ilande.co.uk>
+ *
+ * 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
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 <mark.cave-ayland@ilande.co.uk>
+ *
+ * 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 = NUBUS_DEVICE(opaque);
+
+ nubus_set_irq(nd, level);
+}
+
+static void nubus_virtio_mmio_realize(DeviceState *dev, Error **errp)
+{
+ NubusVirtioMMIODeviceClass *nvmdc = NUBUS_VIRTIO_MMIO_GET_CLASS(dev);
+ NubusVirtioMMIO *s = NUBUS_VIRTIO_MMIO(dev);
+ NubusDevice *nd = NUBUS_DEVICE(dev);
+ SysBusDevice *sbd;
+ int i, offset;
+
+ nvmdc->parent_realize(dev, errp);
+ if (*errp) {
+ return;
+ }
+
+ /* Goldfish PIC */
+ sbd = SYS_BUS_DEVICE(&s->pic);
+ if (!sysbus_realize(sbd, errp)) {
+ return;
+ }
+ memory_region_add_subregion(&nd->slot_mem, NUBUS_VIRTIO_MMIO_PIC_OFFSET,
+ 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 = NUBUS_VIRTIO_MMIO_DEV_OFFSET;
+ for (i = 0; i < NUBUS_VIRTIO_MMIO_NUM_DEVICES; i++) {
+ sbd = 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 += 0x200;
+
+ sysbus_connect_irq(sbd, 0, qdev_get_gpio_in(DEVICE(&s->pic), i));
+ }
+}
+
+static void nubus_virtio_mmio_init(Object *obj)
+{
+ NubusVirtioMMIO *s = NUBUS_VIRTIO_MMIO(obj);
+ int i;
+
+ object_initialize_child(obj, "pic", &s->pic, TYPE_GOLDFISH_PIC);
+ for (i = 0; i < NUBUS_VIRTIO_MMIO_NUM_DEVICES; i++) {
+ char *name = 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 = DEVICE_CLASS(oc);
+ NubusVirtioMMIODeviceClass *nvmdc = 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[] = {
+ {
+ .name = TYPE_NUBUS_VIRTIO_MMIO,
+ .parent = TYPE_NUBUS_DEVICE,
+ .instance_init = nubus_virtio_mmio_init,
+ .instance_size = sizeof(NubusVirtioMMIO),
+ .class_init = nubus_virtio_mmio_class_init,
+ .class_size = sizeof(NubusVirtioMMIODeviceClass),
+ },
+};
+
+DEFINE_TYPES(nubus_virtio_mmio_types)
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 = 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'))
system_ss.add_all(when: 'CONFIG_NUBUS', if_true: nubus_ss)
--
2.41.0
next prev parent reply other threads:[~2024-02-27 8:48 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-02-27 8:39 [PULL 00/30] Misc HW patches for 2024-02-27 Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 01/30] hw/arm: Inline sysbus_create_simple(PL110 / PL111) Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 02/30] hw/display/pl110: Pass frame buffer memory region as link property Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 03/30] hw/arm/exynos4210: Inline sysbus_create_varargs(EXYNOS4210_FIMD) Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 04/30] hw/display/exynos4210_fimd: Pass frame buffer memory region as link Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 05/30] hw/i386/kvmvapic: Inline sysbus_address_space() Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 06/30] hw/sysbus: Remove now unused sysbus_address_space() Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 07/30] hw/nubus-device: round Declaration ROM memory region address to qemu_target_page_size() Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 08/30] hw/nubus: increase maximum Declaration ROM size from 128k to 1Mb Philippe Mathieu-Daudé
2024-02-27 8:39 ` Philippe Mathieu-Daudé [this message]
2024-02-27 8:39 ` [PULL 10/30] hw/acpi: move object_resolve_type_unambiguous to core QOM Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 11/30] hw/ppc/sam460ex: do not use usb_bus_find() Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 12/30] hw/sh4/r2d: " Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 13/30] hw/mips/loongson3_virt: do not require CONFIG_USB Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 14/30] hw/hppa: " Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 15/30] hw/ppc/mac_newworld: " Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 16/30] hw/ppc/pseries: " Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 17/30] hw/usb: remove usb_bus_find Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 18/30] hw/usb: extract sysbus-ohci to a separate file Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 19/30] hw/usb: remove duplicate file in system_ss Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 20/30] hw/nvme: fix invalid endian conversion Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 21/30] hw/i386/x86: Let ioapic_init_gsi() take parent as pointer Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 22/30] hw/i386/sgx: Use QDev API Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 23/30] hw/i386/q35: Include missing 'hw/acpi/acpi.h' header Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 24/30] hw/i386/pc: Rename "bus" attribute to "pcibus" Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 25/30] hw/i386/pc_{piix, q35}: Eliminate local pci_bus/pci_host variables Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 26/30] hw/i386/pc: Remove unneeded class attribute "kvmclock_enabled" Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 27/30] hw/i386/pc: Populate RTC attribute directly Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 28/30] hw/arm/sbsa-ref: Do not open-code ahci_ide_create_devs() Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 29/30] hw/ide: Remove last two uses of ide/internal.h outside of hw/ide/ Philippe Mathieu-Daudé
2024-02-27 8:39 ` [PULL 30/30] hw/ide: Include 'ide-internal.h' from current path Philippe Mathieu-Daudé
2024-02-27 12:33 ` [PULL 00/30] Misc HW patches for 2024-02-27 Peter Maydell
2024-02-27 12:33 ` Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240227083948.5427-10-philmd@linaro.org \
--to=philmd@linaro.org \
--cc=laurent@vivier.eu \
--cc=mark.cave-ayland@ilande.co.uk \
--cc=qemu-arm@nongnu.org \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=qemu-ppc@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).