Merge pull request #78 from pulp-platform/yt/addressability

Fix for PULP cluster addressability.
pulp-platform · Jun 29, 2023 · acc000b · acc000b
2 parents e12c624 + ec1c21d
commit acc000b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/hw/carfield.sv b/hw/carfield.sv
@@ -1340,7 +1340,7 @@ pulp_cluster #(
   .AXI_ID_IN_WIDTH                ( IntClusterAxiIdInWidth    ),
   .AXI_ID_OUT_WIDTH               ( IntClusterAxiIdOutWidth   ),
   .LOG_DEPTH                      ( LogDepth                  ),
-  .BaseAddr                       ( IntClusterBase            )
+  .BaseAddr                       ( IntClusterBaseAddr        )
 ) i_integer_cluster            (
   .clk_i                       ( pulp_clk                                  ),
   .rst_ni                      ( pulp_rst_n                                ),

diff --git a/hw/carfield_pkg.sv b/hw/carfield_pkg.sv
@@ -375,6 +375,10 @@ localparam int unsigned IntClusterAxiIdOutWidth = IntClusterAxiIdInWidth     +
 localparam int unsigned IntClusterMaxUniqId = 1;
 localparam int unsigned IntClusterNumEoc = 1;
 localparam logic [ 5:0] IntClusterIndex = (PulpHartIdOffs >> 5);
+localparam logic [CarfieldCfgDefault.AddrWidth-1:0] IntClusterInternalSize = 'h0040_0000;
+// verilog_lint: waive-start line-length
+localparam logic [CarfieldCfgDefault.AddrWidth-1:0] IntClusterBaseAddr = IntClusterBase - IntClusterIndex*IntClusterInternalSize;
+// verilog_lint: waive-stop line-length
 
 /*******************************/
 /* Narrow Parameters: A32, D32 */