From 152645b1bc7d87f3ac069502384978c867cbf607 Mon Sep 17 00:00:00 2001
From: Howard Mao <zhehao.mao@gmail.com>
Date: Thu, 7 Apr 2016 11:20:16 -0700
Subject: [PATCH] use manager_id instead of client_id in GrantFromSrc and
 FinishToDst

---
 uncore/src/main/scala/converters.scala | 10 +++++-----
 uncore/src/main/scala/tilelink.scala   | 10 +++++++---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/uncore/src/main/scala/converters.scala b/uncore/src/main/scala/converters.scala
index 46b7d7af..100c0412 100644
--- a/uncore/src/main/scala/converters.scala
+++ b/uncore/src/main/scala/converters.scala
@@ -78,10 +78,10 @@ class FinishUnit(srcId: Int = 0, outstanding: Int = 2)(implicit p: Parameters) e
     val q = Module(new FinishQueue(outstanding))
     q.io.enq.valid := io.grant.fire() && g.requiresAck() && (!g.hasMultibeatData() || done)
     q.io.enq.bits := g.makeFinish()
-    q.io.enq.bits.client_id := io.grant.bits.header.src
+    q.io.enq.bits.manager_id := io.grant.bits.header.src
 
     io.finish.bits.header.src := UInt(srcId)
-    io.finish.bits.header.dst := q.io.deq.bits.client_id
+    io.finish.bits.header.dst := q.io.deq.bits.manager_id
     io.finish.bits.payload := q.io.deq.bits
     io.finish.valid := q.io.deq.valid
     q.io.deq.ready := io.finish.ready
@@ -123,7 +123,7 @@ class ClientTileLinkNetworkPort(clientId: Int, addrConvert: UInt => UInt)
   io.network.release <> rel_with_header
   io.network.finish <> fin_with_header
   io.client.probe <> prb_without_header
-  io.client.grant.bits.client_id := io.network.grant.bits.header.src
+  io.client.grant.bits.manager_id := io.network.grant.bits.header.src
   io.client.grant <> gnt_without_header
 }
 
@@ -159,14 +159,14 @@ class ClientUncachedTileLinkNetworkPort(clientId: Int, addrConvert: UInt => UInt
 }
 
 object ClientTileLinkHeaderCreator {
-  def apply[T <: ClientToManagerChannel with HasClientId](
+  def apply[T <: ClientToManagerChannel with HasManagerId](
         in: DecoupledIO[T],
         clientId: Int)
       (implicit p: Parameters): DecoupledIO[LogicalNetworkIO[T]] = {
     val out = Wire(new DecoupledIO(new LogicalNetworkIO(in.bits)))
     out.bits.payload := in.bits
     out.bits.header.src := UInt(clientId)
-    out.bits.header.dst := in.bits.client_id
+    out.bits.header.dst := in.bits.manager_id
     out.valid := in.valid
     in.ready := out.ready
     out
diff --git a/uncore/src/main/scala/tilelink.scala b/uncore/src/main/scala/tilelink.scala
index d24765b3..361e6fb4 100644
--- a/uncore/src/main/scala/tilelink.scala
+++ b/uncore/src/main/scala/tilelink.scala
@@ -147,6 +147,10 @@ trait HasClientId extends HasTileLinkParameters {
   val client_id = UInt(width = tlClientIdBits)
 }
 
+trait HasManagerId extends HasTileLinkParameters {
+  val manager_id = UInt(width = tlManagerIdBits)
+}
+
 trait HasAcquireUnion extends HasTileLinkParameters {
   val union = Bits(width = tlAcquireUnionBits)
 
@@ -787,11 +791,11 @@ class GrantToDst(implicit p: Parameters) extends Grant
 
 /** [[uncore.Grant]] with an extra field stating its destination */
 class GrantFromSrc(implicit p: Parameters) extends Grant
-    with HasClientId {
+    with HasManagerId {
   override def makeFinish(dummy: Int = 0): FinishToDst = {
     val f = Wire(new FinishToDst)
     f.manager_xact_id := this.manager_xact_id
-    f.client_id := this.client_id
+    f.manager_id := this.manager_id
     f
   }
 }
@@ -881,7 +885,7 @@ class Finish(implicit p: Parameters) extends ClientToManagerChannel()(p)
 
 /** [[uncore.Finish]] with an extra field stating its destination */
 class FinishToDst(implicit p: Parameters) extends Finish
-  with HasClientId
+  with HasManagerId
 
 /** Complete IO definition for incoherent TileLink, including networking headers */
 class UncachedTileLinkIO(implicit p: Parameters) extends TLBundle()(p) {