diff options
| -rw-r--r-- | src/dev/arm/generic_timer.cc | 32 | ||||
| -rw-r--r-- | src/dev/arm/generic_timer.hh | 9 |
2 files changed, 25 insertions, 16 deletions
diff --git a/src/dev/arm/generic_timer.cc b/src/dev/arm/generic_timer.cc index efaebb1ba..48f70e135 100644 --- a/src/dev/arm/generic_timer.cc +++ b/src/dev/arm/generic_timer.cc @@ -179,13 +179,6 @@ ArchTimer::serialize(CheckpointOut &cp) const paramOut(cp, "control_serial", _control); SERIALIZE_SCALAR(_counterLimit); SERIALIZE_SCALAR(_offset); - - const bool event_scheduled(_counterLimitReachedEvent.scheduled()); - SERIALIZE_SCALAR(event_scheduled); - if (event_scheduled) { - const Tick event_time(_counterLimitReachedEvent.when()); - SERIALIZE_SCALAR(event_time); - } } void @@ -197,13 +190,24 @@ ArchTimer::unserialize(CheckpointIn &cp) // compatibility. if (!UNSERIALIZE_OPT_SCALAR(_offset)) _offset = 0; - bool event_scheduled; - UNSERIALIZE_SCALAR(event_scheduled); - if (event_scheduled) { - Tick event_time; - UNSERIALIZE_SCALAR(event_time); - _parent.schedule(_counterLimitReachedEvent, event_time); - } + + // We no longer schedule an event here because we may enter KVM + // emulation. The event creation is delayed until drainResume(). +} + +DrainState +ArchTimer::drain() +{ + if (_counterLimitReachedEvent.scheduled()) + _parent.deschedule(_counterLimitReachedEvent); + + return DrainState::Drained; +} + +void +ArchTimer::drainResume() +{ + updateCounter(); } void diff --git a/src/dev/arm/generic_timer.hh b/src/dev/arm/generic_timer.hh index 3a3895489..3eec1d42e 100644 --- a/src/dev/arm/generic_timer.hh +++ b/src/dev/arm/generic_timer.hh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015 ARM Limited + * Copyright (c) 2013, 2015, 2017 ARM Limited * All rights reserved. * * The license below extends only to copyright in the software and shall @@ -102,7 +102,7 @@ class SystemCounter : public Serializable }; /// Per-CPU architected timer. -class ArchTimer : public Serializable +class ArchTimer : public Serializable, public Drainable { public: class Interrupt @@ -188,9 +188,14 @@ class ArchTimer : public Serializable /// Returns the value of the counter which this timer relies on. uint64_t value() const; + // Serializable void serialize(CheckpointOut &cp) const override; void unserialize(CheckpointIn &cp) override; + // Drainable + DrainState drain() override; + void drainResume() override; + private: // Disable copying ArchTimer(const ArchTimer &t); |