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

dev-arm: Remove un-needed Q_CONS_PROD_MASK macro

Browse Source 
Change-Id: I858d7eea088bbdd2dc12123e21e59991c896597f
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Michiel Van Tol <michiel.vantol@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/19310
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Giacomo Travaglini
2019-06-24 16:31:08 +01:00
parent f82f1dd81b
commit 0f50b6252b
3 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/dev/arm/smmu_v3_cmdexec.cc
View File

@@ -56,8 +56,7 @@ SMMUCommandExecProcess::main(Yield &yield)
busy = true;
while (true) {
int sizeMask =
mask(smmu.regs.cmdq_base & Q_BASE_SIZE_MASK) & Q_CONS_PROD_MASK;
int sizeMask = mask(smmu.regs.cmdq_base & Q_BASE_SIZE_MASK);
if ((smmu.regs.cmdq_cons & sizeMask) ==
(smmu.regs.cmdq_prod & sizeMask))

1
src/dev/arm/smmu_v3_defs.hh
View File

@@ -92,7 +92,6 @@ enum {
VMT_BASE_ADDR_MASK = 0x0000ffffffffffe0ULL,
VMT_BASE_SIZE_MASK = 0x000000000000001fULL,
Q_CONS_PROD_MASK = 0x00000000000fffffULL,
Q_BASE_ADDR_MASK = 0x0000ffffffffffe0ULL,
Q_BASE_SIZE_MASK = 0x000000000000001fULL,

3
src/dev/arm/smmu_v3_transl.cc
View File

@@ -1280,8 +1280,7 @@ SMMUTranslationProcess::completePrefetch(Yield &yield)
void
SMMUTranslationProcess::sendEvent(Yield &yield, const SMMUEvent &ev)
{
int sizeMask = mask(smmu.regs.eventq_base & Q_BASE_SIZE_MASK) &
Q_CONS_PROD_MASK;
int sizeMask = mask(smmu.regs.eventq_base & Q_BASE_SIZE_MASK);
if (((smmu.regs.eventq_prod+1) & sizeMask) ==
(smmu.regs.eventq_cons & sizeMask))