diff options
| author | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2018-09-11 13:21:03 +0100 |
|---|---|---|
| committer | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2018-10-01 08:28:51 +0000 |
| commit | 4439c58688af517772c1a1b7f8844e629c51ec11 (patch) | |
| tree | 4a856ebe725ada12f27718e2b202b5fb4a1347dc | |
| parent | 8b3c5309dff79402f7f96660a6d19e450a45356b (diff) | |
| download | gem5-4439c58688af517772c1a1b7f8844e629c51ec11.tar.xz | |
dev-arm: Create postFiq events for GICv2
GICv2 is signaling IRQs only to the CPU. This patch is adding the
capability of scheduling FIQs.
Change-Id: I395afc83eb8d58cfd32cd93372bcb6f804364ef5
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/12947
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
| -rw-r--r-- | src/dev/arm/gic_v2.cc | 26 | ||||
| -rw-r--r-- | src/dev/arm/gic_v2.hh | 3 |
2 files changed, 28 insertions, 1 deletions
diff --git a/src/dev/arm/gic_v2.cc b/src/dev/arm/gic_v2.cc index 01358b732..7bbc89e74 100644 --- a/src/dev/arm/gic_v2.cc +++ b/src/dev/arm/gic_v2.cc @@ -88,6 +88,9 @@ GicV2::GicV2(const Params *p) postIntEvent[x] = new EventFunctionWrapper([this, x]{ postDelayedInt(x); }, "Post Interrupt to CPU"); + postFiqEvent[x] = + new EventFunctionWrapper([this, x]{ postDelayedFiq(x); }, + "Post FIQ to CPU"); } DPRINTF(Interrupt, "cpuEnabled[0]=%d cpuEnabled[1]=%d\n", cpuEnabled(0), cpuEnabled(1)); @@ -97,8 +100,10 @@ GicV2::GicV2(const Params *p) GicV2::~GicV2() { - for (int x = 0; x < CPU_MAX; x++) + for (int x = 0; x < CPU_MAX; x++) { delete postIntEvent[x]; + delete postFiqEvent[x]; + } } Tick @@ -915,6 +920,25 @@ GicV2::postDelayedInt(uint32_t cpu) signalDrainDone(); } +void +GicV2::postFiq(uint32_t cpu, Tick when) +{ + if (!(postFiqEvent[cpu]->scheduled())) { + ++pendingDelayedInterrupts; + eventq->schedule(postFiqEvent[cpu], when); + } +} + +void +GicV2::postDelayedFiq(uint32_t cpu) +{ + platform->intrctrl->post(cpu, ArmISA::INT_FIQ, 0); + --pendingDelayedInterrupts; + assert(pendingDelayedInterrupts >= 0); + if (pendingDelayedInterrupts == 0) + signalDrainDone(); +} + DrainState GicV2::drain() { diff --git a/src/dev/arm/gic_v2.hh b/src/dev/arm/gic_v2.hh index 4ca2f38e2..4f30b00e6 100644 --- a/src/dev/arm/gic_v2.hh +++ b/src/dev/arm/gic_v2.hh @@ -397,13 +397,16 @@ class GicV2 : public BaseGic, public BaseGicRegisters * Post an interrupt to a CPU with a delay */ void postInt(uint32_t cpu, Tick when); + void postFiq(uint32_t cpu, Tick when); /** * Deliver a delayed interrupt to the target CPU */ void postDelayedInt(uint32_t cpu); + void postDelayedFiq(uint32_t cpu); EventFunctionWrapper *postIntEvent[CPU_MAX]; + EventFunctionWrapper *postFiqEvent[CPU_MAX]; int pendingDelayedInterrupts; public: |