hw/arm/exynos4210: Put combiners into state struct
Switch the creation of the combiner devices to the new-style "embedded in state struct" approach, so we can easily refer to the object elsewhere during realize. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Message-id: 20220404154658.565020-18-peter.maydell@linaro.org
This commit is contained in:
Peter Maydell
parent
76621953c9
commit
cebef07df5
|
|
@ -624,25 +624,23 @@ static void exynos4210_realize(DeviceState *socdev, Error **errp)
|
|||
}
|
||||
|
||||
/* Internal Interrupt Combiner */
|
||||
dev = qdev_new("exynos4210.combiner");
|
||||
busdev = SYS_BUS_DEVICE(dev);
|
||||
sysbus_realize_and_unref(busdev, &error_fatal);
|
||||
busdev = SYS_BUS_DEVICE(&s->int_combiner);
|
||||
sysbus_realize(busdev, &error_fatal);
|
||||
for (n = 0; n < EXYNOS4210_MAX_INT_COMBINER_OUT_IRQ; n++) {
|
||||
sysbus_connect_irq(busdev, n,
|
||||
qdev_get_gpio_in(DEVICE(&s->a9mpcore), n));
|
||||
}
|
||||
exynos4210_combiner_get_gpioin(&s->irqs, dev, 0);
|
||||
exynos4210_combiner_get_gpioin(&s->irqs, DEVICE(&s->int_combiner), 0);
|
||||
sysbus_mmio_map(busdev, 0, EXYNOS4210_INT_COMBINER_BASE_ADDR);
|
||||
|
||||
/* External Interrupt Combiner */
|
||||
dev = qdev_new("exynos4210.combiner");
|
||||
qdev_prop_set_uint32(dev, "external", 1);
|
||||
busdev = SYS_BUS_DEVICE(dev);
|
||||
sysbus_realize_and_unref(busdev, &error_fatal);
|
||||
qdev_prop_set_uint32(DEVICE(&s->ext_combiner), "external", 1);
|
||||
busdev = SYS_BUS_DEVICE(&s->ext_combiner);
|
||||
sysbus_realize(busdev, &error_fatal);
|
||||
for (n = 0; n < EXYNOS4210_MAX_INT_COMBINER_OUT_IRQ; n++) {
|
||||
sysbus_connect_irq(busdev, n, qdev_get_gpio_in(DEVICE(&s->ext_gic), n));
|
||||
}
|
||||
exynos4210_combiner_get_gpioin(&s->irqs, dev, 1);
|
||||
exynos4210_combiner_get_gpioin(&s->irqs, DEVICE(&s->ext_combiner), 1);
|
||||
sysbus_mmio_map(busdev, 0, EXYNOS4210_EXT_COMBINER_BASE_ADDR);
|
||||
|
||||
/* Initialize board IRQs. */
|
||||
|
|
@ -844,6 +842,10 @@ static void exynos4210_init(Object *obj)
|
|||
|
||||
object_initialize_child(obj, "a9mpcore", &s->a9mpcore, TYPE_A9MPCORE_PRIV);
|
||||
object_initialize_child(obj, "ext-gic", &s->ext_gic, TYPE_EXYNOS4210_GIC);
|
||||
object_initialize_child(obj, "int-combiner", &s->int_combiner,
|
||||
TYPE_EXYNOS4210_COMBINER);
|
||||
object_initialize_child(obj, "ext-combiner", &s->ext_combiner,
|
||||
TYPE_EXYNOS4210_COMBINER);
|
||||
}
|
||||
|
||||
static void exynos4210_class_init(ObjectClass *klass, void *data)
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@
|
|||
#include "hw/sysbus.h"
|
||||
#include "migration/vmstate.h"
|
||||
#include "qemu/module.h"
|
||||
|
||||
#include "hw/intc/exynos4210_combiner.h"
|
||||
#include "hw/arm/exynos4210.h"
|
||||
#include "hw/hw.h"
|
||||
#include "hw/irq.h"
|
||||
|
|
@ -48,36 +48,7 @@
|
|||
#define DPRINTF(fmt, ...) do {} while (0)
|
||||
#endif
|
||||
|
||||
#define IIC_NGRP 64 /* Internal Interrupt Combiner
|
||||
Groups number */
|
||||
#define IIC_NIRQ (IIC_NGRP * 8)/* Internal Interrupt Combiner
|
||||
Interrupts number */
|
||||
#define IIC_REGION_SIZE 0x108 /* Size of memory mapped region */
|
||||
#define IIC_REGSET_SIZE 0x41
|
||||
|
||||
/*
|
||||
* State for each output signal of internal combiner
|
||||
*/
|
||||
typedef struct CombinerGroupState {
|
||||
uint8_t src_mask; /* 1 - source enabled, 0 - disabled */
|
||||
uint8_t src_pending; /* Pending source interrupts before masking */
|
||||
} CombinerGroupState;
|
||||
|
||||
#define TYPE_EXYNOS4210_COMBINER "exynos4210.combiner"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(Exynos4210CombinerState, EXYNOS4210_COMBINER)
|
||||
|
||||
struct Exynos4210CombinerState {
|
||||
SysBusDevice parent_obj;
|
||||
|
||||
MemoryRegion iomem;
|
||||
|
||||
struct CombinerGroupState group[IIC_NGRP];
|
||||
uint32_t reg_set[IIC_REGSET_SIZE];
|
||||
uint32_t icipsr[2];
|
||||
uint32_t external; /* 1 means that this combiner is external */
|
||||
|
||||
qemu_irq output_irq[IIC_NGRP];
|
||||
};
|
||||
|
||||
static const VMStateDescription vmstate_exynos4210_combiner_group_state = {
|
||||
.name = "exynos4210.combiner.groupstate",
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
#include "hw/sysbus.h"
|
||||
#include "hw/cpu/a9mpcore.h"
|
||||
#include "hw/intc/exynos4210_gic.h"
|
||||
#include "hw/intc/exynos4210_combiner.h"
|
||||
#include "hw/core/split-irq.h"
|
||||
#include "target/arm/cpu-qom.h"
|
||||
#include "qom/object.h"
|
||||
|
|
@ -105,6 +106,8 @@ struct Exynos4210State {
|
|||
qemu_or_irq cpu_irq_orgate[EXYNOS4210_NCPUS];
|
||||
A9MPPrivState a9mpcore;
|
||||
Exynos4210GicState ext_gic;
|
||||
Exynos4210CombinerState int_combiner;
|
||||
Exynos4210CombinerState ext_combiner;
|
||||
SplitIRQ splitter[EXYNOS4210_NUM_SPLITTERS];
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -0,0 +1,57 @@
|
|||
/*
|
||||
* Samsung exynos4210 Interrupt Combiner
|
||||
*
|
||||
* Copyright (c) 2000 - 2011 Samsung Electronics Co., Ltd.
|
||||
* All rights reserved.
|
||||
*
|
||||
* Evgeny Voevodin <e.voevodin@samsung.com>
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify it
|
||||
* under the terms of the GNU General Public License as published by the
|
||||
* Free Software Foundation; either version 2 of the License, or (at your
|
||||
* option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
* See the GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License along
|
||||
* with this program; if not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef HW_INTC_EXYNOS4210_COMBINER
|
||||
#define HW_INTC_EXYNOS4210_COMBINER
|
||||
|
||||
#include "hw/sysbus.h"
|
||||
|
||||
/*
|
||||
* State for each output signal of internal combiner
|
||||
*/
|
||||
typedef struct CombinerGroupState {
|
||||
uint8_t src_mask; /* 1 - source enabled, 0 - disabled */
|
||||
uint8_t src_pending; /* Pending source interrupts before masking */
|
||||
} CombinerGroupState;
|
||||
|
||||
#define TYPE_EXYNOS4210_COMBINER "exynos4210.combiner"
|
||||
OBJECT_DECLARE_SIMPLE_TYPE(Exynos4210CombinerState, EXYNOS4210_COMBINER)
|
||||
|
||||
/* Number of groups and total number of interrupts for the internal combiner */
|
||||
#define IIC_NGRP 64
|
||||
#define IIC_NIRQ (IIC_NGRP * 8)
|
||||
#define IIC_REGSET_SIZE 0x41
|
||||
|
||||
struct Exynos4210CombinerState {
|
||||
SysBusDevice parent_obj;
|
||||
|
||||
MemoryRegion iomem;
|
||||
|
||||
struct CombinerGroupState group[IIC_NGRP];
|
||||
uint32_t reg_set[IIC_REGSET_SIZE];
|
||||
uint32_t icipsr[2];
|
||||
uint32_t external; /* 1 means that this combiner is external */
|
||||
|
||||
qemu_irq output_irq[IIC_NGRP];
|
||||
};
|
||||
|
||||
#endif
|
||||
Loading…
Reference in New Issue