[rom_ctrl, dv] rom_ctrl simulations ported to mocha

hw/top_chip/dv/mocha_sim_cfgs.hjson

@@ -30,7 +30,7 @@
     "{proj_root}/hw/vendor/lowrisc_ip/ip/i2c/dv/i2c_sim_cfg.hjson",
     "{proj_root}/hw/top_chip/ip/xbar_peri/dv/autogen/xbar_peri_sim_cfg.hjson",
     "{proj_root}/hw/top_chip/ip_autogen/gpio/dv/gpio_sim_cfg.hjson",
-    "{proj_root}/hw/top_chip/tmp_sim_cfg/rom_ctrl_32kB_sim_cfg.hjson",
+    "{proj_root}/hw/vendor/lowrisc_ip/ip/rom_ctrl/dv/rom_ctrl_32kB_sim_cfg.hjson",
     "{proj_root}/hw/top_chip/tmp_sim_cfg/rv_dm_use_jtag_interface_sim_cfg.hjson",
 
     // Top-level IPs.

hw/vendor/lowrisc_ip.vendor.hjson

@@ -29,9 +29,9 @@
 
     // Hardware IP blocks.
     {from: "hw/ip/i2c",          to: "ip/i2c", patch_dir: "i2c"}, // I^2C controller/target
+    {from: "hw/ip/kmac",         to: "ip/kmac", patch_dir: "kmac"}, // kmac.
     {from: "hw/ip/lc_ctrl",      to: "ip/lc_ctrl"}, // Dependency of crossbar and power manager.
-    {from: "hw/ip/rom_ctrl",     to: "ip/rom_ctrl"}, // Read-only memory.
-    {from: "hw/ip/kmac",         to: "ip/kmac"}, // kmac.
+    {from: "hw/ip/rom_ctrl",     to: "ip/rom_ctrl", patch_dir: "rom_ctrl"}, // Read-only memory.
     {from: "hw/ip/rv_core_ibex", to: "ip/rv_core_pkg", patch_dir: "rv_core_pkg"}, // RISC-V core package.
     {from: "hw/ip/rv_timer",     to: "ip/rv_timer", patch_dir: "rv_timer"}, // Timer.
     {from: "hw/ip/spi_device",   to: "ip/spi_device", patch_dir: "spi_device"}, // SPI device.

hw/vendor/lowrisc_ip/dv/sv/kmac_app_agent/kmac_app_agent.core

@@ -10,7 +10,6 @@ filesets:
       - lowrisc:dv:dv_utils
       - lowrisc:dv:dv_lib
       - lowrisc:dv:push_pull_agent
-      - lowrisc:ip:keymgr_pkg
       - lowrisc:ip:kmac_pkg
     files:
       - kmac_app_agent_pkg.sv

hw/vendor/lowrisc_ip/dv/sv/kmac_app_agent/kmac_app_agent_pkg.sv

@@ -7,17 +7,17 @@ package kmac_app_agent_pkg;
   import uvm_pkg::*;
   import dv_utils_pkg::*;
   import dv_lib_pkg::*;
-  import keymgr_pkg::*;
   import push_pull_agent_pkg::*;
 
   // macro includes
   `include "uvm_macros.svh"
   `include "dv_macros.svh"
 
   // parameters
