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

make sure to check for region violations in DMA frontend

Browse Source
This commit is contained in:
Howard Mao 2016-02-03 15:40:44 -08:00
parent 78579672d3
commit 5abfd1a4ab
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rocket/src/main/scala/dma.scala
View File

@ -53,7 +53,7 @@ object ClientDmaRequest {
object ClientDmaResponse { object ClientDmaResponse {
val pagefault = UInt("b01") val pagefault = UInt("b01")
val outer_err = UInt("b10") val invalid_region = UInt("b10")
def apply(status: UInt = UInt(0))(implicit p: Parameters) = { def apply(status: UInt = UInt(0))(implicit p: Parameters) = {
val resp = Wire(new ClientDmaResponse) val resp = Wire(new ClientDmaResponse)
@ -164,6 +164,12 @@ class DmaFrontend(implicit p: Parameters) extends CoreModule()(p)
alloc = Bool(false)) alloc = Bool(false))
} }
def check_region(cmd: UInt, src: UInt, dst: UInt): Bool = {
val dst_ok = Mux(cmd === DMA_CMD_SOUT, dst >= UInt(mmioBase), dst < UInt(mmioBase))
val src_ok = Mux(cmd === DMA_CMD_SIN, src >= UInt(mmioBase), Bool(true))
dst_ok && src_ok
}
tlb.io.req.valid := tlb_to_send.orR tlb.io.req.valid := tlb_to_send.orR
tlb.io.req.bits.vpn := Mux(tlb_to_send(0), src_vpn, dst_vpn) tlb.io.req.bits.vpn := Mux(tlb_to_send(0), src_vpn, dst_vpn)
tlb.io.req.bits.passthrough := Bool(false) tlb.io.req.bits.passthrough := Bool(false)
@ -227,7 +233,12 @@ class DmaFrontend(implicit p: Parameters) extends CoreModule()(p)
} }
when (state === s_translate && !to_translate.orR) { when (state === s_translate && !to_translate.orR) {
when (check_region(cmd, src_paddr, dst_paddr)) {
state := s_dma_req state := s_dma_req
} .otherwise {
resp_status := ClientDmaResponse.invalid_region
state := s_finish
}
} }
def setBusy(set: Bool, xact_id: UInt): UInt = def setBusy(set: Bool, xact_id: UInt): UInt =