riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

Fixed race between read resps/reps and write req/reps in null hub

Browse Source
This commit is contained in:
Henry Cook 2012-02-29 00:44:03 -08:00
parent c99f6bbeb7
commit 8ff6e21e3a
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rocket/src/main/scala/coherence.scala
View File

@ -329,19 +329,19 @@ class CoherenceHubNull extends Component {
val x_init = io.tile.xact_init val x_init = io.tile.xact_init
val is_write = x_init.bits.t_type === X_WRITE_UNCACHED val is_write = x_init.bits.t_type === X_WRITE_UNCACHED
x_init.ready := io.mem.req_cmd.ready x_init.ready := io.mem.req_cmd.ready && !(is_write && io.mem.resp.valid) //stall write req/resp to handle previous read resp
io.mem.req_cmd.valid := x_init.valid io.mem.req_cmd.valid := x_init.valid && !(is_write && io.mem.resp.valid)
io.mem.req_cmd.bits.rw := is_write io.mem.req_cmd.bits.rw := is_write
io.mem.req_cmd.bits.tag := x_init.bits.tile_xact_id io.mem.req_cmd.bits.tag := x_init.bits.tile_xact_id
io.mem.req_cmd.bits.addr := x_init.bits.address io.mem.req_cmd.bits.addr := x_init.bits.address
io.mem.req_data <> io.tile.xact_init_data io.mem.req_data <> io.tile.xact_init_data
val x_rep = io.tile.xact_rep val x_rep = io.tile.xact_rep
x_rep.bits.t_type := X_READ_EXCLUSIVE x_rep.bits.t_type := Mux(is_write, X_WRITE_UNCACHED, X_READ_EXCLUSIVE)
x_rep.bits.tile_xact_id := Mux(is_write, x_init.bits.tile_xact_id, io.mem.resp.tag) x_rep.bits.tile_xact_id := Mux(is_write, x_init.bits.tile_xact_id, io.mem.resp.tag)
x_rep.bits.global_xact_id := UFix(0) // don't care x_rep.bits.global_xact_id := UFix(0) // don't care
x_rep.bits.data := io.mem.resp.data x_rep.bits.data := io.mem.resp.data
x_rep.valid := io.mem.resp.valid x_rep.valid := io.mem.resp.valid || is_write
} }