X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=src%2Fcoreboot.c;h=e328c15acfb53f9d6cfb6b2b173d61163a89142a;hb=refs%2Fheads%2Fcoreboot;hp=b8479c5bacac0987de5394c0b6f113873055c30e;hpb=523e5a995e1502deebd94efba44a1b5cb0007794;p=seabios.git

diff --git a/src/coreboot.c b/src/coreboot.c
index b8479c5..e328c15 100644
--- a/src/coreboot.c
+++ b/src/coreboot.c
@@ -1,112 +1,15 @@
 // Coreboot interface support.
 //
-// Copyright (C) 2008  Kevin O'Connor <kevin@koconnor.net>
+// Copyright (C) 2008,2009  Kevin O'Connor <kevin@koconnor.net>
 //
 // This file may be distributed under the terms of the GNU LGPLv3 license.
 
 #include "memmap.h" // add_e820
 #include "util.h" // dprintf
-#include "pci.h" // struct pir_header
-#include "acpi.h" // struct rsdp_descriptor
-#include "mptable.h" // MPTABLE_SIGNATURE
 #include "biosvar.h" // GET_EBDA
 #include "lzmadecode.h" // LzmaDecode
-
-
-/****************************************************************
- * BIOS table copying
- ****************************************************************/
-
-static void
-copy_pir(void *pos)
-{
-    struct pir_header *p = pos;
-    if (p->signature != PIR_SIGNATURE)
-        return;
-    if (PirOffset)
-        return;
-    if (p->size < sizeof(*p))
-        return;
-    if (checksum(pos, p->size) != 0)
-        return;
-    bios_table_cur_addr = ALIGN(bios_table_cur_addr, 16);
-    if (bios_table_cur_addr + p->size > bios_table_end_addr) {
-        dprintf(1, "No room to copy PIR table!\n");
-        return;
-    }
-    dprintf(1, "Copying PIR from %p to %x\n", pos, bios_table_cur_addr);
-    memcpy((void*)bios_table_cur_addr, pos, p->size);
-    PirOffset = bios_table_cur_addr - BUILD_BIOS_ADDR;
-    bios_table_cur_addr += p->size;
-}
-
-static void
-copy_mptable(void *pos)
-{
-    struct mptable_floating_s *p = pos;
-    if (p->signature != MPTABLE_SIGNATURE)
-        return;
-    if (!p->physaddr)
-        return;
-    if (checksum(pos, sizeof(*p)) != 0)
-        return;
-    u32 length = p->length * 16;
-    bios_table_cur_addr = ALIGN(bios_table_cur_addr, 16);
-    u16 mpclength = ((struct mptable_config_s *)p->physaddr)->length;
-    if (bios_table_cur_addr + length + mpclength > bios_table_end_addr) {
-        dprintf(1, "No room to copy MPTABLE!\n");
-        return;
-    }
-    dprintf(1, "Copying MPTABLE from %p/%x to %x\n"
-            , pos, p->physaddr, bios_table_cur_addr);
-    memcpy((void*)bios_table_cur_addr, pos, length);
-    struct mptable_floating_s *newp = (void*)bios_table_cur_addr;
-    newp->physaddr = bios_table_cur_addr + length;
-    newp->checksum -= checksum(newp, sizeof(*newp));
-    memcpy((void*)bios_table_cur_addr + length, (void*)p->physaddr, mpclength);
-    bios_table_cur_addr += length + mpclength;
-}
-
-static void
-copy_acpi_rsdp(void *pos)
-{
-    if (RsdpAddr)
-        return;
-    struct rsdp_descriptor *p = pos;
-    if (p->signature != RSDP_SIGNATURE)
-        return;
-    u32 length = 20;
-    if (checksum(pos, length) != 0)
-        return;
-    if (p->revision > 1) {
-        length = p->length;
-        if (checksum(pos, length) != 0)
-            return;
-    }
-    bios_table_cur_addr = ALIGN(bios_table_cur_addr, 16);
-    if (bios_table_cur_addr + length > bios_table_end_addr) {
-        dprintf(1, "No room to copy ACPI RSDP table!\n");
-        return;
-    }
-    dprintf(1, "Copying ACPI RSDP from %p to %x\n", pos, bios_table_cur_addr);
-    RsdpAddr = (void*)bios_table_cur_addr;
-    memcpy(RsdpAddr, pos, length);
-    bios_table_cur_addr += length;
-}
-
-// Attempt to find (and relocate) any standard bios tables found in a
-// given address range.
-static void
-scan_tables(u32 start, u32 size)
-{
-    void *p = (void*)ALIGN(start, 16);
-    void *end = (void*)start + size;
-    for (; p<end; p += 16) {
-        copy_pir(p);
-        copy_mptable(p);
-        copy_acpi_rsdp(p);
-    }
-}
+#include "smbios.h" // smbios_init
+#include "boot.h" // boot_add_cbfs
 
 
 /****************************************************************
@@ -143,6 +46,16 @@ struct cb_memory {
 #define MEM_RANGE_COUNT(_rec) \
         (((_rec)->size - sizeof(*(_rec))) / sizeof((_rec)->map[0]))
 
+struct cb_mainboard {
+    u32 tag;
+    u32 size;
+    u8  vendor_idx;
+    u8  part_idx;
+    char  strings[0];
+};
+
+#define CB_TAG_MAINBOARD 0x0003
+
 struct cb_forward {
     u32 tag;
     u32 size;
@@ -203,16 +116,15 @@ find_cb_subtable(struct cb_header *cbh, u32 tag)
     return NULL;
 }
 
+static struct cb_memory *CBMemTable;
+const char *CBvendor = "", *CBpart = "";
+
 // Populate max ram and e820 map info by scanning for a coreboot table.
 static void
-coreboot_fill_map()
+coreboot_fill_map(void)
 {
     dprintf(3, "Attempting to find coreboot table\n");
 
-    // Init variables set in coreboot table memory scan.
-    PirOffset = 0;
-    RsdpAddr = 0;
-
     // Find coreboot table.
     struct cb_header *cbh = find_cb_header(0, 0x1000);
     if (!cbh)
@@ -225,7 +137,7 @@ coreboot_fill_map()
             goto fail;
     }
     dprintf(3, "Now attempting to find coreboot memory map\n");
-    struct cb_memory *cbm = find_cb_subtable(cbh, CB_TAG_MEMORY);
+    struct cb_memory *cbm = CBMemTable = find_cb_subtable(cbh, CB_TAG_MEMORY);
     if (!cbm)
         goto fail;
 
@@ -236,7 +148,6 @@ coreboot_fill_map()
         u32 type = m->type;
         if (type == CB_MEM_TABLE) {
             type = E820_RESERVED;
-            scan_tables(m->start, m->size);
         } else if (type == E820_ACPI || type == E820_RAM) {
             u64 end = m->start + m->size;
             if (end > 0x100000000ull) {
@@ -256,9 +167,12 @@ coreboot_fill_map()
     // confuses grub.  So, override it.
     add_e820(0, 16*1024, E820_RAM);
 
-    // XXX - just create dummy smbios table for now - should detect if
-    // smbios/dmi table is found from coreboot and use that instead.
-    smbios_init();
+    struct cb_mainboard *cbmb = find_cb_subtable(cbh, CB_TAG_MAINBOARD);
+    if (cbmb) {
+        CBvendor = &cbmb->strings[cbmb->vendor_idx];
+        CBpart = &cbmb->strings[cbmb->part_idx];
+        dprintf(1, "Found mainboard %s %s\n", CBvendor, CBpart);
+    }
 
     return;
 
@@ -272,10 +186,53 @@ fail:
 }
 
 
+/****************************************************************
+ * BIOS table copying
+ ****************************************************************/
+
+// Attempt to find (and relocate) any standard bios tables found in a
+// given address range.
+static void
+scan_tables(u32 start, u32 size)
+{
+    void *p = (void*)ALIGN(start, 16);
+    void *end = (void*)start + size;
+    for (; p<end; p += 16) {
+        copy_pir(p);
+        copy_mptable(p);
+        copy_acpi_rsdp(p);
+        copy_smbios(p);
+    }
+}
+
+void
+coreboot_copy_biostable(void)
+{
+    struct cb_memory *cbm = CBMemTable;
+    if (! CONFIG_COREBOOT || !cbm)
+        return;
+
+    dprintf(3, "Relocating coreboot bios tables\n");
+
+    // Scan CB_MEM_TABLE areas for bios tables.
+    int i, count = MEM_RANGE_COUNT(cbm);
+    for (i=0; i<count; i++) {
+        struct cb_memory_range *m = &cbm->map[i];
+        if (m->type == CB_MEM_TABLE)
+            scan_tables(m->start, m->size);
+    }
+
+    // XXX - create a dummy smbios table for now.
+    if (!SMBiosAddr)
+        smbios_init();
+}
+
+
 /****************************************************************
  * ulzma
  ****************************************************************/
 
+// Uncompress data in flash to an area of memory.
 static int
 ulzma(u8 *dst, u32 maxlen, const u8 *src, u32 srclen)
 {
@@ -289,7 +246,7 @@ ulzma(u8 *dst, u32 maxlen, const u8 *src, u32 srclen)
     u8 scratch[15980];
     int need = (LzmaGetNumProbs(&state.Properties) * sizeof(CProb));
     if (need > sizeof(scratch)) {
-        dprintf(1, "LzmaDecode need %d have %d\n", need, sizeof(scratch));
+        dprintf(1, "LzmaDecode need %d have %d\n", need, (unsigned int)sizeof(scratch));
         return -1;
     }
     state.Probs = (CProb *)scratch;
@@ -314,11 +271,6 @@ ulzma(u8 *dst, u32 maxlen, const u8 *src, u32 srclen)
  * Coreboot flash format
  ****************************************************************/
 
-// XXX - optimize
-#define ntohl(x) ((((x)&0xff)<<24) | (((x)&0xff00)<<8) | \
-                  (((x)&0xff0000) >> 8) | (((x)&0xff000000) >> 24))
-#define htonl(x) ntohl(x)
-
 #define CBFS_HEADER_MAGIC 0x4F524243
 #define CBFS_HEADPTR_ADDR 0xFFFFFFFc
 #define CBFS_VERSION1 0x31313131
