qemu-devel.nongnu.org archive mirror
 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 02/20] nubus-device: expose separate super slot memory region
Date: Sun, 12 Sep 2021 08:48:56 +0100	[thread overview]
Message-ID: <20210912074914.22048-3-mark.cave-ayland@ilande.co.uk> (raw)
In-Reply-To: <20210912074914.22048-1-mark.cave-ayland@ilande.co.uk>

According to "Designing Cards and Drivers for the Macintosh Family" each physical
nubus slot can access 2 separate address ranges: a super slot memory region which
is 256MB and a standard slot memory region which is 16MB.

Currently a Nubus device uses the physical slot number to determine whether it is
using a standard slot memory region or a super slot memory region rather than
exposing both memory regions for use as required.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
---
 hw/nubus/nubus-device.c  | 36 ++++++++++++++++++------------------
 include/hw/nubus/nubus.h |  1 +
 2 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/hw/nubus/nubus-device.c b/hw/nubus/nubus-device.c
index be01269563..36203848e5 100644
--- a/hw/nubus/nubus-device.c
+++ b/hw/nubus/nubus-device.c
@@ -168,26 +168,26 @@ static void nubus_device_realize(DeviceState *dev, Error **errp)
     }
 
     nd->slot = nubus->current_slot++;
-    name = g_strdup_printf("nubus-slot-%d", nd->slot);
-
-    if (nd->slot < NUBUS_FIRST_SLOT) {
-        /* Super */
-        slot_offset = (nd->slot - 6) * NUBUS_SUPER_SLOT_SIZE;
-
-        memory_region_init(&nd->slot_mem, OBJECT(dev), name,
-                           NUBUS_SUPER_SLOT_SIZE);
-        memory_region_add_subregion(&nubus->super_slot_io, slot_offset,
-                                    &nd->slot_mem);
-    } else {
-        /* Normal */
-        slot_offset = nd->slot * NUBUS_SLOT_SIZE;
-
-        memory_region_init(&nd->slot_mem, OBJECT(dev), name, NUBUS_SLOT_SIZE);
-        memory_region_add_subregion(&nubus->slot_io, slot_offset,
-                                    &nd->slot_mem);
-    }
 
+    /* Super */
+    slot_offset = (nd->slot - 6) * NUBUS_SUPER_SLOT_SIZE;
+
+    name = g_strdup_printf("nubus-super-slot-%x", nd->slot);
+    memory_region_init(&nd->super_slot_mem, OBJECT(dev), name,
+                        NUBUS_SUPER_SLOT_SIZE);
+    memory_region_add_subregion(&nubus->super_slot_io, slot_offset,
+                                &nd->super_slot_mem);
+    g_free(name);
+
+    /* Normal */
+    slot_offset = nd->slot * NUBUS_SLOT_SIZE;
+
+    name = g_strdup_printf("nubus-slot-%x", nd->slot);
+    memory_region_init(&nd->slot_mem, OBJECT(dev), name, NUBUS_SLOT_SIZE);
+    memory_region_add_subregion(&nubus->slot_io, slot_offset,
+                                &nd->slot_mem);
     g_free(name);
+
     nubus_register_format_block(nd);
 }
 
