Giacomo Travaglini has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/18591 )
Change subject: dev-arm: GICv3 LPI tables are using physical addresses
......................................................................
dev-arm: GICv3 LPI tables are using physical addresses
Change-Id: I439112f318720ae74c43a374fd3a524c607b3a23
Signed-off-by: Giacomo Travaglini <giacomo.travagl...@arm.com>
Reviewed-by: Andreas Sandberg <andreas.sandb...@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/18591
Maintainer: Andreas Sandberg <andreas.sandb...@arm.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/dev/arm/gic_v3_redistributor.cc
1 file changed, 5 insertions(+), 4 deletions(-)
Approvals:
Andreas Sandberg: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/dev/arm/gic_v3_redistributor.cc
b/src/dev/arm/gic_v3_redistributor.cc
index 3039e1e..d5a405a 100644
--- a/src/dev/arm/gic_v3_redistributor.cc
+++ b/src/dev/arm/gic_v3_redistributor.cc
@@ -732,7 +732,7 @@
Addr lpi_table_entry_ptr = lpiConfigurationTablePtr +
lpi_entry_index * sizeof(LPIConfigurationTableEntry);
ThreadContext * tc = gic->getSystem()->getThreadContext(cpuId);
- tc->getVirtProxy().readBlob(lpi_table_entry_ptr,
+ tc->getPhysProxy().readBlob(lpi_table_entry_ptr,
(uint8_t*) &lpiConfigurationTable[lpi_entry_index],
sizeof(LPIConfigurationTableEntry));
}
@@ -833,9 +833,10 @@
const uint32_t largest_lpi_id = 1 << (lpiIDBits + 1);
char lpi_pending_table[largest_lpi_id / 8];
ThreadContext * tc = gic->getSystem()->getThreadContext(cpuId);
- tc->getVirtProxy().readBlob(lpiPendingTablePtr,
+ tc->getPhysProxy().readBlob(lpiPendingTablePtr,
(uint8_t *) lpi_pending_table,
sizeof(lpi_pending_table));
+
for (int lpi_id = SMALLEST_LPI_ID; lpi_id < largest_lpi_id;
lpi_id++) {
uint32_t lpi_pending_entry_byte = lpi_id / 8;
@@ -892,7 +893,7 @@
Addr lpi_pending_entry_ptr = lpiPendingTablePtr + (lpi_id / 8);
uint8_t lpi_pending_entry;
ThreadContext * tc = gic->getSystem()->getThreadContext(cpuId);
- tc->getVirtProxy().readBlob(lpi_pending_entry_ptr,
+ tc->getPhysProxy().readBlob(lpi_pending_entry_ptr,
(uint8_t*) &lpi_pending_entry,
sizeof(lpi_pending_entry));
uint8_t lpi_pending_entry_bit_position = lpi_id % 8;
@@ -916,7 +917,7 @@
lpi_pending_entry &= ~(1 << (lpi_pending_entry_bit_position));
}
- tc->getVirtProxy().writeBlob(lpi_pending_entry_ptr,
+ tc->getPhysProxy().writeBlob(lpi_pending_entry_ptr,
(uint8_t*) &lpi_pending_entry,
sizeof(lpi_pending_entry));
updateAndInformCPUInterface();
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/18591
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I439112f318720ae74c43a374fd3a524c607b3a23
Gerrit-Change-Number: 18591
Gerrit-PatchSet: 2
Gerrit-Owner: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: Andreas Sandberg <andreas.sandb...@arm.com>
Gerrit-Reviewer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev