From ccf6a059bdbf5eb146263f51cfc683fb2f579dd0 Mon Sep 17 00:00:00 2001
From: Florian Zaruba <fl.zaruba@be4web.net>
Date: Thu, 18 May 2017 20:26:41 +0200
Subject: [PATCH] Remove IO path from LSU interface

---
 src/lsu.sv         | 22 +++++++++-------------
 src/mem_arbiter.sv |  4 ++--
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/src/lsu.sv b/src/lsu.sv
index d32bbce71..899dca4c2 100644
--- a/src/lsu.sv
+++ b/src/lsu.sv
@@ -268,7 +268,7 @@ module lsu #(
         lsu_ready_o          = 1'b1;
         // LSU result is valid
         // we need to give the valid result even to stores
-        lsu_valid_o          = 1'b0;
+        lsu_valid_o          = data_rvalid_o[1];
         // is the store valid e.g.: can we put it in the store buffer
         st_valid             = 1'b0;
         // as a default we are not requesting on the read interface
@@ -333,24 +333,20 @@ module lsu #(
                 if (enable_translation_i) begin
                     // translation from the previous cycle was valid
                     if (translation_valid_q) begin
+                        lsu_ready_o     = 1'b1;
                         // output the physical address
                         address_i[1]    = paddr_q;
-                        // wait for the rvalid
-                        if (data_rvalid_o[1]) begin
-                            lsu_ready_o     = 1'b1;
-                            lsu_valid_o     = 1'b1;
-                            // we can make a new request here
-                            if (lsu_valid_i)
-                                make_request = 1'b1;
-                        end
-                    end else begin
+                        // we can make a new request here
+                        if (lsu_valid_i)
+                            make_request = 1'b1;
+                    end else begin // TODO: Abort in case of access exception
                         data_tag_status_i[1] = `WAIT_TRANSLATION;
                     end
                 // we do not need address translation, we can simply wait for the rvalid
-                end else if (data_rvalid_o) begin
+                end else if (lsu_valid) begin
                     // we can make a new request here
-                    if (lsu_valid_i)
-                        make_request = 1'b1;
+                    make_request = 1'b1;
+                    lsu_ready_o  = 1'b1;
                 end
             end
             // we've got a flush request but have an outstanding rvalid, wait for it
diff --git a/src/mem_arbiter.sv b/src/mem_arbiter.sv
index 13991bafb..b5ee3095f 100644
--- a/src/mem_arbiter.sv
+++ b/src/mem_arbiter.sv
@@ -144,8 +144,8 @@ module mem_arbiter #(
             // ----------------------------
             // Multi-cycle memory requests
             // ----------------------------
-            // do we have an outstanding request e.g.: a request which is waiting for a grant or an tag_valid
-            // here we need to wait for the tag
+            // do we have an outstanding request e.g.: a request which is waiting for a grant or a tag_valid
+            // here we need to wait for the grant
             WAIT_GNT: begin
                 // we can check for it since we only stay in this state if didn't yet receive a grant
                 if (data_gnt_i) begin