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.

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

AHB/DMA fix in the testbench #278

Draft
wants to merge 11 commits into
base: main
Choose a base branch
from
3 changes: 1 addition & 2 deletions design/lib/ahb_to_axi4.sv
Original file line number Diff line number Diff line change
Expand Up @@ -209,8 +209,7 @@ import el2_pkg::*;
assign ahb_hrdata[63:0] = buf_rdata[63:0];
assign ahb_hresp = ((ahb_htrans_q[1:0] != 2'b0) & (buf_state != IDLE) &

((~(ahb_addr_in_dccm | ahb_addr_in_iccm)) | // request not for ICCM or DCCM
((ahb_addr_in_iccm | (ahb_addr_in_dccm & ahb_hwrite_q)) & ~((ahb_hsize_q[1:0] == 2'b10) | (ahb_hsize_q[1:0] == 2'b11))) | // ICCM Rd/Wr OR DCCM Wr not the right size
(
((ahb_hsize_q[2:0] == 3'h1) & ahb_haddr_q[0]) | // HW size but unaligned
((ahb_hsize_q[2:0] == 3'h2) & (|ahb_haddr_q[1:0])) | // W size but unaligned
((ahb_hsize_q[2:0] == 3'h3) & (|ahb_haddr_q[2:0])))) | // DW size but unaligned
Expand Down
4 changes: 2 additions & 2 deletions testbench/ahb_sif.sv
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ module ahb_sif (
endmodule
`endif

`ifdef RV_BUILD_AXI4
// `ifdef RV_BUILD_AXI4
module axi_slv #(
TAGW = 1
) (
Expand Down Expand Up @@ -238,5 +238,5 @@ module axi_slv #(
end
end
endmodule
`endif
// `endif

Loading
Loading