Revision: 18097
http://sourceforge.net/p/edk2/code/18097
Author: abiesheuvel
Date: 2015-07-28 20:44:27 +0000 (Tue, 28 Jul 2015)
Log Message:
-----------
ArmPkg: merge ArmGicV[23]Lib.h into ArmGicLib.h
Before splitting off ArmGicArchLib and moving it out of
ArmPkg/Drivers/ArmGic into ArmPkg/Library, make sure that the
GIC specific declarations it depends on are not hidden away in
local headers "GicV2/GicV2Lib.h" and "GicV3/GicV3Lib.h".
So merge them with <Library/ArmGicLib.h>. This is entirely
appropriate, since this is not a header that declares a public
interface into ArmGicLib, but defines implementation internals.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <[email protected]>
Reviewed-by: Laszlo Ersek <[email protected]>
Reviewed-by: Leif Lindholm <[email protected]>
Tested-by: Leif Lindholm <[email protected]>
Modified Paths:
--------------
trunk/edk2/ArmPkg/Drivers/ArmGic/AArch64/ArmGicArchLib.c
trunk/edk2/ArmPkg/Drivers/ArmGic/Arm/ArmGicArchLib.c
trunk/edk2/ArmPkg/Drivers/ArmGic/ArmGicLib.c
trunk/edk2/ArmPkg/Drivers/ArmGic/ArmGicSecLib.c
trunk/edk2/ArmPkg/Drivers/ArmGic/GicV2/ArmGicV2Dxe.c
trunk/edk2/ArmPkg/Drivers/ArmGic/GicV3/ArmGicV3Dxe.c
trunk/edk2/ArmPkg/Include/Library/ArmGicLib.h
Removed Paths:
-------------
trunk/edk2/ArmPkg/Drivers/ArmGic/GicV2/ArmGicV2Lib.h
trunk/edk2/ArmPkg/Drivers/ArmGic/GicV3/ArmGicV3Lib.h
Modified: trunk/edk2/ArmPkg/Drivers/ArmGic/AArch64/ArmGicArchLib.c
===================================================================
--- trunk/edk2/ArmPkg/Drivers/ArmGic/AArch64/ArmGicArchLib.c 2015-07-28
20:22:26 UTC (rev 18096)
+++ trunk/edk2/ArmPkg/Drivers/ArmGic/AArch64/ArmGicArchLib.c 2015-07-28
20:44:27 UTC (rev 18097)
@@ -15,8 +15,6 @@
#include <Library/ArmLib.h>
#include <Library/ArmGicLib.h>
-#include "GicV3/ArmGicV3Lib.h"
-
ARM_GIC_ARCH_REVISION
EFIAPI
ArmGicGetSupportedArchRevision (
Modified: trunk/edk2/ArmPkg/Drivers/ArmGic/Arm/ArmGicArchLib.c
===================================================================
--- trunk/edk2/ArmPkg/Drivers/ArmGic/Arm/ArmGicArchLib.c 2015-07-28
20:22:26 UTC (rev 18096)
+++ trunk/edk2/ArmPkg/Drivers/ArmGic/Arm/ArmGicArchLib.c 2015-07-28
20:44:27 UTC (rev 18097)
@@ -15,8 +15,6 @@
#include <Library/ArmLib.h>
#include <Library/ArmGicLib.h>
-#include "GicV3/ArmGicV3Lib.h"
-
ARM_GIC_ARCH_REVISION
EFIAPI
ArmGicGetSupportedArchRevision (
Modified: trunk/edk2/ArmPkg/Drivers/ArmGic/ArmGicLib.c
===================================================================
--- trunk/edk2/ArmPkg/Drivers/ArmGic/ArmGicLib.c 2015-07-28 20:22:26 UTC
(rev 18096)
+++ trunk/edk2/ArmPkg/Drivers/ArmGic/ArmGicLib.c 2015-07-28 20:44:27 UTC
(rev 18097)
@@ -19,9 +19,6 @@
#include <Library/IoLib.h>
#include <Library/PcdLib.h>
-#include "GicV2/ArmGicV2Lib.h"
-#include "GicV3/ArmGicV3Lib.h"
-
/**
* Return the base address of the GIC redistributor for the current CPU
*
Modified: trunk/edk2/ArmPkg/Drivers/ArmGic/ArmGicSecLib.c
===================================================================
--- trunk/edk2/ArmPkg/Drivers/ArmGic/ArmGicSecLib.c 2015-07-28 20:22:26 UTC
(rev 18096)
+++ trunk/edk2/ArmPkg/Drivers/ArmGic/ArmGicSecLib.c 2015-07-28 20:44:27 UTC
(rev 18097)
@@ -17,8 +17,6 @@
#include <Library/IoLib.h>
#include <Library/ArmGicLib.h>
-#include "GicV2/ArmGicV2Lib.h"
-
/*
* This function configures the interrupts set by the mask to be secure.
*
Modified: trunk/edk2/ArmPkg/Drivers/ArmGic/GicV2/ArmGicV2Dxe.c
===================================================================
--- trunk/edk2/ArmPkg/Drivers/ArmGic/GicV2/ArmGicV2Dxe.c 2015-07-28
20:22:26 UTC (rev 18096)
+++ trunk/edk2/ArmPkg/Drivers/ArmGic/GicV2/ArmGicV2Dxe.c 2015-07-28
20:44:27 UTC (rev 18097)
@@ -22,8 +22,9 @@
--*/
+#include <Library/ArmGicLib.h>
+
#include "ArmGicDxe.h"
-#include "GicV2/ArmGicV2Lib.h"
#define ARM_GIC_DEFAULT_PRIORITY 0x80
Deleted: trunk/edk2/ArmPkg/Drivers/ArmGic/GicV2/ArmGicV2Lib.h
===================================================================
--- trunk/edk2/ArmPkg/Drivers/ArmGic/GicV2/ArmGicV2Lib.h 2015-07-28
20:22:26 UTC (rev 18096)
+++ trunk/edk2/ArmPkg/Drivers/ArmGic/GicV2/ArmGicV2Lib.h 2015-07-28
20:44:27 UTC (rev 18097)
@@ -1,54 +0,0 @@
-/** @file
-*
-* Copyright (c) 2013-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
-* which accompanies this distribution. The full text of the license may be
found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
IMPLIED.
-*
-**/
-
-#ifndef _ARM_GIC_V2_H_
-#define _ARM_GIC_V2_H_
-
-// Interrupts from 1020 to 1023 are considered as special interrupts (eg:
spurious interrupts)
-#define ARM_GIC_IS_SPECIAL_INTERRUPTS(Interrupt) (((Interrupt) >= 1020) &&
((Interrupt) <= 1023))
-
-VOID
-EFIAPI
-ArmGicV2SetupNonSecure (
- IN UINTN MpId,
- IN INTN GicDistributorBase,
- IN INTN GicInterruptInterfaceBase
- );
-
-VOID
-EFIAPI
-ArmGicV2EnableInterruptInterface (
- IN INTN GicInterruptInterfaceBase
- );
-
-VOID
-EFIAPI
-ArmGicV2DisableInterruptInterface (
- IN INTN GicInterruptInterfaceBase
- );
-
-UINTN
-EFIAPI
-ArmGicV2AcknowledgeInterrupt (
- IN UINTN GicInterruptInterfaceBase
- );
-
-VOID
-EFIAPI
-ArmGicV2EndOfInterrupt (
- IN UINTN GicInterruptInterfaceBase,
- IN UINTN Source
- );
-
-#endif
Modified: trunk/edk2/ArmPkg/Drivers/ArmGic/GicV3/ArmGicV3Dxe.c
===================================================================
--- trunk/edk2/ArmPkg/Drivers/ArmGic/GicV3/ArmGicV3Dxe.c 2015-07-28
20:22:26 UTC (rev 18096)
+++ trunk/edk2/ArmPkg/Drivers/ArmGic/GicV3/ArmGicV3Dxe.c 2015-07-28
20:44:27 UTC (rev 18097)
@@ -12,8 +12,9 @@
*
**/
+#include <Library/ArmGicLib.h>
+
#include "ArmGicDxe.h"
-#include "GicV3/ArmGicV3Lib.h"
#define ARM_GIC_DEFAULT_PRIORITY 0x80
Deleted: trunk/edk2/ArmPkg/Drivers/ArmGic/GicV3/ArmGicV3Lib.h
===================================================================
--- trunk/edk2/ArmPkg/Drivers/ArmGic/GicV3/ArmGicV3Lib.h 2015-07-28
20:22:26 UTC (rev 18096)
+++ trunk/edk2/ArmPkg/Drivers/ArmGic/GicV3/ArmGicV3Lib.h 2015-07-28
20:44:27 UTC (rev 18097)
@@ -1,68 +0,0 @@
-/** @file
-*
-* Copyright (c) 2014-2015, 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 which accompanies this
-* distribution. The full text of the license may be found at
-* http://opensource.org/licenses/bsd-license.php
-*
-* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
-* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR
IMPLIED.
-*
-**/
-
-#ifndef _ARM_GIC_V3_H_
-#define _ARM_GIC_V3_H_
-
-#define ICC_SRE_EL2_SRE (1 << 0)
-
-#define ARM_GICD_IROUTER_IRM BIT31
-
-UINT32
-EFIAPI
-ArmGicV3GetControlSystemRegisterEnable (
- VOID
- );
-
-VOID
-EFIAPI
-ArmGicV3SetControlSystemRegisterEnable (
- IN UINT32 ControlSystemRegisterEnable
- );
-
-VOID
-EFIAPI
-ArmGicV3EnableInterruptInterface (
- VOID
- );
-
-VOID
-EFIAPI
-ArmGicV3DisableInterruptInterface (
- VOID
- );
-
-UINTN
-EFIAPI
-ArmGicV3AcknowledgeInterrupt (
- VOID
- );
-
-VOID
-EFIAPI
-ArmGicV3EndOfInterrupt (
- IN UINTN Source
- );
-
-VOID
-ArmGicV3SetBinaryPointer (
- IN UINTN BinaryPoint
- );
-
-VOID
-ArmGicV3SetPriorityMask (
- IN UINTN Priority
- );
-
-#endif
Modified: trunk/edk2/ArmPkg/Include/Library/ArmGicLib.h
===================================================================
--- trunk/edk2/ArmPkg/Include/Library/ArmGicLib.h 2015-07-28 20:22:26 UTC
(rev 18096)
+++ trunk/edk2/ArmPkg/Include/Library/ArmGicLib.h 2015-07-28 20:44:27 UTC
(rev 18097)
@@ -231,4 +231,98 @@
IN UINTN Source
);
+//
+// GIC revision 2 specific declarations
+//
+
+// Interrupts from 1020 to 1023 are considered as special interrupts (eg:
spurious interrupts)
+#define ARM_GIC_IS_SPECIAL_INTERRUPTS(Interrupt) (((Interrupt) >= 1020) &&
((Interrupt) <= 1023))
+
+VOID
+EFIAPI
+ArmGicV2SetupNonSecure (
+ IN UINTN MpId,
+ IN INTN GicDistributorBase,
+ IN INTN GicInterruptInterfaceBase
+ );
+
+VOID
+EFIAPI
+ArmGicV2EnableInterruptInterface (
+ IN INTN GicInterruptInterfaceBase
+ );
+
+VOID
+EFIAPI
+ArmGicV2DisableInterruptInterface (
+ IN INTN GicInterruptInterfaceBase
+ );
+
+UINTN
+EFIAPI
+ArmGicV2AcknowledgeInterrupt (
+ IN UINTN GicInterruptInterfaceBase
+ );
+
+VOID
+EFIAPI
+ArmGicV2EndOfInterrupt (
+ IN UINTN GicInterruptInterfaceBase,
+ IN UINTN Source
+ );
+
+//
+// GIC revision 3 specific declarations
+//
+
+#define ICC_SRE_EL2_SRE (1 << 0)
+
+#define ARM_GICD_IROUTER_IRM BIT31
+
+UINT32
+EFIAPI
+ArmGicV3GetControlSystemRegisterEnable (
+ VOID
+ );
+
+VOID
+EFIAPI
+ArmGicV3SetControlSystemRegisterEnable (
+ IN UINT32 ControlSystemRegisterEnable
+ );
+
+VOID
+EFIAPI
+ArmGicV3EnableInterruptInterface (
+ VOID
+ );
+
+VOID
+EFIAPI
+ArmGicV3DisableInterruptInterface (
+ VOID
+ );
+
+UINTN
+EFIAPI
+ArmGicV3AcknowledgeInterrupt (
+ VOID
+ );
+
+VOID
+EFIAPI
+ArmGicV3EndOfInterrupt (
+ IN UINTN Source
+ );
+
+VOID
+ArmGicV3SetBinaryPointer (
+ IN UINTN BinaryPoint
+ );
+
+VOID
+ArmGicV3SetPriorityMask (
+ IN UINTN Priority
+ );
+
#endif
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
