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

BusBlocker: lock bit should affect the prior PMP address, not next

Browse Source
This commit is contained in:
Wesley W. Terpstra 2017-08-08 16:43:59 -07:00
parent 0a351f677d
commit 6d6fc38787
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/scala/devices/tilelink/BusBlocker.scala
View File

@ -37,16 +37,17 @@ class DevicePMP(params: DevicePMPParams) extends GenericParameterizedBundle(para
val addr_hi = UInt(width = params.addressBits-12) val addr_hi = UInt(width = params.addressBits-12)
def address = Cat(addr_hi, UInt(0, width=12)) def address = Cat(addr_hi, UInt(0, width=12))
def blockPriorAddress = l(0) && a(0)
def fields(locked: Bool): Seq[RegField] = { def fields(blockAddress: Bool): Seq[RegField] = {
def field(bits: Int, reg: UInt) = def field(bits: Int, reg: UInt, lock: Bool = l(0)) =
RegField(bits, RegReadFn(reg), RegWriteFn((wen, data) => { RegField(bits, RegReadFn(reg), RegWriteFn((wen, data) => {
when (wen && !locked) { reg := data } when (wen && !lock) { reg := data }
Bool(true) Bool(true)
})) }))
Seq( Seq(
RegField(10), RegField(10),
field(params.addressBits-12, addr_hi), field(params.addressBits-12, addr_hi, l(0) || blockAddress),
RegField(56 - (params.addressBits-2)), RegField(56 - (params.addressBits-2)),
field(1, r), field(1, r),
field(1, w), field(1, w),
@ -88,8 +89,8 @@ class BusBlocker(params: BusBlockerParams)(implicit p: Parameters) extends TLBus
// We need to be able to represent +1 larger than the largest populated address // We need to be able to represent +1 larger than the largest populated address
val addressBits = log2Ceil(nodeOut.edgesOut(0).manager.maxAddress+1+1) val addressBits = log2Ceil(nodeOut.edgesOut(0).manager.maxAddress+1+1)
val pmps = RegInit(Vec.fill(params.pmpRegisters) { DevicePMP(addressBits) }) val pmps = RegInit(Vec.fill(params.pmpRegisters) { DevicePMP(addressBits) })
val locks = (pmps.map(_.l) zip (UInt(0) +: pmps.map(_.l))) map { case (x, n) => x | n } val blocks = pmps.tail.map(_.blockPriorAddress) :+ Bool(false)
controlNode.regmap(0 -> (pmps zip locks).map { case (p, l) => p.fields(l(0)) }.toList.flatten) controlNode.regmap(0 -> (pmps zip blocks).map { case (p, b) => p.fields(b) }.toList.flatten)
val in = io.in(0) val in = io.in(0)
val edge = nodeIn.edgesIn(0) val edge = nodeIn.edgesIn(0)