commit 59370dde2efec2d19280d8453407ea8feda20370
author Giacomo Travaglini <giacomo.travaglini@arm.com> Tue Aug 20 20:47:55 2019 +0100
committer Giacomo Travaglini <giacomo.travaglini@arm.com> Mon Sep 09 08:48:30 2019 +0000
tree b616361aae48c4bddd8f20ab88d0e39e29841658
parent 54e6625546fca51d54d79eb807c999d0756d8320

dev-arm: Fix GICv3 ITS cmdq wrapping

Change-Id: I979e8d1378d5b5d2647158798479cf4238f2c349
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/+/20633
Tested-by: kokoro <noreply+kokoro@google.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.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 ca363f4..ab0d8c2 100644
--- a/src/dev/arm/gic_v3_its.cc
+++ b/src/dev/arm/gic_v3_its.cc
@@ -1065,19 +1065,30 @@
     gitsCreadr.offset = gitsCreadr.offset + 1;
 
     // Check for wrapping
-    auto queue_end = (4096 * (gitsCbaser.size + 1));
-
-    if (gitsCreadr.offset == queue_end) {
+    if (gitsCreadr.offset == maxCommands()) {
         gitsCreadr.offset = 0;
     }
 }
 
+uint64_t
+Gicv3Its::maxCommands() const
+{
+    return (4096 * (gitsCbaser.size + 1)) / sizeof(ItsCommand::CommandEntry);
+}
+
 void
 Gicv3Its::checkCommandQueue()
 {
     if (!gitsControl.enabled || !gitsCbaser.valid)
         return;
 
+    // If GITS_CWRITER gets set by sw to a value bigger than the
+    // allowed one, the command queue should stop processing commands
+    // until the register gets reset to an allowed one
+    if (gitsCwriter.offset >= maxCommands()) {
+        return;
+    }
+
     if (gitsCwriter.offset != gitsCreadr.offset) {
         // writer and reader pointing to different command
         // entries: queue not empty.

src/dev/arm/gic_v3_its.hh

diff --git a/src/dev/arm/gic_v3_its.hh b/src/dev/arm/gic_v3_its.hh
index b9c1d85..d11d7c0 100644
--- a/src/dev/arm/gic_v3_its.hh
+++ b/src/dev/arm/gic_v3_its.hh
@@ -257,6 +257,7 @@
     bool lpiOutOfRange(uint32_t intid) const;
 
   private: // Command
+    uint64_t maxCommands() const;
     void checkCommandQueue();
     void incrementReadPointer();