commit 3762721456700d721ec5dbbc09c74d89e3377537
author Giacomo Travaglini <giacomo.travaglini@arm.com> Tue Apr 30 17:16:19 2019 +0100
committer Giacomo Travaglini <giacomo.travaglini@arm.com> Thu May 02 14:42:42 2019 +0000
tree af6f0ab5dac47184f0e3a75795ffe692f0652f50
parent 5c891178b9e96df79bf03ccd758747b20dc2654e

dev-arm: Add named variable for GICD_TYPER.IDBits

This could be used by other GICv3 components to query the maximum
number of implemented interrupt identifiers

Change-Id: I132e50de331aea22523260bcefba7e961b53eccd
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/+/18599
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>

src/dev/arm/gic_v3_distributor.cc

diff --git a/src/dev/arm/gic_v3_distributor.cc b/src/dev/arm/gic_v3_distributor.cc
index f261b29..a048d18 100644
--- a/src/dev/arm/gic_v3_distributor.cc
+++ b/src/dev/arm/gic_v3_distributor.cc
@@ -472,7 +472,7 @@
         {
             int max_spi_int_id = itLines - 1;
             int it_lines_number = ceil((max_spi_int_id + 1) / 32.0) - 1;
-            return (1 << 26) | (1 << 25) | (1 << 24) | (0xf << 19) |
+            return (1 << 26) | (1 << 25) | (1 << 24) | (IDBITS << 19) |
                 (1 << 17) | (gic->getSystem()->haveSecurity() << 10) |
                 (it_lines_number << 0);
         }

src/dev/arm/gic_v3_distributor.hh

diff --git a/src/dev/arm/gic_v3_distributor.hh b/src/dev/arm/gic_v3_distributor.hh
index 86e53a3..c231438 100644
--- a/src/dev/arm/gic_v3_distributor.hh
+++ b/src/dev/arm/gic_v3_distributor.hh
@@ -140,6 +140,7 @@
   public:
 
     static const uint32_t ADDR_RANGE_SIZE = 0x10000;
+    static const uint32_t IDBITS = 0xf;
 
   protected: