nubus: use bitmap to manage available slots
Convert nubus_device_realize() to use a bitmap to manage available slots to allow for future Nubus devices to be plugged into arbitrary slots from the command line using a new qdev "slot" parameter for nubus devices. Update mac_nubus_bridge_init() to only allow slots 0x9 to 0xe on Macintosh machines as documented in "Designing Cards and Drivers for the Macintosh Family". Signed-off-by: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Reviewed-by: Laurent Vivier <laurent@vivier.eu> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-Id: <20210924073808.1041-5-mark.cave-ayland@ilande.co.uk> Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
parent
90be1dea50
commit
03deab9940
|
@ -18,6 +18,10 @@ static void mac_nubus_bridge_init(Object *obj)
|
||||||
|
|
||||||
s->bus = NUBUS_BUS(qbus_create(TYPE_NUBUS_BUS, DEVICE(s), NULL));
|
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);
|
||||||
|
|
||||||
sysbus_init_mmio(sbd, &s->bus->super_slot_io);
|
sysbus_init_mmio(sbd, &s->bus->super_slot_io);
|
||||||
sysbus_init_mmio(sbd, &s->bus->slot_io);
|
sysbus_init_mmio(sbd, &s->bus->slot_io);
|
||||||
}
|
}
|
||||||
|
|
|
@ -86,13 +86,14 @@ static void nubus_init(Object *obj)
|
||||||
|
|
||||||
memory_region_init_io(&nubus->super_slot_io, obj, &nubus_super_slot_ops,
|
memory_region_init_io(&nubus->super_slot_io, obj, &nubus_super_slot_ops,
|
||||||
nubus, "nubus-super-slots",
|
nubus, "nubus-super-slots",
|
||||||
NUBUS_SUPER_SLOT_NB * NUBUS_SUPER_SLOT_SIZE);
|
(NUBUS_SUPER_SLOT_NB + 1) * NUBUS_SUPER_SLOT_SIZE);
|
||||||
|
|
||||||
memory_region_init_io(&nubus->slot_io, obj, &nubus_slot_ops,
|
memory_region_init_io(&nubus->slot_io, obj, &nubus_slot_ops,
|
||||||
nubus, "nubus-slots",
|
nubus, "nubus-slots",
|
||||||
NUBUS_SLOT_NB * NUBUS_SLOT_SIZE);
|
NUBUS_SLOT_NB * NUBUS_SLOT_SIZE);
|
||||||
|
|
||||||
nubus->current_slot = NUBUS_FIRST_SLOT;
|
nubus->slot_available_mask = MAKE_64BIT_MASK(NUBUS_FIRST_SLOT,
|
||||||
|
NUBUS_SLOT_NB);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void nubus_class_init(ObjectClass *oc, void *data)
|
static void nubus_class_init(ObjectClass *oc, void *data)
|
||||||
|
|
|
@ -161,13 +161,26 @@ static void nubus_device_realize(DeviceState *dev, Error **errp)
|
||||||
char *name;
|
char *name;
|
||||||
hwaddr slot_offset;
|
hwaddr slot_offset;
|
||||||
|
|
||||||
if (nubus->current_slot < NUBUS_FIRST_SLOT ||
|
if (nd->slot == -1) {
|
||||||
nubus->current_slot > NUBUS_LAST_SLOT) {
|
/* No slot specified, find first available free slot */
|
||||||
error_setg(errp, "Cannot register nubus card, not enough slots");
|
int s = ctz32(nubus->slot_available_mask);
|
||||||
return;
|
if (s != 32) {
|
||||||
|
nd->slot = s;
|
||||||
|
} else {
|
||||||
|
error_setg(errp, "Cannot register nubus card, no free slot "
|
||||||
|
"available");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
/* Slot specified, make sure the slot is available */
|
||||||
|
if (!(nubus->slot_available_mask & BIT(nd->slot))) {
|
||||||
|
error_setg(errp, "Cannot register nubus card, slot %d is "
|
||||||
|
"unavailable or already occupied", nd->slot);
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
nd->slot = nubus->current_slot++;
|
nubus->slot_available_mask &= ~BIT(nd->slot);
|
||||||
|
|
||||||
/* Super */
|
/* Super */
|
||||||
slot_offset = nd->slot * NUBUS_SUPER_SLOT_SIZE;
|
slot_offset = nd->slot * NUBUS_SUPER_SLOT_SIZE;
|
||||||
|
@ -191,12 +204,18 @@ static void nubus_device_realize(DeviceState *dev, Error **errp)
|
||||||
nubus_register_format_block(nd);
|
nubus_register_format_block(nd);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static Property nubus_device_properties[] = {
|
||||||
|
DEFINE_PROP_INT32("slot", NubusDevice, slot, -1),
|
||||||
|
DEFINE_PROP_END_OF_LIST()
|
||||||
|
};
|
||||||
|
|
||||||
static void nubus_device_class_init(ObjectClass *oc, void *data)
|
static void nubus_device_class_init(ObjectClass *oc, void *data)
|
||||||
{
|
{
|
||||||
DeviceClass *dc = DEVICE_CLASS(oc);
|
DeviceClass *dc = DEVICE_CLASS(oc);
|
||||||
|
|
||||||
dc->realize = nubus_device_realize;
|
dc->realize = nubus_device_realize;
|
||||||
dc->bus_type = TYPE_NUBUS_BUS;
|
dc->bus_type = TYPE_NUBUS_BUS;
|
||||||
|
device_class_set_props(dc, nubus_device_properties);
|
||||||
}
|
}
|
||||||
|
|
||||||
static const TypeInfo nubus_device_type_info = {
|
static const TypeInfo nubus_device_type_info = {
|
||||||
|
|
|
@ -12,6 +12,10 @@
|
||||||
#include "hw/nubus/nubus.h"
|
#include "hw/nubus/nubus.h"
|
||||||
#include "qom/object.h"
|
#include "qom/object.h"
|
||||||
|
|
||||||
|
#define MAC_NUBUS_FIRST_SLOT 0x9
|
||||||
|
#define MAC_NUBUS_LAST_SLOT 0xe
|
||||||
|
#define MAC_NUBUS_SLOT_NB (MAC_NUBUS_LAST_SLOT - MAC_NUBUS_FIRST_SLOT + 1)
|
||||||
|
|
||||||
#define TYPE_MAC_NUBUS_BRIDGE "mac-nubus-bridge"
|
#define TYPE_MAC_NUBUS_BRIDGE "mac-nubus-bridge"
|
||||||
OBJECT_DECLARE_SIMPLE_TYPE(MacNubusState, MAC_NUBUS_BRIDGE)
|
OBJECT_DECLARE_SIMPLE_TYPE(MacNubusState, MAC_NUBUS_BRIDGE)
|
||||||
|
|
||||||
|
|
|
@ -14,13 +14,12 @@
|
||||||
#include "qom/object.h"
|
#include "qom/object.h"
|
||||||
|
|
||||||
#define NUBUS_SUPER_SLOT_SIZE 0x10000000U
|
#define NUBUS_SUPER_SLOT_SIZE 0x10000000U
|
||||||
#define NUBUS_SUPER_SLOT_NB 0x9
|
#define NUBUS_SUPER_SLOT_NB 0xe
|
||||||
|
|
||||||
#define NUBUS_SLOT_SIZE 0x01000000
|
#define NUBUS_SLOT_SIZE 0x01000000
|
||||||
#define NUBUS_SLOT_NB 0xF
|
#define NUBUS_FIRST_SLOT 0x0
|
||||||
|
#define NUBUS_LAST_SLOT 0xf
|
||||||
#define NUBUS_FIRST_SLOT 0x9
|
#define NUBUS_SLOT_NB (NUBUS_LAST_SLOT - NUBUS_FIRST_SLOT + 1)
|
||||||
#define NUBUS_LAST_SLOT 0xF
|
|
||||||
|
|
||||||
#define TYPE_NUBUS_DEVICE "nubus-device"
|
#define TYPE_NUBUS_DEVICE "nubus-device"
|
||||||
OBJECT_DECLARE_SIMPLE_TYPE(NubusDevice, NUBUS_DEVICE)
|
OBJECT_DECLARE_SIMPLE_TYPE(NubusDevice, NUBUS_DEVICE)
|
||||||
|
@ -36,13 +35,13 @@ struct NubusBus {
|
||||||
MemoryRegion super_slot_io;
|
MemoryRegion super_slot_io;
|
||||||
MemoryRegion slot_io;
|
MemoryRegion slot_io;
|
||||||
|
|
||||||
int current_slot;
|
uint16_t slot_available_mask;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct NubusDevice {
|
struct NubusDevice {
|
||||||
DeviceState qdev;
|
DeviceState qdev;
|
||||||
|
|
||||||
int slot;
|
int32_t slot;
|
||||||
MemoryRegion super_slot_mem;
|
MemoryRegion super_slot_mem;
|
||||||
MemoryRegion slot_mem;
|
MemoryRegion slot_mem;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue