Giacomo Travaglini has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/18589 )
Change subject: dev-arm: Fix Bitwise operation in GICv3
......................................................................
dev-arm: Fix Bitwise operation in GICv3
GICv3 LPI code is wrongly using the xor operator (^) in order to
evaluate powers of two.
Change-Id: Ib1131fd5940d334967a3741f8fd15d86625be356
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/+/18589
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, 4 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 eb5767a..348cd96 100644
--- a/src/dev/arm/gic_v3_redistributor.cc
+++ b/src/dev/arm/gic_v3_redistributor.cc
@@ -675,7 +675,7 @@
lpiIDBits = 0xf;
}
- uint32_t largest_lpi_id = 2 ^ (lpiIDBits + 1);
+ uint32_t largest_lpi_id = 1 << (lpiIDBits + 1);
uint32_t number_lpis = largest_lpi_id - SMALLEST_LPI_ID + 1;
lpiConfigurationTable.resize(number_lpis);
break;
@@ -699,7 +699,7 @@
case GICR_INVLPIR: { // Redistributor Invalidate LPI Register
uint32_t lpi_id = data & 0xffffffff;
- uint32_t largest_lpi_id = 2 ^ (lpiIDBits + 1);
+ uint32_t largest_lpi_id = 1 << (lpiIDBits + 1);
if (lpi_id > largest_lpi_id) {
return;
@@ -830,7 +830,7 @@
}
// Check LPIs
- uint32_t largest_lpi_id = 2 ^ (lpiIDBits + 1);
+ 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,
@@ -881,7 +881,7 @@
}
uint32_t lpi_id = data & 0xffffffff;
- uint32_t largest_lpi_id = 2 ^ (lpiIDBits + 1);
+ uint32_t largest_lpi_id = 1 << (lpiIDBits + 1);
if (lpi_id > largest_lpi_id) {
// Writes to GICR_SETLPIR or GICR_CLRLPIR have not effect if
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/18589
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: Ib1131fd5940d334967a3741f8fd15d86625be356
Gerrit-Change-Number: 18589
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
