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

Fix PLIC control bug when !grant.ready

Browse Source
This commit is contained in:
Andrew Waterman 2016-06-02 13:47:59 -07:00
parent 0866b4c045
commit b7ca2145b3
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
uncore/src/main/scala/plic.scala
View File

@ -95,9 +95,9 @@ class PLIC(val cfg: PLICConfig)(implicit val p: Parameters) extends Module
} }
val acq = Queue(io.tl.acquire, 1) val acq = Queue(io.tl.acquire, 1)
val read = acq.valid && acq.bits.isBuiltInType(Acquire.getType) val read = acq.fire() && acq.bits.isBuiltInType(Acquire.getType)
val write = acq.valid && acq.bits.isBuiltInType(Acquire.putType) val write = acq.fire() && acq.bits.isBuiltInType(Acquire.putType)
assert(!acq.valid || read || write, "unsupported PLIC operation") assert(!acq.fire() || read || write, "unsupported PLIC operation")
val addr = acq.bits.full_addr()(log2Up(cfg.size)-1,0) val addr = acq.bits.full_addr()(log2Up(cfg.size)-1,0)
val claimant = val claimant =
@ -114,10 +114,10 @@ class PLIC(val cfg: PLICConfig)(implicit val p: Parameters) extends Module
pending(myMaxDev) := false pending(myMaxDev) := false
}.elsewhen (write && acq.bits.wmask()(cfg.claimOffset)) { }.elsewhen (write && acq.bits.wmask()(cfg.claimOffset)) {
val dev = (acq.bits.data >> (8 * cfg.claimOffset))(log2Up(pending.size)-1,0) val dev = (acq.bits.data >> (8 * cfg.claimOffset))(log2Up(pending.size)-1,0)
when (write && myEnables(dev)) { io.devices(dev-1).complete := true } when (myEnables(dev)) { io.devices(dev-1).complete := true }
}.elsewhen (write) { }.elsewhen (write) {
val thresh = acq.bits.data(log2Up(pending.size)-1,0) val thresh = acq.bits.data(log2Up(pending.size)-1,0)
when (write) { threshold(claimant) := thresh } threshold(claimant) := thresh
} }
}.elsewhen (addr >= cfg.enableBase) { }.elsewhen (addr >= cfg.enableBase) {
rdata := myEnables rdata := myEnables