colin
/
Hazard3
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SBA: fix alignment check using a stale address when the trigger is an sbaddress write. Fix new transfers being allowed to start when sberror or sbbusyerror are set.

This commit is contained in:
Luke Wren 2022-07-03 19:02:30 +01:00
parent ae11d04b10
commit c7a32c4d00
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hdl/debug/dm/hazard3_dm.v
View File

@ -368,9 +368,12 @@ wire sb_want_start_read =
(sbreadonaddr && dmi_write && dmi_regaddr == ADDR_SBADDRESS0) || (sbreadonaddr && dmi_write && dmi_regaddr == ADDR_SBADDRESS0) ||
(sbreadondata && dmi_read && dmi_regaddr == ADDR_SBDATA0); (sbreadondata && dmi_read && dmi_regaddr == ADDR_SBDATA0);
wire [1:0] sb_next_align = sbreadonaddr && dmi_write && dmi_regaddr == ADDR_SBADDRESS0 ?
dmi_pwdata[1:0] : sbaddress[1:0];
wire sb_badalign = wire sb_badalign =
(sbaccess == 3'h1 && sbaddress[0]) || (sbaccess == 3'h1 && sb_next_align[0]) ||
(sbaccess == 3'h2 && |sbaddress[1:0]); (sbaccess == 3'h2 && |sb_next_align[1:0]);
wire sb_badsize = sbaccess > 3'h2; wire sb_badsize = sbaccess > 3'h2;
@ -413,7 +416,7 @@ always @ (posedge clk or negedge rst_n) begin
sberror <= SBERROR_BADADDR; sberror <= SBERROR_BADADDR;
end end
end end
end else if (sb_want_start_read || sb_want_start_write) begin end else if (sb_want_start_read || sb_want_start_write && ~|sberror && !sbbusyerror) begin
if (sb_badsize) begin if (sb_badsize) begin
sberror <= SBERROR_BADSIZE; sberror <= SBERROR_BADSIZE;
end else if (sb_badalign) begin end else if (sb_badalign) begin