@@ -336,15 +288,15 @@ struct cbfs_header {
 static struct cbfs_header *CBHDR;
 
 static void
-cbfs_setup()
+cbfs_setup(void)
 {
-    if (! CONFIG_COREBOOT_FLASH)
+    if (!CONFIG_COREBOOT || !CONFIG_COREBOOT_FLASH)
         return;
 
     CBHDR = *(void **)CBFS_HEADPTR_ADDR;
     if (CBHDR->magic != htonl(CBFS_HEADER_MAGIC)) {
-        dprintf(1, "Unable to find CBFS (got %x not %x)\n"
-                , CBHDR->magic, htonl(CBFS_HEADER_MAGIC));
+        dprintf(1, "Unable to find CBFS (ptr=%p; got %x not %x)\n"
+                , CBHDR, CBHDR->magic, htonl(CBFS_HEADER_MAGIC));
         CBHDR = NULL;
         return;
     }
@@ -363,165 +315,139 @@ struct cbfs_file {
     char filename[0];
 } PACKED;
 
+// Verify a cbfs entry looks valid.
 static struct cbfs_file *
-cbfs_search(struct cbfs_file *file)
+cbfs_verify(struct cbfs_file *file)
 {
-    for (;;) {
-        if (file < (struct cbfs_file *)(0xFFFFFFFF - ntohl(CBHDR->romsize)))
-            return NULL;
-        u64 magic = file->magic;
-        if (magic == CBFS_FILE_MAGIC) {
-            dprintf(5, "Found CBFS file %s\n", file->filename);
-            return file;
-        }
-        if (magic == 0)
-            return NULL;
-        file = (void*)file + ntohl(CBHDR->align);
+    if (file < (struct cbfs_file *)(0xFFFFFFFF - ntohl(CBHDR->romsize)))
+        return NULL;
+    u64 magic = file->magic;
+    if (magic == CBFS_FILE_MAGIC) {
+        dprintf(5, "Found CBFS file %s\n", file->filename);
+        return file;
     }
+    return NULL;
 }
 
+// Return the first file in the CBFS archive
 static struct cbfs_file *
-cbfs_getfirst()
+cbfs_getfirst(void)
 {
     if (! CBHDR)
         return NULL;
-    return cbfs_search((void *)(0 - ntohl(CBHDR->romsize) + ntohl(CBHDR->offset)));
+    return cbfs_verify((void *)(0 - ntohl(CBHDR->romsize) + ntohl(CBHDR->offset)));
 }
 
+// Return the file after the given file.
 static struct cbfs_file *
 cbfs_getnext(struct cbfs_file *file)
 {
     file = (void*)file + ALIGN(ntohl(file->len) + ntohl(file->offset), ntohl(CBHDR->align));
-    return cbfs_search(file);
+    return cbfs_verify(file);
 }
 
-static struct cbfs_file *
+// Find the file with the given filename.
+struct cbfs_file *
 cbfs_findfile(const char *fname)
 {
     dprintf(3, "Searching CBFS for %s\n", fname);
     struct cbfs_file *file;
-    for (file = cbfs_getfirst(); file; file = cbfs_getnext(file)) {
+    for (file = cbfs_getfirst(); file; file = cbfs_getnext(file))
         if (strcmp(fname, file->filename) == 0)
             return file;
-    }
     return NULL;
 }
 
-static int
-data_copy(u8 *dst, u32 maxlen, const u8 *src, u32 srclen)
+// Find next file with the given filename prefix.
+struct cbfs_file *
+cbfs_findprefix(const char *prefix, struct cbfs_file *last)
 {
-    dprintf(3, "Copying data %d@%p to %d@%p\n", srclen, src, maxlen, dst);
-    if (srclen > maxlen) {
-        dprintf(1, "File too big to copy\n");
-        return -1;
-    }
-    memcpy(dst, src, srclen);
-    return srclen;
+    if (!CONFIG_COREBOOT || !CONFIG_COREBOOT_FLASH)
+        return NULL;
+
+    dprintf(3, "Searching CBFS for prefix %s\n", prefix);
+    int len = strlen(prefix);
+    struct cbfs_file *file;
+    if (! last)
+        file = cbfs_getfirst();
+    else
+        file = cbfs_getnext(last);
+    for (; file; file = cbfs_getnext(file))
+        if (memcmp(prefix, file->filename, len) == 0)
+            return file;
+    return NULL;
 }
 
-// Copy a file to memory (uncompressing if necessary)
-static int
-cbfs_copyfile(void *dst, u32 maxlen, const char *fname)
+// Find a file with the given filename (possibly with ".lzma" extension).
+struct cbfs_file *
+cbfs_finddatafile(const char *fname)
 {
-    dprintf(3, "Searching CBFS for data file %s\n", fname);
     int fnlen = strlen(fname);
-    struct cbfs_file *file;
-    for (file = cbfs_getfirst(); file; file = cbfs_getnext(file)) {
-        if (memcmp(fname, file->filename, fnlen) != 0)
-            continue;
-        u32 size = ntohl(file->len);
-        void *src = (void*)file + ntohl(file->offset);
-        if (file->filename[fnlen] == '\0')
-            return data_copy(dst, maxlen, src, size);
-        if (strcmp(&file->filename[fnlen], ".lzma") == 0)
-            return ulzma(dst, maxlen, src, size);
+    struct cbfs_file *file = NULL;
+    for (;;) {
+        file = cbfs_findprefix(fname, file);
+        if (!file)
+            return NULL;
+        if (file->filename[fnlen] == '\0'
+            || strcmp(&file->filename[fnlen], ".lzma") == 0)
+            return file;
     }
-    return -1;
 }
 
-const char *
-cbfs_findNprefix(const char *prefix, int n)
+// Determine whether the file has a ".lzma" extension.
+static int
+cbfs_iscomp(struct cbfs_file *file)
 {
-    if (! CONFIG_COREBOOT_FLASH)
-        return NULL;
-
-    dprintf(3, "Searching CBFS for prefix %s\n", prefix);
-    int len = strlen(prefix);
-    struct cbfs_file *file;
-    for (file = cbfs_getfirst(); file; file = cbfs_getnext(file)) {
-        if (memcmp(prefix, file->filename, len) == 0) {
-            if (n <= 0)
-                return file->filename;
-            n--;
-        }
-    }
-    return NULL;
+    int fnamelen = strlen(file->filename);
+    return fnamelen > 5 && strcmp(&file->filename[fnamelen-5], ".lzma") == 0;
 }
 
-static char
-getHex(u8 x)
+// Return the filename of a given file.
+const char *
+cbfs_filename(struct cbfs_file *file)
 {
-    if (x <= 9)
-        return '0' + x;
-    return 'a' + x - 10;
+    return file->filename;
 }
 
-static u32
-hexify4(u16 x)
+// Determine the uncompressed size of a datafile.
+u32
+cbfs_datasize(struct cbfs_file *file)
 {
-    return ((getHex(x&0xf) << 24)
-            | (getHex((x>>4)&0xf) << 16)
-            | (getHex((x>>8)&0xf) << 8)
-            | (getHex(x>>12)));
+    void *src = (void*)file + ntohl(file->offset);
+    if (cbfs_iscomp(file))
+        return *(u32*)(src + LZMA_PROPERTIES_SIZE);
+    return ntohl(file->len);
 }
 
+// Copy a file to memory (uncompressing if necessary)
 int
-cbfs_copy_optionrom(void *dst, u32 maxlen, u32 vendev)
+cbfs_copyfile(struct cbfs_file *file, void *dst, u32 maxlen)
 {
-    if (! CONFIG_COREBOOT_FLASH)
+    if (!CONFIG_COREBOOT || !CONFIG_COREBOOT_FLASH || !file)
         return -1;
 
-    char fname[17];
-    // Ughh - poor man's sprintf of "pci%04x,%04x.rom"
-    *(u32*)fname = 0x20696370; // "pci "
-    *(u32*)&fname[3] = hexify4(vendev);
-    fname[7] = ',';
-    *(u32*)&fname[8] = hexify4(vendev >> 16);
-    *(u32*)&fname[12] = 0x6d6f722e; // ".rom"
-    fname[16] = '\0';
-
-    return cbfs_copyfile(dst, maxlen, fname);
-}
+    u32 size = ntohl(file->len);
+    void *src = (void*)file + ntohl(file->offset);
+    if (cbfs_iscomp(file)) {
+        // Compressed - copy to temp ram and uncompress it.
+        void *temp = malloc_tmphigh(size);
+        if (!temp)
+            return -1;
+        iomemcpy(temp, src, size);
+        int ret = ulzma(dst, maxlen, temp, size);
+        yield();
+        free(temp);
+        return ret;
+    }
 
-// Copy the next file with the given prefix - starting at pos 'last'.
-struct cbfs_file *
-cbfs_copyfile_prefix(void *dst, u32 maxlen, const char *prefix
-                     , struct cbfs_file *last)
-{
-    if (! CONFIG_COREBOOT_FLASH)
-        return NULL;
-    dprintf(3, "Searching CBFS for data file prefix %s\n", prefix);
-    struct cbfs_file *file;
-    if (! last)
-        file = cbfs_getfirst();
-    else
-        file = cbfs_getnext(last);
-    int prefixlen = strlen(prefix);
-    for (; file; file = cbfs_getnext(file)) {
-        if (memcmp(prefix, file->filename, prefixlen) != 0)
-            continue;
-        u32 size = ntohl(file->len);
-        void *src = (void*)file + ntohl(file->offset);
-        int fnamelen = strlen(file->filename);
-        int rv;
-        if (fnamelen > 5 && strcmp(&file->filename[fnamelen-5], ".lzma") == 0)
-            rv = ulzma(dst, maxlen, src, size);
-        else
-            rv = data_copy(dst, maxlen, src, size);
-        if (rv >= 0)
-            return file;
+    // Not compressed.
+    dprintf(3, "Copying data %d@%p to %d@%p\n", size, src, maxlen, dst);
+    if (size > maxlen) {
+        warn_noalloc();
+        return -1;
     }
-    return NULL;
+    iomemcpy(dst, src, size);
+    return size;
 }
 
 struct cbfs_payload_segment {
@@ -544,14 +470,11 @@ struct cbfs_payload {
 };
 
 void
-cbfs_run_payload(const char *filename)
+cbfs_run_payload(struct cbfs_file *file)
 {
-    if (! CONFIG_COREBOOT_FLASH)
-        return;
-    dprintf(1, "Run %s\n", filename);
-    struct cbfs_file *file = cbfs_findfile(filename);
-    if (!file)
+    if (!CONFIG_COREBOOT || !CONFIG_COREBOOT_FLASH || !file)
         return;
+    dprintf(1, "Run %s\n", file->filename);
     struct cbfs_payload *pay = (void*)file + ntohl(file->offset);
     struct cbfs_payload_segment *seg = pay->segments;
     for (;;) {
@@ -596,6 +519,21 @@ cbfs_run_payload(const char *filename)
     }
 }
 
+// Register payloads in "img/" directory with boot system.
+void
+cbfs_payload_setup(void)
+{
+    struct cbfs_file *file = NULL;
+    for (;;) {
+        file = cbfs_findprefix("img/", file);
+        if (!file)
+            break;
+        const char *filename = cbfs_filename(file);
+        char *desc = znprintf(MAXDESCSIZE, "Payload [%s]", &filename[4]);
+        boot_add_cbfs(file, desc, bootprio_find_named_rom(filename, 0));
+    }
+}
+
 void
 coreboot_setup(void)
 {