[PATCH] Add sysinfo_have_multiboot function

Add a new infrastructure for returning system information to payloads.
First up - a pointer to the multiboot table.

Signed-off-by: Jordan Crouse <jordan@cosmicpenguin.net>
Acked-by: Peter Stuge <peter@stuge.se>
git-svn-id: svn://svn.coreboot.org/coreboot/trunk@3743 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

diff --git a/payloads/libpayload/i386/multiboot.c b/payloads/libpayload/i386/multiboot.c
index 09e72c768bcdf69622d11fd61a6fcb8c224c4299..040cc082f1476bb9a987b6c7105a8c9df21f3a94 100644 (file)
--- a/payloads/libpayload/i386/multiboot.c
+++ b/payloads/libpayload/i386/multiboot.c
@@ -86,6 +86,8 @@ int get_multiboot_info(struct sysinfo_t *info)
 
        table = (struct multiboot_header *) phys_to_virt(loader_ebx);
 
+       info->mbtable = phys_to_virt(loader_ebx);
+
        if (table->flags & MULTIBOOT_FLAGS_MMAP)
                mb_parse_mmap(table, info);
 

diff --git a/payloads/libpayload/include/libpayload.h b/payloads/libpayload/include/libpayload.h
index 66d114e8f19a8450a8a2bfcd0184b15c05792676..6d48279628b42c10e8e1acbce373787138c58c95 100644 (file)
--- a/payloads/libpayload/include/libpayload.h
+++ b/payloads/libpayload/include/libpayload.h
@@ -420,6 +420,15 @@ int lfseek(struct LFILE *stream, long offset, int whence);
 int lfclose(struct LFILE *file);
 /** @} */
 
+/**
+ * @defgroup info System information functions
+ * This module contains functions that return information about the system
+ * @{
+ */
+
+int sysinfo_have_multiboot(unsigned long *addr);
+/** @} */
+
 /**
  * @defgroup arch Architecture specific functions
  * This module contains global architecture specific functions.

diff --git a/payloads/libpayload/include/sysinfo.h b/payloads/libpayload/include/sysinfo.h
index a9d7d122fb032acec3030bd5e3b4df75c71aafd7..3b2c69c61df082b7d2b0451becd710e2e0391ba9 100644 (file)
--- a/payloads/libpayload/include/sysinfo.h
+++ b/payloads/libpayload/include/sysinfo.h
@@ -48,6 +48,8 @@ struct sysinfo_t {
        u32 cmos_range_start;
        u32 cmos_range_end;
        u32 cmos_checksum_location;
+
+       unsigned long *mbtable; /** Pointer to the multiboot table */
 };
 
 extern struct sysinfo_t lib_sysinfo;

diff --git a/payloads/libpayload/libc/Makefile.inc b/payloads/libpayload/libc/Makefile.inc
index a4cd1bce6f9897f7d7a3fab6cce8a17ee4488abd..0353bb67e04906d9d9d44ae15eadebd4b37761cd 100644 (file)
--- a/payloads/libpayload/libc/Makefile.inc
+++ b/payloads/libpayload/libc/Makefile.inc
@@ -31,4 +31,4 @@
 TARGETS-$(CONFIG_LIBC) += libc/malloc.o libc/printf.o libc/console.o libc/string.o
 TARGETS-$(CONFIG_LIBC) += libc/memory.o libc/ctype.o libc/ipchecksum.o libc/lib.o
 TARGETS-$(CONFIG_LIBC) += libc/rand.o libc/time.o libc/lar.o libc/exec.o
-TARGETS-$(CONFIG_LIBC) += libc/readline.o
+TARGETS-$(CONFIG_LIBC) += libc/readline.o libc/sysinfo.o

diff --git a/payloads/libpayload/libc/sysinfo.c b/payloads/libpayload/libc/sysinfo.c
new file mode 100644 (file)
index 0000000..73a9ab5
--- /dev/null
+++ b/payloads/libpayload/libc/sysinfo.c
@@ -0,0 +1,39 @@
+/*
+ * This file is part of the libpayload project.
+ *
+ * Copyright (C) 2008 Jordan Crouse <jordan@cosmicpenguin.net>
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. 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.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR 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 AUTHOR 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 <libpayload.h>
+#include <sysinfo.h>
+
+extern struct sysinfo_t lib_sysinfo;
+
+int sysinfo_have_multiboot(unsigned long *addr)
+{
+       *addr = (unsigned long) lib_sysinfo.mbtable;
+       return (lib_sysinfo.mbtable == 0) ? 0 : 1;
+}