diff --git a/include/hw/nubus/nubus.h b/include/hw/nubus/nubus.h
index 424309dd73..89b0976aaa 100644
--- a/include/hw/nubus/nubus.h
+++ b/include/hw/nubus/nubus.h
@@ -43,6 +43,7 @@ struct NubusDevice {
     DeviceState qdev;
 
     int slot;
+    MemoryRegion super_slot_mem;
     MemoryRegion slot_mem;
 
     /* Format Block */
-- 
2.20.1



  parent reply	other threads:[~2021-09-12  7:57 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-12  7:48 [PATCH 00/20] nubus: bus, device, bridge, IRQ and address space improvements Mark Cave-Ayland
2021-09-12  7:48 ` [PATCH 01/20] nubus-device: rename slot_nb variable to slot Mark Cave-Ayland
2021-09-12 15:09   ` Philippe Mathieu-Daudé
2021-09-12  7:48 ` Mark Cave-Ayland [this message]
2021-09-12 15:50   ` [PATCH 02/20] nubus-device: expose separate super slot memory region Philippe Mathieu-Daudé
2021-09-12 17:20     ` Mark Cave-Ayland
2021-09-12 17:31       ` Philippe Mathieu-Daudé
2021-09-12  7:48 ` [PATCH 03/20] nubus-device: add device slot parameter Mark Cave-Ayland
2021-09-12 15:15   ` Philippe Mathieu-Daudé
2021-09-12 16:43     ` Mark Cave-Ayland
2021-09-12  7:48 ` [PATCH 04/20] nubus: use bitmap to manage available slots Mark Cave-Ayland
2021-09-12 17:48   ` Philippe Mathieu-Daudé
2021-09-14 20:27     ` Mark Cave-Ayland
2021-09-12  7:48 ` [PATCH 05/20] nubus: move slot bitmap checks from NubusDevice realize() to BusClass check_address() Mark Cave-Ayland
2021-09-12  7:49 ` [PATCH 06/20] nubus: implement BusClass get_dev_path() Mark Cave-Ayland
2021-09-12 15:16   ` Philippe Mathieu-Daudé
2021-09-12  7:49 ` [PATCH 07/20] nubus: add trace-events for unassigned slot accesses Mark Cave-Ayland
2021-09-12 15:18   ` Philippe Mathieu-Daudé
2021-09-12 16:45     ` Mark Cave-Ayland
2021-09-12  7:49 ` [PATCH 08/20] nubus: generate bus error when attempting to access empty slots Mark Cave-Ayland
2021-09-12 15:19   ` Philippe Mathieu-Daudé
2021-09-12  7:49 ` [PATCH 09/20] macfb: don't register declaration ROM Mark Cave-Ayland
2021-09-12  7:49 ` [PATCH 10/20] nubus-device: remove nubus_register_rom() and nubus_register_format_block() Mark Cave-Ayland
2021-09-12  7:49 ` [PATCH 11/20] nubus-device: add romfile property for loading declaration ROMs Mark Cave-Ayland
2021-09-12 17:39   ` Philippe Mathieu-Daudé
2021-09-14 20:23     ` Mark Cave-Ayland
2021-09-15  8:16       ` Mark Cave-Ayland
2021-09-12  7:49 ` [PATCH 12/20] nubus: move nubus to its own 32-bit address space Mark Cave-Ayland
2021-09-12 15:22   ` Philippe Mathieu-Daudé
2021-09-12  7:49 ` [PATCH 13/20] nubus-bridge: introduce separate NubusBridge structure Mark Cave-Ayland
2021-09-12 15:23   ` Philippe Mathieu-Daudé
2021-09-12  7:49 ` [PATCH 14/20] mac-nubus-bridge: rename MacNubusState to MacNubusBridge Mark Cave-Ayland
2021-09-12 15:23   ` Philippe Mathieu-Daudé
2021-09-12  7:49 ` [PATCH 15/20] nubus: move NubusBus from mac-nubus-bridge to nubus-bridge Mark Cave-Ayland
2021-09-12 15:25   ` Philippe Mathieu-Daudé
2021-09-12  7:49 ` [PATCH 16/20] nubus-bridge: embed the NubusBus object directly within nubus-bridge Mark Cave-Ayland
2021-09-12 15:26   ` Philippe Mathieu-Daudé
2021-09-12 17:43   ` Philippe Mathieu-Daudé
2021-09-14 20:26     ` Mark Cave-Ayland
2021-09-12  7:49 ` [PATCH 17/20] nubus-bridge: make slot_available_mask a qdev property Mark Cave-Ayland
2021-09-12  7:49 ` [PATCH 18/20] nubus: add support for slot IRQs Mark Cave-Ayland
2021-09-12 16:00   ` Philippe Mathieu-Daudé
2021-09-12 17:05     ` Mark Cave-Ayland
2021-09-12  7:49 ` [PATCH 19/20] q800: wire up nubus IRQs Mark Cave-Ayland
2021-09-12  7:49 ` [PATCH 20/20] q800: configure nubus available slots for Quadra 800 Mark Cave-Ayland
2021-09-12 15:47 ` [PATCH 00/20] nubus: bus, device, bridge, IRQ and address space improvements Philippe Mathieu-Daudé
2021-09-12 16:56   ` 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=20210912074914.22048-3-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 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).