commit 308b3bbbd6339afbfcd0a3d79bdcb6f6086f3628
author Gabe Black <gabeblack@google.com> Sun Sep 06 23:21:48 2020 -0700
committer Gabe Black <gabeblack@google.com> Tue Sep 08 22:05:55 2020 +0000
tree 881067ae4a82776898a74a25d88521947816affe
parent 0e41f063bef9895e5f0e2bc1a862c27ea249a3df

dev,arm: Use the ArmSystem::PageBytes constant in the generic timer.

This component very specific to ARM, and so there's no reason to use
generic interfaces to get the page size.

Change-Id: Id757b5742c807c5f616a6dc8df94a7709932d071
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/34171
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>

src/dev/arm/generic_timer.cc

diff --git a/src/dev/arm/generic_timer.cc b/src/dev/arm/generic_timer.cc
index 254175a..1b96257 100644
--- a/src/dev/arm/generic_timer.cc
+++ b/src/dev/arm/generic_timer.cc
@@ -873,7 +873,7 @@
 
 GenericTimerFrame::GenericTimerFrame(GenericTimerFrameParams *const p)
     : PioDevice(p),
-      timerRange(RangeSize(p->cnt_base, sys->getPageBytes())),
+      timerRange(RangeSize(p->cnt_base, ArmSystem::PageBytes)),
       addrRanges({timerRange}),
       systemCounter(*p->counter),
       physTimer(csprintf("%s.phys_timer", name()),
@@ -887,7 +887,7 @@
     SystemCounter::validateCounterRef(p->counter);
     // Expose optional CNTEL0Base register frame
     if (p->cnt_el0_base != MaxAddr) {
-        timerEl0Range = RangeSize(p->cnt_el0_base, sys->getPageBytes());
+        timerEl0Range = RangeSize(p->cnt_el0_base, ArmSystem::PageBytes);
         accessBitsEl0 = 0x303;
         addrRanges.push_back(timerEl0Range);
     }
@@ -1244,9 +1244,9 @@
 
 GenericTimerMem::GenericTimerMem(GenericTimerMemParams *const p)
     : PioDevice(p),
-      counterCtrlRange(RangeSize(p->cnt_control_base, sys->getPageBytes())),
-      counterStatusRange(RangeSize(p->cnt_read_base, sys->getPageBytes())),
-      timerCtrlRange(RangeSize(p->cnt_ctl_base, sys->getPageBytes())),
+      counterCtrlRange(RangeSize(p->cnt_control_base, ArmSystem::PageBytes)),
+      counterStatusRange(RangeSize(p->cnt_read_base, ArmSystem::PageBytes)),
+      timerCtrlRange(RangeSize(p->cnt_ctl_base, ArmSystem::PageBytes)),
       cnttidr(0x0),
       addrRanges{counterCtrlRange, counterStatusRange, timerCtrlRange},
       systemCounter(*p->counter),
@@ -1273,7 +1273,7 @@
 void
 GenericTimerMem::validateFrameRange(const AddrRange &range)
 {
-    fatal_if(range.start() % ArmISA::PageBytes,
+    fatal_if(range.start() % ArmSystem::PageBytes,
              "GenericTimerMem::validateFrameRange: Architecture states each "
              "register frame should be in a separate memory page, specified "
              "range base address [0x%x] is not compliant\n");