WIP: Make queues parameterizable via registerchains

hw/newusb/new_usb_dmaoutputqueueED.sv

@@ -38,7 +38,10 @@ package new_usb_dmaoutputqueueED_pkg;
 
 endpackage
 
-module new_usb_dmaoutputqueueED import new_usb_dmaoutputqueueED_pkg::*; (
+module new_usb_dmaoutputqueueED import new_usb_dmaoutputqueueED_pkg::*; #(
+    parameter int unsigned AxiDataWidth = 0,
+    parameter int unsigned DmaOutputQueueStages = 0
+)(
     /// control
     input  logic clk_i,
     input  logic rst_ni,
@@ -58,6 +61,7 @@ module new_usb_dmaoutputqueueED import new_usb_dmaoutputqueueED_pkg::*; (
     output endpoint_descriptor secondin,
     output endpoint_descriptor firstin
 );
+
     endpoint_descriptor stash;
     endpoint_descriptor secondinmux;
 

hw/newusb/new_usb_ohci.sv

@@ -37,15 +37,14 @@ package new_usb_ohci_pkg;
   } store_type;
 
   // OHCI supports between 1-15 ports
-  localparam int unsigned   NumPhyPorts      = 2;
-  localparam state_activate OverProtect      = OFF; // no overcurrent protection implemented yet
-  localparam state_activate PowerSwitching   = OFF; // no power switching implemented yet
-  localparam state_permit   InterruptRouting = DISABLE; // no system management interrupt (SMI) implemented yet
-  localparam state_permit   RemoteWakeup     = DISABLE; // no remote wakeup implemented yet
-  localparam state_permit   OwnershipChange  = DISABLE; // no ownership change implemented yet
-  localparam int unsigned   FifoDepthPort    = 1024; // test value
-  localparam int unsigned   DmaLength        = 128; // test value
-  localparam int unsigned   DmaDataWidth     = 32; // 32|64|128 causes 4|2|1 stages in the dmaoutputqueueED 
+  localparam int unsigned   NumPhyPorts          = 2;
+  localparam state_activate OverProtect          = OFF; // no overcurrent protection implemented yet
+  localparam state_activate PowerSwitching       = OFF; // no power switching implemented yet
+  localparam state_permit   InterruptRouting     = DISABLE; // no system management interrupt (SMI) implemented yet
+  localparam state_permit   RemoteWakeup         = DISABLE; // no remote wakeup implemented yet
+  localparam state_permit   OwnershipChange      = DISABLE; // no ownership change implemented yet
+  localparam int unsigned   FifoDepthPort        = 1024; // test value
+  localparam int unsigned   DmaLength            = 128; // test value
 
   // Todo: Maybe Crc16 input Byte size parameter with selectable parallel/pipelined processing, lookup table?
 
@@ -55,7 +54,7 @@ module new_usb_ohci import new_usb_ohci_pkg::*; #(
   /// DMA manager port parameters
   parameter int unsigned AxiMaxReads   = 0,
   parameter int unsigned AxiAddrWidth  = 0,
-  parameter int unsigned AxiDataWidth  = 0,
+  parameter int unsigned AxiDataWidth  = 0, // 32|64|128 causes 4|2|1 stages in the dmaoutputqueueED
   parameter int unsigned AxiIdWidth    = 0,
   parameter int unsigned AxiUserWidth  = 0,
   /// Default User and ID presented on DMA manager AR, AW, W channels.
@@ -165,7 +164,9 @@ module new_usb_ohci import new_usb_ohci_pkg::*; #(
 
   );
 
-  new_usb_unpackdescriptors i_new_usb_unpackdescriptors (
+  new_usb_unpackdescriptors #(
+    .AxiDataWidth(AxiDataWidth)
+    ) i_new_usb_unpackdescriptors (
     /// control
     .clk_i,
     .rst_ni,

hw/newusb/new_usb_registerchain.sv

@@ -0,0 +1,28 @@
+// Copyright 2024 ETH Zurich and University of Bologna.
+// Solderpad Hardware License, Version 0.51, see LICENSE for details.
+// SPDX-License-Identifier: SHL-0.51
+//
+// Fabian Hauser <[email protected]>
+//
+/// Register chain with variable width and stages 
+
+module new_usb_registerchain #(
+  parameter int unsigned Width  = 0,
+  parameter int unsigned Stages = 0,
+  parameter int unsigned Total  = Width*Stages
+)(
+  input  logic clk_i,
+  input  logic rst_ni,
+  input  logic en,
+  input  logic [Width-1:0] data_i,
+  output logic [Total-1:0] register
+);
+  generate
+    genvar i;
+    for (i = 0; i < Total; i = i + Width) begin
+      if(i == 0) `FFL(register[Width-1:0],   data_i,                en, '0)
+      else       `FFL(register[Width+i-1:i], register[i-1:i-Width], en, '0)
+    end
+  endgenerate
+
+endmodule

hw/newusb/new_usb_unpackdescriptors.sv

@@ -16,7 +16,9 @@
 // Todo: only one package flying
 // Todo: TD management in ED, overwrite HeadP if servedTD, halted or toggle Carry?
 
-module new_usb_unpackdescriptors import new_usb_ohci_pkg::*;(
+module new_usb_unpackdescriptors import new_usb_ohci_pkg::*; #(
+    parameter int unsigned AxiDataWidth = 0
+)(
     /// control
     input logic clk_i,
     input logic rst_ni,
@@ -35,7 +37,7 @@ module new_usb_unpackdescriptors import new_usb_ohci_pkg::*;(
     /// new currentED, updated after processed accessed it
     output logic [27:0] newcurrentED_o,
     output logic        newcurrentED_valid_o,
-    /// dma data
+    /// id type
     input  logic [1:0]  id_valid_i,
     input  logic [2:0]  id_type_i,
     /// dma data
@@ -48,6 +50,9 @@ module new_usb_unpackdescriptors import new_usb_ohci_pkg::*;(
     /// head state
     input  logic sent_head_i
 );
+
+    localparam int unsigned DmaOutputQueueStages = 128/AxiDataWidth; // dmaoutputqueueED stages
+
     // nextis
     assign nextis_ed_o = (id_type[2] && empty_secondin) || !id_type[2]; 
     assign nextis_valid_o = !flying;