Patch set updated for coreboot: c7a5f87 arm64: Reorganize payload entry code and related Kconfigs

[Patrick Georgi]

Patrick Georgi ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10248

-gerrit

commit c7a5f87d005ea03cab1fbd06a1e8f89d874a1a5d
Author: Julius Werner 
Date:   Thu May 7 16:59:31 2015 -0700

arm64: Reorganize payload entry code and related Kconfigs

The secure monitor entry is now guarded by an explicit if
    statement for its Kconfig rather than hiding than in the corresponding
    header file. This makes it clear that there are two (soon three)
    separate code paths here. Similar change for the optional spintable
    feature in the "legacy" payload entry path.

[pg: split out from the patch linked below]

Change-Id: Ia1554959b3268b718a9606e2f79d8f22f336c94d
    Signed-off-by: Patrick Georgi 
    Original-Commit-Id: 5067e47bc03f04ad2dba044f022716e0fc62bb9e
    Original-Change-Id: I1b2038acc0d054716a3c580ce97ea8e9a45abfa2
    Original-Signed-off-by: Julius Werner 
    Original-Reviewed-on: https://chromium-review.googlesource.com/270783
    Original-Reviewed-by: Aaron Durbin 
---
 src/arch/arm64/include/arch/spintable.h    | 7 +++----
 src/arch/arm64/include/armv8/arch/secmon.h | 8 --------
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/src/arch/arm64/include/arch/spintable.h b/src/arch/arm64/include/arch/spintable.h
index b583ddb..8d8d662 100644
--- a/src/arch/arm64/include/arch/spintable.h
+++ b/src/arch/arm64/include/arch/spintable.h
@@ -30,16 +30,12 @@ struct spintable_attributes {
 /* Initialize spintable with provided monitor address. */
 void spintable_init(void *monitor_address);

-/* Start spinning on the non-boot CPUS. */
-void spintable_start(void);
-
 /* Return NULL on failure, otherwise the spintable info. */
 const struct spintable_attributes *spintable_get_attributes(void);

#else /* IS_ENABLED(CONFIG_SPINTABLE) */

static inline void spintable_init(void *monitor_address) {}
-static inline void spintable_start(void) {}
 static inline const struct spintable_attributes *spintable_get_attributes(void)
 {
    return NULL;
@@ -47,4 +43,7 @@ static inline const struct spintable_attributes *spintable_get_attributes(void)

#endif /* IS_ENABLED(CONFIG_SPINTABLE) */

+/* Start spinning on the non-boot CPUs. */
+void spintable_start(void);
+
 #endif /* __ARCH_SPINTABLE_H__ */
diff --git a/src/arch/arm64/include/armv8/arch/secmon.h b/src/arch/arm64/include/armv8/arch/secmon.h
index 3d368a7..98b998a 100644
--- a/src/arch/arm64/include/armv8/arch/secmon.h
+++ b/src/arch/arm64/include/armv8/arch/secmon.h
@@ -22,8 +22,6 @@

#include <arch/cpu.h>

-#if IS_ENABLED(CONFIG_ARCH_USE_SECURE_MONITOR)
-
 struct secmon_params {
    size_t online_cpus;
    struct cpu_action bsp;
@@ -33,10 +31,4 @@ struct secmon_params {
 void secmon_run(void (*entry)(void *), void *arg);
 void soc_get_secmon_base_size(uint64_t *secmon_base, size_t *secmon_size);

-#else
-
-static inline void secmon_run(void (*entry)(void *), void *arg) {}
-
-#endif /* IS_ENABLED(CONFIG_ARCH_USE_SECURE_MONITOR) */
-
 #endif /*__ARCH_ARM64_ARMV8_SECMON__ */