<p>Nico Huber has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/26838">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">time: Revise state abstraction<br><br>Make abstract state `State` of HW.Time.Timer, that's used to derive the<br>Hz value for instance, External. This helps to fix flow issues in the<br>mutime implementation and also matches real hardware better: The clock<br>rate may be derived from the hardware state.<br><br>HW.Time.Timer.Hz had to be made a volatile function, therefore.<br><br>Change-Id: I35af2d0db1acbf9652ea00763aa288545746bb79<br>Signed-off-by: Nico Huber <nico.huber@secunet.com><br>---<br>M ada/mutime/hw-time-timer.adb<br>M common/hw-time-timer.ads<br>M common/hw-time.adb<br>3 files changed, 20 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/libhwbase refs/changes/38/26838/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/ada/mutime/hw-time-timer.adb b/ada/mutime/hw-time-timer.adb</span><br><span>index 272289c..c683d6f 100644</span><br><span>--- a/ada/mutime/hw-time-timer.adb</span><br><span>+++ b/ada/mutime/hw-time-timer.adb</span><br><span>@@ -17,8 +17,8 @@</span><br><span> with Muschedinfo;</span><br><span> </span><br><span> package body HW.Time.Timer</span><br><span style="color: hsl(0, 100%, 40%);">- with Refined_State => (Timer_State => null,</span><br><span style="color: hsl(0, 100%, 40%);">- Abstract_Time => (Sinfo, Sched_Info))</span><br><span style="color: hsl(120, 100%, 40%);">+ with Refined_State => (Timer_State => (Sinfo),</span><br><span style="color: hsl(120, 100%, 40%);">+ Abstract_Time => (Sched_Info))</span><br><span> is</span><br><span> Sinfo_Base_Address : constant := 16#000e_0000_0000#;</span><br><span> Sinfo_Page_Size : constant</span><br><span>@@ -27,6 +27,8 @@</span><br><span> </span><br><span> Sinfo : Musinfo.Subject_Info_Type</span><br><span> with</span><br><span style="color: hsl(120, 100%, 40%);">+ Volatile,</span><br><span style="color: hsl(120, 100%, 40%);">+ Async_Writers,</span><br><span> Address => System'To_Address (Sinfo_Base_Address);</span><br><span> </span><br><span> Sched_Info : Muschedinfo.Scheduling_Info_Type</span><br><span>@@ -51,9 +53,11 @@</span><br><span> return T (TSC_Schedule_End);</span><br><span> end Raw_Value_Max;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- function Hz return T is</span><br><span style="color: hsl(120, 100%, 40%);">+ function Hz return T</span><br><span style="color: hsl(120, 100%, 40%);">+ is</span><br><span style="color: hsl(120, 100%, 40%);">+ Khz : constant T := T (Sinfo.TSC_Khz);</span><br><span> begin</span><br><span style="color: hsl(0, 100%, 40%);">- return T (Sinfo.TSC_Khz) * 1000;</span><br><span style="color: hsl(120, 100%, 40%);">+ return Khz * 1000;</span><br><span> end Hz;</span><br><span> </span><br><span> end HW.Time.Timer;</span><br><span>diff --git a/common/hw-time-timer.ads b/common/hw-time-timer.ads</span><br><span>index cfe2e0b..90978df 100644</span><br><span>--- a/common/hw-time-timer.ads</span><br><span>+++ b/common/hw-time-timer.ads</span><br><span>@@ -14,11 +14,12 @@</span><br><span> </span><br><span> private package HW.Time.Timer</span><br><span> with</span><br><span style="color: hsl(0, 100%, 40%);">- Abstract_State => ((Timer_State with Part_Of => HW.Time.State),</span><br><span style="color: hsl(120, 100%, 40%);">+ Abstract_State => ((Timer_State with</span><br><span style="color: hsl(120, 100%, 40%);">+ Part_Of => HW.Time.State,</span><br><span style="color: hsl(120, 100%, 40%);">+ External => Async_Writers),</span><br><span> (Abstract_Time with</span><br><span> Part_Of => HW.Time.State,</span><br><span style="color: hsl(0, 100%, 40%);">- External => Async_Writers)),</span><br><span style="color: hsl(0, 100%, 40%);">- Initializes => (Timer_State)</span><br><span style="color: hsl(120, 100%, 40%);">+ External => Async_Writers))</span><br><span> is</span><br><span> </span><br><span> -- Returns the highest point in time that has definitely passed.</span><br><span>@@ -37,6 +38,7 @@</span><br><span> </span><br><span> function Hz return T</span><br><span> with</span><br><span style="color: hsl(120, 100%, 40%);">+ Volatile_Function,</span><br><span> Global => (Input => Timer_State);</span><br><span> </span><br><span> end HW.Time.Timer;</span><br><span>diff --git a/common/hw-time.adb b/common/hw-time.adb</span><br><span>index 28db95d..b81d343 100644</span><br><span>--- a/common/hw-time.adb</span><br><span>+++ b/common/hw-time.adb</span><br><span>@@ -34,25 +34,28 @@</span><br><span> with</span><br><span> Refined_Global => (Input => (Timer.Abstract_Time, Timer.Timer_State))</span><br><span> is</span><br><span style="color: hsl(120, 100%, 40%);">+ Hz : constant T := Timer.Hz;</span><br><span> Current : constant T := Timer.Raw_Value_Max;</span><br><span> begin</span><br><span style="color: hsl(0, 100%, 40%);">- return Current + (T (US) * Timer.Hz + 999_999) / 1_000_000;</span><br><span style="color: hsl(120, 100%, 40%);">+ return Current + (T (US) * Hz + 999_999) / 1_000_000;</span><br><span> end US_From_Now;</span><br><span> </span><br><span> function MS_From_Now (MS : Natural) return T</span><br><span> with</span><br><span> Refined_Global => (Input => (Timer.Abstract_Time, Timer.Timer_State))</span><br><span> is</span><br><span style="color: hsl(120, 100%, 40%);">+ Hz : constant T := Timer.Hz;</span><br><span> Current : constant T := Timer.Raw_Value_Max;</span><br><span> begin</span><br><span style="color: hsl(0, 100%, 40%);">- return Current + (T (MS) * Timer.Hz + 999) / 1_000;</span><br><span style="color: hsl(120, 100%, 40%);">+ return Current + (T (MS) * Hz + 999) / 1_000;</span><br><span> end MS_From_Now;</span><br><span> </span><br><span> function Now_US return Int64</span><br><span> with</span><br><span> Refined_Global => (Input => (Timer.Abstract_Time, Timer.Timer_State))</span><br><span> is</span><br><span style="color: hsl(0, 100%, 40%);">- MHz : constant T := Timer.Hz / 1_000_000;</span><br><span style="color: hsl(120, 100%, 40%);">+ Hz : constant T := Timer.Hz;</span><br><span style="color: hsl(120, 100%, 40%);">+ MHz : constant T := Hz / 1_000_000;</span><br><span> Current : constant T := Timer.Raw_Value_Min;</span><br><span> begin</span><br><span> return Int64 (Current and (2 ** 63 - 1))</span><br><span>@@ -65,7 +68,7 @@</span><br><span> with</span><br><span> Refined_Global => (Input => (Timer.Abstract_Time))</span><br><span> is</span><br><span style="color: hsl(0, 100%, 40%);">- Current: T;</span><br><span style="color: hsl(120, 100%, 40%);">+ Current : T;</span><br><span> begin</span><br><span> loop</span><br><span> Current := Timer.Raw_Value_Min;</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/26838">change 26838</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/26838"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libhwbase </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I35af2d0db1acbf9652ea00763aa288545746bb79 </div>
<div style="display:none"> Gerrit-Change-Number: 26838 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Nico Huber <nico.h@gmx.de> </div>