dev, arm: Add a flag to enable/disable gem5 GIC extensions

Make it possible to disable gem5 gic extensions by setting the
gem5_extensions param to False from Python.

Change-Id: Icb255105925ef49891d69cc9fe5cc55578ca066d
Signed-off-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-by: Geoffrey Blake <geoffrey.blake@arm.com>

3 files changed, 15 insertions, 9 deletions

diff --git a/src/dev/arm/Gic.py b/src/dev/arm/Gic.py
index e5a0d0a7b..e5bb238a9 100644
--- a/src/dev/arm/Gic.py
+++ b/src/dev/arm/Gic.py
@@ -59,6 +59,7 @@ class Pl390(BaseGic):
     cpu_pio_delay = Param.Latency('10ns', "Delay for PIO r/w to cpu interface")
     int_latency = Param.Latency('10ns', "Delay for interrupt to get to CPU")
     it_lines = Param.UInt32(128, "Number of interrupt lines supported (max = 1020)")
+    gem5_extensions = Param.Bool(True, "Enable gem5 extensions")
 
 class Gicv2mFrame(SimObject):
     type = 'Gicv2mFrame'
diff --git a/src/dev/arm/gic_pl390.cc b/src/dev/arm/gic_pl390.cc
index 249739e27..7b84be6fc 100644
--- a/src/dev/arm/gic_pl390.cc
+++ b/src/dev/arm/gic_pl390.cc
@@ -55,7 +55,8 @@ Pl390::Pl390(const Params *p)
     : BaseGic(p), distAddr(p->dist_addr),
       cpuAddr(p->cpu_addr), distPioDelay(p->dist_pio_delay),
       cpuPioDelay(p->cpu_pio_delay), intLatency(p->int_latency),
-      enabled(false), itLines(p->it_lines), irqEnable(false)
+      enabled(false), itLines(p->it_lines),
+      haveGem5Extensions(p->gem5_extensions), irqEnable(false)
 {
     itLinesLog2 = ceilLog2(itLines);
 
@@ -258,17 +259,16 @@ Pl390::readDistributor(PacketPtr pkt)
       case GICD_CTLR:
         pkt->set<uint32_t>(enabled);
         break;
-      case GICD_TYPER:
-        uint32_t tmp;
-        tmp = ((sys->numRunningContexts() - 1) << 5) |
-              (itLines/INT_BITS_MAX -1) |
-            0x100;
+      case GICD_TYPER: {
         /* The 0x100 is a made-up flag to show that gem5 extensions
          * are available,
          * write 0x200 to this register to enable it.
          */
+        uint32_t tmp = ((sys->numRunningContexts() - 1) << 5) |
+            (itLines/INT_BITS_MAX -1) |
+            (haveGem5Extensions ? 0x100 : 0x0);
         pkt->set<uint32_t>(tmp);
-        break;
+      } break;
       default:
         panic("Tried to read Gic distributor at offset %#x\n", daddr);
         break;
@@ -502,8 +502,10 @@ Pl390::writeDistributor(PacketPtr pkt)
         /* 0x200 is a made-up flag to enable gem5 extension functionality.
          * This reg is not normally written.
          */
-        gem5ExtensionsEnabled = !!(pkt->get<uint32_t>() & 0x200);
-        DPRINTF(GIC, "gem5 extensions %s\n", gem5ExtensionsEnabled ? "enabled" : "disabled");
+        gem5ExtensionsEnabled = (
+            (pkt->get<uint32_t>() & 0x200) && haveGem5Extensions);
+        DPRINTF(GIC, "gem5 extensions %s\n",
+                gem5ExtensionsEnabled ? "enabled" : "disabled");
         break;
       case GICD_SGIR:
         softInt(ctx_id, pkt->get<uint32_t>());
diff --git a/src/dev/arm/gic_pl390.hh b/src/dev/arm/gic_pl390.hh
index bb35b9974..a05cf43bf 100644
--- a/src/dev/arm/gic_pl390.hh
+++ b/src/dev/arm/gic_pl390.hh
@@ -157,6 +157,9 @@ class Pl390 : public BaseGic
 
     uint32_t itLinesLog2;
 
+    /** Are gem5 extensions available? */
+    const bool haveGem5Extensions;
+
     /** interrupt enable bits for all possible 1020 interupts.
      * one bit per interrupt, 32 bit per word = 32 words */
     uint32_t intEnabled[INT_BITS_MAX];