All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
To: qemu-devel@nongnu.org, laurent@vivier.eu
Subject: [PATCH v5 15/20] nubus: move NubusBus from mac-nubus-bridge to nubus-bridge
Date: Thu, 23 Sep 2021 10:13:03 +0100	[thread overview]
Message-ID: <20210923091308.13832-16-mark.cave-ayland@ilande.co.uk> (raw)
In-Reply-To: <20210923091308.13832-1-mark.cave-ayland@ilande.co.uk>

Now that Nubus has its own address space rather than mapping directly into the
system bus, move the Nubus reference from MacNubusBridge to NubusBridge.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
---
 hw/m68k/q800.c                      |  2 +-
 hw/nubus/mac-nubus-bridge.c         | 11 +++++------
 hw/nubus/nubus-bridge.c             |  9 +++++++++
 include/hw/nubus/mac-nubus-bridge.h |  1 -
 include/hw/nubus/nubus.h            |  2 ++
 5 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/hw/m68k/q800.c b/hw/m68k/q800.c
index a07912b87c..9bdea1a362 100644
--- a/hw/m68k/q800.c
+++ b/hw/m68k/q800.c
@@ -398,7 +398,7 @@ static void q800_init(MachineState *machine)
     sysbus_mmio_map(SYS_BUS_DEVICE(dev), 1, NUBUS_SLOT_BASE +
                     MAC_NUBUS_FIRST_SLOT * NUBUS_SLOT_SIZE);
 
-    nubus = MAC_NUBUS_BRIDGE(dev)->bus;
+    nubus = NUBUS_BRIDGE(dev)->bus;
 
     /* framebuffer in nubus slot #9 */
 
