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>

diff --git a/src/dev/arm/gic_v3_distributor.cc b/src/dev/arm/gic_v3_distributor.cc
index f261b295b3dfa71dcf1b43c157c330e58ca4f1b3..a048d18f1ff9d37ff3d8fc4f5b835ce9adf968fd 100644 (file)
--- a/src/dev/arm/gic_v3_distributor.cc
+++ b/src/dev/arm/gic_v3_distributor.cc
@@ -472,7 +472,7 @@ Gicv3Distributor::read(Addr addr, size_t size, bool is_secure_access)
         {
             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);
         }

diff --git a/src/dev/arm/gic_v3_distributor.hh b/src/dev/arm/gic_v3_distributor.hh
index 86e53a3b69c75e177841ed6fe00ced3208897819..c2314389b36c789b8263696a8174fc1f931aed28 100644 (file)
--- a/src/dev/arm/gic_v3_distributor.hh
+++ b/src/dev/arm/gic_v3_distributor.hh
@@ -140,6 +140,7 @@ class Gicv3Distributor : public Serializable
   public:
 
     static const uint32_t ADDR_RANGE_SIZE = 0x10000;
+    static const uint32_t IDBITS = 0xf;
 
   protected: