x86: coreboot: Decode additional coreboot sysinfo tags

Add support for decoding tags for GPIOs, compile/build info, cbmem and
other features.

Signed-off-by: Stefan Reinauer <reinauer@chromium.org>
Signed-off-by: Vadim Bendebury <vbendeb@chromium.org>
Signed-off-by: Gabe Black <gabeblack@chromium.org>
Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/arch/x86/cpu/coreboot/tables.c b/arch/x86/cpu/coreboot/tables.c
index 25ca50d..b116d59 100644 (file)
--- a/arch/x86/cpu/coreboot/tables.c
+++ b/arch/x86/cpu/coreboot/tables.c
@@ -28,6 +28,7 @@
  * SUCH DAMAGE.
  */
 
+#include <common.h>
 #include <asm/arch-coreboot/ipchecksum.h>
 #include <asm/arch-coreboot/sysinfo.h>
 #include <asm/arch-coreboot/tables.h>
@@ -80,22 +81,45 @@ static void cb_parse_memory(unsigned char *ptr, struct sysinfo_t *info)
 static void cb_parse_serial(unsigned char *ptr, struct sysinfo_t *info)
 {
        struct cb_serial *ser = (struct cb_serial *)ptr;
-       if (ser->type != CB_SERIAL_TYPE_IO_MAPPED)
-               return;
-       info->ser_ioport = ser->baseaddr;
+       info->serial = ser;
 }
 
-static void cb_parse_optiontable(unsigned char *ptr, struct sysinfo_t *info)
+static void cb_parse_vbnv(unsigned char *ptr, struct sysinfo_t *info)
 {
-       info->option_table = (struct cb_cmos_option_table *)ptr;
+       struct cb_vbnv *vbnv = (struct cb_vbnv *)ptr;
+
+       info->vbnv_start = vbnv->vbnv_start;
+       info->vbnv_size = vbnv->vbnv_size;
 }
 
-static void cb_parse_checksum(unsigned char *ptr, struct sysinfo_t *info)
+static void cb_parse_gpios(unsigned char *ptr, struct sysinfo_t *info)
 {
-       struct cb_cmos_checksum *cmos_cksum = (struct cb_cmos_checksum *)ptr;
-       info->cmos_range_start = cmos_cksum->range_start;
-       info->cmos_range_end = cmos_cksum->range_end;
-       info->cmos_checksum_location = cmos_cksum->location;
+       int i;
+       struct cb_gpios *gpios = (struct cb_gpios *)ptr;
+
+       info->num_gpios = (gpios->count < SYSINFO_MAX_GPIOS) ?
+                               (gpios->count) : SYSINFO_MAX_GPIOS;
+
+       for (i = 0; i < info->num_gpios; i++)
+               info->gpios[i] = gpios->gpios[i];
+}
+
+static void cb_parse_vdat(unsigned char *ptr, struct sysinfo_t *info)
+{
+       struct cb_vdat *vdat = (struct cb_vdat *) ptr;
+
+       info->vdat_addr = vdat->vdat_addr;
+       info->vdat_size = vdat->vdat_size;
+}
+
+static void cb_parse_tstamp(unsigned char *ptr, struct sysinfo_t *info)
+{
+       info->tstamp_table = ((struct cb_cbmem_tab *)ptr)->cbmem_tab;
+}
+
+static void cb_parse_cbmem_cons(unsigned char *ptr, struct sysinfo_t *info)
+{
+       info->cbmem_cons = ((struct cb_cbmem_tab *)ptr)->cbmem_tab;
 }
 
 static void cb_parse_framebuffer(unsigned char *ptr, struct sysinfo_t *info)
@@ -103,6 +127,11 @@ static void cb_parse_framebuffer(unsigned char *ptr, struct sysinfo_t *info)
        info->framebuffer = (struct cb_framebuffer *)ptr;
 }
 
+static void cb_parse_string(unsigned char *ptr, char **info)
+{
+       *info = (char *)((struct cb_string *)ptr)->string;
+}
+
 static int cb_parse_header(void *addr, int len, struct sysinfo_t *info)
 {
        struct cb_header *header;
@@ -133,6 +162,9 @@ static int cb_parse_header(void *addr, int len, struct sysinfo_t *info)
        /* Now, walk the tables. */
        ptr += header->header_bytes;
 
+       /* Inintialize some fields to sentinel values. */
+       info->vbnv_start = info->vbnv_size = (uint32_t)(-1);
+
        for (i = 0; i < header->table_entries; i++) {
                struct cb_record *rec = (struct cb_record *)ptr;
 
@@ -150,11 +182,35 @@ static int cb_parse_header(void *addr, int len, struct sysinfo_t *info)
                case CB_TAG_SERIAL:
                        cb_parse_serial(ptr, info);
                        break;
-               case CB_TAG_CMOS_OPTION_TABLE:
-                       cb_parse_optiontable(ptr, info);
+               case CB_TAG_VERSION:
+                       cb_parse_string(ptr, &info->version);
+                       break;
+               case CB_TAG_EXTRA_VERSION:
+                       cb_parse_string(ptr, &info->extra_version);
+                       break;
+               case CB_TAG_BUILD:
+                       cb_parse_string(ptr, &info->build);
+                       break;
+               case CB_TAG_COMPILE_TIME:
+                       cb_parse_string(ptr, &info->compile_time);
+                       break;
+               case CB_TAG_COMPILE_BY:
+                       cb_parse_string(ptr, &info->compile_by);
+                       break;
+               case CB_TAG_COMPILE_HOST:
+                       cb_parse_string(ptr, &info->compile_host);
+                       break;
+               case CB_TAG_COMPILE_DOMAIN:
+                       cb_parse_string(ptr, &info->compile_domain);
+                       break;
+               case CB_TAG_COMPILER:
+                       cb_parse_string(ptr, &info->compiler);
+                       break;
+               case CB_TAG_LINKER:
+                       cb_parse_string(ptr, &info->linker);
                        break;
-               case CB_TAG_OPTION_CHECKSUM:
-                       cb_parse_checksum(ptr, info);
+               case CB_TAG_ASSEMBLER:
+                       cb_parse_string(ptr, &info->assembler);
                        break;
                /*
                 * FIXME we should warn on serial if coreboot set up a
@@ -163,6 +219,21 @@ static int cb_parse_header(void *addr, int len, struct sysinfo_t *info)
                case CB_TAG_FRAMEBUFFER:
                        cb_parse_framebuffer(ptr, info);
                        break;
+               case CB_TAG_GPIO:
+                       cb_parse_gpios(ptr, info);
+                       break;
+               case CB_TAG_VDAT:
+                       cb_parse_vdat(ptr, info);
+                       break;
+               case CB_TAG_TIMESTAMPS:
+                       cb_parse_tstamp(ptr, info);
+                       break;
+               case CB_TAG_CBMEM_CONSOLE:
+                       cb_parse_cbmem_cons(ptr, info);
+                       break;
+               case CB_TAG_VBNV:
+                       cb_parse_vbnv(ptr, info);
+                       break;
                }
 
                ptr += rec->size;
@@ -174,18 +245,12 @@ static int cb_parse_header(void *addr, int len, struct sysinfo_t *info)
 /* == Architecture specific == */
 /* This is the x86 specific stuff. */
 
-/* Assume no translation or that memory is identity mapped. */
-static void *phys_to_virt(unsigned long virt)
-{
-       return (void *)(uintptr_t)virt;
-}
-
 int get_coreboot_info(struct sysinfo_t *info)
 {
-       int ret = cb_parse_header(phys_to_virt(0x00000000), 0x1000, info);
+       int ret = cb_parse_header((void *)0x00000000, 0x1000, info);
 
        if (ret != 1)
-               ret = cb_parse_header(phys_to_virt(0x000f0000), 0x1000, info);
+               ret = cb_parse_header((void *)0x000f0000, 0x1000, info);
 
        return (ret == 1) ? 0 : -1;
 }

diff --git a/arch/x86/include/asm/arch-coreboot/sysinfo.h b/arch/x86/include/asm/arch-coreboot/sysinfo.h
index 5c44e1a..77ae304 100644 (file)
--- a/arch/x86/include/asm/arch-coreboot/sysinfo.h
+++ b/arch/x86/include/asm/arch-coreboot/sysinfo.h
@@ -30,32 +30,52 @@
 #ifndef _COREBOOT_SYSINFO_H
 #define _COREBOOT_SYSINFO_H
 
+#include <common.h>
 #include <compiler.h>
+#include <fdt.h>
+#include <asm/arch/tables.h>
 
 /* Allow a maximum of 16 memory range definitions. */
 #define SYSINFO_MAX_MEM_RANGES 16
+/* Allow a maximum of 8 GPIOs */
+#define SYSINFO_MAX_GPIOS 8
 
 struct sysinfo_t {
-       unsigned int cpu_khz;
-       unsigned short ser_ioport;
-       unsigned long ser_base; /* for mmapped serial */
-
        int n_memranges;
-
        struct memrange {
                unsigned long long base;
                unsigned long long size;
                unsigned int type;
        } memrange[SYSINFO_MAX_MEM_RANGES];
 
-       struct cb_cmos_option_table *option_table;
        u32 cmos_range_start;
        u32 cmos_range_end;
        u32 cmos_checksum_location;
+       u32 vbnv_start;
+       u32 vbnv_size;
+
+       char *version;
+       char *extra_version;
+       char *build;
+       char *compile_time;
+       char *compile_by;
+       char *compile_host;
+       char *compile_domain;
+       char *compiler;
+       char *linker;
+       char *assembler;
 
        struct cb_framebuffer *framebuffer;
 
-       unsigned long *mbtable; /** Pointer to the multiboot table */
+       int num_gpios;
+       struct cb_gpio gpios[SYSINFO_MAX_GPIOS];
+
+       void    *vdat_addr;
+       u32     vdat_size;
+       void    *tstamp_table;
+       void    *cbmem_cons;
+
+       struct cb_serial *serial;
 };
 
 extern struct sysinfo_t lib_sysinfo;

diff --git a/arch/x86/include/asm/arch-coreboot/tables.h b/arch/x86/include/asm/arch-coreboot/tables.h
index c286973..ad34a8b 100644 (file)
--- a/arch/x86/include/asm/arch-coreboot/tables.h
+++ b/arch/x86/include/asm/arch-coreboot/tables.h
@@ -164,6 +164,55 @@ struct cb_framebuffer {
        u8 reserved_mask_size;
 };
 
+#define CB_TAG_GPIO 0x0013
+#define GPIO_MAX_NAME_LENGTH 16
+struct cb_gpio {
+       u32 port;
+       u32 polarity;
+       u32 value;
+       u8 name[GPIO_MAX_NAME_LENGTH];
+};
+
+struct cb_gpios {
+       u32 tag;
+       u32 size;
+
+       u32 count;
+       struct cb_gpio gpios[0];
+};
+
+#define CB_TAG_FDT     0x0014
+struct cb_fdt {
+       uint32_t tag;
+       uint32_t size;  /* size of the entire entry */
+       /* the actual FDT gets placed here */
+};
+
+#define CB_TAG_VDAT    0x0015
+struct cb_vdat {
+       uint32_t tag;
+       uint32_t size;  /* size of the entire entry */
+       void     *vdat_addr;
+       uint32_t vdat_size;
+};
+
+#define CB_TAG_TIMESTAMPS      0x0016
+#define CB_TAG_CBMEM_CONSOLE   0x0017
+#define CB_TAG_MRC_CACHE       0x0018
+struct cb_cbmem_tab {
+       uint32_t tag;
+       uint32_t size;
+       void   *cbmem_tab;
+};
+
+#define CB_TAG_VBNV            0x0019
+struct cb_vbnv {
+       uint32_t tag;
+       uint32_t size;
+       uint32_t vbnv_start;
+       uint32_t vbnv_size;
+};
+
 #define CB_TAG_CMOS_OPTION_TABLE 0x00c8
 struct cb_cmos_option_table {
        u32 tag;
@@ -238,4 +287,29 @@ struct sysinfo_t;
 
 int get_coreboot_info(struct sysinfo_t *info);
 
+#define CBMEM_TOC_RESERVED      512
+#define MAX_CBMEM_ENTRIES       16
+#define CBMEM_MAGIC             0x434f5245
+
+struct cbmem_entry {
+       u32 magic;
+       u32 id;
+       u64 base;
+       u64 size;
+} __packed;
+
+#define CBMEM_ID_FREESPACE      0x46524545
+#define CBMEM_ID_GDT            0x4c474454
+#define CBMEM_ID_ACPI           0x41435049
+#define CBMEM_ID_CBTABLE        0x43425442
+#define CBMEM_ID_PIRQ           0x49525154
+#define CBMEM_ID_MPTABLE        0x534d5054
+#define CBMEM_ID_RESUME         0x5245534d
+#define CBMEM_ID_RESUME_SCRATCH 0x52455343
+#define CBMEM_ID_SMBIOS         0x534d4254
+#define CBMEM_ID_TIMESTAMP      0x54494d45
+#define CBMEM_ID_MRCDATA        0x4d524344
+#define CBMEM_ID_CONSOLE        0x434f4e53
+#define CBMEM_ID_NONE           0x00000000
+
 #endif