From 71e3ff0b7c18b5a7c2fe24487740c5f3ec588629 Mon Sep 17 00:00:00 2001 From: Wei-Han Chen Date: Fri, 29 Jul 2022 03:12:35 +0000 Subject: [PATCH] configs: move cpu a2t, t2g from gic_hub to cpu_hub Connections between cpu and gem5 lies in gic_hub now, but these are not related to gic. So I create a subsystem in fastmodel cluster named cpu_hub, and put those connections (a2t, t2g) there. Change-Id: I18d9f80ce6f7f7f4a8290d1db5e48962294f43e5 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/61851 Maintainer: Jason Lowe-Power Tested-by: kokoro Reviewed-by: Yu-hsin Wang Reviewed-by: Jason Lowe-Power --- configs/example/arm/devices.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/configs/example/arm/devices.py b/configs/example/arm/devices.py index a488ab3755..3dc2bfdab7 100644 --- a/configs/example/arm/devices.py +++ b/configs/example/arm/devices.py @@ -241,10 +241,11 @@ class FastmodelCluster(SubSystem): core.createInterruptController() self.cpus = [ cpu ] + self.cpu_hub = SubSystem() a2t = AmbaToTlmBridge64(amba=cpu.amba) t2g = TlmToGem5Bridge64(tlm=a2t.tlm, gem5=system.membus.cpu_side_ports) - system.gic_hub.a2t = a2t - system.gic_hub.t2g = t2g + self.cpu_hub.a2t = a2t + self.cpu_hub.t2g = t2g system.addCpuCluster(self, num_cpus)