commit 3126e84db773f64e46b1d02a9a27892bf6612d30
author Giacomo Travaglini <giacomo.travaglini@arm.com> Tue Aug 20 16:18:53 2019 +0100
committer Giacomo Travaglini <giacomo.travaglini@arm.com> Mon Aug 26 09:29:53 2019 +0000
tree 46115c8a31ef163e25f0bf93046d7c856e90aae1
parent b90fcd7357dfc065908e60def2b9c18c1a091627

dev-arm: Fix GICv3 ITS indexing error

Table walks were not considering the entry size when evaluating
the address.

Change-Id: Ica6bf6d88632985ee8ed120448b32e0f7e918a8a
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/20329
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>

src/dev/arm/gic_v3_its.cc

diff --git a/src/dev/arm/gic_v3_its.cc b/src/dev/arm/gic_v3_its.cc
index 692bbd0..f822042 100644
--- a/src/dev/arm/gic_v3_its.cc
+++ b/src/dev/arm/gic_v3_its.cc
@@ -146,7 +146,7 @@
 ItsProcess::writeDeviceTable(Yield &yield, uint32_t device_id, DTE dte)
 {
     const Addr base = its.pageAddress(Gicv3Its::DEVICE_TABLE);
-    const Addr address = base + device_id;
+    const Addr address = base + (device_id * sizeof(dte));
 
     DPRINTF(ITS, "Writing DTE at address %#x: %#x\n", address, dte);
 
@@ -157,7 +157,7 @@
 ItsProcess::writeIrqTranslationTable(
     Yield &yield, const Addr itt_base, uint32_t event_id, ITTE itte)
 {
-    const Addr address = itt_base + event_id;
+    const Addr address = itt_base + (event_id * sizeof(itte));
 
     doWrite(yield, address, &itte, sizeof(itte));
 
@@ -169,7 +169,7 @@
     Yield &yield, uint32_t collection_id, CTE cte)
 {
     const Addr base = its.pageAddress(Gicv3Its::COLLECTION_TABLE);
-    const Addr address = base + collection_id;
+    const Addr address = base + (collection_id * sizeof(cte));
 
     doWrite(yield, address, &cte, sizeof(cte));
 
@@ -179,10 +179,10 @@
 uint64_t
 ItsProcess::readDeviceTable(Yield &yield, uint32_t device_id)
 {
-    const Addr base = its.pageAddress(Gicv3Its::DEVICE_TABLE);
-    const Addr address = base + device_id;
-
     uint64_t dte;
+    const Addr base = its.pageAddress(Gicv3Its::DEVICE_TABLE);
+    const Addr address = base + (device_id * sizeof(dte));
+
     doRead(yield, address, &dte, sizeof(dte));
 
     DPRINTF(ITS, "Reading DTE at address %#x: %#x\n", address, dte);
@@ -193,9 +193,9 @@
 ItsProcess::readIrqTranslationTable(
     Yield &yield, const Addr itt_base, uint32_t event_id)
 {
-    const Addr address = itt_base + event_id;
-
     uint64_t itte;
+    const Addr address = itt_base + (event_id * sizeof(itte));
+
     doRead(yield, address, &itte, sizeof(itte));
 
     DPRINTF(ITS, "Reading ITTE at address %#x: %#x\n", address, itte);
@@ -205,10 +205,10 @@
 uint64_t
 ItsProcess::readIrqCollectionTable(Yield &yield, uint32_t collection_id)
 {
-    const Addr base = its.pageAddress(Gicv3Its::COLLECTION_TABLE);
-    const Addr address = base + collection_id;
-
     uint64_t cte;
+    const Addr base = its.pageAddress(Gicv3Its::COLLECTION_TABLE);
+    const Addr address = base + (collection_id * sizeof(cte));
+
     doRead(yield, address, &cte, sizeof(cte));
 
     DPRINTF(ITS, "Reading CTE at address %#x: %#x\n", address, cte);