#include <types.h>
#include <string.h>
#include <console/console.h>
-#include <boot/coreboot_tables.h>
#include <cbfs.h>
-
-#ifndef CONFIG_BIG_ENDIAN
-#define ntohl(x) ( ((x&0xff)<<24) | ((x&0xff00)<<8) | \
- ((x&0xff0000) >> 8) | ((x&0xff000000) >> 24) )
-#else
-#define ntohl(x) (x)
-#endif
-
-int run_address(void *f);
+#include <lib.h>
+#include <arch/byteorder.h>
int cbfs_decompress(int algo, void *src, void *dst, int len)
{
memcpy(dst, src, len);
return 0;
-#if CONFIG_COMPRESSED_PAYLOAD_LZMA==1
-
- case CBFS_COMPRESS_LZMA: {
- unsigned long ulzma(unsigned char *src, unsigned char *dst);
- ulzma(src, dst);
- }
+ case CBFS_COMPRESS_LZMA:
+ if (!ulzma(src, dst)) {
+ printk_err("CBFS: LZMA decompression failed!\n");
+ return -1;
+ }
return 0;
-#endif
-
-#if CONFIG_COMPRESSED_PAYLOAD_NRV2B==1
- case CBFS_COMPRESS_NRV2B: {
- unsigned long unrv2b(u8 *src, u8 *dst, unsigned long *ilen_p);
- unsigned long tmp;
- unrv2b(src, dst, &tmp);
- }
- return 0;
-#endif
default:
- printk_info( "CBFS: Unknown compression type %d\n",
- algo);
+ printk_info( "CBFS: Unknown compression type %d\n", algo);
return -1;
}
}
struct cbfs_header *header;
void *ptr = (void *)*((unsigned long *) CBFS_HEADPTR_ADDR);
- printk_debug("Check CBFS header at %p\n", ptr);
+ printk_spew("Check CBFS header at %p\n", ptr);
header = (struct cbfs_header *) ptr;
- printk_debug("magic is %08x\n", ntohl(header->magic));
+ printk_spew("magic is %08x\n", ntohl(header->magic));
if (ntohl(header->magic) != CBFS_HEADER_MAGIC) {
- printk_err("NO CBFS HEADER\n");
+ printk_err("ERROR: No valid CBFS header found!\n");
+ if (header->magic == 0xffffffff) {
+ printk_err("Maybe the ROM isn't entirely mapped yet?\n"
+ "See (and report to) http://www.coreboot.org/Infrastructure_Projects#CBFS\n");
+ }
return NULL;
}
- printk_debug("Found CBFS header at %p\n", ptr);
+ printk_spew("Found CBFS header at %p\n", ptr);
return header;
}
return NULL;
offset = 0 - ntohl(header->romsize) + ntohl(header->offset);
+ int align= ntohl(header->align);
+
while(1) {
struct cbfs_file *file = (struct cbfs_file *) offset;
- if (cbfs_check_magic(file)) printk_info("Check %s\n", CBFS_NAME(file));
- if (cbfs_check_magic(file) &&
- !strcmp(CBFS_NAME(file), name))
+ if (!cbfs_check_magic(file)) return NULL;
+ printk_spew("Check %s\n", CBFS_NAME(file));
+ if (!strcmp(CBFS_NAME(file), name))
return file;
- offset += ntohl(header->align);
+ int flen = ntohl(file->len);
+ int foffset = ntohl(file->offset);
+ printk_spew("CBFS: follow chain: %p + %x + %x + align -> ", (void *)offset, foffset, flen);
+
+ unsigned long oldoffset = offset;
+ offset = ALIGN(offset + foffset + flen, align);
+ printk_spew("%p\n", (void *)offset);
+ if (offset <= oldoffset) return NULL;
if (offset < 0xFFFFFFFF - ntohl(header->romsize))
return NULL;
return (void *) CBFS_SUBHEADER(file);
}
+static int tohex4(unsigned int c)
+{
+ return (c<=9)?(c+'0'):(c-10+'a');
+}
+
+static void tohex16(unsigned int val, char* dest)
+{
+ dest[0]=tohex4(val>>12);
+ dest[1]=tohex4((val>>8) & 0xf);
+ dest[2]=tohex4((val>>4) & 0xf);
+ dest[3]=tohex4(val & 0xf);
+}
+
void *cbfs_load_optionrom(u16 vendor, u16 device, void * dest)
{
- char name[17];
+ char name[17]="pciXXXX,XXXX.rom";
struct cbfs_optionrom *orom;
u8 *src;
- sprintf(name,"pci%04x,%04x.rom", vendor, device);
+ tohex16(vendor, name+3);
+ tohex16(device, name+8);
orom = (struct cbfs_optionrom *)
cbfs_find_file(name, CBFS_TYPE_OPTIONROM);
return dest;
}
-void * cbfs_load_payload(struct lb_memory *lb_mem, const char *name)
-{
- int selfboot(struct lb_memory *mem, struct cbfs_payload *payload);
- struct cbfs_payload *payload = (struct cbfs_payload *)
- cbfs_find_file(name, CBFS_TYPE_PAYLOAD);
-
- struct cbfs_payload_segment *segment, *first_segment;
-
- if (payload == NULL)
- return (void *) -1;
- printk_debug("Got a payload\n");
- first_segment = segment = &payload->segments;
- selfboot(lb_mem, payload);
- printk_emerg("SELFBOOT RETURNED!\n");
-
- return (void *) -1;
-}
-
void * cbfs_load_stage(const char *name)
{
struct cbfs_stage *stage = (struct cbfs_stage *)
if (stage == NULL)
return (void *) -1;
- printk_info("Stage: load @ %d/%d bytes, enter @ %llx\n",
- ntohl((u32) stage->load), ntohl(stage->memlen),
+ printk_info("Stage: loading %s @ 0x%x (%d bytes), entry @ 0x%llx\n",
+ name,
+ (u32) stage->load, stage->memlen,
stage->entry);
- memset((void *) ntohl((u32) stage->load), 0, ntohl(stage->memlen));
+ memset((void *) (u32) stage->load, 0, stage->memlen);
- if (cbfs_decompress(ntohl(stage->compression),
+ if (cbfs_decompress(stage->compression,
((unsigned char *) stage) +
sizeof(struct cbfs_stage),
- (void *) ntohl((u32) stage->load),
- ntohl(stage->len)))
+ (void *) (u32) stage->load,
+ stage->len))
return (void *) -1;
+ printk_debug("Stage: done loading.\n");
+
entry = stage->entry;
-// return (void *) ntohl((u32) stage->entry);
+ // entry = ntohl((u32) stage->entry);
+
return (void *) entry;
}
void * cbfs_get_file(const char *name)
{
- return cbfs_find(name);
+ return (void *) cbfs_find(name);
}
int cbfs_execute_stage(const char *name)
projects / coreboot.git / blobdiff