Merge pull request #326 from antonblanchard/dcache-nc-fix

dcache: Loads from non-cacheable PTEs load entire 64 bits
3 years ago · 77d9891d2f
parent 39e1d10069 b29c58f3d1
commit 77d9891d2f
1 changed files with 1 additions and 1 deletions
--- a/dcache.vhdl
+++ b/dcache.vhdl
@ -1363,7 +1363,7 @@ begin
                        req.data := d_in.data;
                    end if;
                    -- Select all bytes for dcbz and for cacheable loads
-                    if r0.req.dcbz = '1' or (r0.req.load = '1' and r0.req.nc = '0') then
+                    if r0.req.dcbz = '1' or (r0.req.load = '1' and r0.req.nc = '0' and perm_attr.nocache = '0') then
                        req.byte_sel := (others => '1');
                    else
                        req.byte_sel := r0.req.byte_sel;