Fix last PR comments and typos.

pulp-platform · Mar 19, 2024 · e36e28e · e36e28e
1 parent dc33fc2
commit e36e28e
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/Bender.lock b/Bender.lock
@@ -338,7 +338,7 @@ packages:
     - common_cells
     - common_verification
   opentitan:
-    revision: c3d6967775e80c5a2cb8086e2618d1a829464bc5
+    revision: 3fc11c14f29a161054766fabd95f90ab2a9e473a
     version: null
     source:
       Git: https://github.com/pulp-platform/opentitan.git

diff --git a/Bender.yml b/Bender.yml
@@ -18,7 +18,7 @@ dependencies:
   dyn_mem:            { git: https://github.com/pulp-platform/dyn_spm.git,              rev: 480590062742230dc9bd4050358a15b4747bdf34 } # branch: main
   safety_island:      { git: https://github.com/pulp-platform/safety_island.git,        rev: aaef55c798ab53560faaf451a86668fa1e6d0f3b } # branch: carfield
   pulp_cluster:       { git: https://github.com/pulp-platform/pulp_cluster.git,         rev: 3d3a8691a1fd87966835e89a64d4d370b379f402 } # branch: astral
-  opentitan:          { git: https://github.com/pulp-platform/opentitan.git,            rev: c3d6967775e80c5a2cb8086e2618d1a829464bc5 } # branch: mc/astral
+  opentitan:          { git: https://github.com/pulp-platform/opentitan.git,            rev: 3fc11c14f29a161054766fabd95f90ab2a9e473a } # branch: mc/astral
   mailbox_unit:       { git: https://github.com/pulp-platform/mailbox_unit.git,         version: 1.1.0                                }
   apb:                { git: https://github.com/pulp-platform/apb.git,                  version: 0.2.3                                }
   timer_unit:         { git: https://github.com/pulp-platform/timer_unit.git,           version: 1.0.2                                }

diff --git a/hw/carfield.sv b/hw/carfield.sv
@@ -476,7 +476,6 @@ logic [    LogDepth:0] llc_w_rptr;
 
 logic hyper_isolate_req, hyper_isolated_rsp;
 logic security_island_isolate_req;
-logic unused;
 
 logic [iomsb(NumIsolate):0] slave_isolate_req, slave_isolated_rsp, slave_isolated;
 logic [iomsb(Cfg.AxiExtNumMst):0] master_isolated_rsp;
@@ -1773,7 +1772,7 @@ if (CarfieldIslandsCfg.secured.enable) begin : gen_secure_subsystem
                    narrow_axi_data_t, narrow_axi_strb_t, narrow_axi_user_t)
 
   `ifndef SECD_NETLIST
-  secure_subsystem_synth_wrap_astral #(
+  security_island #(
     .HartIdOffs            ( OpnTitHartIdOffs                  ),
     .AxiAddrWidth          ( Cfg.AddrWidth                     ),
     .AxiDataWidth          ( Cfg.AxiDataWidth                  ),
@@ -1856,7 +1855,7 @@ if (CarfieldIslandsCfg.secured.enable) begin : gen_secure_subsystem
     .async_idma_axi_out_r_wptr_i  ( axi_mst_ext_r_wptr  [SecurityIslandiDMAMstIdx] ),
     .async_idma_axi_out_r_rptr_o  ( axi_mst_ext_r_rptr  [SecurityIslandiDMAMstIdx] ),
     .axi_isolate_i    ( security_island_isolate_req                                ),
-    .axi_isolated_o   ( { master_isolated_rsp[SecurityIslandiDMAMstIdx] master_isolated_rsp[SecurityIslandTlulMstIdx] } ),
+    .axi_isolated_o   ( { master_isolated_rsp[SecurityIslandiDMAMstIdx], master_isolated_rsp[SecurityIslandTlulMstIdx] } ),
      // Uart
     .ibex_uart_rx_i   ( uart_ot_rx_i  ),
     .ibex_uart_tx_o   ( uart_ot_tx_o  ),

diff --git a/hw/carfield_pkg.sv b/hw/carfield_pkg.sv
@@ -40,6 +40,7 @@ typedef struct packed {
   islands_properties_t spatz;
   islands_properties_t pulp;
   islands_properties_t secured;
+  islands_properties_t secured_idma;
   islands_properties_t mbox;
 } islands_cfg_t;
 
@@ -122,10 +123,10 @@ endfunction
 // crossbar starting from the islands enable structure.
 function automatic int unsigned gen_num_axi_master(islands_cfg_t island_cfg);
   int unsigned ret = 0; // Number of masters starts from 0
-  if (island_cfg.safed.enable  )      begin ret++; end
-  if (island_cfg.spatz.enable  )      begin ret++; end
-  if (island_cfg.pulp.enable   )      begin ret++; end
-  if (island_cfg.secured.enable)      begin ret+=2; end
+  if (island_cfg.safed.enable  ) begin ret++; end
+  if (island_cfg.spatz.enable  ) begin ret++; end
+  if (island_cfg.pulp.enable   ) begin ret++; end
+  if (island_cfg.secured.enable) begin ret+=2; end
   return ret;
 endfunction