ArmPkg/ArmGic: Returned the InterruptId in ArmGicAcknowledgeInterrupt()
The InterruptId has a different width for GicV2 and GicV3 (respectively 10bit and 24bit). The function prototype has been changed to return this value to make the caller GIC architecture version independent. Otherwise, we would have need to expose a different mask to allow the caller to retrieve this value from the read register. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Olivier Martin <olivier.martin@arm.com> git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15628 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
committed by
oliviermartin
parent
f5241b5725
commit
1b0ac0dedf
@@ -1,6 +1,6 @@
|
||||
/** @file
|
||||
*
|
||||
* Copyright (c) 2011-2012, ARM Limited. All rights reserved.
|
||||
* Copyright (c) 2011-2014, ARM Limited. All rights reserved.
|
||||
*
|
||||
* This program and the accompanying materials
|
||||
* are licensed and made available under the terms and conditions of the BSD License
|
||||
@@ -30,24 +30,25 @@ NonSecureWaitForFirmware (
|
||||
VOID
|
||||
)
|
||||
{
|
||||
VOID (*secondary_start)(VOID);
|
||||
UINTN Interrupt;
|
||||
VOID (*SecondaryStart)(VOID);
|
||||
UINTN AcknowledgeInterrupt;
|
||||
UINTN InterruptId;
|
||||
|
||||
// The secondary cores will execute the firmware once wake from WFI.
|
||||
secondary_start = (VOID (*)())PcdGet32(PcdFvBaseAddress);
|
||||
SecondaryStart = (VOID (*)())PcdGet32 (PcdFvBaseAddress);
|
||||
|
||||
ArmCallWFI();
|
||||
ArmCallWFI ();
|
||||
|
||||
// Acknowledge the interrupt and send End of Interrupt signal.
|
||||
Interrupt = ArmGicAcknowledgeInterrupt (PcdGet32 (PcdGicInterruptInterfaceBase));
|
||||
AcknowledgeInterrupt = ArmGicAcknowledgeInterrupt (PcdGet32 (PcdGicInterruptInterfaceBase), &InterruptId);
|
||||
// Check if it is a valid interrupt ID
|
||||
if ((Interrupt & ARM_GIC_ICCIAR_ACKINTID) < ArmGicGetMaxNumInterrupts (PcdGet32 (PcdGicDistributorBase))) {
|
||||
if (InterruptId < ArmGicGetMaxNumInterrupts (PcdGet32 (PcdGicDistributorBase))) {
|
||||
// Got a valid SGI number hence signal End of Interrupt
|
||||
ArmGicEndOfInterrupt (PcdGet32 (PcdGicInterruptInterfaceBase), Interrupt);
|
||||
ArmGicEndOfInterrupt (PcdGet32 (PcdGicInterruptInterfaceBase), AcknowledgeInterrupt);
|
||||
}
|
||||
|
||||
// Jump to secondary core entry point.
|
||||
secondary_start ();
|
||||
SecondaryStart ();
|
||||
|
||||
// PEI Core should always load and never return
|
||||
ASSERT (FALSE);
|
||||
|
Reference in New Issue
Block a user