From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
To: qemu-devel@nongnu.org, laurent@vivier.eu
Subject: [PATCH 11/20] nubus-device: add romfile property for loading declaration ROMs
Date: Sun, 12 Sep 2021 08:49:05 +0100 [thread overview]
Message-ID: <20210912074914.22048-12-mark.cave-ayland@ilande.co.uk> (raw)
In-Reply-To: <20210912074914.22048-1-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>
---
hw/nubus/nubus-device.c | 43 +++++++++++++++++++++++++++++++++++++++-
include/hw/nubus/nubus.h | 5 +++++
2 files changed, 47 insertions(+), 1 deletion(-)
diff --git a/hw/nubus/nubus-device.c b/hw/nubus/nubus-device.c
index 9c1992ceb0..98a4c6bb33 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 - 6) * NUBUS_SUPER_SLOT_SIZE;
@@ -38,10 +43,46 @@ 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 64K)",
+ 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_fatal);
+ ret = load_image_mr(path, &nd->decl_rom);
+ g_free(path);
+ if (ret < 0) {
+ warn_report("nubus-device: could not load prom '%s'", nd->romfile);
+ }
+ 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()
};
diff --git a/include/hw/nubus/nubus.h b/include/hw/nubus/nubus.h
index 87a97516c7..42f4c9dbb8 100644
--- a/include/hw/nubus/nubus.h
+++ b/include/hw/nubus/nubus.h
@@ -39,12 +39,17 @@ struct NubusBus {
uint32_t slot_available_mask;
};
+#define NUBUS_DECL_ROM_MAX_SIZE 0xffff
+
struct NubusDevice {
DeviceState qdev;
int32_t slot;
MemoryRegion super_slot_mem;
MemoryRegion slot_mem;
+
+ char *romfile;
+ MemoryRegion decl_rom;
};
#endif
--
2.20.1
next prev parent reply other threads:[~2021-09-12 7:54 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 ` [PATCH 02/20] nubus-device: expose separate super slot memory region Mark Cave-Ayland
2021-09-12 15:50 ` 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 ` Mark Cave-Ayland [this message]
2021-09-12 17:39 ` [PATCH 11/20] nubus-device: add romfile property for loading declaration ROMs 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-12-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).