rmodule: allow rmodule header structure to be used by userland
In order for userland to create rmodules the common code should be
shareable. Therefore, convert the short u<width> name types to the
posix uint<width>_t types. Additionally, move the definition of the
header structure to a new rmodule-defs.h header file so that userland
can include that without pulling in the coreboot state.
Change-Id: I54acd3bfd8c207b9efd50a3b6d89efd5fcbfc1d9
Signed-off-by: Aaron Durbin <adurbin@chromium.org>
Reviewed-on: http://review.coreboot.org/5363
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
diff --git a/src/include/rmodule.h b/src/include/rmodule.h
index 41da3a9..2147ab0 100644
--- a/src/include/rmodule.h
+++ b/src/include/rmodule.h
@@ -21,9 +21,7 @@
#include <stdint.h>
#include <stddef.h>
-
-#define RMODULE_MAGIC 0xf8fe
-#define RMODULE_VERSION_1 1
+#include <rmodule-defs.h>
enum {
RMODULE_TYPE_SMM,
@@ -52,28 +50,6 @@
int rmodule_calc_region(unsigned int region_alignment, size_t rmodule_size,
size_t *region_size, int *load_offset);
-#define FIELD_ENTRY(x_) ((u32)&x_)
-#define RMODULE_HEADER(entry_, type_) \
-{ \
- .magic = RMODULE_MAGIC, \
- .version = RMODULE_VERSION_1, \
- .type = type_, \
- .payload_begin_offset = FIELD_ENTRY(_payload_begin_offset), \
- .payload_end_offset = FIELD_ENTRY(_payload_end_offset), \
- .relocations_begin_offset = \
- FIELD_ENTRY(_relocations_begin_offset), \
- .relocations_end_offset = \
- FIELD_ENTRY(_relocations_end_offset), \
- .module_link_start_address = \
- FIELD_ENTRY(_module_link_start_addr), \
- .module_program_size = FIELD_ENTRY(_module_program_size), \
- .module_entry_point = FIELD_ENTRY(entry_), \
- .parameters_begin = FIELD_ENTRY(_module_params_begin), \
- .parameters_end = FIELD_ENTRY(_module_params_end), \
- .bss_begin = FIELD_ENTRY(_bss), \
- .bss_end = FIELD_ENTRY(_ebss), \
-}
-
#define DEFINE_RMODULE_HEADER(name_, entry_, type_) \
struct rmodule_header name_ \
__attribute__ ((section (".module_header"))) = \
@@ -100,43 +76,6 @@
int rmodule_stage_load_from_cbfs(struct rmod_stage_load *rsl);
#endif
-/* Private data structures below should not be used directly. */
-
-/* All fields with '_offset' in the name are byte offsets into the flat blob.
- * The linker and the linker script takes are of assigning the values. */
-struct rmodule_header {
- u16 magic;
- u8 version;
- u8 type;
- /* The payload represents the program's loadable code and data. */
- u32 payload_begin_offset;
- u32 payload_end_offset;
- /* Begin and of relocation information about the program module. */
- u32 relocations_begin_offset;
- u32 relocations_end_offset;
- /* The starting address of the linked program. This address is vital
- * for determining relocation offsets as the relocation info and other
- * symbols (bss, entry point) need this value as a basis to calculate
- * the offsets.
- */
- u32 module_link_start_address;
- /* The module_program_size is the size of memory used while running
- * the program. The program is assumed to consume a contiguous amount
- * of memory. */
- u32 module_program_size;
- /* This is program's execution entry point. */
- u32 module_entry_point;
- /* Optional parameter structure that can be used to pass data into
- * the module. */
- u32 parameters_begin;
- u32 parameters_end;
- /* BSS section information so the loader can clear the bss. */
- u32 bss_begin;
- u32 bss_end;
- /* Add some room for growth. */
- u32 padding[4];
-} __attribute__ ((packed));
-
struct rmodule {
void *location;
struct rmodule_header *header;