From eb14329c63deedfb13adc56c9dd16a62ea6921ff Mon Sep 17 00:00:00 2001
From: "Wesley W. Terpstra" <wesley@sifive.com>
Date: Thu, 1 Jun 2017 15:29:45 -0700
Subject: [PATCH] tilelink2: only combine managers of the same resources

---
 src/main/scala/uncore/tilelink2/Parameters.scala | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/scala/uncore/tilelink2/Parameters.scala b/src/main/scala/uncore/tilelink2/Parameters.scala
index dae24e06..f10f098e 100644
--- a/src/main/scala/uncore/tilelink2/Parameters.scala
+++ b/src/main/scala/uncore/tilelink2/Parameters.scala
@@ -355,9 +355,9 @@ object ManagerUnification
   def apply(managers: Seq[TLManagerParameters]) = {
     // To be unified, devices must agree on all of these terms
     case class TLManagerKey(
+      resources:          Seq[Resource],
       regionType:         RegionType.T,
       executable:         Boolean,
-      lastNode:           BaseNode,
       supportsAcquireT:   TransferSizes,
       supportsAcquireB:   TransferSizes,
       supportsArithmetic: TransferSizes,
@@ -367,9 +367,9 @@ object ManagerUnification
       supportsPutPartial: TransferSizes,
       supportsHint:       TransferSizes)
     def key(x: TLManagerParameters) = TLManagerKey(
+      resources          = x.resources,
       regionType         = x.regionType,
       executable         = x.executable,
-      lastNode           = x.nodePath.last,
       supportsAcquireT   = x.supportsAcquireT,
       supportsAcquireB   = x.supportsAcquireB,
       supportsArithmetic = x.supportsArithmetic,