From 3762721456700d721ec5dbbc09c74d89e3377537 Mon Sep 17 00:00:00 2001 From: Giacomo Travaglini Date: Tue, 30 Apr 2019 17:16:19 +0100 Subject: [PATCH] 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 Reviewed-by: Andreas Sandberg Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/18599 Maintainer: Andreas Sandberg Tested-by: kokoro --- src/dev/arm/gic_v3_distributor.cc | 2 +- src/dev/arm/gic_v3_distributor.hh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/dev/arm/gic_v3_distributor.cc b/src/dev/arm/gic_v3_distributor.cc index f261b295b..a048d18f1 100644 --- 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 86e53a3b6..c2314389b 100644 --- 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: -- 2.30.2