From 8ec72b4fba82ddd2c5888dd72db5ed54438962bf Mon Sep 17 00:00:00 2001 From: Giacomo Travaglini Date: Wed, 14 Aug 2019 17:50:06 +0100 Subject: [PATCH] dev-arm: Add GITS_PIDR2 register to the ITS memory map The GITS Peripheral Identification Register #2 bits assignments are the same as those for GICD_PIDR2. Change-Id: I235008a383e08dd557d899cb3aa18202ef943f8b Signed-off-by: Giacomo Travaglini Reviewed-by: Andreas Sandberg Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/20254 Maintainer: Andreas Sandberg Tested-by: kokoro --- src/dev/arm/gic_v3_distributor.hh | 1 + src/dev/arm/gic_v3_its.cc | 4 ++++ src/dev/arm/gic_v3_its.hh | 1 + 3 files changed, 6 insertions(+) diff --git a/src/dev/arm/gic_v3_distributor.hh b/src/dev/arm/gic_v3_distributor.hh index 880c577d7..0cf8d378c 100644 --- a/src/dev/arm/gic_v3_distributor.hh +++ b/src/dev/arm/gic_v3_distributor.hh @@ -53,6 +53,7 @@ class Gicv3Distributor : public Serializable friend class Gicv3Redistributor; friend class Gicv3CPUInterface; + friend class Gicv3Its; protected: diff --git a/src/dev/arm/gic_v3_its.cc b/src/dev/arm/gic_v3_its.cc index f3fa0a50e..26c123c03 100644 --- a/src/dev/arm/gic_v3_its.cc +++ b/src/dev/arm/gic_v3_its.cc @@ -834,6 +834,10 @@ Gicv3Its::read(PacketPtr pkt) value = gitsCreadr; break; + case GITS_PIDR2: + value = gic->getDistributor()->gicdPidr2; + break; + case GITS_TRANSLATER: value = gitsTranslater; break; diff --git a/src/dev/arm/gic_v3_its.hh b/src/dev/arm/gic_v3_its.hh index aa0b8c805..e09f712be 100644 --- a/src/dev/arm/gic_v3_its.hh +++ b/src/dev/arm/gic_v3_its.hh @@ -123,6 +123,7 @@ class Gicv3Its : public BasicPioDevice GITS_CBASER = itsControl + 0x0080, GITS_CWRITER = itsControl + 0x0088, GITS_CREADR = itsControl + 0x0090, + GITS_PIDR2 = itsControl + 0xffe8, // Translation frame GITS_TRANSLATER = itsTranslate + 0x0040 -- 2.30.2