diff options
| author | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2018-09-11 15:18:02 +0100 |
|---|---|---|
| committer | Giacomo Travaglini <giacomo.travaglini@arm.com> | 2018-09-28 10:53:54 +0000 |
| commit | a43e3108b4a9bd34cf382588e2e3bc0b81381623 (patch) | |
| tree | 8f81b3eaa81bf2f69413bf63101c0a238b89bcb0 /src/dev/arm/RealView.py | |
| parent | 54bc94114f22dfd7960c9ba9045f42ff276c3305 (diff) | |
| download | gem5-a43e3108b4a9bd34cf382588e2e3bc0b81381623.tar.xz | |
dev-arm: Make CpuLocalTimer use standard ArmInterruptPin
Change-Id: I8c4eb9389b47df8cdf1eec966bb2c9da85a7a7c8
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/12744
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Diffstat (limited to 'src/dev/arm/RealView.py')
| -rw-r--r-- | src/dev/arm/RealView.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/dev/arm/RealView.py b/src/dev/arm/RealView.py index e8a7cd6d4..3f1803037 100644 --- a/src/dev/arm/RealView.py +++ b/src/dev/arm/RealView.py @@ -410,9 +410,8 @@ class A9GlobalTimer(BasicPioDevice): class CpuLocalTimer(BasicPioDevice): type = 'CpuLocalTimer' cxx_header = "dev/arm/timer_cpulocal.hh" - gic = Param.BaseGic(Parent.any, "Gic to use for interrupting") - int_num_timer = Param.UInt32("Interrrupt number used per-cpu to GIC") - int_num_watchdog = Param.UInt32("Interrupt number for per-cpu watchdog to GIC") + int_timer = Param.ArmPPI("Interrrupt used per-cpu to GIC") + int_watchdog = Param.ArmPPI("Interrupt for per-cpu watchdog to GIC") class GenericTimer(ClockedObject): type = 'GenericTimer' @@ -621,7 +620,8 @@ class RealViewPBX(RealView): timer0 = Sp804(int_num0=36, int_num1=36, pio_addr=0x10011000) timer1 = Sp804(int_num0=37, int_num1=37, pio_addr=0x10012000) global_timer = A9GlobalTimer(int_num=27, pio_addr=0x1f000200) - local_cpu_timer = CpuLocalTimer(int_num_timer=29, int_num_watchdog=30, + local_cpu_timer = CpuLocalTimer(int_timer=ArmPPI(num=29), + int_watchdog=ArmPPI(num=30), pio_addr=0x1f000600) clcd = Pl111(pio_addr=0x10020000, int_num=55) kmi0 = Pl050(pio_addr=0x10006000, int_num=52, ps2=PS2Keyboard()) @@ -877,7 +877,8 @@ class VExpress_EMM(RealView): gic = GicV2(dist_addr=0x2C001000, cpu_addr=0x2C002000) vgic = VGic(vcpu_addr=0x2c006000, hv_addr=0x2c004000, ppint=25) - local_cpu_timer = CpuLocalTimer(int_num_timer=29, int_num_watchdog=30, + local_cpu_timer = CpuLocalTimer(int_timer=ArmPPI(num=29), + int_watchdog=ArmPPI(num=30), pio_addr=0x2C080000) hdlcd = HDLcd(pxl_clk=dcc.osc_pxl, |