The GICv5 allows an IRS to implement SPIs, which are fixed-wire interrupts connected directly to the IRS. For QEMU we want to use these for all our traditional fixed-wire interrupt devices. (The other option the architecture permits is an Interrupt Wire Bridge (IWB), which converts from a fixed-wire interrupt to an interrupt event that is then translated through an ITS to send an LPI to the ITS -- this is much more complexity than we need or want.)
SPI configuration is set via the same CPUIF instructions as LPI configuration. Create an array of structs which track the SPI state information listed in I_JVVTZ and I_BWPPP (ignoring for the moment the VM assignment state, which we will add when we add virtualization support). Signed-off-by: Peter Maydell <[email protected]> --- hw/intc/arm_gicv5_common.c | 30 ++++++++++++++++++++++++++++++ include/hw/intc/arm_gicv5_common.h | 28 ++++++++++++++++++++++++++++ include/hw/intc/arm_gicv5_types.h | 15 +++++++++++++++ 3 files changed, 73 insertions(+) diff --git a/hw/intc/arm_gicv5_common.c b/hw/intc/arm_gicv5_common.c index 751df2001c..8cca3a9764 100644 --- a/hw/intc/arm_gicv5_common.c +++ b/hw/intc/arm_gicv5_common.c @@ -66,6 +66,34 @@ static void gicv5_common_reset_hold(Object *obj, ResetType type) memset(cs->irs_ist_baser, 0, sizeof(cs->irs_ist_baser)); memset(cs->irs_ist_cfgr, 0, sizeof(cs->irs_ist_cfgr)); + + if (cs->spi) { + GICv5Domain mp_domain; + + /* + * D_YGLYC, D_TVVRZ: SPIs reset to edge-triggered, inactive, + * idle, disabled, targeted routing mode, not assigned to a VM, + * and assigned to the most-privileged interrupt domain. + * Other state is UNKNOWN: we choose to zero it. + */ + memset(cs->spi, 0, cs->spi_irs_range * sizeof(*cs->spi)); + + /* + * The most-privileged interrupt domain is effectively the + * first in the list (EL3, S, NS) that we implement. + */ + if (gicv5_domain_implemented(cs, GICV5_ID_EL3)) { + mp_domain = GICV5_ID_EL3; + } else if (gicv5_domain_implemented(cs, GICV5_ID_S)) { + mp_domain = GICV5_ID_S; + } else { + mp_domain = GICV5_ID_NS; + } + + for (int i = 0; i < cs->spi_irs_range; i++) { + cs->spi[i].domain = mp_domain; + } + } } static void gicv5_common_init(Object *obj) @@ -144,6 +172,8 @@ static void gicv5_common_realize(DeviceState *dev, Error **errp) address_space_init(&cs->dma_as, cs->dma, "gicv5-sysmem"); + cs->spi = g_new0(GICv5SPIState, cs->spi_irs_range); + trace_gicv5_common_realize(cs->irsid, cs->num_cpus, cs->spi_base, cs->spi_irs_range, cs->spi_range); } diff --git a/include/hw/intc/arm_gicv5_common.h b/include/hw/intc/arm_gicv5_common.h index 2a49d58679..c29eab2951 100644 --- a/include/hw/intc/arm_gicv5_common.h +++ b/include/hw/intc/arm_gicv5_common.h @@ -53,6 +53,26 @@ OBJECT_DECLARE_TYPE(GICv5Common, GICv5CommonClass, ARM_GICV5_COMMON) +/* + * This is where we store the state the IRS handles for an SPI. + * Generally this corresponds to the spec's list of state in + * I_JVVTZ and J_BWPPP. level is a QEMU implementation detail and + * is where we store the actual current state of the incoming + * qemu_irq line. + */ +typedef struct GICv5SPIState { + uint32_t iaffid; + uint8_t priority; + bool level; + bool pending; + bool active; + bool enabled; + GICv5HandlingMode hm; + GICv5RoutingMode irm; + GICv5TriggerMode tm; + GICv5Domain domain; +} GICv5SPIState; + /* * This class is for common state that will eventually be shared * between TCG and KVM implementations of the GICv5. @@ -65,6 +85,14 @@ struct GICv5Common { uint64_t irs_ist_baser[NUM_GICV5_DOMAINS]; uint32_t irs_ist_cfgr[NUM_GICV5_DOMAINS]; + /* + * Pointer to an array of state information for the SPIs. + * Array element 0 is SPI ID s->spi_base, and there are s->spi_irs_range + * elements in total. SPI state is not per-domain: SPI is configurable + * to a particular domain via IRS_SPI_DOMAINR. + */ + GICv5SPIState *spi; + /* Bits here are set for each physical interrupt domain implemented */ uint8_t implemented_domains; diff --git a/include/hw/intc/arm_gicv5_types.h b/include/hw/intc/arm_gicv5_types.h index 15d4d5c3f4..30e1bc58cb 100644 --- a/include/hw/intc/arm_gicv5_types.h +++ b/include/hw/intc/arm_gicv5_types.h @@ -70,4 +70,19 @@ typedef enum GICv5RoutingMode { GICV5_1OFN = 1, } GICv5RoutingMode; +/* + * Interrupt trigger mode (same encoding as IRS_SPI_CFGR.TM) + * Note that this is not the same thing as handling mode, even though + * the two possible states have the same names. Trigger mode applies + * only for SPIs and tells the IRS what kinds of changes to the input + * signal wire should make it generate SET and CLEAR events. + * Handling mode affects whether the pending state of an interrupt + * is cleared when the interrupt is acknowledged, and applies to + * both SPIs and LPIs. + */ +typedef enum GICv5TriggerMode { + GICV5_TRIGGER_EDGE = 0, + GICV5_TRIGGER_LEVEL = 1, +} GICv5TriggerMode; + #endif -- 2.43.0
