Move spinlock library code to AArch64 folder

This patch moves the assembly exclusive lock library code
`spinlock.S` into architecture specific folder `aarch64`.
A stub file which includes the file from new location is
retained at the original location for compatibility. The BL
makefiles are also modified to include the file from the new
location.

Change-Id: Ide0b601b79c439e390c3a017d93220a66be73543

diff --git a/bl2/bl2.mk b/bl2/bl2.mk
index 1e8207870f0a879793c350dc04e624db25ef0a33..d7907389002ae5592f9dfcf501b3ceb4a30e515d 100644 (file)
--- a/bl2/bl2.mk
+++ b/bl2/bl2.mk
@@ -32,6 +32,6 @@ BL2_SOURCES           +=      bl2/bl2_main.c                          \
                                bl2/aarch64/bl2_entrypoint.S            \
                                bl2/aarch64/bl2_arch_setup.c            \
                                common/aarch64/early_exceptions.S       \
-                               lib/locks/exclusive/spinlock.S
+                               lib/locks/exclusive/aarch64/spinlock.S
 
 BL2_LINKERFILE         :=      bl2/bl2.ld.S

diff --git a/bl32/tsp/tsp.mk b/bl32/tsp/tsp.mk
index a50242840c3df2dab8fa2d29ddddf7543aa0e4b5..2f3391e5b7485f804306ac1e87ed44038e12dd98 100644 (file)
--- a/bl32/tsp/tsp.mk
+++ b/bl32/tsp/tsp.mk
@@ -37,7 +37,7 @@ BL32_SOURCES          +=      bl32/tsp/tsp_main.c                     \
                                bl32/tsp/tsp_interrupt.c                \
                                bl32/tsp/tsp_timer.c                    \
                                common/aarch64/early_exceptions.S       \
-                               lib/locks/exclusive/spinlock.S
+                               lib/locks/exclusive/aarch64/spinlock.S
 
 BL32_LINKERFILE                :=      bl32/tsp/tsp.ld.S
 

diff --git a/lib/locks/exclusive/aarch64/spinlock.S b/lib/locks/exclusive/aarch64/spinlock.S
new file mode 100644 (file)
index 0000000..1ca5912
--- /dev/null
+++ b/lib/locks/exclusive/aarch64/spinlock.S
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation
+ * and/or other materials provided with the distribution.
+ *
+ * Neither the name of ARM nor the names of its contributors may be used
+ * to endorse or promote products derived from this software without specific
+ * prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include <asm_macros.S>
+
+       .globl  spin_lock
+       .globl  spin_unlock
+
+
+func spin_lock
+       mov     w2, #1
+       sevl
+l1:    wfe
+l2:    ldaxr   w1, [x0]
+       cbnz    w1, l1
+       stxr    w1, w2, [x0]
+       cbnz    w1, l2
+       ret
+endfunc spin_lock
+
+
+func spin_unlock
+       stlr    wzr, [x0]
+       ret
+endfunc spin_unlock

diff --git a/lib/locks/exclusive/spinlock.S b/lib/locks/exclusive/spinlock.S
index 772f14e96271a22203562eee046a5d7e4792fdb2..9c945f9bd2aaa5859c111e58598a90882a509f8c 100644 (file)
--- a/lib/locks/exclusive/spinlock.S
+++ b/lib/locks/exclusive/spinlock.S
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2014, ARM Limited and Contributors. All rights reserved.
+ * Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -28,25 +28,6 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include <asm_macros.S>
-
-       .globl  spin_lock
-       .globl  spin_unlock
-
-
-func spin_lock
-       mov     w2, #1
-       sevl
-l1:    wfe
-l2:    ldaxr   w1, [x0]
-       cbnz    w1, l1
-       stxr    w1, w2, [x0]
-       cbnz    w1, l2
-       ret
-endfunc spin_lock
-
-
-func spin_unlock
-       stlr    wzr, [x0]
-       ret
-endfunc spin_unlock
+#if !ERROR_DEPRECATED
+#include "./aarch64/spinlock.S"
+#endif

diff --git a/lib/psci/psci_lib.mk b/lib/psci/psci_lib.mk
index 662e14a2713a434205a6a69c5d66d7cb1278fcf8..3a5833ba2e96b8cb16d0ae69ac9b248a841e20c5 100644 (file)
--- a/lib/psci/psci_lib.mk
+++ b/lib/psci/psci_lib.mk
@@ -33,7 +33,7 @@ PSCI_LIB_SOURCES      :=      lib/el3_runtime/cpu_data_array.c        \
                                lib/el3_runtime/aarch64/cpu_data.S      \
                                lib/el3_runtime/aarch64/context_mgmt.c  \
                                lib/cpus/aarch64/cpu_helpers.S          \
-                               lib/locks/exclusive/spinlock.S          \
+                               lib/locks/exclusive/aarch64/spinlock.S  \
                                lib/psci/psci_off.c                     \
                                lib/psci/psci_on.c                      \
                                lib/psci/psci_suspend.c                 \