-  parameter int KMAC_REQ_DATA_WIDTH = keymgr_pkg::KmacDataIfWidth       // data width
-                                      + keymgr_pkg::KmacDataIfWidth / 8 // data mask width
-                                      + 1;                              // bit last
+  parameter int KmacDataIfWidth     = 64; // keymgr_pkg::KmacDataIfWidth
+  parameter int KMAC_REQ_DATA_WIDTH = KmacDataIfWidth       // data width
+                                      + KmacDataIfWidth / 8 // data mask width
+                                      + 1;                  // bit last
 
   `define CONNECT_DATA_WIDTH .HostDataWidth(kmac_app_agent_pkg::KMAC_REQ_DATA_WIDTH)
 

hw/vendor/lowrisc_ip/dv/sv/kmac_app_agent/kmac_app_intf.sv

@@ -5,8 +5,6 @@
 // verilog_lint: waive interface-name-style
 interface kmac_app_intf (input clk, input rst_n);
 
-  import keymgr_pkg::*;
-
   dv_utils_pkg::if_mode_e if_mode; // interface mode - Host or Device
 
   // interface pins used to connect with DUT
@@ -60,7 +58,7 @@ interface kmac_app_intf (input clk, input rst_n);
           clk, !rst_n || if_mode == dv_utils_pkg::Host)
 
   // Check strb is aligned to LSB, for example: if strb[1]==0, strb[$:2] should be 0 too
-  for (genvar k = 1; k < KmacDataIfWidth / 8 - 1; k++) begin : gen_strb_check
+  for (genvar k = 1; k < kmac_app_agent_pkg::KmacDataIfWidth / 8 - 1; k++) begin : gen_strb_check
     `ASSERT(StrbAlignLSB_A, kmac_data_req.valid && kmac_data_req.strb[k] === 0 |->
                             kmac_data_req.strb[k+1] === 0,
                             clk, !rst_n || if_mode == dv_utils_pkg::Host)

hw/vendor/lowrisc_ip/ip/rom_ctrl/data/rom_ctrl_testplan.hjson

@@ -3,14 +3,14 @@
 // SPDX-License-Identifier: Apache-2.0
 {
   name: "rom_ctrl"
-  import_testplans: ["hw/dv/tools/dvsim/testplans/csr_testplan.hjson",
-                     "hw/dv/tools/dvsim/testplans/alert_test_testplan.hjson",
-                     "hw/dv/tools/dvsim/testplans/mem_testplan.hjson",
-                     "hw/dv/tools/dvsim/testplans/passthru_mem_intg_testplan.hjson",
-                     "hw/dv/tools/dvsim/testplans/tl_device_access_types_testplan.hjson",
-                     "hw/dv/tools/dvsim/testplans/sec_cm_fsm_testplan.hjson",
-                     "hw/dv/tools/dvsim/testplans/stress_all_with_reset_testplan.hjson",
-                     "hw/dv/tools/dvsim/testplans/sec_cm_count_testplan.hjson",
+  import_testplans: ["hw/vendor/lowrisc_ip/dv/tools/dvsim/testplans/csr_testplan.hjson",
+                     "hw/vendor/lowrisc_ip/dv/tools/dvsim/testplans/alert_test_testplan.hjson",
+                     "hw/vendor/lowrisc_ip/dv/tools/dvsim/testplans/mem_testplan.hjson",
+                     "hw/vendor/lowrisc_ip/dv/tools/dvsim/testplans/passthru_mem_intg_testplan.hjson",
+                     "hw/vendor/lowrisc_ip/dv/tools/dvsim/testplans/tl_device_access_types_testplan.hjson",
+                     "hw/vendor/lowrisc_ip/dv/tools/dvsim/testplans/sec_cm_fsm_testplan.hjson",
+                     "hw/vendor/lowrisc_ip/dv/tools/dvsim/testplans/stress_all_with_reset_testplan.hjson",
+                     "hw/vendor/lowrisc_ip/dv/tools/dvsim/testplans/sec_cm_count_testplan.hjson",
                      "rom_ctrl_sec_cm_testplan.hjson"]
   testpoints: [
     {

hw/vendor/lowrisc_ip/ip/rom_ctrl/dv/env/rom_ctrl_bkdr_util.core

@@ -13,8 +13,11 @@ filesets:
       - lowrisc:dv:crypto_dpi_prince:0.1
       - lowrisc:dv:crypto_dpi_present:0.1
       - lowrisc:prim:secded:0.1
-      - lowrisc:dv:sram_ctrl_bkdr_util
+      - lowrisc:dv:digestpp_dpi:0.1
+      - lowrisc:ip:kmac_pkg
+      - lowrisc:dv:mem_bkdr_util
     files:
+      - sram_scrambler_pkg.sv
       - rom_ctrl_bkdr_util_pkg.sv
       - rom_ctrl_bkdr_util.sv: {is_include_file: true}
     file_type: systemVerilogSource