Adrian Herrera has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/35075 )
Change subject: dev-arm: FVPBasePwrCtrl, fix vector resizing
......................................................................
dev-arm: FVPBasePwrCtrl, fix vector resizing
(1) ThreadContexts are registered into System in BaseCPU::init.
(2) FVPBasePwrCtrl state is resized based on registered ThreadContexts
in FVPBasePwrCtrl::init.
FVPBasePwrCtrl::init may be called before BaseCPU::init based on the
model names alphabetical order, leading to segmentation faults.
To fix this, (2) is now carried out in FVPBasePwrCtrl::startup.
Change-Id: Ica6c5b7448da556d61aee53f8777a709fcad2212
---
M src/dev/arm/fvp_base_pwr_ctrl.cc
M src/dev/arm/fvp_base_pwr_ctrl.hh
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/dev/arm/fvp_base_pwr_ctrl.cc
b/src/dev/arm/fvp_base_pwr_ctrl.cc
index fc66e1c..d6b6a59 100644
--- a/src/dev/arm/fvp_base_pwr_ctrl.cc
+++ b/src/dev/arm/fvp_base_pwr_ctrl.cc
@@ -58,13 +58,13 @@
}
void
-FVPBasePwrCtrl::init()
+FVPBasePwrCtrl::startup()
{
// All cores are ON by default (PwrStatus.{l0,l1} = 0b1)
corePwrStatus.resize(sys->threads.size(), 0x60000000);
for (const auto &tc : sys->threads)
poweredCoresPerCluster[tc->socketId()] += 1;
- BasicPioDevice::init();
+ BasicPioDevice::startup();
}
void
diff --git a/src/dev/arm/fvp_base_pwr_ctrl.hh
b/src/dev/arm/fvp_base_pwr_ctrl.hh
index aa446a8..92c3198 100644
--- a/src/dev/arm/fvp_base_pwr_ctrl.hh
+++ b/src/dev/arm/fvp_base_pwr_ctrl.hh
@@ -88,7 +88,7 @@
*/
void clearWakeRequest(ThreadContext *const tc);
- void init() override;
+ void startup() override;
protected:
Tick read(PacketPtr pkt) override;
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/35075
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Ica6c5b7448da556d61aee53f8777a709fcad2212
Gerrit-Change-Number: 35075
Gerrit-PatchSet: 1
Gerrit-Owner: Adrian Herrera <adrian.herr...@arm.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
