[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 18/20] nubus: add support for slot IRQs
From: |
Laurent Vivier |
Subject: |
[PULL 18/20] nubus: add support for slot IRQs |
Date: |
Wed, 29 Sep 2021 11:28:41 +0200 |
From: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk>
Each Nubus slot has an IRQ line that can be used to request service from the
CPU. Connect the IRQs to the Nubus bridge so that they can be wired up using
qdev
gpios accordingly, and introduce a new nubus_set_irq() function that can be used
by Nubus devices to control the slot IRQ.
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-19-mark.cave-ayland@ilande.co.uk>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
---
include/hw/nubus/nubus.h | 6 ++++++
hw/nubus/nubus-bridge.c | 2 ++
hw/nubus/nubus-device.c | 8 ++++++++
3 files changed, 16 insertions(+)
diff --git a/include/hw/nubus/nubus.h b/include/hw/nubus/nubus.h
index 63c69a7586fc..b3b4d2eadb4b 100644
--- a/include/hw/nubus/nubus.h
+++ b/include/hw/nubus/nubus.h
@@ -26,6 +26,8 @@
#define NUBUS_LAST_SLOT 0xf
#define NUBUS_SLOT_NB (NUBUS_LAST_SLOT - NUBUS_FIRST_SLOT + 1)
+#define NUBUS_IRQS 16
+
#define TYPE_NUBUS_DEVICE "nubus-device"
OBJECT_DECLARE_SIMPLE_TYPE(NubusDevice, NUBUS_DEVICE)
@@ -45,6 +47,8 @@ struct NubusBus {
MemoryRegion slot_io;
uint16_t slot_available_mask;
+
+ qemu_irq irqs[NUBUS_IRQS];
};
#define NUBUS_DECL_ROM_MAX_SIZE (128 * KiB)
@@ -60,6 +64,8 @@ struct NubusDevice {
MemoryRegion decl_rom;
};
+void nubus_set_irq(NubusDevice *nd, int level);
+
struct NubusBridge {
SysBusDevice parent_obj;
diff --git a/hw/nubus/nubus-bridge.c b/hw/nubus/nubus-bridge.c
index 7b51722f66ec..c517a8a7047b 100644
--- a/hw/nubus/nubus-bridge.c
+++ b/hw/nubus/nubus-bridge.c
@@ -19,6 +19,8 @@ static void nubus_bridge_init(Object *obj)
NubusBus *bus = &s->bus;
qbus_create_inplace(bus, sizeof(s->bus), TYPE_NUBUS_BUS, DEVICE(s), NULL);
+
+ qdev_init_gpio_out(DEVICE(s), bus->irqs, NUBUS_IRQS);
}
static Property nubus_bridge_properties[] = {
diff --git a/hw/nubus/nubus-device.c b/hw/nubus/nubus-device.c
index 280f40e88a30..0f1852f671eb 100644
--- a/hw/nubus/nubus-device.c
+++ b/hw/nubus/nubus-device.c
@@ -10,12 +10,20 @@
#include "qemu/osdep.h"
#include "qemu/datadir.h"
+#include "hw/irq.h"
#include "hw/loader.h"
#include "hw/nubus/nubus.h"
#include "qapi/error.h"
#include "qemu/error-report.h"
+void nubus_set_irq(NubusDevice *nd, int level)
+{
+ NubusBus *nubus = NUBUS_BUS(qdev_get_parent_bus(DEVICE(nd)));
+
+ qemu_set_irq(nubus->irqs[nd->slot], level);
+}
+
static void nubus_device_realize(DeviceState *dev, Error **errp)
{
NubusBus *nubus = NUBUS_BUS(qdev_get_parent_bus(dev));
--
2.31.1
- [PULL 09/20] macfb: don't register declaration ROM, (continued)
- [PULL 09/20] macfb: don't register declaration ROM, Laurent Vivier, 2021/09/29
- [PULL 04/20] nubus: use bitmap to manage available slots, Laurent Vivier, 2021/09/29
- [PULL 10/20] nubus-device: remove nubus_register_rom() and nubus_register_format_block(), Laurent Vivier, 2021/09/29
- [PULL 11/20] nubus-device: add romfile property for loading declaration ROMs, Laurent Vivier, 2021/09/29
- [PULL 12/20] nubus: move nubus to its own 32-bit address space, Laurent Vivier, 2021/09/29
- [PULL 02/20] nubus-device: rename slot_nb variable to slot, Laurent Vivier, 2021/09/29
- [PULL 16/20] nubus-bridge: embed the NubusBus object directly within nubus-bridge, Laurent Vivier, 2021/09/29
- [PULL 15/20] nubus: move NubusBus from mac-nubus-bridge to nubus-bridge, Laurent Vivier, 2021/09/29
- [PULL 03/20] nubus-device: expose separate super slot memory region, Laurent Vivier, 2021/09/29
- [PULL 06/20] nubus: implement BusClass get_dev_path(), Laurent Vivier, 2021/09/29
- [PULL 18/20] nubus: add support for slot IRQs,
Laurent Vivier <=
- [PULL 07/20] nubus: add trace-events for empty slot accesses, Laurent Vivier, 2021/09/29
- [PULL 08/20] nubus: generate bus error when attempting to access empty slots, Laurent Vivier, 2021/09/29
- [PULL 20/20] q800: configure nubus available slots for Quadra 800, Laurent Vivier, 2021/09/29
- [PULL 13/20] nubus-bridge: introduce separate NubusBridge structure, Laurent Vivier, 2021/09/29
- [PULL 19/20] q800: wire up nubus IRQs, Laurent Vivier, 2021/09/29
- [PULL 14/20] mac-nubus-bridge: rename MacNubusState to MacNubusBridge, Laurent Vivier, 2021/09/29
- [PULL 17/20] nubus-bridge: make slot_available_mask a qdev property, Laurent Vivier, 2021/09/29
- Re: [PULL 00/20] Q800 for 6.2 patches, Peter Maydell, 2021/09/30