Merge 'origin/master' into dev for blkdev fix; bump midas
This commit is contained in:
commit
341a538b6f
|
@ -164,6 +164,9 @@ class BlockDevWidget(implicit p: Parameters) extends EndpointWidget()(p) {
|
|||
|
||||
when (tFire) {
|
||||
when (done || idle) {
|
||||
readRespBeatsLeft := 0.U
|
||||
returnWrite := false.B
|
||||
|
||||
// If a write-response is waiting, return it first
|
||||
when(writeLatencyPipe.io.deq.valid) {
|
||||
returnWrite := true.B
|
||||
|
@ -171,9 +174,6 @@ class BlockDevWidget(implicit p: Parameters) extends EndpointWidget()(p) {
|
|||
}.elsewhen(readLatencyPipe.io.deq.valid) {
|
||||
readRespBeatsLeft := readLatencyPipe.io.deq.bits * dataBeats.U
|
||||
readLatencyPipe.io.deq.ready := true.B
|
||||
}.otherwise {
|
||||
readRespBeatsLeft := 0.U
|
||||
returnWrite := false.B
|
||||
}
|
||||
}.elsewhen(readRespBusy && target.resp.fire) {
|
||||
readRespBeatsLeft := readRespBeatsLeft - 1.U
|
||||
|
|
|
@ -1 +1 @@
|
|||
Subproject commit e88aa10dc6db4ca4b4fd0c7b439fc2fef8db8e8e
|
||||
Subproject commit 71a516a5fd70e05b35d388a2c83a494f63fdbe26
|
Loading…
Reference in New Issue