ArmPlatformPkg/PL35xSmc: Clean SMC driver to replace hardcoded Chip Select into the driver itself by passing SMC configuration to the driver

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@11959 6f19259b-4bc3-4df7-8a09-765794883524

5 files changed, 87 insertions, 39 deletions

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbBoot.S b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbBoot.S
new file mode 100755
index 0000000000..037efd9c20
--- /dev/null
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbBoot.S
@@ -0,0 +1,37 @@
+//

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

+#include <Base.h>

+#include <Library/ArmPlatformLib.h>

+#include <ArmPlatform.h>

+#include <AutoGen.h>

+

+.text

+.align 3

+

+GCC_ASM_EXPORT(ArmPlatformInitializeBootMemory)

+

+/**

+  Initialize the memory where the initial stacks will reside

+

+  This memory can contain the initial stacks (Secure and Secure Monitor stacks).

+  In some platform, this region is already initialized and the implementation of this function can

+  do nothing. This memory can also represent the Secure RAM.

+  This function is called before the satck has been set up. Its implementation must ensure the stack

+  pointer is not used (probably required to use assembly language)

+

+**/

+ASM_PFX(ArmPlatformInitializeBootMemory):

+  // The SMC does not need to be initialized for RTSM

+  bx    lr

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbBoot.asm b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbBoot.asm
new file mode 100755
index 0000000000..272a05a8fa
--- /dev/null
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbBoot.asm
@@ -0,0 +1,39 @@
+//

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

+#include <Base.h>

+#include <Library/ArmPlatformLib.h>

+#include <ArmPlatform.h>

+#include <AutoGen.h>

+

+  INCLUDE AsmMacroIoLib.inc

+

+  EXPORT  ArmPlatformInitializeBootMemory

+

+  PRESERVE8

+  AREA    CTA9x4BootMode, CODE, READONLY

+

+/**

+  Initialize the memory where the initial stacks will reside

+

+  This memory can contain the initial stacks (Secure and Secure Monitor stacks).

+  In some platform, this region is already initialized and the implementation of this function can

+  do nothing. This memory can also represent the Secure RAM.

+  This function is called before the satck has been set up. Its implementation must ensure the stack

+  pointer is not used (probably required to use assembly language)

+

+**/

+ArmPlatformInitializeBootMemory

+  // The SMC does not need to be initialized for RTSM

+  bx    lr

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.S b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.S
index ca18aa88dd..3bbdf6f52d 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.S
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.S
@@ -14,14 +14,13 @@
 #include <AsmMacroIoLib.h>

 #include <Base.h>

 #include <Library/PcdLib.h>

+#include <Library/ArmPlatformLib.h>

 #include <ArmPlatform.h>

 #include <AutoGen.h>

 

-#Start of Code section

 .text

 .align 3

 

-GCC_ASM_EXPORT(ArmPlatformIsMemoryInitialized)

 GCC_ASM_EXPORT(ArmPlatformInitializeBootMemory)

 

 /**

@@ -45,18 +44,4 @@ ASM_PFX(ArmPlatformIsMemoryInitialized):
   tst   r0, #0x200

   bx	lr

     

-/**

-  Initialize the memory where the initial stacks will reside

-

-  This memory can contain the initial stacks (Secure and Secure Monitor stacks).

-  In some platform, this region is already initialized and the implementation of this function can

-  do nothing. This memory can also represent the Secure RAM.

-  This function is called before the satck has been set up. Its implementation must ensure the stack

-  pointer is not used (probably required to use assembly language)

-

-**/

-ASM_PFX(ArmPlatformInitializeBootMemory):

-  // The SMC does not need to be initialized for RTSM

-  bx    lr

-

 ASM_FUNCTION_REMOVE_IF_UNREFERENCED
\ No newline at end of file
diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.asm b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.asm
index c0b4263a35..b72fc6f37e 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.asm
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbHelper.asm
@@ -1,26 +1,26 @@
 //

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

+//  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>

 #include <Base.h>

 #include <Library/PcdLib.h>

+#include <Library/ArmPlatformLib.h>

 #include <ArmPlatform.h>

 #include <AutoGen.h>

 

   INCLUDE AsmMacroIoLib.inc

   

   EXPORT  ArmPlatformIsMemoryInitialized

-  EXPORT  ArmPlatformInitializeBootMemory

   

   PRESERVE8

   AREA    ArmRealViewEbHelper, CODE, READONLY

@@ -45,19 +45,4 @@ ArmPlatformIsMemoryInitialized
   and   r0, r0, #0x200

   tst   r0, #0x200

   bx	lr

-    

-/**

-  Initialize the memory where the initial stacks will reside

-

-  This memory can contain the initial stacks (Secure and Secure Monitor stacks).

-  In some platform, this region is already initialized and the implementation of this function can

-  do nothing. This memory can also represent the Secure RAM.

-  This function is called before the satck has been set up. Its implementation must ensure the stack

-  pointer is not used (probably required to use assembly language)

-

-**/

-ArmPlatformInitializeBootMemory

-  // The SMC does not need to be initialized for RTSM

-  bx    lr

-  

   END

diff --git a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf
index dc4d560b14..d4a603718b 100644
--- a/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf
+++ b/ArmPlatformPkg/ArmRealViewEbPkg/Library/ArmRealViewEbLibRTSM/ArmRealViewEbSecLib.inf
@@ -34,6 +34,8 @@
   ArmRealViewEb.c

   ArmRealViewEbHelper.asm   | RVCT

   ArmRealViewEbHelper.S     | GCC

+  ArmRealViewEbBoot.asm     | RVCT

+  ArmRealViewEbBoot.S       | GCC

 

 [Protocols]