From 40c7808f6be265fd4a44b35b195980dfbf473812 Mon Sep 17 00:00:00 2001
From: Paul Selkirk <paul@psgd.org>
Date: Tue, 28 Apr 2015 18:03:27 -0400
Subject: (1) Remove the delayed read for EIM (see core/platform/novena commit
 2f58e8f). (2) Add the code to read the csprng name and version registers.

---
 src/rtl/trng_mixer.v | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

(limited to 'src/rtl/trng_mixer.v')

diff --git a/src/rtl/trng_mixer.v b/src/rtl/trng_mixer.v
index 24ccaaa..449dc5c 100644
--- a/src/rtl/trng_mixer.v
+++ b/src/rtl/trng_mixer.v
@@ -214,8 +214,7 @@ module trng_mixer(
   reg         restart_reg;
   reg         restart_new;
 
-  reg [31 : 0] read_data_new;
-  reg [31 : 0] read_data_reg;
+  reg [31 : 0] tmp_read_data;
 
 
   //----------------------------------------------------------------
@@ -248,7 +247,7 @@ module trng_mixer(
   //----------------------------------------------------------------
   // Concurrent connectivity for ports etc.
   //----------------------------------------------------------------
-  assign read_data      = read_data_reg;
+  assign read_data      = tmp_read_data;
   assign error          = tmp_error;
   assign security_error = 0;
 
@@ -349,16 +348,12 @@ module trng_mixer(
           entropy_timeout_reg      <= DEFAULT_ENTROPY_TIMEOUT;
           entropy_timeout_ctr_reg  <= 24'h000000;
           entropy_collect_ctrl_reg <= CTRL_IDLE;
-          read_data_reg            <= 32'h00000000;
           mixer_ctrl_reg           <= CTRL_IDLE;
         end
       else
         begin
           restart_reg <= restart_new;
 
-          if (cs)
-            read_data_reg <= read_data_new;
-
           if (block00_we)
             block00_reg <= muxed_entropy;
 
@@ -493,7 +488,7 @@ module trng_mixer(
       restart_new         = 0;
       entropy_timeout_new = 24'h000000;
       entropy_timeout_we  = 0;
-      read_data_new       = 32'h00000000;
+      tmp_read_data       = 32'h00000000;
       tmp_error           = 0;
 
       if (cs)
@@ -530,17 +525,17 @@ module trng_mixer(
                 // Read operations.
                 ADDR_MIXER_CTRL:
                   begin
-                    read_data_new = {30'h00000000, restart_reg, enable_reg};
+                    tmp_read_data = {30'h00000000, restart_reg, enable_reg};
                   end
 
                 ADDR_MIXER_STATUS:
                   begin
-                    read_data_new = 32'h00000000;
+                    tmp_read_data = 32'h00000000;
                   end
 
                 ADDR_MIXER_TIMEOUT:
                   begin
-                    read_data_new = {8'h00, entropy_timeout_reg};
+                    tmp_read_data = {8'h00, entropy_timeout_reg};
                   end
 
                 default:
-- 
cgit v1.2.3