Subrata Banik has uploaded this change for review.
arch/x86: Move generic functions from postcar_loader.c to stage_loader.c
This patch moves few generic functions (finalize_load and stack_push)
from postcar_loader.c to stage_loader.c file so that other callers can
also use these functions.
Change-Id: I4d2200d95e68c0eb01681b8f9b71b3d30d122c43
Signed-off-by: Subrata Banik <subrata.banik@intel.com>
---
M src/arch/x86/Makefile.inc
A src/arch/x86/include/arch/stage_loader.h
M src/arch/x86/postcar_loader.c
A src/arch/x86/stage_loader.c
4 files changed, 62 insertions(+), 21 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/51/34751/1
diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc
index 32e0173..2fad75e 100644
--- a/src/arch/x86/Makefile.inc
+++ b/src/arch/x86/Makefile.inc
@@ -239,6 +239,7 @@
romstage-y += memset.c
romstage-$(CONFIG_X86_TOP4G_BOOTMEDIA_MAP) += mmap_boot.c
romstage-y += postcar_loader.c
+romstage-y += stage_loader.c
romstage-$(CONFIG_COLLECT_TIMESTAMPS_TSC) += timestamp.c
romstage-$(CONFIG_ARCH_ROMSTAGE_X86_32) += walkcbfs.S
diff --git a/src/arch/x86/include/arch/stage_loader.h b/src/arch/x86/include/arch/stage_loader.h
new file mode 100644
index 0000000..23ac6e9
--- /dev/null
+++ b/src/arch/x86/include/arch/stage_loader.h
@@ -0,0 +1,32 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2019 Intel Corp.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#ifndef STAGE_LOADER_H
+#define STAGE_LOADER_H
+
+#include <arch/cpu.h>
+
+static inline void stack_push(struct postcar_frame *pcf, uint32_t val)
+{
+ uint32_t *ptr;
+
+ pcf->stack -= sizeof(val);
+ ptr = (void *)pcf->stack;
+ *ptr = val;
+}
+
+void finalize_load(uintptr_t *stack_top_ptr, uintptr_t stack_top);
+
+#endif /* STAGE_LOADER_H */
diff --git a/src/arch/x86/postcar_loader.c b/src/arch/x86/postcar_loader.c
index 35e139f..3f42298 100644
--- a/src/arch/x86/postcar_loader.c
+++ b/src/arch/x86/postcar_loader.c
@@ -13,7 +13,7 @@
* GNU General Public License for more details.
*/
-#include <arch/cpu.h>
+#include <arch/stage_loader.h>
#include <cbmem.h>
#include <console/console.h>
#include <cpu/cpu.h>
@@ -25,15 +25,6 @@
#include <stage_cache.h>
#include <timestamp.h>
-static inline void stack_push(struct postcar_frame *pcf, uint32_t val)
-{
- uint32_t *ptr;
-
- pcf->stack -= sizeof(val);
- ptr = (void *)pcf->stack;
- *ptr = val;
-}
-
static void postcar_frame_prepare(struct postcar_frame *pcf)
{
msr_t msr;
@@ -131,17 +122,6 @@
return (void *) pcf->stack;
}
-static void finalize_load(uintptr_t *stack_top_ptr, uintptr_t stack_top)
-{
- *stack_top_ptr = stack_top;
- /*
- * Signal to rest of system that another update was made to the
- * postcar program prior to running it.
- */
- prog_segment_loaded((uintptr_t)stack_top_ptr, sizeof(uintptr_t),
- SEG_FINAL);
-}
-
static void load_postcar_cbfs(struct prog *prog, struct postcar_frame *pcf)
{
struct rmod_stage_load rsl = {
diff --git a/src/arch/x86/stage_loader.c b/src/arch/x86/stage_loader.c
new file mode 100644
index 0000000..ca6a987
--- /dev/null
+++ b/src/arch/x86/stage_loader.c
@@ -0,0 +1,28 @@
+/*
+ * This file is part of the coreboot project.
+ *
+ * Copyright (C) 2019 Intel Corp.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 of the License.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ */
+
+#include <arch/stage_loader.h>
+#include <stage_cache.h>
+
+void finalize_load(uintptr_t *stack_top_ptr, uintptr_t stack_top)
+{
+ *stack_top_ptr = stack_top;
+ /*
+ * Signal to rest of system that another update was made to the
+ * postcar program prior to running it.
+ */
+ prog_segment_loaded((uintptr_t)stack_top_ptr, sizeof(uintptr_t),
+ SEG_FINAL);
+}
To view, visit change 34751. To unsubscribe, or for help writing mail filters, visit settings.