qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Laurent Vivier <laurent@vivier.eu>
To: qemu-devel@nongnu.org
Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>,
	Laurent Vivier <laurent@vivier.eu>
Subject: [PULL 11/20] nubus-device: add romfile property for loading declaration ROMs
Date: Wed, 29 Sep 2021 11:28:34 +0200	[thread overview]
Message-ID: <20210929092843.2686234-12-laurent@vivier.eu> (raw)
In-Reply-To: <20210929092843.2686234-1-laurent@vivier.eu>

From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>

The declaration ROM is located at the top-most address of the standard slot
space.

Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Reviewed-by: Laurent Vivier <laurent@vivier.eu>
Message-Id: <20210924073808.1041-12-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
 include/hw/nubus/nubus.h |  6 ++++++
 hw/nubus/nubus-device.c  | 44 +++++++++++++++++++++++++++++++++++++++-
 2 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/include/hw/nubus/nubus.h b/include/hw/nubus/nubus.h
index 187ecc00a576..343be958417a 100644
--- a/include/hw/nubus/nubus.h
+++ b/include/hw/nubus/nubus.h
@@ -12,6 +12,7 @@
 #include "hw/qdev-properties.h"
 #include "exec/address-spaces.h"
 #include "qom/object.h"
+#include "qemu/units.h"
 
 #define NUBUS_SUPER_SLOT_SIZE 0x10000000U
 #define NUBUS_SUPER_SLOT_NB   0xe
@@ -38,12 +39,17 @@ struct NubusBus {
     uint16_t slot_available_mask;
 };
 
+#define NUBUS_DECL_ROM_MAX_SIZE    (128 * KiB)
+
 struct NubusDevice {
     DeviceState qdev;
 
     int32_t slot;
     MemoryRegion super_slot_mem;
     MemoryRegion slot_mem;
+
+    char *romfile;
+    MemoryRegion decl_rom;
 };
 
 #endif
diff --git a/hw/nubus/nubus-device.c b/hw/nubus/nubus-device.c
index d4932d64a278..280f40e88a30 100644
--- a/hw/nubus/nubus-device.c
+++ b/hw/nubus/nubus-device.c
@@ -9,16 +9,21 @@
  */
 
 #include "qemu/osdep.h"
+#include "qemu/datadir.h"
+#include "hw/loader.h"
 #include "hw/nubus/nubus.h"
 #include "qapi/error.h"
+#include "qemu/error-report.h"
 
 
 static void nubus_device_realize(DeviceState *dev, Error **errp)
 {
     NubusBus *nubus = NUBUS_BUS(qdev_get_parent_bus(dev));
     NubusDevice *nd = NUBUS_DEVICE(dev);
-    char *name;
+    char *name, *path;
     hwaddr slot_offset;
+    int64_t size;
+    int ret;
 
     /* Super */
     slot_offset = nd->slot * NUBUS_SUPER_SLOT_SIZE;
@@ -38,10 +43,47 @@ static void nubus_device_realize(DeviceState *dev, Error **errp)
     memory_region_add_subregion(&nubus->slot_io, slot_offset,
                                 &nd->slot_mem);
     g_free(name);
+
+    /* Declaration ROM */
+    if (nd->romfile != NULL) {
+        path = qemu_find_file(QEMU_FILE_TYPE_BIOS, nd->romfile);
+        if (path == NULL) {
+            path = g_strdup(nd->romfile);
+        }
+
+        size = get_image_size(path);
+        if (size < 0) {
+            error_setg(errp, "failed to find romfile \"%s\"", nd->romfile);
+            g_free(path);
+            return;
+        } else if (size == 0) {
+            error_setg(errp, "romfile \"%s\" is empty", nd->romfile);
+            g_free(path);
+            return;
+        } else if (size > NUBUS_DECL_ROM_MAX_SIZE) {
+            error_setg(errp, "romfile \"%s\" too large (maximum size 128K)",
+                       nd->romfile);
+            g_free(path);
+            return;
+        }
+
+        name = g_strdup_printf("nubus-slot-%x-declaration-rom", nd->slot);
+        memory_region_init_rom(&nd->decl_rom, OBJECT(dev), name, size,
+                               &error_abort);
+        ret = load_image_mr(path, &nd->decl_rom);
+        g_free(path);
+        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,
+                                    &nd->decl_rom);
+    }
 }
 
 static Property nubus_device_properties[] = {
     DEFINE_PROP_INT32("slot", NubusDevice, slot, -1),
+    DEFINE_PROP_STRING("romfile", NubusDevice, romfile),
     DEFINE_PROP_END_OF_LIST()
 };
 
