The primary aim of this patchset is to make the exynos4210 code use
the TYPE_SPLIT_IRQ device instead of the old qemu_split_irq() function
(which we are trying to get rid of). However, the current code is
quite complicated and so we have to do a fair amount of refactoring
in order to be able to use TYPE_SPLIT_IRQ in a clean way.
The interrupt wiring on this SoC is complicated and interrupt
lines from devices may be wired up to multiple places:
* a GIC device
* an internal combiner
* an external combiner
(a combiner is a fairly simple "OR multiple IRQ sources together
in groups with enable/disable and mask logic" piece of hardware).
In some cases an interrupt is wired up to more than one input
on each combiner.
The current code has a struct Exynos4210Irq where it keeps arrays of
qemu_irqs corresponding to the inputs of these devices, and it handles
the "wire interrupt lines to multiple places" logic in functions which
are called by the SoC device model but which live in the source files
with the combiner and GIC models. This series moves the logic to the
SoC device model's source file (because it is really part of the SoC
wiring, not part of the individual combiner or GIC devices) and makes
use of the TYPE_SPLIT_IRQ ability to provide more than 2 output lines
to simplify things so that each interrupt line connects to just one
splitter, whose outputs go to all the places they need to. In the
new setup, these splitter devices clearly belong to the SoC object,
and so they are created as QOM children of it. The Exynos4210Irq
struct ends up unneeded and is deleted.
I have also done some conversion of specific child devices of this SoC
from the old-style "call qemu_new()" to the new-style "embed the child
device struct in the parent state struct". I haven't done a complete
conversion, but only touched those devices where making the conversion
was useful for the TYPE_SPLIT_IRQ changes.
I don't have a datasheet for this SoC that describes all the external
combiner and external GIC wiring, so I have mostly kept the QEMU
behaviour the same as it is currently. In a few places, however, I
have fixed what seem to me to be fairly clearly bugs in the current
handling. (Largely these bugs weren't visible to the guest because
we weren't actually connecting up devices to the affected bits of
the interrupt line wiring.)
I've tested this with a simple Linux image, which I think is basically
the same one as the 'make check-acceptance' test. If anybody has
access to other test images that would be interesting.
thanks
-- PMM
Peter Maydell (18):
hw/arm/exynos4210: Use TYPE_OR_IRQ instead of custom OR-gate device
hw/intc/exynos4210_gic: Remove unused TYPE_EXYNOS4210_IRQ_GATE
hw/arm/exynos4210: Put a9mpcore device into state struct
hw/arm/exynos4210: Drop int_gic_irq[] from Exynos4210Irq struct
hw/arm/exynos4210: Coalesce board_irqs and irq_table
hw/arm/exynos4210: Fix code style nit in combiner_grp_to_gic_id[]
hw/arm/exynos4210: Move exynos4210_init_board_irqs() into exynos4210.c
hw/arm/exynos4210: Put external GIC into state struct
hw/arm/exynos4210: Drop ext_gic_irq[] from Exynos4210Irq struct
hw/arm/exynos4210: Move exynos4210_combiner_get_gpioin() into
exynos4210.c
hw/arm/exynos4210: Delete unused macro definitions
hw/arm/exynos4210: Use TYPE_SPLIT_IRQ in exynos4210_init_board_irqs()
hw/arm/exynos4210: Fill in irq_table[] for internal-combiner-only IRQ
lines
hw/arm/exynos4210: Connect MCT_G0 and MCT_G1 to both combiners
hw/arm/exynos4210: Don't connect multiple lines to external GIC inputs
hw/arm/exynos4210: Fold combiner splits into
exynos4210_init_board_irqs()
hw/arm/exynos4210: Put combiners into state struct
hw/arm/exynos4210: Drop Exynos4210Irq struct
include/hw/arm/exynos4210.h | 50 ++-
include/hw/intc/exynos4210_combiner.h | 57 ++++
include/hw/intc/exynos4210_gic.h | 43 +++
hw/arm/exynos4210.c | 430 +++++++++++++++++++++++---
hw/intc/exynos4210_combiner.c | 108 +------
hw/intc/exynos4210_gic.c | 344 +--------------------
MAINTAINERS | 2 +-
7 files changed, 508 insertions(+), 526 deletions(-)
create mode 100644 include/hw/intc/exynos4210_combiner.h
create mode 100644 include/hw/intc/exynos4210_gic.h
--
2.25.1
