From: Adrian Herrera <adrian.herrera@arm.com>
Date: Mon, 28 Oct 2019 19:38:06 +0000 (+0000)
Subject: dev-arm: GenericTimer, freq as 32-bit value
X-Git-Tag: v19.0.0.0~211
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7acd6a57c8876c3c5498595d239978b048d28b19;p=gem5.git

dev-arm: GenericTimer, freq as 32-bit value

The System Counter frequency is now a 32-bit value. This is consistent
with CNTFRQ and CNTFRQ_EL0 register sizes.

Change-Id: I39886a3767adbe9c58887b8b6d5f30ebc6035bcc
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/22424
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/src/dev/arm/generic_timer.hh b/src/dev/arm/generic_timer.hh
index acd8b3960..9a7f162e7 100644
--- a/src/dev/arm/generic_timer.hh
+++ b/src/dev/arm/generic_timer.hh
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2015, 2017-2018 ARM Limited
+ * Copyright (c) 2013, 2015, 2017-2018, 2019 ARM Limited
  * All rights reserved.
  *
  * The license below extends only to copyright in the software and shall
@@ -63,7 +63,7 @@ class SystemCounter : public Serializable
 {
   protected:
     /// Counter frequency (as specified by CNTFRQ).
-    uint64_t _freq;
+    uint32_t _freq;
     /// Cached copy of the counter period (inverse of the frequency).
     Tick _period;
     /// Tick when the counter was reset.
@@ -86,7 +86,7 @@ class SystemCounter : public Serializable
     }
 
     /// Returns the counter frequency.
-    uint64_t freq() const { return _freq; }
+    uint32_t freq() const { return _freq; }
     /// Sets the counter frequency.
     /// @param freq frequency in Hz.
     void setFreq(uint32_t freq);