[flash_ctrl] dv port updates
Signed-off-by: Timothy Chen <timothytim@google.com>
diff --git a/hw/ip/flash_ctrl/dv/env/flash_ctrl_env_pkg.sv b/hw/ip/flash_ctrl/dv/env/flash_ctrl_env_pkg.sv
index e88c72d..f62ac45 100644
--- a/hw/ip/flash_ctrl/dv/env/flash_ctrl_env_pkg.sv
+++ b/hw/ip/flash_ctrl/dv/env/flash_ctrl_env_pkg.sv
@@ -50,8 +50,7 @@
FlashCtrlIntrRdFull = 2,
FlashCtrlIntrRdLvl = 3,
FlashCtrlIntrOpDone = 4,
- FlashCtrlIntrOpError = 5,
- NumFlashCtrlIntr = 6
+ NumFlashCtrlIntr = 5
} flash_ctrl_intr_e;
typedef enum {
diff --git a/hw/ip/flash_ctrl/dv/tb/flash_ctrl_wrapper.sv b/hw/ip/flash_ctrl/dv/tb/flash_ctrl_wrapper.sv
index 79aec2b..fd4df3a 100644
--- a/hw/ip/flash_ctrl/dv/tb/flash_ctrl_wrapper.sv
+++ b/hw/ip/flash_ctrl/dv/tb/flash_ctrl_wrapper.sv
@@ -21,7 +21,7 @@
input flash_power_down_h_i,
// DFT Interface
- input flash_bist_enable_i,
+ input lc_ctrl_pkg::lc_tx_t flash_bist_enable_i,
// OTP interface
input otp_ctrl_pkg::flash_otp_key_req_t otp_i,
@@ -43,8 +43,7 @@
output logic intr_prog_lvl_o, // Program fifo is empty
output logic intr_rd_full_o, // Read fifo is full
output logic intr_rd_lvl_o, // Read fifo is full
- output logic intr_op_done_o, // Requested flash operation (wr/erase) done
- output logic intr_op_error_o // Requested flash operation (wr/erase) done
+ output logic intr_op_done_o // Requested flash operation (wr/erase) done
);
// define inter-module signals
@@ -61,7 +60,6 @@
.intr_rd_full_o (intr_rd_full_o),
.intr_rd_lvl_o (intr_rd_lvl_o),
.intr_op_done_o (intr_op_done_o),
- .intr_op_error_o (intr_op_error_o),
// Inter-module signals
.flash_o (flash_ctrl_flash_req),
diff --git a/hw/ip/flash_ctrl/dv/tb/tb.sv b/hw/ip/flash_ctrl/dv/tb/tb.sv
index aa43a04..2de60ec 100644
--- a/hw/ip/flash_ctrl/dv/tb/tb.sv
+++ b/hw/ip/flash_ctrl/dv/tb/tb.sv
@@ -22,7 +22,6 @@
wire intr_rd_full;
wire intr_rd_lvl;
wire intr_op_done;
- wire intr_op_error;
wire [NUM_MAX_INTERRUPTS-1:0] interrupts;
// interfaces
@@ -44,6 +43,7 @@
.flash_power_ready_h_i (1'b1 ),
.flash_power_down_h_i (1'b0 ),
+ .flash_bist_enable_i (lc_ctrl_pkg::Off),
.eflash_tl_i (eflash_tl_if.h2d),
.eflash_tl_o (eflash_tl_if.d2h),
@@ -67,8 +67,7 @@
.intr_prog_lvl_o (intr_prog_lvl ),
.intr_rd_full_o (intr_rd_full ),
.intr_rd_lvl_o (intr_rd_lvl ),
- .intr_op_done_o (intr_op_done ),
- .intr_op_error_o (intr_op_error )
+ .intr_op_done_o (intr_op_done )
);
// bind mem_bkdr_if
@@ -102,7 +101,6 @@
assign interrupts[FlashCtrlIntrRdFull] = intr_rd_full;
assign interrupts[FlashCtrlIntrRdLvl] = intr_rd_lvl;
assign interrupts[FlashCtrlIntrOpDone] = intr_op_done;
- assign interrupts[FlashCtrlIntrOpError] = intr_op_error;
initial begin
// drive clk and rst_n from clk_if