From 2839f1f841f45d53c7b8a9a66d511edaa5a4ed82 Mon Sep 17 00:00:00 2001 From: joey0320 Date: Tue, 3 Oct 2023 22:42:25 -0700 Subject: [PATCH 1/3] Fix --- generators/chipyard/src/main/scala/harness/HarnessBinders.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/chipyard/src/main/scala/harness/HarnessBinders.scala b/generators/chipyard/src/main/scala/harness/HarnessBinders.scala index b670fd7404..46c2c36442 100644 --- a/generators/chipyard/src/main/scala/harness/HarnessBinders.scala +++ b/generators/chipyard/src/main/scala/harness/HarnessBinders.scala @@ -106,7 +106,7 @@ class WithBlockDeviceModel extends OverrideHarnessBinder({ class WithLoopbackNIC extends OverrideHarnessBinder({ (system: CanHavePeripheryIceNIC, th: HasHarnessInstantiators, ports: Seq[ClockedIO[NICIOvonly]]) => { implicit val p: Parameters = GetSystemParameters(system) - ports.map { n => NicLoopback.connect(Some(n.bits), p(NICKey)) } + ports.map { n => NicLoopback.connect(Some(n.bits), p(NICKey), n.clock, th.harnessBinderReset.asBool) } } }) From 33b599052a028f402a10171d5c54e27eaad605b9 Mon Sep 17 00:00:00 2001 From: joey0320 Date: Tue, 3 Oct 2023 22:46:50 -0700 Subject: [PATCH 2/3] Bump icenet --- generators/icenet | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/generators/icenet b/generators/icenet index 68b4c7f30f..c8f955579c 160000 --- a/generators/icenet +++ b/generators/icenet @@ -1 +1 @@ -Subproject commit 68b4c7f30f0119fe5cfab7ea99fb6927a563e112 +Subproject commit c8f955579c9e544dc4a83cc3433692f211184571 From 1aace7569436df42f206192c5f465d1f100813c0 Mon Sep 17 00:00:00 2001 From: joey0320 Date: Thu, 5 Oct 2023 23:05:39 -0700 Subject: [PATCH 3/3] revert icenet bump | fix harnessbinders --- .../chipyard/src/main/scala/harness/HarnessBinders.scala | 6 +++++- generators/icenet | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/generators/chipyard/src/main/scala/harness/HarnessBinders.scala b/generators/chipyard/src/main/scala/harness/HarnessBinders.scala index 46c2c36442..2b5228843b 100644 --- a/generators/chipyard/src/main/scala/harness/HarnessBinders.scala +++ b/generators/chipyard/src/main/scala/harness/HarnessBinders.scala @@ -106,7 +106,11 @@ class WithBlockDeviceModel extends OverrideHarnessBinder({ class WithLoopbackNIC extends OverrideHarnessBinder({ (system: CanHavePeripheryIceNIC, th: HasHarnessInstantiators, ports: Seq[ClockedIO[NICIOvonly]]) => { implicit val p: Parameters = GetSystemParameters(system) - ports.map { n => NicLoopback.connect(Some(n.bits), p(NICKey), n.clock, th.harnessBinderReset.asBool) } + ports.map { n => + withClockAndReset(n.clock, th.harnessBinderReset.asBool) { + NicLoopback.connect(Some(n.bits), p(NICKey)) + } + } } }) diff --git a/generators/icenet b/generators/icenet index c8f955579c..68b4c7f30f 160000 --- a/generators/icenet +++ b/generators/icenet @@ -1 +1 @@ -Subproject commit c8f955579c9e544dc4a83cc3433692f211184571 +Subproject commit 68b4c7f30f0119fe5cfab7ea99fb6927a563e112