diff options
| author | Ard Biesheuvel <ard.biesheuvel@linaro.org> | 2014-09-09 16:08:42 +0000 |
|---|---|---|
| committer | oliviermartin <oliviermartin@6f19259b-4bc3-4df7-8a09-765794883524> | 2014-09-09 16:08:42 +0000 |
| commit | 2785509b57d9ff92321c1083aab4a5ffc9519961 (patch) | |
| tree | 55c6bb1eb67d094c54b4d6338d5a35bbd23c389a /ArmPkg/Drivers/TimerDxe | |
| parent | bcf37cf6002ba538b63172a496b142ab322eff95 (diff) | |
| download | edk2-platforms-2785509b57d9ff92321c1083aab4a5ffc9519961.tar.xz | |
ArmPkg/TimerDxe: Register the virt and hyp timer interrupts at init time.
Change-Id: I1162dc60140278c0b3da837bf325e3789ababf54
Contributed-under: TianoCore Contribution Agreement 1.0
Acked-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-By: Olivier Martin <olivier.martin@arm.com>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@16077 6f19259b-4bc3-4df7-8a09-765794883524
Diffstat (limited to 'ArmPkg/Drivers/TimerDxe')
| -rw-r--r-- | ArmPkg/Drivers/TimerDxe/TimerDxe.c | 6 | ||||
| -rw-r--r-- | ArmPkg/Drivers/TimerDxe/TimerDxe.inf | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/ArmPkg/Drivers/TimerDxe/TimerDxe.c b/ArmPkg/Drivers/TimerDxe/TimerDxe.c index 40ccf161be..239a353269 100644 --- a/ArmPkg/Drivers/TimerDxe/TimerDxe.c +++ b/ArmPkg/Drivers/TimerDxe/TimerDxe.c @@ -390,6 +390,12 @@ TimerInitialize ( // Note: Because it is not possible to determine the security state of the
// CPU dynamically, we just install interrupt handler for both sec and non-sec
// timer PPI
+ Status = gInterrupt->RegisterInterruptSource (gInterrupt, PcdGet32 (PcdArmArchTimerVirtIntrNum), TimerInterruptHandler);
+ ASSERT_EFI_ERROR (Status);
+
+ Status = gInterrupt->RegisterInterruptSource (gInterrupt, PcdGet32 (PcdArmArchTimerHypIntrNum), TimerInterruptHandler);
+ ASSERT_EFI_ERROR (Status);
+
Status = gInterrupt->RegisterInterruptSource (gInterrupt, PcdGet32 (PcdArmArchTimerSecIntrNum), TimerInterruptHandler);
ASSERT_EFI_ERROR (Status);
diff --git a/ArmPkg/Drivers/TimerDxe/TimerDxe.inf b/ArmPkg/Drivers/TimerDxe/TimerDxe.inf index 50477ba42a..161d286d9c 100644 --- a/ArmPkg/Drivers/TimerDxe/TimerDxe.inf +++ b/ArmPkg/Drivers/TimerDxe/TimerDxe.inf @@ -52,6 +52,8 @@ gEmbeddedTokenSpaceGuid.PcdTimerPeriod
gArmTokenSpaceGuid.PcdArmArchTimerSecIntrNum
gArmTokenSpaceGuid.PcdArmArchTimerIntrNum
+ gArmTokenSpaceGuid.PcdArmArchTimerVirtIntrNum
+ gArmTokenSpaceGuid.PcdArmArchTimerHypIntrNum
gArmTokenSpaceGuid.PcdArmArchTimerFreqInHz
[Depex]
|