summaryrefslogtreecommitdiff
path: root/src/arch/arm/kvm/gic.cc
diff options
context:
space:
mode:
authorCurtis Dunham <Curtis.Dunham@arm.com>2017-02-14 15:09:18 -0600
committerCurtis Dunham <Curtis.Dunham@arm.com>2017-02-14 15:09:18 -0600
commit80c17d0a8d5f95fd4501360c031384054460a7bf (patch)
tree1fab6ab2a252ab1fc0c010f56afeb307fb187701 /src/arch/arm/kvm/gic.cc
parent092b06b7453a9125a0519c623cbdd3fcfc48751b (diff)
downloadgem5-80c17d0a8d5f95fd4501360c031384054460a7bf.tar.xz
arm, kvm: remove KvmGic
KvmGic functionality has been subsumed within the new MuxingKvmGic model, which has Pl390 fallback when not using KVM for fast emulation. This simplifies configuration and will enable checkpointing between KVM emulation and full-system simulation. Change-Id: Ie61251720064c512843015c075e4ac419a4081e8 Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Diffstat (limited to 'src/arch/arm/kvm/gic.cc')
-rw-r--r--src/arch/arm/kvm/gic.cc83
1 files changed, 0 insertions, 83 deletions
diff --git a/src/arch/arm/kvm/gic.cc b/src/arch/arm/kvm/gic.cc
index 7bc1ba59f..64fb7c6c6 100644
--- a/src/arch/arm/kvm/gic.cc
+++ b/src/arch/arm/kvm/gic.cc
@@ -44,7 +44,6 @@
#include "arch/arm/kvm/base_cpu.hh"
#include "debug/Interrupt.hh"
-#include "params/KvmGic.hh"
#include "params/MuxingKvmGic.hh"
KvmKernelGicV2::KvmKernelGicV2(KvmVM &_vm, Addr cpu_addr, Addr dist_addr,
@@ -106,88 +105,6 @@ KvmKernelGicV2::setIntState(unsigned type, unsigned vcpu, unsigned irq,
}
-KvmGic::KvmGic(const KvmGicParams *p)
- : BaseGic(p),
- system(*p->system),
- kernelGic(*system.getKvmVM(),
- p->cpu_addr, p->dist_addr, p->it_lines),
- addrRanges{kernelGic.distRange, kernelGic.cpuRange}
-{
-}
-
-KvmGic::~KvmGic()
-{
-}
-
-void
-KvmGic::serialize(CheckpointOut &cp) const
-{
- panic("Checkpointing unsupported\n");
-}
-
-void
-KvmGic::unserialize(CheckpointIn &cp)
-{
- panic("Checkpointing unsupported\n");
-}
-
-Tick
-KvmGic::read(PacketPtr pkt)
-{
- panic("KvmGic: PIO from gem5 is currently unsupported\n");
-}
-
-Tick
-KvmGic::write(PacketPtr pkt)
-{
- panic("KvmGic: PIO from gem5 is currently unsupported\n");
-}
-
-void
-KvmGic::sendInt(uint32_t num)
-{
- DPRINTF(Interrupt, "Set SPI %d\n", num);
- kernelGic.setSPI(num);
-}
-
-void
-KvmGic::clearInt(uint32_t num)
-{
- DPRINTF(Interrupt, "Clear SPI %d\n", num);
- kernelGic.clearSPI(num);
-}
-
-void
-KvmGic::sendPPInt(uint32_t num, uint32_t cpu)
-{
- DPRINTF(Interrupt, "Set PPI %d:%d\n", cpu, num);
- kernelGic.setPPI(cpu, num);
-}
-
-void
-KvmGic::clearPPInt(uint32_t num, uint32_t cpu)
-{
- DPRINTF(Interrupt, "Clear PPI %d:%d\n", cpu, num);
- kernelGic.clearPPI(cpu, num);
-}
-
-void
-KvmGic::verifyMemoryMode() const
-{
- if (!(system.isAtomicMode() && system.bypassCaches())) {
- fatal("The in-kernel KVM GIC can only be used with KVM CPUs, but the "
- "current memory mode does not support KVM.\n");
- }
-}
-
-
-KvmGic *
-KvmGicParams::create()
-{
- return new KvmGic(this);
-}
-
-
MuxingKvmGic::MuxingKvmGic(const MuxingKvmGicParams *p)
: Pl390(p),
system(*p->system),