derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev-arm: Allow 32 bit accesses to GITS_C(WRITER/READR/BASER)

Browse Source 
For those registers (GITS_CWRITER, GITS_READR and GITS_CBASER)
Bits [63:32] and bits [31:0] are accessible separately.

Change-Id: Ibf60b5e4fd20efb21a63570e6012862e37946877
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/+/20256
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Giacomo Travaglini
2019-08-15 11:45:53 +01:00
parent 8e73f1d497
commit bd8c9614da
2 changed files with 45 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/dev/arm/gic_v3_its.cc
View File

@@ -826,14 +826,26 @@ Gicv3Its::read(PacketPtr pkt)
value = gitsCbaser;
break;
case GITS_CBASER + 4:
value = gitsCbaser.high;
break;
case GITS_CWRITER:
value = gitsCwriter;
break;
case GITS_CWRITER + 4:
value = gitsCwriter.high;
break;
case GITS_CREADR:
value = gitsCreadr;
break;
case GITS_CREADR + 4:
value = gitsCreadr.high;
break;
case GITS_PIDR2:
value = gic->getDistributor()->gicdPidr2;
break;
@@ -879,16 +891,41 @@ Gicv3Its::write(PacketPtr pkt)
panic("GITS_TYPER is Read Only\n");
case GITS_CBASER:
assert(pkt->getSize() == sizeof(uint64_t));
gitsCbaser = pkt->getLE<uint64_t>();
if (pkt->getSize() == sizeof(uint32_t)) {
gitsCbaser.low = pkt->getLE<uint32_t>();
} else {
assert(pkt->getSize() == sizeof(uint64_t));
gitsCbaser = pkt->getLE<uint64_t>();
}
gitsCreadr = 0; // Cleared when CBASER gets written
checkCommandQueue();
break;
case GITS_CBASER + 4:
assert(pkt->getSize() == sizeof(uint32_t));
gitsCbaser.high = pkt->getLE<uint32_t>();
gitsCreadr = 0; // Cleared when CBASER gets written
checkCommandQueue();
break;
case GITS_CWRITER:
assert(pkt->getSize() == sizeof(uint64_t));
gitsCwriter = pkt->getLE<uint64_t>();
if (pkt->getSize() == sizeof(uint32_t)) {
gitsCwriter.low = pkt->getLE<uint32_t>();
} else {
assert(pkt->getSize() == sizeof(uint64_t));
gitsCwriter = pkt->getLE<uint64_t>();
}
checkCommandQueue();
break;
case GITS_CWRITER + 4:
assert(pkt->getSize() == sizeof(uint32_t));
gitsCwriter.high = pkt->getLE<uint32_t>();
checkCommandQueue();
break;

4
src/dev/arm/gic_v3_its.hh
View File

@@ -149,12 +149,16 @@ class Gicv3Its : public BasicPioDevice
// Command read/write, (CREADR, CWRITER)
BitUnion64(CRDWR)
Bitfield<63, 32> high;
Bitfield<31, 0> low;
Bitfield<19, 5> offset;
Bitfield<0> retry;
Bitfield<0> stalled;
EndBitUnion(CRDWR)
BitUnion64(CBASER)
Bitfield<63, 32> high;
Bitfield<31, 0> low;
Bitfield<63> valid;
Bitfield<61, 59> innerCache;
Bitfield<55, 53> outerCache;