Use harness binder chipId to support multi-chip id pins

ucb-bar · Jan 12, 2024 · 67faf0c · 67faf0c
1 parent 8a4fc7c
commit 67faf0c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/generators/chipyard/src/main/scala/config/ChipletConfigs.scala b/generators/chipyard/src/main/scala/config/ChipletConfigs.scala
@@ -11,6 +11,7 @@ import testchipip.soc.{OBUS}
 
 // Simple design which exposes a second serial-tl port that can connect to another instance of itself
 class SymmetricChipletRocketConfig extends Config(
+  new testchipip.soc.WithChipIdPin ++                               // Add pin to identify chips
   new chipyard.harness.WithSerialTLTiedOff(tieoffs=Some(Seq(1))) ++ // Tie-off the chip-to-chip link in single-chip sims
   new testchipip.serdes.WithSerialTL(Seq(
     testchipip.serdes.SerialTLParams(                               // 0th serial-tl is chip-to-bringup-fpga

diff --git a/generators/chipyard/src/main/scala/harness/HarnessBinders.scala b/generators/chipyard/src/main/scala/harness/HarnessBinders.scala
@@ -254,8 +254,8 @@ class WithSimTSIOverSerialTL extends HarnessBinder({
 
 //TODO: Set with chipId argument to harness binder, hardcoding is temporary hack
 class WithDriveChipIdPin extends HarnessBinder({
-  case (th: HasHarnessInstantiators, port: ChipIdPort) => {
-    port.io := 0.U
+  case (th: HasHarnessInstantiators, port: ChipIdPort, chipId: Int) => {
+    port.io := chipId.U
   }
 })