-- 
2.31.1



  parent reply	other threads:[~2021-09-29  9:51 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-29  9:28 [PULL 00/20] Q800 for 6.2 patches Laurent Vivier
2021-09-29  9:28 ` [PULL 01/20] nubus: add comment indicating reference documents Laurent Vivier
2021-09-29  9:28 ` [PULL 02/20] nubus-device: rename slot_nb variable to slot Laurent Vivier
2021-09-29  9:28 ` [PULL 03/20] nubus-device: expose separate super slot memory region Laurent Vivier
2021-10-02 10:33   ` Peter Maydell
2021-10-04  7:01     ` Laurent Vivier
2021-10-04 10:16       ` BALATON Zoltan
2021-09-29  9:28 ` [PULL 04/20] nubus: use bitmap to manage available slots Laurent Vivier
2021-09-29  9:28 ` [PULL 05/20] nubus: move slot bitmap checks from NubusDevice realize() to BusClass check_address() Laurent Vivier
2021-09-29  9:28 ` [PULL 06/20] nubus: implement BusClass get_dev_path() Laurent Vivier
2021-09-29  9:28 ` [PULL 07/20] nubus: add trace-events for empty slot accesses Laurent Vivier
2021-09-29  9:28 ` [PULL 08/20] nubus: generate bus error when attempting to access empty slots Laurent Vivier
2021-09-29  9:28 ` [PULL 09/20] macfb: don't register declaration ROM Laurent Vivier
2021-09-29  9:28 ` [PULL 10/20] nubus-device: remove nubus_register_rom() and nubus_register_format_block() Laurent Vivier
2021-09-29  9:28 ` Laurent Vivier [this message]
2021-10-02 10:30   ` [PULL 11/20] nubus-device: add romfile property for loading declaration ROMs Peter Maydell
2021-09-29  9:28 ` [PULL 12/20] nubus: move nubus to its own 32-bit address space Laurent Vivier
2021-09-29  9:28 ` [PULL 13/20] nubus-bridge: introduce separate NubusBridge structure Laurent Vivier
2021-09-29  9:28 ` [PULL 14/20] mac-nubus-bridge: rename MacNubusState to MacNubusBridge Laurent Vivier
2021-09-29  9:28 ` [PULL 15/20] nubus: move NubusBus from mac-nubus-bridge to nubus-bridge Laurent Vivier
2021-09-29  9:28 ` [PULL 16/20] nubus-bridge: embed the NubusBus object directly within nubus-bridge Laurent Vivier
2021-09-29  9:28 ` [PULL 17/20] nubus-bridge: make slot_available_mask a qdev property Laurent Vivier
2021-09-29  9:28 ` [PULL 18/20] nubus: add support for slot IRQs Laurent Vivier
2021-09-29  9:28 ` [PULL 19/20] q800: wire up nubus IRQs Laurent Vivier
2021-09-29  9:28 ` [PULL 20/20] q800: configure nubus available slots for Quadra 800 Laurent Vivier
2021-09-30 10:27 ` [PULL 00/20] Q800 for 6.2 patches 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=20210929092843.2686234-12-laurent@vivier.eu \
    --to=laurent@vivier.eu \
    --cc=mark.cave-ayland@ilande.co.uk \
    --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).