Make rata_req.we propagation consistent.

pulp-platform · Oct 30, 2023 · de93f20 · de93f20
1 parent 86e67af
commit de93f20
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 8 deletions.
diff --git a/packages/pulp_cluster_package.sv b/packages/pulp_cluster_package.sv
@@ -58,7 +58,7 @@ package pulp_cluster_package;
   typedef struct packed {
     logic req;
     logic [31:0] add;
-    logic wen;
+    logic we;
     logic [31:0] data;
     logic [3:0] be;
   } core_data_req_t;

diff --git a/rtl/core_demux_wrap.sv b/rtl/core_demux_wrap.sv
@@ -44,7 +44,7 @@ data_periph_demux #(
   .base_addr_i        (  base_addr_i              ),
   .data_req_i         (  core_data_req_i.req      ),
   .data_add_i         (  core_data_req_i.add      ),
-  .data_wen_i         (  core_data_req_i.wen      ), //inverted when using OR10N
+  .data_wen_i         (  ~core_data_req_i.we      ), //inverted when using OR10N
   .data_wdata_i       (  core_data_req_i.data     ),
   .data_be_i          (  core_data_req_i.be       ),
   .data_gnt_o         (  core_data_rsp_o.gnt      ),

diff --git a/rtl/core_region.sv b/rtl/core_region.sv
@@ -145,7 +145,6 @@ import rapid_recovery_pkg::*;
 
   logic        core_data_req_we ;
 
-  assign core_data_req_o.wen  = ~core_data_req_we;
   assign hart_id = {21'b0, cluster_id_i[5:0], 1'b0, core_id_i};
 
    //********************************************************
@@ -185,7 +184,7 @@ import rapid_recovery_pkg::*;
         .data_req_o            ( core_data_req_o.req         ),
         .data_gnt_i            ( core_data_rsp_i.gnt         ),
         .data_rvalid_i         ( core_data_rsp_i.r_valid     ),
-        .data_we_o             ( core_data_req_we            ),
+        .data_we_o             ( core_data_req_o.we          ),
         .data_be_o             ( core_data_req_o.be          ),
         .data_addr_o           ( core_data_req_o.add         ),
         .data_wdata_o          ( core_data_req_o.data        ),
@@ -263,7 +262,7 @@ import rapid_recovery_pkg::*;
         .data_req_o            ( core_data_req_o.req         ),
         .data_gnt_i            ( core_data_rsp_i.gnt         ),
         .data_rvalid_i         ( core_data_rsp_i.r_valid     ),
-        .data_we_o             ( core_data_req_we            ),
+        .data_we_o             ( core_data_req_o.we          ),
         .data_be_o             ( core_data_req_o.be          ),
         .data_addr_o           ( core_data_req_o.add         ),
         .data_wdata_o          ( core_data_req_o.data        ),
@@ -439,7 +438,7 @@ import rapid_recovery_pkg::*;
         .data_req_o            ( core_mem_req            ),
         .data_gnt_i            ( core_data_rsp_i.gnt     ),
         .data_rvalid_i         ( core_data_rsp_i.r_valid ),
-        .data_we_o             ( core_data_req_we        ),
+        .data_we_o             ( core_data_req_o.we      ),
         .data_be_o             ( core_data_req_o.be      ),
         .data_addr_o           ( core_data_req_o.add     ),
         .data_wdata_o          ( core_data_req_o.wdata   ),

diff --git a/rtl/pulp_cluster.sv b/rtl/pulp_cluster.sv
@@ -985,7 +985,7 @@ generate
     assign instr_req[i]            = hmr2sys[i].instr_req;
     assign instr_addr[i]           = hmr2sys[i].instr_addr;
     assign demux_data_req[i].req   = hmr2sys[i].data_req;
-    assign demux_data_req[i].wen   = hmr2sys[i].data_we; // The protocol is handeled within the core
+    assign demux_data_req[i].we    = hmr2sys[i].data_we;
     assign demux_data_req[i].be    = hmr2sys[i].data_be;
     assign demux_data_req[i].add   = hmr2sys[i].data_add;
     assign demux_data_req[i].data  = hmr2sys[i].data_wdata;
@@ -1000,7 +1000,7 @@ generate
 
     assign core2hmr[i].data_req   = core_data_req[i].req;
     assign core2hmr[i].data_add   = core_data_req[i].add;
-    assign core2hmr[i].data_we    = core_data_req[i].wen; // The protocol is handeled within the core
+    assign core2hmr[i].data_we    = core_data_req[i].we;
     assign core2hmr[i].data_wdata = core_data_req[i].data;
     assign core2hmr[i].data_be    = core_data_req[i].be;