derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev-arm: Rename GenericTimer interrupts

Browse Source 
The Arm Architecture Reference Manual has moved from
"Armv7-oriented" names for generic timer interrupts to
names more consistent with Armv8 (Exception Levels based).

We are therefore renaming those interrupts as follows:

int_phys_s -> int_el3_phys
int_phys_ns -> int_el1_phys
int_virt -> int_el1_virt
int_hyp -> int_el2_ns_phys

Change-Id: Id6e34a0e4311953938b25bca168a34357e3c8643
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/58109
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Giacomo Travaglini
2022-03-15 15:54:19 +00:00
parent 0aedbb82fe
commit cfc570dd1c
4 changed files with 108 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/dev/arm/GenericTimer.py
View File

@@ -1,4 +1,4 @@
# Copyright (c) 2009-2020 ARM Limited
# Copyright (c) 2009-2020, 2022 Arm Limited
# All rights reserved.
#
# The license below extends only to copyright in the software and shall
@@ -86,10 +86,10 @@ Reference:
counter = Param.SystemCounter(Parent.any, "Global system counter")
int_phys_s = Param.ArmPPI("Physical (S) timer interrupt")
int_phys_ns = Param.ArmPPI("Physical (NS) timer interrupt")
int_virt = Param.ArmPPI("Virtual timer interrupt")
int_hyp = Param.ArmPPI("Hypervisor timer interrupt")
int_el1_phys = Param.ArmPPI("EL1 physical timer interrupt")
int_el1_virt = Param.ArmPPI("EL1 virtual timer interrupt")
int_el2_ns_phys = Param.ArmPPI("EL2 Non-secure physical timer interrupt")
int_el3_phys = Param.ArmPPI("EL3 physical timer interrupt")
# This value should be in theory initialized by the highest
# priviledged software. We do this in gem5 to avoid KVM
@@ -109,10 +109,10 @@ Reference:
gic = self._parent.unproxy(self).gic
node.append(FdtPropertyWords("interrupts",
self.int_phys_s.generateFdtProperty(gic) +
self.int_phys_ns.generateFdtProperty(gic) +
self.int_virt.generateFdtProperty(gic) +
self.int_hyp.generateFdtProperty(gic)))
self.int_el3_phys.generateFdtProperty(gic) +
self.int_el1_phys.generateFdtProperty(gic) +
self.int_el1_virt.generateFdtProperty(gic) +
self.int_el2_ns_phys.generateFdtProperty(gic)))
if self._freq_in_dtb:
node.append(self.counter.unproxy(self).generateDtb())