diff options
| author | Leif Lindholm <quic_llindhol@quicinc.com> | 2023-09-19 11:20:25 +0100 |
|---|---|---|
| committer | mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> | 2023-09-19 20:27:55 +0000 |
| commit | eb485b6438f488db5300b56949d9dad460c9f2d4 (patch) | |
| tree | 022dc24d403d35e215e463919e760f1327e2a264 /ArmVirtPkg/ArmVirtQemuKernel.dsc | |
| parent | baee97670ff0c0391ad2c4fc1f32e2d89ed1a057 (diff) | |
| download | edk2-eb485b6438f488db5300b56949d9dad460c9f2d4.tar.gz | |
ArmVirtPkg: handle virtual EL2 timer in DT
FEAT_VHE, introduced in ARMv8.1, adds a virtual EL2 timer.
However, this library verifies that exactly 3 or 4 12-byte timer
interrupts are provided in input DT, ASSERTing when the new timer
is added.
Change the assert to >= 36.
Extend the current logic, also initializing PcdArmArchTimerHypVirtIntrNum
if 5 interrupts are provided.
Signed-off-by: Leif Lindholm <quic_llindhol@quicinc.com>
Reported-by: Peter Maydell <peter.maydell@linaro.org>
Cc: Ard Biesheuvel <ardb+tianocore@kernel.org>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Reviewed-by: Ard Biesheuvel <ardb@kernel.org>
Tested-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ArmVirtPkg/ArmVirtQemuKernel.dsc')
| -rw-r--r-- | ArmVirtPkg/ArmVirtQemuKernel.dsc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ArmVirtPkg/ArmVirtQemuKernel.dsc b/ArmVirtPkg/ArmVirtQemuKernel.dsc index 8ef5927b53..b50f8e84a3 100644 --- a/ArmVirtPkg/ArmVirtQemuKernel.dsc +++ b/ArmVirtPkg/ArmVirtQemuKernel.dsc @@ -214,6 +214,7 @@ gArmTokenSpaceGuid.PcdArmArchTimerIntrNum|0x0
gArmTokenSpaceGuid.PcdArmArchTimerVirtIntrNum|0x0
gArmTokenSpaceGuid.PcdArmArchTimerHypIntrNum|0x0
+ gArmTokenSpaceGuid.PcdArmArchTimerHypVirtIntrNum|0x0
#
# ARM General Interrupt Controller
|