From 7e0dc81cee05c276fec945dbc422e4674216be4f Mon Sep 17 00:00:00 2001
From: Blaise Tine <tinebp@yahoo.com>
Date: Wed, 23 Jun 2021 04:19:13 -0700
Subject: [PATCH] minor update

---
 hw/rtl/afu/VX_avs_wrapper.v | 15 ++++++++++++---
 hw/scripts/scope.json       |  2 +-
 hw/simulate/simulator.cpp   |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/hw/rtl/afu/VX_avs_wrapper.v b/hw/rtl/afu/VX_avs_wrapper.v
index b3d0a5d5..19123e83 100644
--- a/hw/rtl/afu/VX_avs_wrapper.v
+++ b/hw/rtl/afu/VX_avs_wrapper.v
@@ -51,8 +51,13 @@ module VX_avs_wrapper #(
     wire [NUM_BANKS-1:0] req_queue_going_full;
     wire [NUM_BANKS-1:0][RD_QUEUE_ADDR_WIDTH-1:0] req_queue_size;
     wire [NUM_BANKS-1:0][REQ_TAG_WIDTH-1:0] avs_reqq_data_out;
-    
-    wire [BANK_ADDRW-1:0] req_bank_sel = (NUM_BANKS >= 2) ? mem_req_addr[BANK_ADDRW-1:0] : '0;
+    wire [BANK_ADDRW-1:0] req_bank_sel;
+
+    if (NUM_BANKS >= 2) begin
+        assign req_bank_sel = mem_req_addr[BANK_ADDRW-1:0];        
+    end else begin
+        assign req_bank_sel = 0;
+    end
 
     for (genvar i = 0; i < NUM_BANKS; i++) begin
         assign avs_reqq_ready[i] = !req_queue_going_full[i] && !avs_waitrequest[i];
@@ -100,7 +105,11 @@ module VX_avs_wrapper #(
         assign avs_burstcount[i] = AVS_BURST_WIDTH'(1);
     end
 
-    assign mem_req_ready = avs_reqq_ready[req_bank_sel];
+    if (NUM_BANKS >= 2) begin
+        assign mem_req_ready = avs_reqq_ready[req_bank_sel];
+    end else begin
+        assign mem_req_ready = avs_reqq_ready;
+    end
 
     // Responses handling
 
diff --git a/hw/scripts/scope.json b/hw/scripts/scope.json
index 4ccc6548..2f240161 100644
--- a/hw/scripts/scope.json
+++ b/hw/scripts/scope.json
@@ -74,7 +74,7 @@
     "taps": {     
         "afu": {                                     
             "!cmd_type":3,
-            "!state":3,
+            "!state":2,
             "?cci_sRxPort_c0_mmioRdValid":1,
             "?cci_sRxPort_c0_mmioWrValid":1,
             "mmio_hdr_address":16,            
diff --git a/hw/simulate/simulator.cpp b/hw/simulate/simulator.cpp
index 6099f182..c4e9f378 100644
--- a/hw/simulate/simulator.cpp
+++ b/hw/simulate/simulator.cpp
@@ -173,7 +173,7 @@ void Simulator::eval_mem_bus() {
   }
 
   // select the memory bank
-  uint32_t req_bank = vortex_->mem_req_addr % MEMORY_BANKS;
+  uint32_t req_bank = (MEMORY_BANKS >= 2) ? (vortex_->mem_req_addr % MEMORY_BANKS) : 0;
 
   // handle memory stalls
   bool mem_stalled = false;