coreboot February 2013

coreboot@coreboot.org

27 participants
790 discussions

Patch set updated for coreboot: f1c7678 snow: switch to stack in DRAM once in ramstage
by David Hendricks 12 Feb '13

12 Feb '13

David Hendricks (dhendrix(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2350 -gerrit commit f1c7678a30858563635f3bc5aa029ef67694b227 Author: David Hendricks <dhendrix(a)chromium.org> Date: Sun Feb 10 15:59:22 2013 -0800 snow: switch to stack in DRAM once in ramstage This patch gives us some stack space in RAM and sets our stack pointer to once we begin ramstage. Note: We may not need this patch after all since we should have plenty of stack space in SRAM. It might be simpler (and perhaps faster) to keep the stack in SRAM. (credit to Gabe for this one, I'm just putting it up on gerrit) Change-Id: I2e447d6359d52e4615e1cd7811e6f167e3dc314b Signed-off-by: David Hendricks <dhendrix(a)chromium.org> Signed-off-by: Gabe Black <gabeblack(a)chromium.org> --- src/arch/armv7/Kconfig | 4 ++++ src/mainboard/google/snow/ramstage.c | 37 ++++++++++++------------------------ 2 files changed, 16 insertions(+), 25 deletions(-) diff --git a/src/arch/armv7/Kconfig b/src/arch/armv7/Kconfig index 488ca97..fe36d79 100644 --- a/src/arch/armv7/Kconfig +++ b/src/arch/armv7/Kconfig @@ -49,4 +49,8 @@ config ARM_DCACHE_POLICY_WRITETHROUGH bool default n +config STACK_SIZE + hex + default 0x1000 + endmenu diff --git a/src/mainboard/google/snow/ramstage.c b/src/mainboard/google/snow/ramstage.c index e144388..a15336d 100644 --- a/src/mainboard/google/snow/ramstage.c +++ b/src/mainboard/google/snow/ramstage.c @@ -17,6 +17,7 @@ * MA 02111-1307 USA */ +#include <lib.h> #include <console/console.h> #include <device/device.h> @@ -25,7 +26,7 @@ #endif void hardwaremain(int boot_complete); -void main(void) +static void real_main(void) { console_init(); printk(BIOS_INFO, "hello from ramstage\n"); @@ -41,30 +42,6 @@ void main(void) hardwaremain(0); } -#if 0 -static void mainboard_read_resources(device_t dev) -{ - printk(BIOS_DEBUG, "%s: entered\n", __func__); - /* Report the memory regions */ - ram_resource(dev, 0, - CONFIG_SYS_SDRAM_BASE + (CONFIG_COREBOOT_ROMSIZE_KB), - ((CONFIG_DRAM_SIZE_MB << 10UL) * CONFIG_NR_DRAM_BANKS) - - CONFIG_COREBOOT_TABLES_SIZE); -} - -static void mainboard_set_resources(device_t dev) -{ - printk(BIOS_DEBUG, "%s: entered\n", __func__); - - assign_resources(dev->link_list); -} - -static struct device_operations mainboard_device_ops = { - .read_resources = mainboard_read_resources, - .set_resources = mainboard_set_resources, -}; -#endif - static void mainboard_enable(device_t dev) { printk(BIOS_DEBUG, "%s: entered\n", __func__); @@ -75,3 +52,13 @@ struct chip_operations mainboard_ops = { .name = "Samsung/Google ARM ChromeBook", .enable_dev = mainboard_enable, }; + +void main(void) +{ + __asm__ __volatile__( + "mov sp, %0\n\r" + "mov pc, %1\n\r" + : + :"r"(_estack), "r"(&real_main) + ); +}

1 0

Patch set updated for coreboot: b6024c2 armv7: don't do anything in checkstack for now()
by David Hendricks 12 Feb '13

12 Feb '13

David Hendricks (dhendrix(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2362 -gerrit commit b6024c23233648c1fa29d906d93e9c0c0e81f0f5 Author: David Hendricks <dhendrix(a)chromium.org> Date: Mon Feb 11 16:32:09 2013 -0800 armv7: don't do anything in checkstack for now() ** do not submit ** Another gross hack. Change-Id: I7d95b3b1e30d422aeb2bdf306bd6c6b30710edc2 Signed-off-by: David Hendricks <dhendrix(a)chromium.org> Signed-off-by: Stefan Reinauer <reinauer(a)chromium.org> --- src/lib/stack.c | 1 - 1 file changed, 1 deletion(-) diff --git a/src/lib/stack.c b/src/lib/stack.c index 0a6637f..f431fd1 100644 --- a/src/lib/stack.c +++ b/src/lib/stack.c @@ -47,7 +47,6 @@ int checkstack(void *top_of_stack, int core) sizeof(stack[0])] - (unsigned long)&stack[i]); return 0; } - return 0; }

1 0

Patch set updated for coreboot: 938c978 exynos5250: add memory resources (dirty hack)
by David Hendricks 12 Feb '13

12 Feb '13

David Hendricks (dhendrix(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2361 -gerrit commit 938c978f0ae1f4b84548ea786582a7424e358535 Author: David Hendricks <dhendrix(a)chromium.org> Date: Mon Feb 11 16:05:33 2013 -0800 exynos5250: add memory resources (dirty hack) ** do not submit ** this is just a dirty hack to get the resource allocator to add memory. Change-Id: Ifb264ff159d45ad2f0fd8656abd6cb47fc14c7ac Signed-off-by: Stefan Reinauer <reinauer(a)chromium.org> Signed-off-by: David Hendricks <dhendrix(a)chromium.org> --- src/arch/armv7/boot/coreboot_table.c | 4 -- src/cpu/samsung/exynos5250/Makefile.inc | 1 + src/cpu/samsung/exynos5250/cpu.c | 66 +++++++++++++++++++++++++++++++++ src/device/device.c | 1 + src/mainboard/google/snow/devicetree.cb | 6 +++ src/mainboard/google/snow/mainboard.c | 21 +++++++++++ src/mainboard/google/snow/ramstage.c | 36 ++++++++++++++++++ 7 files changed, 131 insertions(+), 4 deletions(-) diff --git a/src/arch/armv7/boot/coreboot_table.c b/src/arch/armv7/boot/coreboot_table.c index ed105a4..76fc8fb 100644 --- a/src/arch/armv7/boot/coreboot_table.c +++ b/src/arch/armv7/boot/coreboot_table.c @@ -559,13 +559,11 @@ struct lb_memory *get_lb_mem(void) return mem_ranges; } -#if 0 static void build_lb_mem_range(void *gp, struct device *dev, struct resource *res) { struct lb_memory *mem = gp; new_lb_memory_range(mem, LB_MEM_RAM, res->base, res->size); } -#endif static struct lb_memory *build_lb_mem(struct lb_header *head) { @@ -576,12 +574,10 @@ static struct lb_memory *build_lb_mem(struct lb_header *head) mem_ranges = mem; /* FIXME: implement this */ -#if 0 /* Build the raw table of memory */ search_global_resources( IORESOURCE_MEM | IORESOURCE_CACHEABLE, IORESOURCE_MEM | IORESOURCE_CACHEABLE, build_lb_mem_range, mem); -#endif /* FIXME: things die in cleanup_memory_ranges(), skip for now */ // lb_cleanup_memory_ranges(mem); return mem; diff --git a/src/cpu/samsung/exynos5250/Makefile.inc b/src/cpu/samsung/exynos5250/Makefile.inc index 0a58c0c..5244692 100644 --- a/src/cpu/samsung/exynos5250/Makefile.inc +++ b/src/cpu/samsung/exynos5250/Makefile.inc @@ -27,6 +27,7 @@ ramstage-y += pinmux.c ramstage-y += power.c ramstage-y += soc.c ramstage-$(CONFIG_CONSOLE_SERIAL_UART) += uart.c +ramstage-y += cpu.c #ramstage-$(CONFIG_EXYNOS_ACE_SHA) += ace_sha.c #ramstage-$(CONFIG_SATA_AHCI) += sata.c diff --git a/src/cpu/samsung/exynos5250/cpu.c b/src/cpu/samsung/exynos5250/cpu.c new file mode 100644 index 0000000..745bf1a --- /dev/null +++ b/src/cpu/samsung/exynos5250/cpu.c @@ -0,0 +1,66 @@ +#include <console/console.h> +#include <device/device.h> + +static void my_pci_domain_read_resources(device_t dev) +{ + printk(BIOS_DEBUG, "%s: ENTERED!!\n", __func__); + ram_resource(dev, 0, + (CONFIG_SYS_SDRAM_BASE >> 10) + (CONFIG_COREBOOT_ROMSIZE_KB), + ((CONFIG_DRAM_SIZE_MB << 10UL) * CONFIG_NR_DRAM_BANKS) - CONFIG_COREBOOT_ROMSIZE_KB +/* - (CONFIG_COREBOOT_TABLES_SIZE >> 10) */); +} + +static void my_pci_domain_set_resources(device_t dev) +{ + printk(BIOS_DEBUG, "%s: ENTERED!!\n", __func__); + assign_resources(dev->link_list); +} + +static unsigned int my_pci_domain_scan_bus(device_t dev, unsigned int max) +{ + //max = pci_scan_bus(dev->link_list, PCI_DEVFN(0, 0), 0xff, max); + return max; +} + + +static struct device_operations pci_domain_ops = { + .read_resources = my_pci_domain_read_resources, + .set_resources = my_pci_domain_set_resources, + .enable_resources = NULL, + .init = NULL, + .scan_bus = my_pci_domain_scan_bus, +}; + +static void cpu_bus_init(device_t dev) +{ + printk(BIOS_DEBUG,"INITIALIZE CPUS!\n"); + //initialize_cpus(dev->link_list); +} + +static void cpu_bus_noop(device_t dev) +{ +} + +static struct device_operations cpu_bus_ops = { + .read_resources = cpu_bus_noop, + .set_resources = cpu_bus_noop, + .enable_resources = cpu_bus_noop, + .init = cpu_bus_init, + .scan_bus = 0, +}; + +static void enable_dev(device_t dev) +{ + printk (BIOS_DEBUG, "OUR CPU CHIP OPS!!\n"); + /* Set the operations if it is a special bus type */ + if (dev->path.type == DEVICE_PATH_PCI_DOMAIN) { + dev->ops = &pci_domain_ops; + } else if (dev->path.type == DEVICE_PATH_APIC_CLUSTER) { + dev->ops = &cpu_bus_ops; + } +} + +struct chip_operations cpu_samsung_exynos5250_ops = { + CHIP_NAME("CPU Samsung Exynos 5250") + .enable_dev = enable_dev, +}; diff --git a/src/device/device.c b/src/device/device.c index 07bbc7a..7c8905b 100644 --- a/src/device/device.c +++ b/src/device/device.c @@ -812,6 +812,7 @@ void assign_resources(struct bus *bus) dev_path(bus->dev), bus->secondary, bus->link_num); for (curdev = bus->children; curdev; curdev = curdev->sibling) { + printk(BIOS_DEBUG, "curdev=%s\n", dev_path(curdev)); if (!curdev->enabled || !curdev->resource_list) continue; diff --git a/src/mainboard/google/snow/devicetree.cb b/src/mainboard/google/snow/devicetree.cb index f88835e..5f5de32 100644 --- a/src/mainboard/google/snow/devicetree.cb +++ b/src/mainboard/google/snow/devicetree.cb @@ -19,8 +19,14 @@ # FIXME: this is just a stub for now chip cpu/samsung/exynos5250 + +device lapic_cluster 0 on +end + +device pci_domain 0 on chip drivers/generic/generic # I2C0 controller device i2c 6 on end # ? device i2c 9 on end # ? end end +end diff --git a/src/mainboard/google/snow/mainboard.c b/src/mainboard/google/snow/mainboard.c index efe6672..79d5715 100644 --- a/src/mainboard/google/snow/mainboard.c +++ b/src/mainboard/google/snow/mainboard.c @@ -69,6 +69,27 @@ int board_get_config(void) } #if 0 +static void mainboard_set_resources(device_t dev) +{ + printk(BIOS_DEBUG, "%s: entered\n", __func__); + /* Report the memory regions */ + ram_resource(dev, 0, + CONFIG_SYS_SDRAM_BASE + (CONFIG_COREBOOT_ROMSIZE_KB), + ((CONFIG_DRAM_SIZE_MB << 10UL) * CONFIG_NR_DRAM_BANKS) - + CONFIG_COREBOOT_TABLES_SIZE); + + assign_resources(dev->link_list); +} + +static struct device_operations mainboard_device_ops = { + .set_resources = mainboard_set_resources, +} + +static void mainboard_enable(device_t dev) +{ + dev->ops = &mainboard_device_ops; +} + struct chip_operations mainboard_ops = { .name = "Samsung/Google ARM ChromeBook", .enable_dev = mainboard_enable, diff --git a/src/mainboard/google/snow/ramstage.c b/src/mainboard/google/snow/ramstage.c index a3e9236..e144388 100644 --- a/src/mainboard/google/snow/ramstage.c +++ b/src/mainboard/google/snow/ramstage.c @@ -18,6 +18,7 @@ */ #include <console/console.h> +#include <device/device.h> #if CONFIG_WRITE_HIGH_TABLES #include <cbmem.h> @@ -39,3 +40,38 @@ void main(void) hardwaremain(0); } + +#if 0 +static void mainboard_read_resources(device_t dev) +{ + printk(BIOS_DEBUG, "%s: entered\n", __func__); + /* Report the memory regions */ + ram_resource(dev, 0, + CONFIG_SYS_SDRAM_BASE + (CONFIG_COREBOOT_ROMSIZE_KB), + ((CONFIG_DRAM_SIZE_MB << 10UL) * CONFIG_NR_DRAM_BANKS) - + CONFIG_COREBOOT_TABLES_SIZE); +} + +static void mainboard_set_resources(device_t dev) +{ + printk(BIOS_DEBUG, "%s: entered\n", __func__); + + assign_resources(dev->link_list); +} + +static struct device_operations mainboard_device_ops = { + .read_resources = mainboard_read_resources, + .set_resources = mainboard_set_resources, +}; +#endif + +static void mainboard_enable(device_t dev) +{ + printk(BIOS_DEBUG, "%s: entered\n", __func__); + //dev->ops = &mainboard_device_ops; +} + +struct chip_operations mainboard_ops = { + .name = "Samsung/Google ARM ChromeBook", + .enable_dev = mainboard_enable, +};

1 0

Patch set updated for coreboot: bc67049 fix an error message in checkstack()
by David Hendricks 12 Feb '13

12 Feb '13

David Hendricks (dhendrix(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2364 -gerrit commit bc670498b9b8a7d4aabaaad48220f082eacb4445 Author: David Hendricks <dhendrix(a)chromium.org> Date: Mon Feb 11 19:05:36 2013 -0800 fix an error message in checkstack() The order of some printk arguments were reversed. Change-Id: I5e8f70b79050b92ebe8cfa5aae94b6cd1a5fd547 Signed-off-by: David Hendricks <dhendrix(a)chromium.org> --- src/lib/stack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/stack.c b/src/lib/stack.c index 0a6637f..1f9e009 100644 --- a/src/lib/stack.c +++ b/src/lib/stack.c @@ -31,7 +31,7 @@ int checkstack(void *top_of_stack, int core) if (stack[0] != 0xDEADBEEF){ printk(BIOS_ERR, "Stack overrun on CPU%d." "Increase stack from current %d bytes\n", - CONFIG_STACK_SIZE, core); + core, CONFIG_STACK_SIZE); return -1; }

1 0

New patch to review for coreboot: 854c636 fix debug print in checkstack()
by David Hendricks 12 Feb '13

12 Feb '13

David Hendricks (dhendrix(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2364 -gerrit commit 854c6367d868b6ac8425823f7cf84796fe23bee7 Author: David Hendricks <dhendrix(a)chromium.org> Date: Mon Feb 11 19:05:36 2013 -0800 fix debug print in checkstack() The order of some printk arguments were reversed. Change-Id: I5e8f70b79050b92ebe8cfa5aae94b6cd1a5fd547 Signed-off-by: David Hendricks <dhendrix(a)chromium.org> --- src/lib/stack.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/stack.c b/src/lib/stack.c index 0a6637f..1f9e009 100644 --- a/src/lib/stack.c +++ b/src/lib/stack.c @@ -31,7 +31,7 @@ int checkstack(void *top_of_stack, int core) if (stack[0] != 0xDEADBEEF){ printk(BIOS_ERR, "Stack overrun on CPU%d." "Increase stack from current %d bytes\n", - CONFIG_STACK_SIZE, core); + core, CONFIG_STACK_SIZE); return -1; }

1 0

Patch merged into coreboot/master: ca3198f armv7: jump to ELF image using stage_exit()
by gerrit＠coreboot.org 12 Feb '13

12 Feb '13

the following patch was just integrated into master: commit ca3198f5d646847fe2bf66f4a7c9dcc2e8d7a179 Author: David Hendricks <dhendrix(a)chromium.org> Date: Mon Feb 11 18:22:44 2013 -0800 armv7: jump to ELF image using stage_exit() This is just to get us to the payload. TODO: Do we want to implement any of the stuff from the x86 version, such as copying coreboot to a new location? Change-Id: Ia0544f111d7a1189ebd92d0ba3e11448eabd6252 Signed-off-by: David Hendricks <dhendrix(a)chromium.org> Reviewed-on: http://review.coreboot.org/2363 Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com> Tested-by: build bot (Jenkins) Build-Tested: build bot (Jenkins) at Tue Feb 12 03:37:52 2013, giving +1 See http://review.coreboot.org/2363 for details. -gerrit

1 0

Re: [coreboot] New patch to review for coreboot: 0ae65d8 Add support for "Butterfly" Chromebook
by David Hendricks 12 Feb '13

12 Feb '13

There's also a lot of code that we just can't release until the product actually launches, so catch-22 w.r.t. community feedback. Even if we could, there are warehouses full of machines that have already been flashed. So releasing the code that actually is flashed on the machines and then iterating makes a great deal of sense. /my $0.02 -- David Hendricks (dhendrix) Systems Software Engineer, Google Inc.

1 0

New patch to review for coreboot: 3644ef8 armv7: jump to ELF image using stage_exit()
by David Hendricks 12 Feb '13

12 Feb '13

David Hendricks (dhendrix(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2363 -gerrit commit 3644ef8fff99a13f7cc290fcb60b237084957cde Author: David Hendricks <dhendrix(a)chromium.org> Date: Mon Feb 11 18:22:44 2013 -0800 armv7: jump to ELF image using stage_exit() This is just to get us to the payload. TODO: Do we want to implement any of the stuff from the x86 version, such as copying coreboot to a new location? Change-Id: Ia0544f111d7a1189ebd92d0ba3e11448eabd6252 Signed-off-by: David Hendricks <dhendrix(a)chromium.org> --- src/arch/armv7/boot/boot.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/arch/armv7/boot/boot.c b/src/arch/armv7/boot/boot.c index 722fca5..ab531be 100644 --- a/src/arch/armv7/boot/boot.c +++ b/src/arch/armv7/boot/boot.c @@ -4,6 +4,7 @@ #include <boot/elf_boot.h> #include <string.h> #include <cpu/x86/multiboot.h> +#include <arch/stages.h> #ifndef CMD_LINE @@ -92,8 +93,9 @@ void jmp_to_elf_entry(void *entry, unsigned long buffer, unsigned long size) printk(BIOS_SPEW, " elf_boot_notes = 0x%08lx\n", (unsigned long)&elf_boot_notes); printk(BIOS_SPEW, "adjusted_boot_notes = 0x%08lx\n", adjusted_boot_notes); - /* FIXME(dhendrix): port code to jump to kernel here... */ + stage_exit(entry); #if 0 + /* FIXME: do we need any of this? */ /* Jump to kernel */ __asm__ __volatile__( " cld \n\t" @@ -185,5 +187,3 @@ void jmp_to_elf_entry(void *entry, unsigned long buffer, unsigned long size) ); #endif } - -

1 0

Patch merged into coreboot/master: 7635a60 armv7: Add emulation/qemu-armv7 board.
by gerrit＠coreboot.org 12 Feb '13

12 Feb '13

the following patch was just integrated into master: commit 7635a60ca848b50ff4a0ac85a667adc7151a5abf Author: Hung-Te Lin <hungte(a)chromium.org> Date: Tue Feb 12 00:07:38 2013 +0800 armv7: Add emulation/qemu-armv7 board. To simplify testing ARM implementation, we need a QEMU configuration for ARM. The qemu-armv7 provides serial output, CBFS simulation, and full boot path (bootblock, romstage, ramstage) to verify the boot loader functionality. To run with QEMU: export QEMU_AUDIO_DRV=none qemu-system-arm -M vexpress-a9 -m 1024M -nographic -kernel build/coreboot.rom Verified to boot until ramstage loaded successfully by QEMU v1.0.50. Change-Id: I1f23ffaf408199811a0756236821c7e0f2a85004 Signed-off-by: Hung-Te Lin <hungte(a)chromium.org> Reviewed-on: http://review.coreboot.org/2354 Reviewed-by: David Hendricks <dhendrix(a)chromium.org> Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com> Build-Tested: build bot (Jenkins) at Tue Feb 12 02:44:42 2013, giving +1 Reviewed-By: David Hendricks <dhendrix(a)chromium.org> at Tue Feb 12 02:36:06 2013, giving +1 Reviewed-By: Ronald G. Minnich <rminnich(a)gmail.com> at Tue Feb 12 03:02:44 2013, giving +2 See http://review.coreboot.org/2354 for details. -gerrit

1 0

Patch set updated for coreboot: 97963f0 libpayload: New CBFS to support multiple firmware media sources.
by Hung-Te Lin 12 Feb '13

12 Feb '13

Hung-Te Lin (hungte(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2191 -gerrit commit 97963f0b6bec0de6a83a279330de707c08873820 Author: Hung-Te Lin <hungte(a)chromium.org> Date: Fri Jan 25 12:42:40 2013 +0800 libpayload: New CBFS to support multiple firmware media sources. Upgrade CBFS in libpayload to use new media-based implementation from coreboot ( http://review.coreboot.org/#/c/2182/ ). Old CBFS functions (cbfs_find, cbfs_find_file, get_cbfs_header) are still supported, although the recommended way is to use new CBFS API. To migrate your existing x86 payload source: - Change cbfs_find to cbfs_get_file - Change cbfs_find_file to cbfs_get_file_content - Prefix every CBFS call with a CBFS_DEFAULT_MEDIA argument. Ex, char *jpeg_data = cbfs_find_file("splash.jpg", CBFS_TYPE_BOOTSPLASH); => char *jpeg_data = cbfs_get_file_content( CBFS_DEFAULT_MEDIA, "splash.jpg", CBFS_TYPE_BOOTSPLASH); The legacy setup_cbfs_from_{ram,flash} is also supported, although the better equivalent is to make a new media instance: struct cbfs_media ram_media; init_cbfs_ram_media(&ram_media, start, size); char *data = cbfs_get_file_content(&ram_media, "myfile", my_type); Verified by being successfully linked with filo. Change-Id: If797bc7e3ba975d7e3be905c59424f7a93b8ce11 Signed-off-by: Hung-Te Lin <hungte(a)chromium.org> --- payloads/libpayload/arch/x86/Makefile.inc | 2 + payloads/libpayload/arch/x86/rom_media.c | 111 ++++++++++++++ payloads/libpayload/include/cbfs.h | 102 +++++++++++-- payloads/libpayload/include/cbfs_core.h | 73 +++++++--- payloads/libpayload/include/stdint.h | 1 + payloads/libpayload/libcbfs/Makefile.inc | 1 + payloads/libpayload/libcbfs/cbfs.c | 232 ++++++++++++++++++++++++------ payloads/libpayload/libcbfs/cbfs_core.c | 198 ++++++++++++++----------- payloads/libpayload/libcbfs/ram_media.c | 114 +++++++++++++++ 9 files changed, 675 insertions(+), 159 deletions(-) diff --git a/payloads/libpayload/arch/x86/Makefile.inc b/payloads/libpayload/arch/x86/Makefile.inc index 8f68b07..0977eb1 100644 --- a/payloads/libpayload/arch/x86/Makefile.inc +++ b/payloads/libpayload/arch/x86/Makefile.inc @@ -33,5 +33,7 @@ libc-y += timer.c coreboot.c util.S libc-y += exec.S virtual.c libc-y += string.c +libcbfs-$(CONFIG_CBFS) += rom_media.c + # Multiboot support is configurable libc-$(CONFIG_MULTIBOOT) += multiboot.c diff --git a/payloads/libpayload/arch/x86/rom_media.c b/payloads/libpayload/arch/x86/rom_media.c new file mode 100644 index 0000000..e338d1c --- /dev/null +++ b/payloads/libpayload/arch/x86/rom_media.c @@ -0,0 +1,111 @@ +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2013 Google, Inc. + * + * 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. + */ +#define LIBPAYLOAD + +#include <cbfs.h> +#include <string.h> + +#ifdef LIBPAYLOAD +# define printk(x...) +# define init_default_cbfs_media libpayload_init_default_cbfs_media + extern int libpayload_init_default_cbfs_media(struct cbfs_media *media); +#else +# include <console/console.h> +#endif + +// Implementation of memory-mapped ROM media source on X86. + +static int x86_rom_open(struct cbfs_media *media) { + return 0; +} + +static void *x86_rom_map(struct cbfs_media *media, size_t offset, size_t count) { + void *ptr; + // Some address (ex, pointer to master header) may be given in memory + // mapped location. To workaround that, we handle >0xf0000000 as real + // memory pointer. + + if ((uint32_t)offset > (uint32_t)0xf0000000) + ptr = (void*)offset; + else + ptr = (void*)(0 - (uint32_t)media->context + offset); + return ptr; +} + +static void *x86_rom_unmap(struct cbfs_media *media, const void *address) { + return NULL; +} + +static size_t x86_rom_read(struct cbfs_media *media, void *dest, size_t offset, + size_t count) { + void *ptr = x86_rom_map(media, offset, count); + memcpy(dest, ptr, count); + x86_rom_unmap(media, ptr); + return count; +} + +static int x86_rom_close(struct cbfs_media *media) { + return 0; +} + +int init_x86rom_cbfs_media(struct cbfs_media *media); +int init_x86rom_cbfs_media(struct cbfs_media *media) { + // On X86, we always keep a reference of pointer to CBFS header in + // 0xfffffffc, and the pointer is still a memory-mapped address. + // Since the CBFS core always use ROM offset, we need to figure out + // header->romsize even before media is initialized. + struct cbfs_header *header = (struct cbfs_header*) + *(uint32_t*)(0xfffffffc); + if (CBFS_HEADER_MAGIC != ntohl(header->magic)) { +#if defined(CONFIG_ROM_SIZE) + printk(BIOS_ERR, "Invalid CBFS master header at %p\n", header); + media->context = (void*)CONFIG_ROM_SIZE; +#else + return -1; +#endif + } else { + uint32_t romsize = ntohl(header->romsize); + media->context = (void*)romsize; +#if defined(CONFIG_ROM_SIZE) + if (CONFIG_ROM_SIZE != romsize) + printk(BIOS_INFO, "Warning: rom size unmatch (%d/%d)\n", + CONFIG_ROM_SIZE, romsize); +#endif + } + media->open = x86_rom_open; + media->close = x86_rom_close; + media->map = x86_rom_map; + media->unmap = x86_rom_unmap; + media->read = x86_rom_read; + return 0; +} + +int init_default_cbfs_media(struct cbfs_media *media) { + return init_x86rom_cbfs_media(media); +} diff --git a/payloads/libpayload/include/cbfs.h b/payloads/libpayload/include/cbfs.h index cf0584e..df3bb1c 100644 --- a/payloads/libpayload/include/cbfs.h +++ b/payloads/libpayload/include/cbfs.h @@ -1,16 +1,92 @@ -#include <arch/types.h> +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2008 Jordan Crouse <jordan(a)cosmicpenguin.net> + * Copyright (C) 2013 Google, Inc. + * + * This file is dual-licensed. You can choose between: + * - The GNU GPL, version 2, as published by the Free Software Foundation + * - The revised BSD license (without advertising clause) + * + * --------------------------------------------------------------------------- + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA + * --------------------------------------------------------------------------- + * 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. + * --------------------------------------------------------------------------- + */ + +#ifndef _CBFS_H_ +#define _CBFS_H_ + +#include <cbfs_core.h> + +/* legacy APIs */ +const struct cbfs_header *get_cbfs_header(void); +struct cbfs_file *cbfs_find(const char *name); +void *cbfs_find_file(const char *name, int type); + +int cbfs_execute_stage(struct cbfs_media *media, const char *name); +void *cbfs_load_optionrom(struct cbfs_media *media, uint16_t vendor, + uint16_t device, void * dest); +void *cbfs_load_payload(struct cbfs_media *media, const char *name); +void *cbfs_load_stage(struct cbfs_media *media, const char *name); + +/* Simple buffer for streaming media. */ +struct cbfs_simple_buffer { + char *buffer; + size_t allocated; + size_t size; + size_t last_allocate; +}; + +void *cbfs_simple_buffer_map(struct cbfs_simple_buffer *buffer, + struct cbfs_media *media, + size_t offset, size_t count); + +void *cbfs_simple_buffer_unmap(struct cbfs_simple_buffer *buffer, + const void *address); + +// Utility functions +int run_address(void *f); + +/* Defined in src/lib/selfboot.c */ +struct lb_memory; +int selfboot(struct lb_memory *mem, struct cbfs_payload *payload); + +/* Defined in individual arch / board implementation. */ +int init_default_cbfs_media(struct cbfs_media *media); -/* FIXME: workaround for coreboot/libpayload Kconfig differences */ -#ifndef CONFIG_ARCH_ARMV7 -#define CONFIG_ARCH_ARMV7 0 -#endif -#ifndef CONFIG_ARCH_POWERPC -#define CONFIG_ARCH_POWERPC 0 -#endif -#ifndef CONFIG_ARCH_X86 -#define CONFIG_ARCH_X86 0 #endif -#include "cbfs_core.h" -void setup_cbfs_from_ram(void* start, uint32_t size); -void setup_cbfs_from_flash(void); diff --git a/payloads/libpayload/include/cbfs_core.h b/payloads/libpayload/include/cbfs_core.h index a3c54b1..81ca866 100644 --- a/payloads/libpayload/include/cbfs_core.h +++ b/payloads/libpayload/include/cbfs_core.h @@ -1,5 +1,5 @@ /* - * This file is part of the coreboot project. + * This file is part of the libpayload project. * * Copyright (C) 2008 Jordan Crouse <jordan(a)cosmicpenguin.net> * Copyright (C) 2012 Google, Inc. @@ -50,6 +50,10 @@ #ifndef _CBFS_CORE_H_ #define _CBFS_CORE_H_ +#include <endian.h> +#include <stddef.h> +#include <stdint.h> + /** These are standard values for the known compression alogrithms that coreboot knows about for stages and payloads. Of course, other CBFS users can use whatever @@ -74,24 +78,18 @@ #define CBFS_COMPONENT_CMOS_DEFAULT 0xaa #define CBFS_COMPONENT_CMOS_LAYOUT 0x01aa - -/** this is the master cbfs header - it need to be - located somewhere in the bootblock. Where it - actually lives is up to coreboot. On x86, a - pointer to this header will live at 0xFFFFFFFC, - so we can easily find it. */ - #define CBFS_HEADER_MAGIC 0x4F524243 -#if CONFIG_ARCH_X86 -#define CBFS_HEADPTR_ADDR 0xFFFFFFFC -#elif CONFIG_ARCH_ARMV7 -/* FIXME: This could also be 0xFFFF0000 with HIVECS enabled */ -#define CBFS_HEADPTR_ADDR 0x0000000C -#endif #define CBFS_HEADER_VERSION1 0x31313131 #define CBFS_HEADER_VERSION2 0x31313132 #define CBFS_HEADER_VERSION CBFS_HEADER_VERSION2 +#define CBFS_HEADER_INVALID_ADDRESS ((void*)(0xffffffff)) + +/** this is the master cbfs header - it need to be located somewhere available + to bootblock (to load romstage). Where it actually lives is up to coreboot. + On x86, a pointer to this header will live at 0xFFFFFFFC. + For other platforms, you need to define CONFIG_CBFS_HEADER_ROM_OFFSET */ + struct cbfs_header { uint32_t magic; uint32_t version; @@ -181,16 +179,49 @@ struct cbfs_optionrom { #define CBFS_NAME(_c) (((char *) (_c)) + sizeof(struct cbfs_file)) #define CBFS_SUBHEADER(_p) ( (void *) ((((uint8_t *) (_p)) + ntohl((_p)->offset))) ) -/* returns pointer to file inside CBFS or NULL */ -struct cbfs_file *cbfs_find(const char *name); +#define CBFS_MEDIA_INVALID_MAP_ADDRESS ((void*)(0xffffffff)) +#define CBFS_DEFAULT_MEDIA ((void*)(0x0)) + +/* Media for CBFS to load files. */ +struct cbfs_media { + + /* implementation dependent context, to hold resource references */ + void *context; -/* returns pointer to file data inside CBFS */ -void *cbfs_get_file(const char *name); + /* opens media and returns 0 on success, -1 on failure */ + int (*open)(struct cbfs_media *media); -/* returns pointer to file data inside CBFS after if type is correct */ -void *cbfs_find_file(const char *name, int type); + /* returns number of bytes read from media into dest, starting from + * offset for count of bytes */ + size_t (*read)(struct cbfs_media *media, void *dest, size_t offset, + size_t count); + + /* returns a pointer to memory with count of bytes from media source + * starting from offset, or CBFS_MEDIA_INVALID_MAP_ADDRESS on failure. + * Note: mapped data can't be free unless unmap is called, even if you + * do close first. */ + void * (*map)(struct cbfs_media *media, size_t offset, size_t count); + + /* returns NULL and releases the memory by address, which was allocated + * by map */ + void * (*unmap)(struct cbfs_media *media, const void *address); + + /* closes media and returns 0 on success, -1 on failure. */ + int (*close)(struct cbfs_media *media); +}; + +/* returns pointer to a file entry inside CBFS or NULL */ +struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name); + +/* returns pointer to file content inside CBFS after if type is correct */ +void *cbfs_get_file_content(struct cbfs_media *media, const char *name, + int type); /* returns 0 on success, -1 on failure */ int cbfs_decompress(int algo, void *src, void *dst, int len); -struct cbfs_header *get_cbfs_header(void); + +/* returns a pointer to CBFS master header, or CBFS_HEADER_INVALID_ADDRESS + * on failure */ +const struct cbfs_header *cbfs_get_header(struct cbfs_media *media); + #endif diff --git a/payloads/libpayload/include/stdint.h b/payloads/libpayload/include/stdint.h index 8e5083e..dd7439d 100644 --- a/payloads/libpayload/include/stdint.h +++ b/payloads/libpayload/include/stdint.h @@ -32,4 +32,5 @@ #include <arch/types.h> typedef unsigned long uintptr_t; +typedef long intptr_t; #endif diff --git a/payloads/libpayload/libcbfs/Makefile.inc b/payloads/libpayload/libcbfs/Makefile.inc index 50f4821..0d3e1ec 100644 --- a/payloads/libpayload/libcbfs/Makefile.inc +++ b/payloads/libpayload/libcbfs/Makefile.inc @@ -28,4 +28,5 @@ ## libcbfs-$(CONFIG_CBFS) += cbfs.c +libcbfs-$(CONFIG_CBFS) += ram_media.c diff --git a/payloads/libpayload/libcbfs/cbfs.c b/payloads/libpayload/libcbfs/cbfs.c index 026b73c..35e48dd 100644 --- a/payloads/libpayload/libcbfs/cbfs.c +++ b/payloads/libpayload/libcbfs/cbfs.c @@ -2,6 +2,7 @@ * This file is part of the libpayload project. * * Copyright (C) 2011 secunet Security Networks AG + * Copyright (C) 2013 Google, Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -26,80 +27,221 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ +#define LIBPAYLOAD + +#ifdef LIBPAYLOAD +# include <libpayload-config.h> +# ifdef CONFIG_LZMA +# include <lzma.h> +# define CBFS_CORE_WITH_LZMA +# endif +# define CBFS_MINI_BUILD +#elif defined(__SMM__) +# define CBFS_MINI_BUILD +#else +# define CBFS_CORE_WITH_LZMA +# include <lib.h> +#endif -#include <endian.h> -#include <stdio.h> -#include <string.h> #include <cbfs.h> +#include <string.h> -#ifdef CONFIG_LZMA -#define CBFS_CORE_WITH_LZMA -#include <lzma.h> +#ifdef LIBPAYLOAD +# include <stdio.h> +# define DEBUG(x...) +# define LOG(x...) printf(x) +# define ERROR(x...) printf(x) +#else +# include <console/console.h> +# define ERROR(x...) printk(BIOS_ERR, "CBFS: " x) +# define LOG(x...) printk(BIOS_INFO, "CBFS: " x) +# if CONFIG_DEBUG_CBFS +# define DEBUG(x...) printk(BIOS_SPEW, "CBFS: " x) +# else +# define DEBUG(x...) +# endif #endif -#define ERROR(x...) printf(x) -#define LOG(x...) - -static uint32_t host_virt_to_phys(void *addr); -static void *host_phys_to_virt(uint32_t addr); +#if defined(CONFIG_CBFS_HEADER_ROM_OFFSET) && (CONFIG_CBFS_HEADER_ROM_OFFSET) +# define CBFS_HEADER_ROM_ADDRESS (CONFIG_CBFS_HEADER_ROM_OFFSET) +#else +// Indirect address: only works on 32bit top-aligned systems. +# define CBFS_HEADER_ROM_ADDRESS (*(uint32_t*)0xfffffffc) +#endif -uint32_t romstart(void); -uint32_t romend(void); +#include "cbfs_core.c" -#include <arch/virtual.h> -static uint32_t host_virt_to_phys(void *addr) +#ifndef __SMM__ +static inline int tohex4(unsigned int c) { - return virt_to_phys(addr); + return (c <= 9) ? (c + '0') : (c - 10 + 'a'); } -static void *host_phys_to_virt(uint32_t addr) +static void tohex16(unsigned int val, char* dest) { - return phys_to_virt(addr); + dest[0] = tohex4(val>>12); + dest[1] = tohex4((val>>8) & 0xf); + dest[2] = tohex4((val>>4) & 0xf); + dest[3] = tohex4(val & 0xf); } -#undef virt_to_phys -#undef phys_to_virt -uint32_t (*virt_to_phys)(void *) = host_virt_to_phys; -void* (*phys_to_virt)(uint32_t) = host_phys_to_virt; +void *cbfs_load_optionrom(struct cbfs_media *media, uint16_t vendor, + uint16_t device, void *dest) +{ + char name[17] = "pciXXXX,XXXX.rom"; + struct cbfs_optionrom *orom; + uint8_t *src; + tohex16(vendor, name+3); + tohex16(device, name+8); -uint32_t _romstart = 0xffffffff; -uint32_t _romend = 0; + orom = (struct cbfs_optionrom *) + cbfs_get_file_content(media, name, CBFS_TYPE_OPTIONROM); -uint32_t romstart(void) -{ - return _romstart; + if (orom == NULL) + return NULL; + + /* They might have specified a dest address. If so, we can decompress. + * If not, there's not much hope of decompressing or relocating the rom. + * in the common case, the expansion rom is uncompressed, we + * pass 0 in for the dest, and all we have to do is find the rom and + * return a pointer to it. + */ + + /* BUG: the cbfstool is (not yet) including a cbfs_optionrom header */ + src = (uint8_t*)orom; // + sizeof(struct cbfs_optionrom); + + if (! dest) + return src; + + if (cbfs_decompress(ntohl(orom->compression), + src, + dest, + ntohl(orom->len))) + return NULL; + + return dest; } -uint32_t romend(void) +void * cbfs_load_stage(struct cbfs_media *media, const char *name) { - return _romend; + struct cbfs_stage *stage = (struct cbfs_stage *) + cbfs_get_file_content(media, name, CBFS_TYPE_STAGE); + /* this is a mess. There is no ntohll. */ + /* for now, assume compatible byte order until we solve this. */ + uint32_t entry; + + if (stage == NULL) + return (void *) -1; + + LOG("loading stage %s @ 0x%x (%d bytes), entry @ 0x%llx\n", + name, + (uint32_t) stage->load, stage->memlen, + stage->entry); + memset((void *) (uint32_t) stage->load, 0, stage->memlen); + + if (cbfs_decompress(stage->compression, + ((unsigned char *) stage) + + sizeof(struct cbfs_stage), + (void *) (uint32_t) stage->load, + stage->len)) + return (void *) -1; + + DEBUG("stage loaded.\n"); + + entry = stage->entry; + // entry = ntohll(stage->entry); + + return (void *) entry; } -#include "cbfs_core.c" +int cbfs_execute_stage(struct cbfs_media *media, const char *name) +{ + struct cbfs_stage *stage = (struct cbfs_stage *) + cbfs_get_file_content(media, name, CBFS_TYPE_STAGE); -static uint32_t ram_cbfs_offset; + if (stage == NULL) + return 1; -static uint32_t ram_virt_to_phys(void *addr) -{ - return (uint32_t)addr - ram_cbfs_offset; + if (ntohl(stage->compression) != CBFS_COMPRESS_NONE) { + LOG("Unable to run %s: Compressed file" + "Not supported for in-place execution\n", name); + return 1; + } + + /* FIXME: This isn't right */ + LOG("run @ %p\n", (void *) ntohl((uint32_t) stage->entry)); + return run_address((void *)(uintptr_t)ntohll(stage->entry)); } -static void *ram_phys_to_virt(uint32_t addr) +void *cbfs_load_payload(struct cbfs_media *media, const char *name) { - return (void*)addr + ram_cbfs_offset; + return (struct cbfs_payload *)cbfs_get_file_content( + media, name, CBFS_TYPE_PAYLOAD); } -void setup_cbfs_from_ram(void* start, uint32_t size) -{ - /* assumes rollover */ - ram_cbfs_offset = (uint32_t)start + size; - virt_to_phys = ram_virt_to_phys; - phys_to_virt = ram_phys_to_virt; +struct cbfs_file *cbfs_find(const char *name) { + return cbfs_get_file(CBFS_DEFAULT_MEDIA, name); +} + +void *cbfs_find_file(const char *name, int type) { + return cbfs_get_file_content(CBFS_DEFAULT_MEDIA, name, type); +} + +const struct cbfs_header *get_cbfs_header(void) { + return cbfs_get_header(CBFS_DEFAULT_MEDIA); } -void setup_cbfs_from_flash(void) +/* Simple buffer */ + +void *cbfs_simple_buffer_map(struct cbfs_simple_buffer *buffer, + struct cbfs_media *media, + size_t offset, size_t count) { + void *address = buffer->buffer + buffer->allocated;; + DEBUG("simple_buffer_map(offset=%d, count=%d): " + "allocated=%d, size=%d, last_allocate=%d\n", + offset, count, buffer->allocated, buffer->size, + buffer->last_allocate); + if (buffer->allocated + count >= buffer->size) + return CBFS_MEDIA_INVALID_MAP_ADDRESS; + if (media->read(media, address, offset, count) != count) { + ERROR("simple_buffer: fail to read %zd bytes from 0x%zx\n", + count, offset); + return CBFS_MEDIA_INVALID_MAP_ADDRESS; + } + buffer->allocated += count; + buffer->last_allocate = count; + return address; +} + +void *cbfs_simple_buffer_unmap(struct cbfs_simple_buffer *buffer, + const void *address) { + // TODO Add simple buffer management so we can free more than last + // allocated one. + DEBUG("simple_buffer_unmap(address=0x%p): " + "allocated=%d, size=%d, last_allocate=%d\n", + address, buffer->allocated, buffer->size, + buffer->last_allocate); + if ((buffer->buffer + buffer->allocated - buffer->last_allocate) == + address) { + buffer->allocated -= buffer->last_allocate; + buffer->last_allocate = 0; + } + return NULL; +} + +/** + * run_address is passed the address of a function taking no parameters and + * jumps to it, returning the result. + * @param f the address to call as a function. + * @return value returned by the function. + */ + +int run_address(void *f) { - virt_to_phys = host_virt_to_phys; - phys_to_virt = host_phys_to_virt; + int (*v) (void); + v = f; + return v(); } + +#endif diff --git a/payloads/libpayload/libcbfs/cbfs_core.c b/payloads/libpayload/libcbfs/cbfs_core.c index 4bf755b..4fecd40 100644 --- a/payloads/libpayload/libcbfs/cbfs_core.c +++ b/payloads/libpayload/libcbfs/cbfs_core.c @@ -2,6 +2,7 @@ * This file is part of the libpayload project. * * Copyright (C) 2011 secunet Security Networks AG + * Copyright (C) 2013 Google, Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -27,119 +28,153 @@ * SUCH DAMAGE. */ -/* The CBFS core requires a couple of #defines or functions to adapt it to the target environment: +/* The CBFS core requires a couple of #defines or functions to adapt it to the + * target environment: * * CBFS_CORE_WITH_LZMA (must be #define) * if defined, ulzma() must exist for decompression of data streams * - * phys_to_virt(x), virt_to_phys(x) - * translate physical addresses to virtual and vice versa - * can be idempotent if no mapping is necessary. + * CBFS_HEADER_ROM_ADDRESS + * ROM address (offset) of CBFS header. Underlying CBFS media may interpret + * it in other way so we call this "address". * * ERROR(x...) * print an error message x (in printf format) * * LOG(x...) - * print a debug message x (in printf format) + * print a message x (in printf format) * - * romstart() - * returns the start address of the ROM image, or 0xffffffff if ROM is - * top-aligned. This is a physical address. + * DEBUG(x...) + * print a debug message x (in printf format) * - * romend() - * returns the highest address of the ROM image + 1, for use if - * romstart() == 0xffffffff. This is a physical address. */ -#include <cbfs_core.h> +#include <cbfs.h> +#include <string.h> - -/* returns pointer to master header or 0xffffffff if not found */ -struct cbfs_header *get_cbfs_header(void) +/* returns a pointer to CBFS master header, or CBFS_HEADER_INVALID_ADDRESS + * on failure */ +const struct cbfs_header *cbfs_get_header(struct cbfs_media *media) { - struct cbfs_header *header; - - /* find header */ - if (romstart() == 0xffffffff) { - header = (struct cbfs_header*)phys_to_virt(*(uint32_t*)phys_to_virt(romend() + CBFS_HEADPTR_ADDR)); - } else { - // FIXME: where's the master header on ARM (our current bottom-aligned platform)? - header = NULL; + const struct cbfs_header *header; + struct cbfs_media default_media; + + if (media == CBFS_DEFAULT_MEDIA) { + media = &default_media; + if (init_default_cbfs_media(media) != 0) { + ERROR("Failed to initializee default media.\n"); + return NULL; + } + } + + media->open(media); + DEBUG("CBFS_HEADER_ROM_ADDRESS: 0x%x/0x%x\n", CBFS_HEADER_ROM_ADDRESS, + CONFIG_ROM_SIZE); + header = media->map(media, CBFS_HEADER_ROM_ADDRESS, sizeof(*header)); + media->close(media); + + if (header == CBFS_MEDIA_INVALID_MAP_ADDRESS) { + ERROR("Failed to load CBFS header from 0x%x\n", + CBFS_HEADER_ROM_ADDRESS); + return CBFS_HEADER_INVALID_ADDRESS; } + if (CBFS_HEADER_MAGIC != ntohl(header->magic)) { - ERROR("Could not find valid CBFS master header at %p: %x vs %x.\n", header, CBFS_HEADER_MAGIC, ntohl(header->magic)); + ERROR("Could not find valid CBFS master header at %x: " + "%x vs %x.\n", CBFS_HEADER_ROM_ADDRESS, CBFS_HEADER_MAGIC, + ntohl(header->magic)); if (header->magic == 0xffffffff) { ERROR("Maybe ROM is not mapped properly?\n"); } - return (void*)0xffffffff; + return CBFS_HEADER_INVALID_ADDRESS; } return header; } -// by must be power-of-two -#define CBFS_ALIGN(val, by) (typeof(val))((uint32_t)(val + by - 1) & (uint32_t)~(by - 1)) -#define CBFS_ALIGN_UP(val, by) CBFS_ALIGN(val + 1, by) - /* public API starts here*/ -struct cbfs_file *cbfs_find(const char *name) +struct cbfs_file *cbfs_get_file(struct cbfs_media *media, const char *name) { - struct cbfs_header *header = get_cbfs_header(); - if (header == (void*)0xffffffff) return NULL; - - LOG("Searching for %s\n", name); - - void *data, *dataend, *origdata; - /* find first entry */ - if (romstart() == 0xffffffff) { - data = (void*)phys_to_virt(romend()) - ntohl(header->romsize) + ntohl(header->offset); - dataend = (void*)phys_to_virt(romend()); - } else { - data = (void*)phys_to_virt(romstart()) + ntohl(header->offset); - dataend = (void*)phys_to_virt(romstart()) + ntohl(header->romsize); - } - dataend -= ntohl(header->bootblocksize); - - int align = ntohl(header->align); - - origdata = data; - while ((data < (dataend - 1)) && (data >= origdata)) { - struct cbfs_file *file = data; - if (memcmp(CBFS_FILE_MAGIC, file->magic, strlen(CBFS_FILE_MAGIC)) != 0) { - // no file header found. corruption? - // proceed in aligned steps to resynchronize - LOG("ERROR: No file header found at %p, attempting to recover by searching for header\n", data); - data = phys_to_virt(CBFS_ALIGN_UP(virt_to_phys(data), align)); - continue; - } - LOG("Check %s\n", CBFS_NAME(file)); - if (strcmp(CBFS_NAME(file), name) == 0) { - return file; - } - void *olddata = data; - data = phys_to_virt(CBFS_ALIGN(virt_to_phys(data) + ntohl(file->len) + ntohl(file->offset), align)); - if (olddata > data) { - LOG("Something is wrong here. File chain moved from %p to %p\n", olddata, data); + const char *file_name; + uint32_t offset, align, romsize, name_len; + const struct cbfs_header *header; + struct cbfs_file file, *file_ptr; + struct cbfs_media default_media; + + if (media == CBFS_DEFAULT_MEDIA) { + media = &default_media; + if (init_default_cbfs_media(media) != 0) { + ERROR("Failed to initializee default media.\n"); return NULL; } } - return NULL; -} - -void *cbfs_get_file(const char *name) -{ - struct cbfs_file *file = cbfs_find(name); - if (file == NULL) { - ERROR("Could not find file '%s'.\n", name); + if (CBFS_HEADER_INVALID_ADDRESS == (header = cbfs_get_header(media))) return NULL; - } - return (void*)CBFS_SUBHEADER(file); + // Logical offset (for source media) of first file. + offset = ntohl(header->offset); + align = ntohl(header->align); + romsize = ntohl(header->romsize); + + // TODO header->romsize seems broken now on ARM. Remove this when it's + // fixed. +#if defined(CONFIG_ARCH_ARMV7) && CONFIG_ARCH_ARMV7 + romsize = CONFIG_ROM_SIZE; +#endif + DEBUG("offset: 0x%x, align: %d, romsize: %d\n", offset, align, romsize); + + LOG("Looking for '%s' starting from 0x%x.\n", name, offset); + media->open(media); + while (offset < romsize && + media->read(media, &file, offset, sizeof(file)) == sizeof(file)) { + if (memcmp(CBFS_FILE_MAGIC, file.magic, + sizeof(file.magic)) != 0) { + uint32_t new_align = align; + if (offset % align) + new_align += align - (offset % align); + ERROR("ERROR: No file header found at 0x%xx - " + "try next aligned address: 0x%x.\n", offset, + offset + new_align); + offset += new_align; + continue; + } + name_len = ntohl(file.offset) - sizeof(file); + DEBUG(" - load entry 0x%x file name (%d bytes)...\n", offset, + name_len); + + // load file name (arbitrary length). + file_name = (const char*)media->map( + media, offset + sizeof(file), name_len); + if (file_name == CBFS_MEDIA_INVALID_MAP_ADDRESS) { + ERROR("ERROR: Failed to get filename: 0x%x.\n", offset); + } else if (strcmp(file_name, name) == 0) { + int file_offset = ntohl(file.offset), + file_len = ntohl(file.len); + LOG("Found file (offset=0x%x, len=%d).\n", + offset + file_offset, file_len); + media->unmap(media, file_name); + file_ptr = media->map(media, offset, + file_offset + file_len); + media->close(media); + return file_ptr; + } else { + LOG(" (unmatched file @0x%x: %s)\n", offset, file_name); + media->unmap(media, file_name); + } + + // Move to next file. + offset += ntohl(file.len) + ntohl(file.offset); + if (offset % align) + offset += align - (offset % align); + } + media->close(media); + ERROR("ERROR: Not found.\n"); + return NULL; } -void *cbfs_find_file(const char *name, int type) +void *cbfs_get_file_content(struct cbfs_media *media, const char *name, int type) { - struct cbfs_file *file = cbfs_find(name); + struct cbfs_file *file = cbfs_get_file(media, name); if (file == NULL) { ERROR("Could not find file '%s'.\n", name); @@ -147,7 +182,8 @@ void *cbfs_find_file(const char *name, int type) } if (ntohl(file->type) != type) { - ERROR("File '%s' is of type %x, but we requested %x.\n", name, ntohl(file->type), type); + ERROR("File '%s' is of type %x, but we requested %x.\n", name, + ntohl(file->type), type); return NULL; } @@ -168,7 +204,9 @@ int cbfs_decompress(int algo, void *src, void *dst, int len) return -1; #endif default: - ERROR("tried to decompress %d bytes with algorithm #%x, but that algorithm id is unsupported.\n", len, algo); + ERROR("tried to decompress %d bytes with algorithm #%x," + "but that algorithm id is unsupported.\n", len, + algo); return -1; } } diff --git a/payloads/libpayload/libcbfs/ram_media.c b/payloads/libpayload/libcbfs/ram_media.c new file mode 100644 index 0000000..87b5292 --- /dev/null +++ b/payloads/libpayload/libcbfs/ram_media.c @@ -0,0 +1,114 @@ +/* + * This file is part of the libpayload project. + * + * Copyright (C) 2013 Google, Inc. + * + * 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 <cbfs.h> +#include <string.h> +#include <stdio.h> +#include <stdlib.h> + +// Implementation of a media source based on given memory buffer. +struct ram_media { + char *start; + size_t size; +}; + +static int ram_open(struct cbfs_media *media) { + return 0; +} + +static void *ram_map(struct cbfs_media *media, size_t offset, size_t count) { + struct ram_media *m = (struct ram_media*)media->context; + if (offset + count >= m->size) { + printf("ERROR: ram_map: request out of range (0x%x+0x%x)\n", + offset, count); + return NULL; + } + return (void*)(m->start + offset); +} + +static void *ram_unmap(struct cbfs_media *media, const void *address) { + return NULL; +} + +static size_t ram_read(struct cbfs_media *media, void *dest, size_t offset, + size_t count) { + void *ptr = ram_map(media, offset, count); + memcpy(dest, ptr, count); + ram_unmap(media, ptr); + return count; +} + +static int ram_close(struct cbfs_media *media) { + return 0; +} + +int init_cbfs_ram_media(struct cbfs_media *media, void *start, size_t size); +int init_cbfs_ram_media(struct cbfs_media *media, void *start, size_t size) { + // TODO Find a way to release unused media. Maybe adding media->destroy. + struct ram_media *m = (struct ram_media*)malloc(sizeof(*m)); + m->start = start; + m->size = size; + media->context = (void*)m; + media->open = ram_open; + media->close = ram_close; + media->map = ram_map; + media->unmap = ram_unmap; + media->read = ram_read; + return 0; +} + +// Legacy setup_cbfs_from_*. +static int is_default_cbfs_media_initialized; +static struct cbfs_media default_cbfs_media; + +int setup_cbfs_from_ram(void *start, uint32_t size); +int setup_cbfs_from_ram(void *start, uint32_t size) { + int result = init_cbfs_ram_media(&default_cbfs_media, start, size); + if (result == 0) + is_default_cbfs_media_initialized = 1; + return result; +} + +extern int libpayload_init_default_cbfs_media(struct cbfs_media *media); +int setup_cbfs_from_flash(void); +int setup_cbfs_from_flash(void) { + int result = libpayload_init_default_cbfs_media(&default_cbfs_media); + if (result == 0) + is_default_cbfs_media_initialized = 1; + return result; +} + +int init_default_cbfs_media(struct cbfs_media *media) { + int result = 0; + if (is_default_cbfs_media_initialized != 1) { + result = setup_cbfs_from_flash(); + } + if (result == 0) + memcpy(media, &default_cbfs_media, sizeof(*media)); + return result; +}

1 0

← Newer
1
...
40
41
42
43
44
45
46
...
79
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

coreboot February 2013