Merge pull request #2457 from chipsalliance/release-as-amba-cache-op

Release as amba cache op
chipsalliance · May 12, 2020 · c257dd4 · c257dd4
1 parent 004836c
commit c257dd4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/src/main/scala/tilelink/Broadcast.scala b/src/main/scala/tilelink/Broadcast.scala
@@ -7,6 +7,7 @@ import freechips.rocketchip.util.CompileOptions.NotStrictInferReset
 import freechips.rocketchip.config.Parameters
 import freechips.rocketchip.diplomacy._
 import freechips.rocketchip.util._
+import freechips.rocketchip.amba.AMBAProt
 import scala.math.{min,max}
 
 class TLBroadcast(lineBytes: Int, numTrackers: Int = 4, bufferless: Boolean = false)(implicit p: Parameters) extends LazyModule
@@ -142,6 +143,15 @@ class TLBroadcast(lineBytes: Int, numTrackers: Int = 4, bufferless: Boolean = fa
       val put_who  = Mux(c_releasedata, in.c.bits.source, c_trackerSrc)
       putfull.valid := in.c.valid && (c_probeackdata || c_releasedata)
       putfull.bits := edgeOut.Put(Cat(put_what, put_who), in.c.bits.address, in.c.bits.size, in.c.bits.data)._2
+      putfull.bits.user.lift(AMBAProt).foreach { x =>
+        x.fetch       := false.B
+        x.secure      := true.B
+        x.privileged  := true.B
+        x.bufferable  := true.B
+        x.modifiable  := true.B
+        x.readalloc   := true.B
+        x.writealloc  := true.B
+      }
 
       // Combine ReleaseAck or the modified D
       TLArbiter.lowest(edgeOut, in.d, releaseack, d_normal)

diff --git a/src/main/scala/tilelink/CacheCork.scala b/src/main/scala/tilelink/CacheCork.scala
@@ -6,6 +6,7 @@ import Chisel._
 import freechips.rocketchip.config.Parameters
 import freechips.rocketchip.diplomacy._
 import freechips.rocketchip.util._
+import freechips.rocketchip.amba.AMBAProt
 import scala.math.{min,max}
 import TLMessages._
 
@@ -91,6 +92,15 @@ class TLCacheCork(unsafe: Boolean = false, sinkIds: Int = 8)(implicit p: Paramet
           lgSize     = in.c.bits.size,
           data       = in.c.bits.data,
           corrupt    = in.c.bits.corrupt)._2
+        c_a.bits.user.lift(AMBAProt).foreach { x =>
+          x.fetch       := false.B
+          x.secure      := true.B
+          x.privileged  := true.B
+          x.bufferable  := true.B
+          x.modifiable  := true.B
+          x.readalloc   := true.B
+          x.writealloc  := true.B
+        }
 
         // Releases without Data succeed instantly
         val c_d = Wire(in.d)