From: Giacomo Travaglini <giacomo.travaglini@arm.com>
Date: Tue, 23 Jul 2019 08:58:39 +0000 (+0100)
Subject: dev-arm: Polish SMMUv3 CMDQ setup
X-Git-Tag: v19.0.0.0~716
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=15c736b2c54d78d7f18c23b09d1c9f2b25687106;p=gem5.git

dev-arm: Polish SMMUv3 CMDQ setup

The patch is aiming to be spec compliant when it comes to setup
the SMMU command queue (while CR0.CMDQEN = 0), in the following ways:

* Writes to CMDQ_CONS (read index) are allowed during initialization
* Writes to CMDQ_BASE (cmdq pointer) are allowed during initialization

According to spec,
If they happen when the command queue is in fuction (CR0.CMDQEN = 1),
behaviour is constrained unpredictable, with the following options

1) The write is ignored
2) The register takes the value and it is unpredictable whether it
affects the SMMU command queue internal state.

In the model/patch we go for option 1.

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

diff --git a/src/dev/arm/smmu_v3.cc b/src/dev/arm/smmu_v3.cc
index 7c4bd3673..2c974b57b 100644
--- a/src/dev/arm/smmu_v3.cc
+++ b/src/dev/arm/smmu_v3.cc
@@ -604,6 +604,16 @@ SMMUv3::writeControl(PacketPtr pkt)
                 pkt->getLE<uint32_t>();
             break;
 
+        case offsetof(SMMURegs, cmdq_cons):
+            assert(pkt->getSize() == sizeof(uint32_t));
+            if (regs.cr0 & CR0_CMDQEN_MASK) {
+                warn("CMDQ is enabled: ignoring write to CMDQ_CONS\n");
+            } else {
+                *reinterpret_cast<uint32_t *>(regs.data + offset) =
+                    pkt->getLE<uint32_t>();
+            }
+            break;
+
         case offsetof(SMMURegs, cmdq_prod):
             assert(pkt->getSize() == sizeof(uint32_t));
             *reinterpret_cast<uint32_t *>(regs.data + offset) =
@@ -620,13 +630,16 @@ SMMUv3::writeControl(PacketPtr pkt)
 
         case offsetof(SMMURegs, cmdq_base):
             assert(pkt->getSize() == sizeof(uint64_t));
-            *reinterpret_cast<uint64_t *>(regs.data + offset) =
-                pkt->getLE<uint64_t>();
-            regs.cmdq_cons = 0;
-            regs.cmdq_prod = 0;
+            if (regs.cr0 & CR0_CMDQEN_MASK) {
+                warn("CMDQ is enabled: ignoring write to CMDQ_BASE\n");
+            } else {
+                *reinterpret_cast<uint64_t *>(regs.data + offset) =
+                    pkt->getLE<uint64_t>();
+                regs.cmdq_cons = 0;
+                regs.cmdq_prod = 0;
+            }
             break;
 
-
         case offsetof(SMMURegs, eventq_base):
             assert(pkt->getSize() == sizeof(uint64_t));
             *reinterpret_cast<uint64_t *>(regs.data + offset) =