Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

systems/cva6_desc: Various fixes #26

Closed
wants to merge 1 commit into from
Closed

systems/cva6_desc: Various fixes #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions src/systems/cva6_desc/dma_desc_wrap.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,24 +63,22 @@ module dma_desc_wrap #(
// iDMA struct definitions
localparam int unsigned TFLenWidth = 32;
typedef logic [TFLenWidth-1:0] tf_len_t;
typedef logic [RepWidth-1:0] reps_t;
typedef logic [StrideWidth-1:0] strides_t;

// iDMA request / response types
`IDMA_TYPEDEF_FULL_REQ_T(idma_req_t, post_mux_id_t, addr_t, tf_len_t)
`IDMA_TYPEDEF_FULL_RSP_T(idma_rsp_t, addr_t)

burst_req_t dma_be_req;
idma_req_t dma_be_req;
logic dma_be_tx_complete;
logic dma_be_valid;
logic dma_be_ready;
idma_pkg::idma_busy_t idma_busy;

idma_desc64_top #(
.AddrWidth (AxiAddrWidth) ,
.burst_req_t(burst_req_t) ,
.reg_req_t (dma_reg_req_t),
.reg_rsp_t (dma_reg_rsp_t)
.AddrWidth ( AxiAddrWidth ),
.burst_req_t( idma_req_t ),
.reg_req_t ( dma_reg_req_t ),
.reg_rsp_t ( dma_reg_rsp_t )
) i_dma_desc64 (
.clk_i,
.rst_ni,
Expand Down Expand Up @@ -114,8 +112,8 @@ module dma_desc_wrap #(
.idma_rsp_t ( idma_rsp_t ),
.idma_eh_req_t ( idma_pkg::idma_eh_req_t ),
.idma_busy_t ( idma_pkg::idma_busy_t ),
.axi_req_t ( axi_slv_req_t ),
.axi_rsp_t ( axi_slv_resp_t )
.protocol_req_t ( axi_slv_req_t ),
.protocol_rsp_t ( axi_slv_rsp_t )
) i_idma_backend (
.clk_i,
.rst_ni,
Expand All @@ -133,8 +131,8 @@ module dma_desc_wrap #(
.eh_req_valid_i( 1'b1 ),
.eh_req_ready_o( /*NOT CONNECTED*/ ),

.axi_req_o ( axi_be_mst_req ),
.axi_rsp_i ( axi_be_mst_rsp ),
.protocol_req_o( axi_be_mst_req ),
.protocol_rsp_i( axi_be_mst_rsp ),
.busy_o ( idma_busy )
);

Expand Down
2 changes: 1 addition & 1 deletion src/systems/cva6_desc/dma_reg_to_axi.sv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ module dma_reg_to_axi #(

/* check that we don't get any errors in the simulation */
`IDMA_NONSYNTH_BLOCK(
assert property (@(posedge clk_i) (axi_rsp_i.r_valid && axi_req_o.r_ready) |-> \
assert property (@(posedge clk_i) (axi_rsp_i.r_valid && axi_req_o.r_ready) |->
(axi_rsp_i.r.resp == axi_pkg::RESP_OKAY));
)

Expand Down