hw(periph): Convert from AXI directly to APB (#235)

* hw(periph): Convert from AXI directly to APB

* hw(periph): Make linter happy

* hw(periph): Remove include of APB typedef header

* bender: Remove `register_interface` as a dependency

`register_interface` is still used as sub-dependency. That's why
`Bender.lock` does not change

* deps: Bump `axi`

* deps: Bump `obi`

Author: fischeti

Bender.lock

@@ -7,8 +7,8 @@ packages:
     dependencies:
     - common_cells
   axi:
-    revision: 39f5f2d51c5e524f6fc5cf8b6e901f7dcc5622d7
-    version: 0.39.6
+    revision: f07498d53ecd5518b277c7d213ec3b71ca4df93c
+    version: 0.39.7
     source:
       Git: https://github.com/pulp-platform/axi
     dependencies:
@@ -83,8 +83,8 @@ packages:
     - obi
     - register_interface
   obi:
-    revision: 8097928cf1b43712f93d5356f336397879b4ad2c
-    version: 0.1.6
+    revision: 0155fc34e900c7c884e081c0a1114a247937ff69
+    version: 0.1.7
     source:
       Git: https://github.com/pulp-platform/obi.git
     dependencies:
@@ -94,7 +94,7 @@ packages:
     revision: 5daa85d164cf6b54ad061ea1e4c6f3624556e467
     version: 0.4.5
     source:
-      Git: https://github.com/pulp-platform/register_interface
+      Git: https://github.com/pulp-platform/register_interface.git
     dependencies:
     - apb
     - axi

Bender.yml

@@ -24,7 +24,6 @@ dependencies:
   apb:                { git: https://github.com/pulp-platform/apb.git,            version:  0.2.2       }
   common_cells:       { git: https://github.com/pulp-platform/common_cells,       version:  1.35.0      }
   FPnew:              { git: https://github.com/pulp-platform/cvfpu.git,          rev:      pulp-v0.1.3 }
-  register_interface: { git: https://github.com/pulp-platform/register_interface, version:  0.4.2       }
   tech_cells_generic: { git: https://github.com/pulp-platform/tech_cells_generic, version:  0.2.13      }
   riscv-dbg:          { git: https://github.com/pulp-platform/riscv-dbg,          version:  0.8.0       }
   cluster_icache:     { git: https://github.com/pulp-platform/cluster_icache.git, rev: 64e21ae455bbdde850c4df13bef86ea55ac42537 }

hw/snitch_cluster/src/snitch_cluster.sv

@@ -12,7 +12,7 @@
 `include "common_cells/registers.svh"
 
 `include "mem_interface/typedef.svh"
-`include "register_interface/typedef.svh"
+`include "apb/typedef.svh"
 `include "reqrsp_interface/typedef.svh"
 `include "tcdm_interface/typedef.svh"
 
@@ -371,6 +371,10 @@ module snitch_cluster
   `AXI_TYPEDEF_ALL(axi_mst_dma, addr_t, id_dma_mst_t, data_dma_t, strb_dma_t, user_dma_t)
   `AXI_TYPEDEF_ALL(axi_slv_dma, addr_t, id_dma_slv_t, data_dma_t, strb_dma_t, user_dma_t)
 
+  `AXI_LITE_TYPEDEF_ALL(axi_lite, addr_t, data_t, strb_t)
+
+  `APB_TYPEDEF_ALL(apb, addr_t, data_t, strb_t)
+
   `REQRSP_TYPEDEF_ALL(reqrsp, addr_t, data_t, strb_t)
 
   `MEM_TYPEDEF_ALL(mem, tcdm_mem_addr_t, data_t, strb_t, tcdm_user_t)
@@ -379,9 +383,6 @@ module snitch_cluster
   `TCDM_TYPEDEF_ALL(tcdm, tcdm_addr_t, data_t, strb_t, tcdm_user_t)
   `TCDM_TYPEDEF_ALL(tcdm_dma, tcdm_addr_t, data_dma_t, strb_dma_t, logic)
 
-  `REG_BUS_TYPEDEF_REQ(reg_req_t, addr_t, data_t, strb_t)
-  `REG_BUS_TYPEDEF_RSP(reg_rsp_t, data_t)
-
   // Event counter increments for the TCDM.
   typedef struct packed {
     /// Number requests going in
@@ -538,8 +539,10 @@ module snitch_cluster
   reqrsp_rsp_t [NrHives-1:0] ptw_rsp;
 
   // 5. Peripheral Subsystem
-  reg_req_t reg_req;
-  reg_rsp_t reg_rsp;
+  axi_lite_req_t axi_lite_req;
+  axi_lite_resp_t axi_lite_resp;
+  apb_req_t apb_req;
+  apb_resp_t apb_resp;
 
   // 5. Misc. Wires.
   logic icache_prefetch_enable;
@@ -1230,26 +1233,58 @@ module snitch_cluster
   );
 
   // 2. Peripherals
-  axi_to_reg #(
-    .ADDR_WIDTH (PhysicalAddrWidth),
-    .DATA_WIDTH (NarrowDataWidth),
-    .AXI_MAX_WRITE_TXNS (1),
-    .AXI_MAX_READ_TXNS (1),
-    .DECOUPLE_W (0),
-    .ID_WIDTH (NarrowIdWidthOut),
-    .USER_WIDTH (NarrowUserWidth),
-    .axi_req_t (axi_slv_req_t),
-    .axi_rsp_t (axi_slv_resp_t),
-    .reg_req_t (reg_req_t),
-    .reg_rsp_t (reg_rsp_t)
-  ) i_axi_to_reg (
-    .clk_i,
-    .rst_ni,
-    .testmode_i (1'b0),
-    .axi_req_i (narrow_axi_slv_req[ClusterPeripherals]),
-    .axi_rsp_o (narrow_axi_slv_rsp[ClusterPeripherals]),
-    .reg_req_o (reg_req),
-    .reg_rsp_i (reg_rsp)
+  axi_to_axi_lite #(
+    .AxiAddrWidth   (PhysicalAddrWidth),
+    .AxiDataWidth   (NarrowDataWidth),
+    .AxiIdWidth     (NarrowIdWidthOut),
+    .AxiUserWidth   (NarrowUserWidth),
+    .AxiMaxWriteTxns(1),
+    .AxiMaxReadTxns (1),
+    .full_req_t     (axi_slv_req_t),
+    .full_resp_t    (axi_slv_resp_t),
+    .lite_req_t     (axi_lite_req_t),
+    .lite_resp_t    (axi_lite_resp_t)
+  ) i_axi_to_axi_lite (
+    .clk_i     (clk_i),
+    .rst_ni    (rst_ni),
+    .test_i    (1'b0),
+    .slv_req_i (narrow_axi_slv_req[ClusterPeripherals]),
+    .slv_resp_o(narrow_axi_slv_rsp[ClusterPeripherals]),
+    .mst_req_o (axi_lite_req),
+    .mst_resp_i(axi_lite_resp)
+  );
+
+  // There is only one APB slave in the cluster, at index 0.
+  localparam int unsigned NumApbConvRules = 1 + AliasRegionEnable;
+  xbar_rule_t [NumApbConvRules-1:0] apb_conv_rules;
+
+  assign apb_conv_rules[0] = '{
+    idx: 0, start_addr: cluster_periph_start_address, end_addr: cluster_periph_end_address
+  };
+  if (AliasRegionEnable) begin : gen_apb_alias
+    assign apb_conv_rules[1] = '{
+      idx: 0, start_addr: PeriphAliasStart, end_addr: PeriphAliasEnd
+    };
+  end
+
+  axi_lite_to_apb #(
+    .NoApbSlaves     (1),
+    .NoRules         (NumApbConvRules),
+    .AddrWidth       (PhysicalAddrWidth),
+    .DataWidth       (NarrowDataWidth),
+    .axi_lite_req_t  (axi_lite_req_t),
+    .axi_lite_resp_t (axi_lite_resp_t),
+    .apb_req_t       (apb_req_t),
+    .apb_resp_t      (apb_resp_t),
+    .rule_t          (xbar_rule_t)
+  ) i_axi_lite_to_apb (
+    .clk_i          (clk_i),
+    .rst_ni         (rst_ni),
+    .axi_lite_req_i (axi_lite_req),
+    .axi_lite_resp_o(axi_lite_resp),
+    .apb_req_o      (apb_req),
+    .apb_resp_i     (apb_resp),
+    .addr_map_i     (apb_conv_rules)
   );
 
   if (IntBootromEnable) begin : gen_bootrom
@@ -1301,17 +1336,17 @@ module snitch_cluster
     .addr_t (addr_t),
     .data_t (data_t),
     .strb_t (strb_t),
-    .reg_req_t (reg_req_t),
-    .reg_rsp_t (reg_rsp_t),
+    .apb_req_t (apb_req_t),
+    .apb_resp_t (apb_resp_t),
     .tcdm_events_t (tcdm_events_t),
     .dma_events_t (dma_events_t),
     .NrCores (NrCores),
     .DMANumChannels (DMANumChannels)
   ) i_snitch_cluster_peripheral (
     .clk_i,
     .rst_ni,
-    .reg_req_i (reg_req),
-    .reg_rsp_o (reg_rsp),
+    .apb_req_i (apb_req),
+    .apb_resp_o (apb_resp),
     .icache_prefetch_enable_o (icache_prefetch_enable),
     .cl_clint_o (cl_interrupt),
     .core_events_i (core_events),

hw/snitch_cluster/src/snitch_cluster_peripheral/snitch_cluster_peripheral.sv

@@ -4,7 +4,6 @@
 
 /// Exposes cluster confugration and information as memory mapped information
 
-`include "apb/typedef.svh"
 `include "common_cells/registers.svh"
 
 module snitch_cluster_peripheral
@@ -20,16 +19,16 @@ module snitch_cluster_peripheral
   parameter type addr_t = logic,
   parameter type data_t = logic,
   parameter type strb_t = logic,
-  parameter type reg_req_t = logic,
-  parameter type reg_rsp_t = logic,
+  parameter type apb_req_t = logic,
+  parameter type apb_resp_t = logic,
   parameter type tcdm_events_t = logic,
   parameter type dma_events_t = logic
 ) (
   input  logic                                   clk_i,
   input  logic                                   rst_ni,
 
-  input  reg_req_t                               reg_req_i,
-  output reg_rsp_t                               reg_rsp_o,
+  input  apb_req_t                               apb_req_i,
+  output apb_resp_t                              apb_resp_o,
 
   output logic                                   icache_prefetch_enable_o,
   output logic              [NrCores-1:0]        cl_clint_o,
@@ -50,37 +49,19 @@ module snitch_cluster_peripheral
   snitch_cluster_peripheral_reg__out_t reg2hw;
   snitch_cluster_peripheral_reg__in_t  hw2reg;
 
-  `APB_TYPEDEF_ALL(sn_periph_regs_apb, addr_t, data_t, strb_t)
-  sn_periph_regs_apb_req_t  sn_periph_regs_apb_req;
-  sn_periph_regs_apb_resp_t sn_periph_regs_apb_rsp;
-
-  reg_to_apb #(
-    .reg_req_t  ( reg_req_t ),
-    .reg_rsp_t  ( reg_rsp_t ),
-    .apb_req_t  ( sn_periph_regs_apb_req_t ),
-    .apb_rsp_t  ( sn_periph_regs_apb_resp_t )
-  ) chs_regs_reg_to_apb (
-    .clk_i,
-    .rst_ni,
-    .reg_req_i  ( reg_req_i ),
-    .reg_rsp_o  ( reg_rsp_o ),
-    .apb_req_o  ( sn_periph_regs_apb_req ),
-    .apb_rsp_i  ( sn_periph_regs_apb_rsp )
-  );
-
   snitch_cluster_peripheral_reg i_snitch_cluster_peripheral_reg (
-    .clk (clk_i),
+    .clk    (clk_i),
     .arst_n (rst_ni),
-    .s_apb_psel    ( sn_periph_regs_apb_req.psel    ),
-    .s_apb_penable ( sn_periph_regs_apb_req.penable ),
-    .s_apb_pwrite  ( sn_periph_regs_apb_req.pwrite  ),
-    .s_apb_pprot   ( sn_periph_regs_apb_req.pprot   ),
-    .s_apb_paddr(sn_periph_regs_apb_req.paddr[SNITCH_CLUSTER_PERIPHERAL_REG_MIN_ADDR_WIDTH-1:0]),
-    .s_apb_pwdata  ( sn_periph_regs_apb_req.pwdata  ),
-    .s_apb_pstrb   ( sn_periph_regs_apb_req.pstrb   ),
-    .s_apb_pready  ( sn_periph_regs_apb_rsp.pready  ),
-    .s_apb_prdata  ( sn_periph_regs_apb_rsp.prdata  ),
-    .s_apb_pslverr ( sn_periph_regs_apb_rsp.pslverr ),
+    .s_apb_psel    ( apb_req_i.psel    ),
+    .s_apb_penable ( apb_req_i.penable ),
+    .s_apb_pwrite  ( apb_req_i.pwrite  ),
+    .s_apb_pprot   ( apb_req_i.pprot   ),
+    .s_apb_paddr   (apb_req_i.paddr[SNITCH_CLUSTER_PERIPHERAL_REG_MIN_ADDR_WIDTH-1:0]),
+    .s_apb_pwdata  ( apb_req_i.pwdata  ),
+    .s_apb_pstrb   ( apb_req_i.pstrb   ),
+    .s_apb_pready  ( apb_resp_o.pready  ),
+    .s_apb_prdata  ( apb_resp_o.prdata  ),
+    .s_apb_pslverr ( apb_resp_o.pslverr ),
     .hwif_out (reg2hw),
     .hwif_in  (hw2reg)
   );