ArmPkg: split off ArmGicArchLib from ArmGicLib

The current implementation of ArmGicGetSupportedArchRevision ()
that is used by all ARM platforms is entirely stateless (in order
to support being executed from flash) so it needs to interrogate
the hardware for the supported GIC revision upon each invocation.

However, this statelessness is only needed for SEC type modules;
in all other cases, we could easily determine the GIC revision once,
and store the result in a global variable.

In preparation of having separate early and normal versions, this patch
introduces the ArmGicArchLib library class and default implementation,
and moves the existing ArmGicGetSupportedArchRevision () into it.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>
Tested-by: Leif Lindholm <leif.lindholm@linaro.org>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18098 6f19259b-4bc3-4df7-8a09-765794883524

9 files changed, 71 insertions, 17 deletions

diff --git a/ArmPkg/ArmPkg.dec b/ArmPkg/ArmPkg.dec
index da0c8a9f27..46e9894d3f 100644
--- a/ArmPkg/ArmPkg.dec
+++ b/ArmPkg/ArmPkg.dec
@@ -38,6 +38,7 @@
   UncachedMemoryAllocationLib|Include/Library/UncachedMemoryAllocationLib.h

   DefaultExceptionHandlerLib|Include/Library/DefaultExceptionHandlerLib.h

   ArmDisassemblerLib|Include/Library/ArmDisassemblerLib.h

+  ArmGicArchLib|Include/Library/ArmGicArchLib.h

 

 [Guids.common]

   gArmTokenSpaceGuid       = { 0xBB11ECFE, 0x820F, 0x4968, { 0xBB, 0xA6, 0xF7, 0x6A, 0xFE, 0x30, 0x25, 0x96 } }

diff --git a/ArmPkg/ArmPkg.dsc b/ArmPkg/ArmPkg.dsc
index 1f69799dc2..10e8a1a83d 100644
--- a/ArmPkg/ArmPkg.dsc
+++ b/ArmPkg/ArmPkg.dsc
@@ -66,6 +66,7 @@
 

   CpuLib|MdePkg/Library/BaseCpuLib/BaseCpuLib.inf

   ArmGicLib|ArmPkg/Drivers/ArmGic/ArmGicLib.inf

+  ArmGicArchLib|ArmPkg/Library/ArmGicArchLib/ArmGicArchLib.inf

   ArmGenericTimerCounterLib|ArmPkg/Library/ArmGenericTimerPhyCounterLib/ArmGenericTimerPhyCounterLib.inf

   ArmSmcLib|ArmPkg/Library/ArmSmcLib/ArmSmcLib.inf

   ArmDisassemblerLib|ArmPkg/Library/ArmDisassemblerLib/ArmDisassemblerLib.inf

diff --git a/ArmPkg/Drivers/ArmGic/ArmGicLib.inf b/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
index 2ae3fd31e8..047adac85f 100644
--- a/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
+++ b/ArmPkg/Drivers/ArmGic/ArmGicLib.inf
@@ -27,18 +27,17 @@
   GicV2/ArmGicV2NonSecLib.c

 

 [Sources.ARM]

-  Arm/ArmGicArchLib.c

   GicV3/Arm/ArmGicV3.S     | GCC

   GicV3/Arm/ArmGicV3.asm   | RVCT

 

 [Sources.AARCH64]

-  AArch64/ArmGicArchLib.c

   GicV3/AArch64/ArmGicV3.S

 

 [LibraryClasses]

   ArmLib

   DebugLib

   IoLib

+  ArmGicArchLib

 

 [Packages]

   ArmPkg/ArmPkg.dec

diff --git a/ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf b/ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf
index 7d4e49e4b9..fc2e1bc01e 100644
--- a/ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf
+++ b/ArmPkg/Drivers/ArmGic/ArmGicSecLib.inf
@@ -27,12 +27,10 @@
   GicV2/ArmGicV2SecLib.c

 

 [Sources.ARM]

-  Arm/ArmGicArchLib.c

   GicV3/Arm/ArmGicV3.S     | GCC

   GicV3/Arm/ArmGicV3.asm   | RVCT

 

 [Sources.AARCH64]

-  AArch64/ArmGicArchLib.c

   GicV3/AArch64/ArmGicV3.S

 

 [Packages]

@@ -45,6 +43,7 @@
   ArmLib

   DebugLib

   IoLib