diff --git a/hw/nubus/mac-nubus-bridge.c b/hw/nubus/mac-nubus-bridge.c
index e241c581b5..db8640eed2 100644
--- a/hw/nubus/mac-nubus-bridge.c
+++ b/hw/nubus/mac-nubus-bridge.c
@@ -16,22 +16,21 @@
 static void mac_nubus_bridge_init(Object *obj)
 {
     MacNubusBridge *s = MAC_NUBUS_BRIDGE(obj);
+    NubusBridge *nb = NUBUS_BRIDGE(obj);
     SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
 
-    s->bus = NUBUS_BUS(qbus_create(TYPE_NUBUS_BUS, DEVICE(s), NULL));
-
     /* Macintosh only has slots 0x9 to 0xe available */
-    s->bus->slot_available_mask = MAKE_64BIT_MASK(MAC_NUBUS_FIRST_SLOT,
-                                                  MAC_NUBUS_SLOT_NB);
+    nb->bus->slot_available_mask = MAKE_64BIT_MASK(MAC_NUBUS_FIRST_SLOT,
+                                                   MAC_NUBUS_SLOT_NB);
 
     /* Aliases for slots 0x9 to 0xe */
     memory_region_init_alias(&s->super_slot_alias, obj, "super-slot-alias",
-                             &s->bus->nubus_mr,
+                             &nb->bus->nubus_mr,
                              MAC_NUBUS_FIRST_SLOT * NUBUS_SUPER_SLOT_SIZE,
                              MAC_NUBUS_SLOT_NB * NUBUS_SUPER_SLOT_SIZE);
 
     memory_region_init_alias(&s->slot_alias, obj, "slot-alias",
-                             &s->bus->nubus_mr,
+                             &nb->bus->nubus_mr,
                              NUBUS_SLOT_BASE +
                              MAC_NUBUS_FIRST_SLOT * NUBUS_SLOT_SIZE,
                              MAC_NUBUS_SLOT_NB * NUBUS_SLOT_SIZE);
diff --git a/hw/nubus/nubus-bridge.c b/hw/nubus/nubus-bridge.c
index 95662568c5..3b68d4435c 100644
--- a/hw/nubus/nubus-bridge.c
+++ b/hw/nubus/nubus-bridge.c
@@ -12,6 +12,14 @@
 #include "hw/sysbus.h"
 #include "hw/nubus/nubus.h"
 
+
+static void nubus_bridge_init(Object *obj)
+{
+    NubusBridge *s = NUBUS_BRIDGE(obj);
+
+    s->bus = NUBUS_BUS(qbus_create(TYPE_NUBUS_BUS, DEVICE(s), NULL));
+}
+
 static void nubus_bridge_class_init(ObjectClass *klass, void *data)
 {
     DeviceClass *dc = DEVICE_CLASS(klass);
@@ -22,6 +30,7 @@ static void nubus_bridge_class_init(ObjectClass *klass, void *data)
 static const TypeInfo nubus_bridge_info = {
     .name          = TYPE_NUBUS_BRIDGE,
     .parent        = TYPE_SYS_BUS_DEVICE,
+    .instance_init = nubus_bridge_init,
     .instance_size = sizeof(NubusBridge),
     .class_init    = nubus_bridge_class_init,
 };
diff --git a/include/hw/nubus/mac-nubus-bridge.h b/include/hw/nubus/mac-nubus-bridge.h
index b595e1b7ef..70ab50ab2d 100644
--- a/include/hw/nubus/mac-nubus-bridge.h
+++ b/include/hw/nubus/mac-nubus-bridge.h
@@ -22,7 +22,6 @@ OBJECT_DECLARE_SIMPLE_TYPE(MacNubusBridge, MAC_NUBUS_BRIDGE)
 struct MacNubusBridge {
     NubusBridge parent_obj;
 
-    NubusBus *bus;
     MemoryRegion super_slot_alias;
     MemoryRegion slot_alias;
 };
diff --git a/include/hw/nubus/nubus.h b/include/hw/nubus/nubus.h
index 43bde7dd69..607cdef968 100644
--- a/include/hw/nubus/nubus.h
+++ b/include/hw/nubus/nubus.h
@@ -62,6 +62,8 @@ struct NubusDevice {
 
 struct NubusBridge {
     SysBusDevice parent_obj;
+
+    NubusBus *bus;
 };
 
 #endif
-- 
2.20.1



  parent reply	other threads:[~2021-09-23  9:33 UTC|newest]

Thread overview: 52+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-23  9:12 [PATCH v5 00/20] nubus: bus, device, bridge, IRQ and address space improvements Mark Cave-Ayland
2021-09-23  9:12 ` [PATCH v5 01/20] nubus: add comment indicating reference documents Mark Cave-Ayland
2021-09-23  9:35   ` Philippe Mathieu-Daudé
2021-09-23 10:01   ` Laurent Vivier
2021-09-23  9:12 ` [PATCH v5 02/20] nubus-device: rename slot_nb variable to slot Mark Cave-Ayland
2021-09-23  9:12 ` [PATCH v5 03/20] nubus-device: expose separate super slot memory region Mark Cave-Ayland
2021-09-23 10:04   ` Laurent Vivier
2021-09-23  9:12 ` [PATCH v5 04/20] nubus: use bitmap to manage available slots Mark Cave-Ayland
2021-09-23  9:42   ` Philippe Mathieu-Daudé
2021-09-24  7:00     ` Mark Cave-Ayland
2021-09-23 10:28   ` Laurent Vivier
2021-09-23 14:16   ` BALATON Zoltan
2021-09-24  7:16     ` Mark Cave-Ayland
2021-09-24  8:50       ` Philippe Mathieu-Daudé
2021-09-24 10:51         ` BALATON Zoltan
2021-09-23  9:12 ` [PATCH v5 05/20] nubus: move slot bitmap checks from NubusDevice realize() to BusClass check_address() Mark Cave-Ayland
2021-09-23  9:45   ` Philippe Mathieu-Daudé
2021-09-24  7:01     ` Mark Cave-Ayland
2021-09-23 10:30   ` Laurent Vivier
2021-09-23  9:12 ` [PATCH v5 06/20] nubus: implement BusClass get_dev_path() Mark Cave-Ayland
2021-09-23  9:12 ` [PATCH v5 07/20] nubus: add trace-events for empty slot accesses Mark Cave-Ayland
2021-09-23  9:12 ` [PATCH v5 08/20] nubus: generate bus error when attempting to access empty slots Mark Cave-Ayland
2021-09-23  9:12 ` [PATCH v5 09/20] macfb: don't register declaration ROM Mark Cave-Ayland
2021-09-23  9:12 ` [PATCH v5 10/20] nubus-device: remove nubus_register_rom() and nubus_register_format_block() Mark Cave-Ayland
2021-09-23  9:12 ` [PATCH v5 11/20] nubus-device: add romfile property for loading declaration ROMs Mark Cave-Ayland
2021-09-23  9:13 ` [PATCH v5 12/20] nubus: move nubus to its own 32-bit address space Mark Cave-Ayland
2021-09-23 10:33   ` Laurent Vivier
2021-09-23  9:13 ` [PATCH v5 13/20] nubus-bridge: introduce separate NubusBridge structure Mark Cave-Ayland
2021-09-23 10:35   ` Laurent Vivier
2021-09-23  9:13 ` [PATCH v5 14/20] mac-nubus-bridge: rename MacNubusState to MacNubusBridge Mark Cave-Ayland
2021-09-23 10:35   ` Laurent Vivier
2021-09-23 12:50     ` Mark Cave-Ayland
2021-09-23 13:53       ` Laurent Vivier
2021-09-23 16:03         ` Mark Cave-Ayland
2021-09-24  6:37           ` Mark Cave-Ayland
2021-09-23  9:13 ` Mark Cave-Ayland [this message]
2021-09-23 10:36   ` [PATCH v5 15/20] nubus: move NubusBus from mac-nubus-bridge to nubus-bridge Laurent Vivier
2021-09-23  9:13 ` [PATCH v5 16/20] nubus-bridge: embed the NubusBus object directly within nubus-bridge Mark Cave-Ayland
2021-09-23 10:37   ` Laurent Vivier
2021-09-23  9:13 ` [PATCH v5 17/20] nubus-bridge: make slot_available_mask a qdev property Mark Cave-Ayland
2021-09-23  9:52   ` Philippe Mathieu-Daudé
2021-09-24  7:09     ` Mark Cave-Ayland
2021-09-23  9:13 ` [PATCH v5 18/20] nubus: add support for slot IRQs Mark Cave-Ayland
2021-09-23  9:49   ` Philippe Mathieu-Daudé
2021-09-24  7:06     ` Mark Cave-Ayland
2021-09-24  9:01       ` Philippe Mathieu-Daudé
2021-09-24  9:05         ` Philippe Mathieu-Daudé
2021-09-29  6:42           ` Mark Cave-Ayland
2021-09-29  8:38             ` Laurent Vivier
2021-09-24  9:43         ` Mark Cave-Ayland
2021-09-23  9:13 ` [PATCH v5 19/20] q800: wire up nubus IRQs Mark Cave-Ayland
2021-09-23  9:13 ` [PATCH v5 20/20] q800: configure nubus available slots for Quadra 800 Mark Cave-Ayland

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=20210923091308.13832-16-mark.cave-ayland@ilande.co.uk \
    --to=mark.cave-ayland@ilande.co.uk \
    --cc=laurent@vivier.eu \
    --cc=qemu-devel@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.