ArmPlatformPkg: Added initial support for the FVP Base and Foundation Models

The FVP Base Model has GICv3 support.
UEFI SEC does limited configuration of GICv3 if present. This is required for Linux to use GICv3.
UEFI itself uses the GICv3 in legacy mode (GICv2).

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@14824 6f19259b-4bc3-4df7-8a09-765794883524

5 files changed, 155 insertions, 16 deletions

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/AArch64/GicV3.S b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/AArch64/GicV3.S
new file mode 100644
index 0000000000..8d2bde2f81
--- /dev/null
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/AArch64/GicV3.S
@@ -0,0 +1,67 @@
+//

+//  Copyright (c) 2013, 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.

+//

+//

+

+#include <AsmMacroIoLib.h>

+

+// Register definitions used by GCC for GICv3 access.

+// These are defined by ARMCC, so keep them in the GCC specific code for now.

+#define ICC_SRE_EL2     S3_4_C12_C9_5

+#define ICC_SRE_EL3     S3_6_C12_C12_5

+#define ICC_CTLR_EL1    S3_0_C12_C12_4

+#define ICC_CTLR_EL3    S3_6_C12_C12_4

+#define ICC_PMR_EL1     S3_0_C4_C6_0

+

+.text

+.align 3

+

+GCC_ASM_EXPORT(InitializeGicV3)

+

+/* Initialize GICv3 to expose it as a GICv2 as UEFI does not support GICv3 yet */

+ASM_PFX(InitializeGicV3):

+  // We have a GICv3. UEFI still uses the GICv2 mode. We must do enough setup

+  // to allow Linux to use GICv3 if it chooses.

+

+  // In order to setup NS side we need to enable it first.

+  mrs     x0, scr_el3

+  orr     x0, x0, #1

+  msr     scr_el3, x0

+

+  // Enable SRE at EL3 and ICC_SRE_EL2 access

+  mov     x0, #((1 << 3) | (1 << 0))      // Enable | SRE

+  mrs     x1, ICC_SRE_EL3

+  orr     x1, x1, x0

+  msr     ICC_SRE_EL3, x1

+  isb

+

+  // Enable SRE at EL2 and ICC_SRE_EL1 access..

+  mrs     x1, ICC_SRE_EL2

+  orr     x1, x1, x0

+  msr     ICC_SRE_EL2, x1

+  isb

+

+  // Configure CPU interface

+  msr     ICC_CTLR_EL3, xzr

+  isb

+  msr     ICC_CTLR_EL1, xzr

+  isb

+

+  // The MemoryMap view and Register view may not be consistent, So Set PMR again.

+  mov     w1, #1 << 7                        // allow NS access to GICC_PMR

+  msr     ICC_PMR_EL1, x1

+  isb

+

+  // Remove the SCR.NS bit

+  mrs     x0, scr_el3

+  bic     x0, x0, #1

+  msr     scr_el3, x0

+  ret

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/Arm/GicV3.S b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/Arm/GicV3.S
new file mode 100644
index 0000000000..4a82cdbd48
--- /dev/null
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/Arm/GicV3.S
@@ -0,0 +1,24 @@
+//

+//  Copyright (c) 2013, 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.

+//

+//

+

+#include <AsmMacroIoLib.h>

+

+.text

+.align 3

+

+GCC_ASM_EXPORT(InitializeGicV3)

+

+/* Initialize GICv3 to expose it as a GICv2 as UEFI does not support GICv3 yet */

+ASM_PFX(InitializeGicV3):

+  // GICv3 Initialization not Supported yet

+  bx  lr

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/Arm/GicV3.asm b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/Arm/GicV3.asm
new file mode 100644
index 0000000000..4578c1c31d
--- /dev/null
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/Arm/GicV3.asm
@@ -0,0 +1,27 @@
+//

+//  Copyright (c) 2013, 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.

+//

+//

+

+  INCLUDE AsmMacroIoLib.inc

+

+  EXPORT  InitializeGicV3

+

+  PRESERVE8

+  AREA    GicV3, CODE, READONLY

+

+/* Initialize GICv3 to expose it as a GICv2 as UEFI does not support GICv3 yet */

+InitializeGicV3 FUNCTION

+  // GICv3 Initialization not Supported yet

+  bx  lr

+  ENDFUNC

+

+  END

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/ArmVExpressSecLib.inf b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/ArmVExpressSecLib.inf
index 27c78f42d8..17720ef7e0 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/ArmVExpressSecLib.inf
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/ArmVExpressSecLib.inf
@@ -1,13 +1,13 @@
 #/* @file

-#  Copyright (c) 2011-2012, 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                                            

+#  Copyright (c) 2011-2013, ARM Limited. All rights reserved.

 #

-#  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-#  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+#  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.

 #

 #*/

 

@@ -37,9 +37,13 @@
 [Sources.ARM]

   Arm/RTSMBoot.asm     | RVCT

   Arm/RTSMBoot.S       | GCC

+  Arm/GicV3.asm        | RVCT

+  Arm/GicV3.S          | GCC

 

 [Sources.AARCH64]

   AArch64/RTSMBoot.S   | GCC

+  AArch64/GicV3.S      | GCC

 

 [FixedPcd]

   gArmTokenSpaceGuid.PcdFvBaseAddress

+  gArmTokenSpaceGuid.PcdGicInterruptInterfaceBase

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/RTSMSec.c b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/RTSMSec.c
index bce834eea9..4c018f7672 100644
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/RTSMSec.c
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/RTSMSec.c
@@ -1,18 +1,19 @@
 /** @file

 *

-*  Copyright (c) 2011-2012, 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                                            

+*  Copyright (c) 2011-2013, ARM Limited. All rights reserved.

 *

-*  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     

-*  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             

+*  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.

 *

 **/

 

 #include <Library/IoLib.h>

+#include <Library/ArmGicLib.h>

 #include <Library/ArmPlatformLib.h>

 #include <Library/DebugLib.h>

 #include <Library/PcdLib.h>

@@ -22,6 +23,12 @@
 

 #include <ArmPlatform.h>

 

+// Initialize GICv3 to expose it as a GICv2 as UEFI does not support GICv3 yet

+VOID

+InitializeGicV3 (

+  VOID

+  );

+

 /**

   Initialize the Secure peripherals and memory regions

 

@@ -49,6 +56,8 @@ ArmPlatformSecInitialize (
   IN  UINTN                     MpId

   )

 {

+  UINT32  Identification;

+

   // If it is not the primary core then there is nothing to do

   if (!ArmPlatformIsPrimaryCore (MpId)) {

     return RETURN_SUCCESS;

@@ -63,6 +72,14 @@ ArmPlatformSecInitialize (
   // Configure SP810 to use 1MHz clock and disable

   MmioAndThenOr32 (SP810_CTRL_BASE + SP810_SYS_CTRL_REG, ~SP810_SYS_CTRL_TIMER3_EN, SP810_SYS_CTRL_TIMER3_TIMCLK);

 

+  // Read the GIC Identification Register

+  Identification = MmioRead32 (PcdGet32(PcdGicInterruptInterfaceBase) + ARM_GIC_ICCIDR);

+

+  // Check if we are GICv3

+  if (ARM_GIC_ICCIDR_GET_ARCH_VERSION(Identification) >= 0x3) {

+    InitializeGicV3 ();

+  }

+

   return RETURN_SUCCESS;

 }