mirror of
https://github.com/qemu/qemu.git
synced 2024-12-05 09:43:44 +08:00
e90f2a8c3e
cannot_instantiate_with_device_add_yet was introduced by commit
efec3dd631
to replace no_user. It was
supposed to be a temporary measure.
When it was introduced, we had 54
cannot_instantiate_with_device_add_yet=true lines in the code.
Today (3 years later) this number has not shrunk: we now have
57 cannot_instantiate_with_device_add_yet=true lines. I think it
is safe to say it is not a temporary measure, and we won't see
the flag go away soon.
Instead of a long field name that misleads people to believe it
is temporary, replace it a shorter and less misleading field:
user_creatable.
Except for code comments, changes were generated using the
following Coccinelle patch:
@@
expression DC;
@@
(
-DC->cannot_instantiate_with_device_add_yet = false;
+DC->user_creatable = true;
|
-DC->cannot_instantiate_with_device_add_yet = true;
+DC->user_creatable = false;
)
@@
typedef ObjectClass;
expression dc;
identifier class, data;
@@
static void device_class_init(ObjectClass *class, void *data)
{
...
dc->hotpluggable = true;
+dc->user_creatable = true;
...
}
@@
@@
struct DeviceClass {
...
-bool cannot_instantiate_with_device_add_yet;
+bool user_creatable;
...
}
@@
expression DC;
@@
(
-!DC->cannot_instantiate_with_device_add_yet
+DC->user_creatable
|
-DC->cannot_instantiate_with_device_add_yet
+!DC->user_creatable
)
Cc: Alistair Francis <alistair.francis@xilinx.com>
Cc: Laszlo Ersek <lersek@redhat.com>
Cc: Marcel Apfelbaum <marcel@redhat.com>
Cc: Markus Armbruster <armbru@redhat.com>
Cc: Peter Maydell <peter.maydell@linaro.org>
Cc: Thomas Huth <thuth@redhat.com>
Acked-by: Alistair Francis <alistair.francis@xilinx.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
Acked-by: Marcel Apfelbaum <marcel@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Message-Id: <20170503203604.31462-2-ehabkost@redhat.com>
[ehabkost: kept "TODO remove once we're there" comment]
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
194 lines
5.3 KiB
C
194 lines
5.3 KiB
C
/*
|
|
* QEMU ETRAX Interrupt Controller.
|
|
*
|
|
* Copyright (c) 2008 Edgar E. Iglesias, Axis Communications AB.
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
* in the Software without restriction, including without limitation the rights
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
* furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice shall be included in
|
|
* all copies or substantial portions of the Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
* THE SOFTWARE.
|
|
*/
|
|
|
|
#include "qemu/osdep.h"
|
|
#include "hw/sysbus.h"
|
|
#include "hw/hw.h"
|
|
//#include "pc.h"
|
|
//#include "etraxfs.h"
|
|
|
|
#define D(x)
|
|
|
|
#define R_RW_MASK 0
|
|
#define R_R_VECT 1
|
|
#define R_R_MASKED_VECT 2
|
|
#define R_R_NMI 3
|
|
#define R_R_GURU 4
|
|
#define R_MAX 5
|
|
|
|
#define TYPE_ETRAX_FS_PIC "etraxfs,pic"
|
|
#define ETRAX_FS_PIC(obj) \
|
|
OBJECT_CHECK(struct etrax_pic, (obj), TYPE_ETRAX_FS_PIC)
|
|
|
|
struct etrax_pic
|
|
{
|
|
SysBusDevice parent_obj;
|
|
|
|
MemoryRegion mmio;
|
|
void *interrupt_vector;
|
|
qemu_irq parent_irq;
|
|
qemu_irq parent_nmi;
|
|
uint32_t regs[R_MAX];
|
|
};
|
|
|
|
static void pic_update(struct etrax_pic *fs)
|
|
{
|
|
uint32_t vector = 0;
|
|
int i;
|
|
|
|
fs->regs[R_R_MASKED_VECT] = fs->regs[R_R_VECT] & fs->regs[R_RW_MASK];
|
|
|
|
/* The ETRAX interrupt controller signals interrupts to the core
|
|
through an interrupt request wire and an irq vector bus. If
|
|
multiple interrupts are simultaneously active it chooses vector
|
|
0x30 and lets the sw choose the priorities. */
|
|
if (fs->regs[R_R_MASKED_VECT]) {
|
|
uint32_t mv = fs->regs[R_R_MASKED_VECT];
|
|
for (i = 0; i < 31; i++) {
|
|
if (mv & 1) {
|
|
vector = 0x31 + i;
|
|
/* Check for multiple interrupts. */
|
|
if (mv > 1)
|
|
vector = 0x30;
|
|
break;
|
|
}
|
|
mv >>= 1;
|
|
}
|
|
}
|
|
|
|
if (fs->interrupt_vector) {
|
|
/* hack alert: ptr property */
|
|
*(uint32_t*)(fs->interrupt_vector) = vector;
|
|
}
|
|
qemu_set_irq(fs->parent_irq, !!vector);
|
|
}
|
|
|
|
static uint64_t
|
|
pic_read(void *opaque, hwaddr addr, unsigned int size)
|
|
{
|
|
struct etrax_pic *fs = opaque;
|
|
uint32_t rval;
|
|
|
|
rval = fs->regs[addr >> 2];
|
|
D(printf("%s %x=%x\n", __func__, addr, rval));
|
|
return rval;
|
|
}
|
|
|
|
static void pic_write(void *opaque, hwaddr addr,
|
|
uint64_t value, unsigned int size)
|
|
{
|
|
struct etrax_pic *fs = opaque;
|
|
D(printf("%s addr=%x val=%x\n", __func__, addr, value));
|
|
|
|
if (addr == R_RW_MASK) {
|
|
fs->regs[R_RW_MASK] = value;
|
|
pic_update(fs);
|
|
}
|
|
}
|
|
|
|
static const MemoryRegionOps pic_ops = {
|
|
.read = pic_read,
|
|
.write = pic_write,
|
|
.endianness = DEVICE_NATIVE_ENDIAN,
|
|
.valid = {
|
|
.min_access_size = 4,
|
|
.max_access_size = 4
|
|
}
|
|
};
|
|
|
|
static void nmi_handler(void *opaque, int irq, int level)
|
|
{
|
|
struct etrax_pic *fs = (void *)opaque;
|
|
uint32_t mask;
|
|
|
|
mask = 1 << irq;
|
|
if (level)
|
|
fs->regs[R_R_NMI] |= mask;
|
|
else
|
|
fs->regs[R_R_NMI] &= ~mask;
|
|
|
|
qemu_set_irq(fs->parent_nmi, !!fs->regs[R_R_NMI]);
|
|
}
|
|
|
|
static void irq_handler(void *opaque, int irq, int level)
|
|
{
|
|
struct etrax_pic *fs = (void *)opaque;
|
|
|
|
if (irq >= 30) {
|
|
nmi_handler(opaque, irq, level);
|
|
return;
|
|
}
|
|
|
|
irq -= 1;
|
|
fs->regs[R_R_VECT] &= ~(1 << irq);
|
|
fs->regs[R_R_VECT] |= (!!level << irq);
|
|
pic_update(fs);
|
|
}
|
|
|
|
static void etraxfs_pic_init(Object *obj)
|
|
{
|
|
DeviceState *dev = DEVICE(obj);
|
|
struct etrax_pic *s = ETRAX_FS_PIC(obj);
|
|
SysBusDevice *sbd = SYS_BUS_DEVICE(obj);
|
|
|
|
qdev_init_gpio_in(dev, irq_handler, 32);
|
|
sysbus_init_irq(sbd, &s->parent_irq);
|
|
sysbus_init_irq(sbd, &s->parent_nmi);
|
|
|
|
memory_region_init_io(&s->mmio, obj, &pic_ops, s,
|
|
"etraxfs-pic", R_MAX * 4);
|
|
sysbus_init_mmio(sbd, &s->mmio);
|
|
}
|
|
|
|
static Property etraxfs_pic_properties[] = {
|
|
DEFINE_PROP_PTR("interrupt_vector", struct etrax_pic, interrupt_vector),
|
|
DEFINE_PROP_END_OF_LIST(),
|
|
};
|
|
|
|
static void etraxfs_pic_class_init(ObjectClass *klass, void *data)
|
|
{
|
|
DeviceClass *dc = DEVICE_CLASS(klass);
|
|
|
|
dc->props = etraxfs_pic_properties;
|
|
/*
|
|
* Note: pointer property "interrupt_vector" may remain null, thus
|
|
* no need for dc->user_creatable = false;
|
|
*/
|
|
}
|
|
|
|
static const TypeInfo etraxfs_pic_info = {
|
|
.name = TYPE_ETRAX_FS_PIC,
|
|
.parent = TYPE_SYS_BUS_DEVICE,
|
|
.instance_size = sizeof(struct etrax_pic),
|
|
.instance_init = etraxfs_pic_init,
|
|
.class_init = etraxfs_pic_class_init,
|
|
};
|
|
|
|
static void etraxfs_pic_register_types(void)
|
|
{
|
|
type_register_static(&etraxfs_pic_info);
|
|
}
|
|
|
|
type_init(etraxfs_pic_register_types)
|