+  ArmGicArchLib

 

 [Pcd]

   gArmPlatformTokenSpaceGuid.PcdCoreCount

diff --git a/ArmPkg/Include/Library/ArmGicArchLib.h b/ArmPkg/Include/Library/ArmGicArchLib.h
new file mode 100644
index 0000000000..e6964a2d57
--- /dev/null
+++ b/ArmPkg/Include/Library/ArmGicArchLib.h
@@ -0,0 +1,33 @@
+/** @file

+*

+*  Copyright (c) 2015, Linaro Ltd. 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_ARCH_LIB_H__

+#define __ARM_GIC_ARCH_LIB_H__

+

+//

+// GIC definitions

+//

+typedef enum {

+  ARM_GIC_ARCH_REVISION_2,

+  ARM_GIC_ARCH_REVISION_3

+} ARM_GIC_ARCH_REVISION;

+

+

+ARM_GIC_ARCH_REVISION

+EFIAPI

+ArmGicGetSupportedArchRevision (

+  VOID

+  );

+

+#endif

diff --git a/ArmPkg/Include/Library/ArmGicLib.h b/ArmPkg/Include/Library/ArmGicLib.h
index e3db9c0d25..10c4a9d72e 100644
--- a/ArmPkg/Include/Library/ArmGicLib.h
+++ b/ArmPkg/Include/Library/ArmGicLib.h
@@ -15,13 +15,7 @@
 #ifndef __ARMGIC_H

 #define __ARMGIC_H

 

-//

-// GIC definitions

-//

-typedef enum {

-  ARM_GIC_ARCH_REVISION_2,

-  ARM_GIC_ARCH_REVISION_3

-} ARM_GIC_ARCH_REVISION;

+#include <Library/ArmGicArchLib.h>

 

 //

 // GIC Distributor

@@ -103,12 +97,6 @@ typedef enum {
 // Bit Mask for

 #define ARM_GIC_ICCIAR_ACKINTID                 0x3FF

 

-ARM_GIC_ARCH_REVISION

-EFIAPI

-ArmGicGetSupportedArchRevision (

-  VOID

-  );

-

 UINTN

 EFIAPI

 ArmGicGetInterfaceIdentification (

diff --git a/ArmPkg/Drivers/ArmGic/AArch64/ArmGicArchLib.c b/ArmPkg/Library/ArmGicArchLib/AArch64/ArmGicArchLib.c
index 0e0fa3b9f3..0e0fa3b9f3 100644
--- a/ArmPkg/Drivers/ArmGic/AArch64/ArmGicArchLib.c
+++ b/ArmPkg/Library/ArmGicArchLib/AArch64/ArmGicArchLib.c
diff --git a/ArmPkg/Drivers/ArmGic/Arm/ArmGicArchLib.c b/ArmPkg/Library/ArmGicArchLib/Arm/ArmGicArchLib.c
index f256de7046..f256de7046 100644
--- a/ArmPkg/Drivers/ArmGic/Arm/ArmGicArchLib.c
+++ b/ArmPkg/Library/ArmGicArchLib/Arm/ArmGicArchLib.c
diff --git a/ArmPkg/Library/ArmGicArchLib/ArmGicArchLib.inf b/ArmPkg/Library/ArmGicArchLib/ArmGicArchLib.inf
new file mode 100644
index 0000000000..d71b2adc30
--- /dev/null
+++ b/ArmPkg/Library/ArmGicArchLib/ArmGicArchLib.inf
@@ -0,0 +1,33 @@
+#/* @file

+#  Copyright (c) 2015, Linaro Ltd. 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.

+#

+#*/

+

+[Defines]

+  INF_VERSION                    = 0x00010005

+  BASE_NAME                      = ArmGicArchLib

+  FILE_GUID                      = cd67f41a-26e9-4482-90c9-a9aff803382a

+  MODULE_TYPE                    = BASE

+  VERSION_STRING                 = 1.0

+  LIBRARY_CLASS                  = ArmGicArchLib

+

+[Sources.ARM]

+  Arm/ArmGicArchLib.c

+

+[Sources.AARCH64]

+  AArch64/ArmGicArchLib.c

+

+[Packages]

+  MdePkg/MdePkg.dec

+  ArmPkg/ArmPkg.dec

+

+[LibraryClasses]

+  ArmGicLib