arch-arm: Refactor code to check if gic is GicV2
Refactor code to use cpu_addr only when gic is GicV2 since cpu_addr is
only meanful to GicV2.
Test: Boot Android P successfully with the following command:
M5_PATH=$PWD/fs_files ./build/ARM/gem5.opt
./configs/example/arm/fs_bigLITTLE.py --dtb
$PWD/fs_files/binaries/armv8_gem5_v2_1cpu.dtb --kernel
$PWD/fs_files/binaries/vmlinux --disk $PWD/fs_files/disks/disk.img
--kernel-init "/init" --cpu-type fastmodel --machine-type
VExpressFastmodel --big-cpu-clock "2GHz" --big-cpus 1 --little-cpus 0
--mem-size 8GB --kernel-cmd "earlyprintk=pl011,0x1c090000
console=ttyAMA0 lpj=19988480 norandmaps rw loglevel=8 mem=8GB
root=/dev/vda1 init=/init androidboot.hardware=gem5 qemu=1 qemu.gles=2
android.bootanim=0 vmalloc=640MB android.early.fstab=/fstab.gem5
androidboot.selinux=permissive audit=0 cma=128M"
Change-Id: Iedd1388f292685c25f1effcd2e14b3db8899dff9
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/21339
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com>
diff --git a/src/arch/arm/fastmodel/GIC/gic.cc b/src/arch/arm/fastmodel/GIC/gic.cc
index cb77528..8a7eb3b 100644
--- a/src/arch/arm/fastmodel/GIC/gic.cc
+++ b/src/arch/arm/fastmodel/GIC/gic.cc
@@ -70,7 +70,8 @@
}
SCGIC::SCGIC(const SCFastModelGICParams ¶ms,
- sc_core::sc_module_name _name) : scx_evs_GIC(_name)
+ sc_core::sc_module_name _name)
+ : scx_evs_GIC(_name), _params(params)
{
signalInterrupt.bind(signal_interrupt);
@@ -349,6 +350,15 @@
scGIC->signalInterrupt->ppi(cpu, num, false);
}
+bool
+GIC::supportsVersion(GicVersion version)
+{
+ if (scGIC->params().gicv2_only)
+ return version == GicVersion::GIC_V2;
+ return (version == GicVersion::GIC_V3) ||
+ (version == GicVersion::GIC_V4 && scGIC->params().has_gicv4_1);
+}
+
} // namespace FastModel
FastModel::SCGIC *
diff --git a/src/arch/arm/fastmodel/GIC/gic.hh b/src/arch/arm/fastmodel/GIC/gic.hh
index aadfa3a..f607d2b 100644
--- a/src/arch/arm/fastmodel/GIC/gic.hh
+++ b/src/arch/arm/fastmodel/GIC/gic.hh
@@ -79,6 +79,7 @@
};
std::unique_ptr<Terminator> terminator;
+ const SCFastModelGICParams &_params;
public:
SCGIC(const SCFastModelGICParams ¶ms, sc_core::sc_module_name _name);
@@ -94,6 +95,11 @@
scx_evs_GIC::start_of_simulation();
}
void start_of_simulation() override {}
+ const SCFastModelGICParams &
+ params()
+ {
+ return _params;
+ }
};
// This class pairs with the one above to implement the receiving end of gem5's
@@ -125,6 +131,8 @@
void sendPPInt(uint32_t num, uint32_t cpu) override;
void clearPPInt(uint32_t num, uint32_t cpu) override;
+ bool supportsVersion(GicVersion version) override;
+
AddrRangeList getAddrRanges() const override { return AddrRangeList(); }
Tick read(PacketPtr pkt) override { return 0; }
Tick write(PacketPtr pkt) override { return 0; }
diff --git a/src/arch/arm/system.cc b/src/arch/arm/system.cc
index 6add9c0..c3c2b8d 100644
--- a/src/arch/arm/system.cc
+++ b/src/arch/arm/system.cc
@@ -48,7 +48,7 @@
#include "base/loader/object_file.hh"
#include "base/loader/symtab.hh"
#include "cpu/thread_context.hh"
-#include "dev/arm/gic_v3.hh"
+#include "dev/arm/gic_v2.hh"
#include "mem/fs_translating_port_proxy.hh"
#include "mem/physical.hh"
#include "sim/full_system.hh"
@@ -142,7 +142,8 @@
const Params* p = params();
if (bootldr) {
- bool isGICv3System = dynamic_cast<Gicv3 *>(getGIC()) != nullptr;
+ bool is_gic_v2 =
+ getGIC()->supportsVersion(BaseGic::GicVersion::GIC_V2);
bootldr->buildImage().write(physProxy);
inform("Using bootloader at address %#x\n", bootldr->entryPoint());
@@ -153,14 +154,14 @@
if (!p->flags_addr)
fatal("flags_addr must be set with bootloader\n");
- if (!p->gic_cpu_addr && !isGICv3System)
+ if (!p->gic_cpu_addr && is_gic_v2)
fatal("gic_cpu_addr must be set with bootloader\n");
for (int i = 0; i < threadContexts.size(); i++) {
if (!_highestELIs64)
threadContexts[i]->setIntReg(3, (kernelEntry & loadAddrMask) +
loadAddrOffset);
- if (!isGICv3System)
+ if (is_gic_v2)
threadContexts[i]->setIntReg(4, params()->gic_cpu_addr);
threadContexts[i]->setIntReg(5, params()->flags_addr);
}
diff --git a/src/dev/arm/base_gic.hh b/src/dev/arm/base_gic.hh
index 7c0cc0e..3d7a579 100644
--- a/src/dev/arm/base_gic.hh
+++ b/src/dev/arm/base_gic.hh
@@ -65,6 +65,7 @@
{
public:
typedef BaseGicParams Params;
+ enum class GicVersion { GIC_V2, GIC_V3, GIC_V4 };
BaseGic(const Params *p);
virtual ~BaseGic();
@@ -107,6 +108,9 @@
return (ArmSystem *) sys;
}
+ /** Check if version supported */
+ virtual bool supportsVersion(GicVersion version) = 0;
+
protected:
/** Platform this GIC belongs to. */
Platform *platform;
diff --git a/src/dev/arm/gic_v2.cc b/src/dev/arm/gic_v2.cc
index fa480a2..20bd015 100644
--- a/src/dev/arm/gic_v2.cc
+++ b/src/dev/arm/gic_v2.cc
@@ -950,6 +950,12 @@
}
}
+bool
+GicV2::supportsVersion(GicVersion version)
+{
+ return version == GicVersion::GIC_V2;
+}
+
void
GicV2::postDelayedFiq(uint32_t cpu)
{
diff --git a/src/dev/arm/gic_v2.hh b/src/dev/arm/gic_v2.hh
index 4104140..15cb89e 100644
--- a/src/dev/arm/gic_v2.hh
+++ b/src/dev/arm/gic_v2.hh
@@ -475,6 +475,8 @@
void sendPPInt(uint32_t num, uint32_t cpu) override;
void clearPPInt(uint32_t num, uint32_t cpu) override;
+ bool supportsVersion(GicVersion version) override;
+
protected:
/** Handle a read to the distributor portion of the GIC
* @param pkt packet to respond to
diff --git a/src/dev/arm/gic_v3.cc b/src/dev/arm/gic_v3.cc
index ba0a8ee..e9c2fbc 100644
--- a/src/dev/arm/gic_v3.cc
+++ b/src/dev/arm/gic_v3.cc
@@ -209,6 +209,13 @@
platform->intrctrl->post(cpu, int_type, 0);
}
+bool
+Gicv3::supportsVersion(GicVersion version)
+{
+ return (version == GicVersion::GIC_V3) ||
+ (version == GicVersion::GIC_V4 && params()->gicv4);
+}
+
void
Gicv3::deassertInt(uint32_t cpu, ArmISA::InterruptTypes int_type)
{
diff --git a/src/dev/arm/gic_v3.hh b/src/dev/arm/gic_v3.hh
index 89a8abe..e0212ee 100644
--- a/src/dev/arm/gic_v3.hh
+++ b/src/dev/arm/gic_v3.hh
@@ -125,6 +125,7 @@
void serialize(CheckpointOut & cp) const override;
void unserialize(CheckpointIn & cp) override;
Tick write(PacketPtr pkt) override;
+ bool supportsVersion(GicVersion version) override;
public:
