commit 9f5b6e1b74c8289050836abdfb9c2539380f9105
author Curtis Dunham <Curtis.Dunham@arm.com> Thu Sep 07 16:13:54 2017 -0500
committer Curtis Dunham <curtis.dunham@arm.com> Mon Jan 29 22:19:55 2018 +0000
tree 9b5dc7cdee74400580241907d8b50b3ed69a02ee
parent 624a026a393104e6730731695d5d74addd65d79e

arm: make Arm GenericTimer a ClockedObject

Within a device tree, the GenericTimer device needs to point (via phandle)
to a clock domain which is itself also an object in the device tree. Within
gem5, clock domains are managed by making all clocked SimObjects inherit
from ClockedObject rather than SimObject.

Without this change, the GenericTimer is unable to generate the appropriate
clock domain phandle, and will crash during DTB autogeneration.

Change-Id: I6d3fb6362847c6a01720b2f14b3d595d1e59f01f
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/4960
Reviewed-by: Jason Lowe-Power <jason@lowepower.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>

src/dev/arm/RealView.py

diff --git a/src/dev/arm/RealView.py b/src/dev/arm/RealView.py
index 699b7df..cd7772f 100644
--- a/src/dev/arm/RealView.py
+++ b/src/dev/arm/RealView.py
@@ -54,6 +54,7 @@
 from SimpleMemory import SimpleMemory
 from Gic import *
 from EnergyCtrl import EnergyCtrl
+from ClockedObject import ClockedObject
 from ClockDomain import SrcClockDomain
 from SubSystem import SubSystem
 from Graphics import ImageFormat
@@ -247,7 +248,7 @@
     int_num_timer = Param.UInt32("Interrrupt number used per-cpu to GIC")
     int_num_watchdog = Param.UInt32("Interrupt number for per-cpu watchdog to GIC")
 
-class GenericTimer(SimObject):
+class GenericTimer(ClockedObject):
     type = 'GenericTimer'
     cxx_header = "dev/arm/generic_timer.hh"
     system = Param.ArmSystem(Parent.any, "system")

src/dev/arm/generic_timer.cc

diff --git a/src/dev/arm/generic_timer.cc b/src/dev/arm/generic_timer.cc
index f8433bd..73e4f91 100644
--- a/src/dev/arm/generic_timer.cc
+++ b/src/dev/arm/generic_timer.cc
@@ -239,7 +239,7 @@
 
 
 GenericTimer::GenericTimer(GenericTimerParams *p)
-    : SimObject(p),
+    : ClockedObject(p),
       system(*p->system),
       gic(p->gic),
       irqPhys(p->int_phys),

src/dev/arm/generic_timer.hh

diff --git a/src/dev/arm/generic_timer.hh b/src/dev/arm/generic_timer.hh
index ccfb127..c9cfb74 100644
--- a/src/dev/arm/generic_timer.hh
+++ b/src/dev/arm/generic_timer.hh
@@ -226,7 +226,7 @@
     }
 };
 
-class GenericTimer : public SimObject
+class GenericTimer : public ClockedObject
 {
   public:
     GenericTimer(GenericTimerParams *p);