iDMA: Expose parameters, tune

pulp-platform · Sep 12, 2023 · 797cfdc · 797cfdc
1 parent ca374f0
commit 797cfdc
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 15 deletions.
diff --git a/Bender.lock b/Bender.lock
@@ -108,7 +108,7 @@ packages:
     dependencies:
     - common_cells
   idma:
-    revision: d1902b2c180f574fcd473bda3c90bdca6c831ea0
+    revision: cc6e3e2842d4904a6becb5bc965b25549f3e99f3
     version: null
     source:
       Git: https://github.com/pulp-platform/iDMA.git

diff --git a/hw/cheshire_pkg.sv b/hw/cheshire_pkg.sv
@@ -171,6 +171,10 @@ package cheshire_pkg;
     dw_bt   DmaConfMaxReadTxns;
     dw_bt   DmaConfMaxWriteTxns;
     aw_bt   DmaConfAmoNumCuts;
+    dw_bt   DmaNumAxInFlight;
+    dw_bt   DmaMemSysDepth;
+    aw_bt   DmaJobFifoDepth;
+    bit     DmaRAWCouplingAvail;
     bit     DmaConfAmoPostCut;
     bit     DmaConfEnableTwoD;
     // Parameters for GPIO
@@ -514,8 +518,8 @@ package cheshire_pkg;
     AxiDataWidth      : 64,
     AxiUserWidth      : 2,  // AMO(2)
     AxiMstIdWidth     : 2,
-    AxiMaxMstTrans    : 8,
-    AxiMaxSlvTrans    : 8,
+    AxiMaxMstTrans    : 24,
+    AxiMaxSlvTrans    : 24,
     AxiUserAmoMsb     : 1,  // Convention: bit 0 for core(s), bit 1 for serial link
     AxiUserAmoLsb     : 0,  // Convention: bit 0 for core(s), bit 1 for serial link
     AxiUserDefault    : 0,
@@ -550,8 +554,8 @@ package cheshire_pkg;
     LlcSetAssoc       : 8,
     LlcNumLines       : 256,
     LlcNumBlocks      : 8,
-    LlcMaxReadTxns    : 8,
-    LlcMaxWriteTxns   : 8,
+    LlcMaxReadTxns    : 16,
+    LlcMaxWriteTxns   : 16,
     LlcAmoNumCuts     : 1,
     LlcAmoPostCut     : 1,
     LlcOutConnect     : 1,
@@ -576,6 +580,10 @@ package cheshire_pkg;
     DmaConfMaxReadTxns  : 4,
     DmaConfMaxWriteTxns : 4,
     DmaConfAmoNumCuts   : 1,
+    DmaNumAxInFlight    : 16,
+    DmaMemSysDepth      : 8,
+    DmaJobFifoDepth     : 2,
+    DmaRAWCouplingAvail : 1,
     DmaConfAmoPostCut   : 1,
     DmaConfEnableTwoD   : 1,
     // GPIOs

diff --git a/hw/cheshire_soc.sv b/hw/cheshire_soc.sv
@@ -1459,16 +1459,20 @@ module cheshire_soc import cheshire_pkg::*; #(
     end
 
     dma_core_wrap #(
-      .AxiAddrWidth   ( Cfg.AddrWidth     ),
-      .AxiDataWidth   ( Cfg.AxiDataWidth  ),
-      .AxiIdWidth     ( Cfg.AxiMstIdWidth ),
-      .AxiUserWidth   ( Cfg.AxiUserWidth  ),
-      .AxiSlvIdWidth  ( AxiSlvIdWidth     ),
-      .IsTwoD         ( Cfg.DmaConfEnableTwoD ),
-      .axi_mst_req_t  ( axi_mst_req_t ),
-      .axi_mst_rsp_t  ( axi_mst_rsp_t ),
-      .axi_slv_req_t  ( axi_slv_req_t ),
-      .axi_slv_rsp_t  ( axi_slv_rsp_t )
+      .AxiAddrWidth       ( Cfg.AddrWidth           ),
+      .AxiDataWidth       ( Cfg.AxiDataWidth        ),
+      .AxiIdWidth         ( Cfg.AxiMstIdWidth       ),
+      .AxiUserWidth       ( Cfg.AxiUserWidth        ),
+      .AxiSlvIdWidth      ( AxiSlvIdWidth           ),
+      .NumAxInFlight      ( Cfg.DmaNumAxInFlight    ),
+      .MemSysDepth        ( Cfg.DmaMemSysDepth      ),
+      .JobFifoDepth       ( Cfg.DmaJobFifoDepth     ),
+      .RAWCouplingAvail   ( Cfg.DmaRAWCouplingAvail ),
+      .IsTwoD             ( Cfg.DmaConfEnableTwoD   ),
+      .axi_mst_req_t      ( axi_mst_req_t           ),
+      .axi_mst_rsp_t      ( axi_mst_rsp_t           ),
+      .axi_slv_req_t      ( axi_slv_req_t           ),
+      .axi_slv_rsp_t      ( axi_slv_rsp_t           )
     ) i_dma (
       .clk_i,
       .rst_ni,