From: Adrian Herrera <adrian.herrera@arm.com>
Date: Tue, 17 Mar 2020 16:33:38 +0000 (+0000)
Subject: dev-arm: Instantiate FVPBasePwrCtrl in VExpress_GEM5
X-Git-Tag: v20.0.0.0~280
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=59bbae6e8449df9acb735c4e068809f54a17c5e8;p=gem5.git

dev-arm: Instantiate FVPBasePwrCtrl in VExpress_GEM5

Change-Id: I9390570ce459adece930dbbfad050bfb1100dfd2
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/26832
Reviewed-by: Ciro Santilli <ciro.santilli@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/src/dev/arm/RealView.py b/src/dev/arm/RealView.py
index 0eaeb82f8..93f6e1290 100644
--- a/src/dev/arm/RealView.py
+++ b/src/dev/arm/RealView.py
@@ -546,6 +546,17 @@ class HDLcd(AmbaDmaDevice):
 
         yield node
 
+class FVPBasePwrCtrl(BasicPioDevice):
+    """
+Based on Fast Models Base_PowerController v11.8
+Reference:
+    Fast Models Reference Manual - Section 7.7.2 - Version 11.8
+    Document ID: 100964_1180_00_en
+    """
+
+    type = 'FVPBasePwrCtrl'
+    cxx_header = 'dev/arm/fvp_base_pwr_ctrl.hh'
+
 class RealView(Platform):
     type = 'RealView'
     cxx_header = "dev/arm/realview.hh"
@@ -1018,6 +1029,8 @@ Interrupts:
 
     energy_ctrl = EnergyCtrl(pio_addr=0x10000000)
 
+    pwr_ctrl = FVPBasePwrCtrl(pio_addr=0x1c100000)
+
     vio = [
         MmioVirtIO(pio_addr=0x1c130000, pio_size=0x1000,
                    interrupt=ArmSPI(num=74)),
@@ -1034,6 +1047,7 @@ Interrupts:
             self.rtc,
             self.pci_host,
             self.energy_ctrl,
+            self.pwr_ctrl,
             self.clock32KHz,
             self.clock24MHz,
             self.vio[0],
@@ -1163,13 +1177,3 @@ class VExpress_GEM5_V2(VExpress_GEM5_V2_Base):
                 self.hdlcd,
             ]
 
-class FVPBasePwrCtrl(BasicPioDevice):
-    """
-Based on Fast Models Base_PowerController v11.8
-Reference:
-    Fast Models Reference Manual - Section 7.7.2 - Version 11.8
-    Document ID: 100964_1180_00_en
-    """
-
-    type = 'FVPBasePwrCtrl'
-    cxx_header = 'dev/arm/fvp_base_pwr_ctrl.hh'