Revert last merge, made by mistake

Author: dpretet

test/svut/src/axicb_crossbar_top_testbench.sv

@@ -935,7 +935,7 @@ module axicb_crossbar_top_testbench();
     .AXI_ID_W        (AXI_ID_W),
     .AXI_DATA_W      (AXI_DATA_W),
     .MST_ID          (MST0_ID_MASK),
-    .MST_OSTDREQ_NUM (MST0_OSTDREQ_NUM),
+    .MST_OSTDREQ_NUM (16),
     .AXI_SIGNALING   (AXI_SIGNALING),
     .USER_SUPPORT    (USER_SUPPORT),
     .AXI_AUSER_W     (AXI_AUSER_W),
@@ -1016,7 +1016,7 @@ module axicb_crossbar_top_testbench();
     .AXI_ID_W        (AXI_ID_W),
     .AXI_DATA_W      (AXI_DATA_W),
     .MST_ID          (MST1_ID_MASK),
-    .MST_OSTDREQ_NUM (MST1_OSTDREQ_NUM),
+    .MST_OSTDREQ_NUM (16),
     .AXI_SIGNALING   (AXI_SIGNALING),
     .USER_SUPPORT    (USER_SUPPORT),
     .AXI_AUSER_W     (AXI_AUSER_W),
@@ -1097,7 +1097,7 @@ module axicb_crossbar_top_testbench();
     .AXI_ID_W        (AXI_ID_W),
     .AXI_DATA_W      (AXI_DATA_W),
     .MST_ID          (MST2_ID_MASK),
-    .MST_OSTDREQ_NUM (MST2_OSTDREQ_NUM),
+    .MST_OSTDREQ_NUM (16),
     .AXI_SIGNALING   (AXI_SIGNALING),
     .USER_SUPPORT    (USER_SUPPORT),
     .AXI_AUSER_W     (AXI_AUSER_W),
@@ -1178,7 +1178,7 @@ module axicb_crossbar_top_testbench();
     .AXI_ID_W        (AXI_ID_W),
     .AXI_DATA_W      (AXI_DATA_W),
     .MST_ID          (MST3_ID_MASK),
-    .MST_OSTDREQ_NUM (MST3_OSTDREQ_NUM),
+    .MST_OSTDREQ_NUM (16),
     .AXI_SIGNALING   (AXI_SIGNALING),
     .USER_SUPPORT    (USER_SUPPORT),
     .AXI_AUSER_W     (AXI_AUSER_W),

test/svut/src/mst_driver.sv

@@ -330,8 +330,7 @@ module mst_driver
     generate
     if (AXI_SIGNALING > 0) begin
 
-        // assign wvalid = wvalid_lfsr[0] & en & (!w_empty_r | !(w_empty & wlast_r));
-        assign wvalid = wvalid_lfsr[0] & en & wvalid_r & !w_empty;
+        assign wvalid = wvalid_lfsr[0] & en & !w_empty_r;
         assign wdata = (wlen==8'h0) ? wdata_w : next_wdata;
         assign wstrb = {AXI_DATA_W/8{1'b1}};
         assign wlast = (w_empty) ? 1'b0 : (wlen==awlen_w) ? 1'b1 : 1'b0;