coreboot-gerrit July 2014

coreboot-gerrit@coreboot.org

1 participants
861 discussions

Patch set updated for coreboot: 7ae9403 libpayload: usb: Deep search for endpoint descriptors
by Nico Huber 22 Jul '14

22 Jul '14

Nico Huber (nico.h(a)gmx.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3467 -gerrit commit 7ae94034ef8e81b41151d8817d2a4cfc4119f995 Author: Anton Kochkov <anton.kochkov(a)gmail.com> Date: Fri Jun 14 19:41:48 2013 +0400 libpayload: usb: Deep search for endpoint descriptors This improves searching for endpoint descriptors and skipping non-endpoint interface descriptors. Change-Id: I063c096ab886f9753a9ee59f570fd81ce6f618cb Signed-off-by: Anton Kochkov <anton.kochkov(a)gmail.com> Signed-off-by: Nico Huber <nico.huber(a)secunet.com> --- payloads/libpayload/drivers/usb/usb.c | 54 ++++++++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 11 deletions(-) diff --git a/payloads/libpayload/drivers/usb/usb.c b/payloads/libpayload/drivers/usb/usb.c index 2d9cbe9..6a1d5bb 100644 --- a/payloads/libpayload/drivers/usb/usb.c +++ b/payloads/libpayload/drivers/usb/usb.c @@ -320,6 +320,30 @@ usb_decode_interval(const int speed, const endpoint_type type, const unsigned ch #undef LOG2 } +static const endpoint_descriptor_t * +next_endpoint(const u8 *start, const u8 *const end) +{ + for (start += start[0]; + start < end && start[1] != 0x04 && start[1] != 0x05; + start += start[0]); + if (start < end && start[1] == 0x05) + return (const endpoint_descriptor_t *)start; + else + return NULL; +} + +static const interface_descriptor_t * +next_interface(const u8 *start, const u8 *const end) +{ + for (start += start[0]; + start < end && start[1] != 0x04; + start += start[0]); + if (start < end && start[1] == 0x04) + return (const interface_descriptor_t *)start; + else + return NULL; +} + static int set_address (hci_t *controller, int speed, int hubport, int hubaddr) { @@ -329,6 +353,7 @@ set_address (hci_t *controller, int speed, int hubport, int hubaddr) return -1; } configuration_descriptor_t *cd; + const u8 *cd_end; device_descriptor_t *dd; usbdev_t *dev = controller->devices[adr]; @@ -356,12 +381,12 @@ set_address (hci_t *controller, int speed, int hubport, int hubaddr) dev->configuration = get_descriptor (dev, gen_bmRequestType (device_to_host, standard_type, dev_recp), 2, 0, 0); cd = (configuration_descriptor_t *) dev->configuration; + cd_end = dev->configuration + cd->wTotalLength; interface_descriptor_t *interface = (interface_descriptor_t *) (((char *) cd) + cd->bLength); { int i; int num = cd->bNumInterfaces; - interface_descriptor_t *current = interface; usb_debug ("device has %x interfaces\n", num); if (num > 1) { int interfaces = usb_interface_check(dd->idVendor, dd->idProduct); @@ -382,17 +407,18 @@ set_address (hci_t *controller, int speed, int hubport, int hubaddr) num = (num > 1) ? 1 : num; } } + const interface_descriptor_t *current = + (const interface_descriptor_t *)cd; for (i = 0; i < num; i++) { + current = next_interface((const u8 *)current, cd_end); + if (!current) { + usb_detach_device(controller, adr); + return -1; + } + int j; usb_debug (" #%x has %x endpoints, interface %x:%x, protocol %x\n", current->bInterfaceNumber, current->bNumEndpoints, current->bInterfaceClass, current->bInterfaceSubClass, current->bInterfaceProtocol); - endpoint_descriptor_t *endp = - (endpoint_descriptor_t *) (((char *) current) - + current->bLength); - /* Skip any non-endpoint descriptor */ - if (endp->bDescriptorType != 0x05) - endp = (endpoint_descriptor_t *)(((char *)endp) + ((char *)endp)[0]); - memset (dev->endpoints, 0, sizeof (dev->endpoints)); dev->num_endp = 1; // 0 always exists dev->endpoints[0].dev = dev; @@ -400,7 +426,15 @@ set_address (hci_t *controller, int speed, int hubport, int hubaddr) dev->endpoints[0].direction = SETUP; dev->endpoints[0].type = CONTROL; dev->endpoints[0].interval = 0; + + const endpoint_descriptor_t *endp = + (const endpoint_descriptor_t *)current; for (j = 1; j <= current->bNumEndpoints; j++) { + endp = next_endpoint((const u8 *)endp, cd_end); + if (!endp) { + usb_detach_device(controller, adr); + return -1; + } #ifdef USB_DEBUG static const char *transfertypes[4] = { "control", "isochronous", "bulk", "interrupt" @@ -418,10 +452,8 @@ set_address (hci_t *controller, int speed, int hubport, int hubaddr) 0) ? OUT : IN; ep->type = endp->bmAttributes; ep->interval = usb_decode_interval(dev->speed, ep->type, endp->bInterval); - endp = (endpoint_descriptor_t - *) (((char *) endp) + endp->bLength); } - current = (interface_descriptor_t *) endp; + current = (const interface_descriptor_t *)endp; } }

1 0

Patch merged into coreboot/master: e34a627 src/drivers: Remove a trailing whitespace
by gerrit＠coreboot.org 21 Jul '14

21 Jul '14

the following patch was just integrated into master: commit e34a6275eeebf324e921f8aa06e7c1c9fc0179f8 Author: Elyes HAOUAS <ehaouas(a)noos.fr> Date: Mon Jul 21 08:11:18 2014 +0200 src/drivers: Remove a trailing whitespace Change-Id: If357da5d84a255e0bdf8784d559ee0941045bbd6 Signed-off-by: Elyes HAOUAS <ehaouas(a)noos.fr> Reviewed-on: http://review.coreboot.org/6309 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> See http://review.coreboot.org/6309 for details. -gerrit

1 0

Patch set updated for coreboot: 43673dd x86/smm: Initialize SMM on CPUs one-by-one
by Patrick Georgi 21 Jul '14

21 Jul '14

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6311 -gerrit commit 43673dd4b9c87cd5d44af7caa29e9d3cf06c82f2 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Mon Jul 21 20:58:18 2014 +0200 x86/smm: Initialize SMM on CPUs one-by-one We currently race in SMM init on Atom 230 (and potentially other CPUs). At least on the 230, this leads to a hang on RSM, likely because both hyperthreads mess around with SMBASE and other SMM state variables in parallel without coordination. Change it so first APs are spun up and sent to sleep, then BSP initializes SMM, then every CPU, one after another. Change-Id: I1ae864e37546298ea222e81349c27cf774ed251f Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- src/cpu/x86/lapic/lapic_cpu_init.c | 48 ++++++++++++++++++++++++++++++++++---- 1 file changed, 44 insertions(+), 4 deletions(-) diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c index 09b6b9e..8846470 100644 --- a/src/cpu/x86/lapic/lapic_cpu_init.c +++ b/src/cpu/x86/lapic/lapic_cpu_init.c @@ -463,6 +463,41 @@ static void start_other_cpus(struct bus *cpu_bus, device_t bsp_cpu) } +#if CONFIG_HAVE_SMI_HANDLER && CONFIG_SMP && CONFIG_MAX_CPUS > 1 +static void smm_other_cpus(struct bus *cpu_bus, device_t bsp_cpu) +{ + device_t cpu; + int pre_count = atomic_read(&active_cpus); + + /* Loop through the cpus once to let them run through SMM relocator */ + + for(cpu = cpu_bus->children; cpu ; cpu = cpu->sibling) { + if (cpu->path.type != DEVICE_PATH_APIC) { + continue; + } + + printk(BIOS_ERR, "considering CPU 0x%02x for SMM init\n", + cpu->path.apic.apic_id); + + if (cpu==bsp_cpu) + continue; + + if (!cpu->enabled) { + continue; + } + + if (!start_cpu(cpu)) { + /* Record the error in cpu? */ + printk(BIOS_ERR, "CPU 0x%02x would not start!\n", + cpu->path.apic.apic_id); + } + + /* FIXME: endless loop */ + while (atomic_read(&active_cpus) != pre_count) ; + } +} +#endif + static void wait_other_cpus_stop(struct bus *cpu_bus) { device_t cpu; @@ -531,10 +566,6 @@ void initialize_cpus(struct bus *cpu_bus) copy_secondary_start_to_lowest_1M(); #endif -#if CONFIG_HAVE_SMI_HANDLER - smm_init(); -#endif - #if CONFIG_SMP && CONFIG_MAX_CPUS > 1 /* start all aps at first, so we can init ECC all together */ if (IS_ENABLED(CONFIG_PARALLEL_CPU_INIT)) @@ -551,4 +582,13 @@ void initialize_cpus(struct bus *cpu_bus) /* Now wait the rest of the cpus stop*/ wait_other_cpus_stop(cpu_bus); #endif + +#if CONFIG_HAVE_SMI_HANDLER + /* BSP only, all APs are sleeping */ + smm_init(); +#if CONFIG_SMP && CONFIG_MAX_CPUS > 1 + last_cpu_index = 0; + smm_other_cpus(cpu_bus, info->cpu); +#endif +#endif }

1 0

New patch to review for coreboot: c9abb1d x86/smm: Initialize SMM on CPUs one-by-one
by Patrick Georgi 21 Jul '14

21 Jul '14

Patrick Georgi (patrick(a)georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6311 -gerrit commit c9abb1df5bc6082cef59a0d116df13622f6cba92 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Mon Jul 21 20:58:18 2014 +0200 x86/smm: Initialize SMM on CPUs one-by-one We currently race in SMM init on Atom 230 (and potentially other CPUs). At least on the 230, this leads to a hang on RSM, likely because both hyperthreads mess around with SMBASE and other SMM state variables in parallel without coordination. Change it so first APs are spun up and sent to sleep, then BSP initializes SMM, then every CPU, one after another. Change-Id: I1ae864e37546298ea222e81349c27cf774ed251f Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- src/cpu/x86/lapic/lapic_cpu_init.c | 46 ++++++++++++++++++++++++++++++++++---- 1 file changed, 42 insertions(+), 4 deletions(-) diff --git a/src/cpu/x86/lapic/lapic_cpu_init.c b/src/cpu/x86/lapic/lapic_cpu_init.c index 09b6b9e..35863a1 100644 --- a/src/cpu/x86/lapic/lapic_cpu_init.c +++ b/src/cpu/x86/lapic/lapic_cpu_init.c @@ -463,6 +463,39 @@ static void start_other_cpus(struct bus *cpu_bus, device_t bsp_cpu) } +static void smm_other_cpus(struct bus *cpu_bus, device_t bsp_cpu) +{ + device_t cpu; + int pre_count = atomic_read(&active_cpus); + + /* Loop through the cpus once to let them run through SMM relocator */ + + for(cpu = cpu_bus->children; cpu ; cpu = cpu->sibling) { + if (cpu->path.type != DEVICE_PATH_APIC) { + continue; + } + + printk(BIOS_ERR, "considering CPU 0x%02x for SMM init\n", + cpu->path.apic.apic_id); + + if (cpu==bsp_cpu) + continue; + + if (!cpu->enabled) { + continue; + } + + if (!start_cpu(cpu)) { + /* Record the error in cpu? */ + printk(BIOS_ERR, "CPU 0x%02x would not start!\n", + cpu->path.apic.apic_id); + } + + /* FIXME: endless loop */ + while (atomic_read(&active_cpus) != pre_count) ; + } +} + static void wait_other_cpus_stop(struct bus *cpu_bus) { device_t cpu; @@ -531,10 +564,6 @@ void initialize_cpus(struct bus *cpu_bus) copy_secondary_start_to_lowest_1M(); #endif -#if CONFIG_HAVE_SMI_HANDLER - smm_init(); -#endif - #if CONFIG_SMP && CONFIG_MAX_CPUS > 1 /* start all aps at first, so we can init ECC all together */ if (IS_ENABLED(CONFIG_PARALLEL_CPU_INIT)) @@ -551,4 +580,13 @@ void initialize_cpus(struct bus *cpu_bus) /* Now wait the rest of the cpus stop*/ wait_other_cpus_stop(cpu_bus); #endif + +#if CONFIG_HAVE_SMI_HANDLER + /* BSP only, all APs are sleeping */ + smm_init(); +#if CONFIG_SMP && CONFIG_MAX_CPUS > 1 + last_cpu_index = 0; + smm_other_cpus(cpu_bus, info->cpu); +#endif +#endif }

1 0

Patch merged into coreboot/master: bcd0993 board_status.sh minor fixes - no functional changes
by gerrit＠coreboot.org 21 Jul '14

21 Jul '14

the following patch was just integrated into master: commit bcd09930d8ff78704cb98ad18805788d02687a31 Author: Martin Roth <martin.roth(a)se-eng.com> Date: Thu Jul 10 15:02:19 2014 -0600 board_status.sh minor fixes - no functional changes - Update some comments - Whitespace fixes - change from backticks to $() format for getting command data. Change-Id: Iaf424224abfd30a3581d0e43a1689cc7c887beec Signed-off-by: Martin Roth <martin.roth(a)se-eng.com> Reviewed-on: http://review.coreboot.org/6261 Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> Reviewed-by: Edward O'Callaghan <eocallaghan(a)alterapraxis.com> Reviewed-by: David Hendricks <dhendrix(a)chromium.org> See http://review.coreboot.org/6261 for details. -gerrit

1 0

Patch merged into coreboot/master: 8e0071b board_status.sh: Read coreboot boot log from a serial device
by gerrit＠coreboot.org 21 Jul '14

21 Jul '14

the following patch was just integrated into master: commit 8e0071b7982f5f72cc8e182f8eb5d77248f0b720 Author: Martin Roth <martin.roth(a)se-eng.com> Date: Thu Jul 10 15:00:35 2014 -0600 board_status.sh: Read coreboot boot log from a serial device - Read the boot log from a serial device. Change-Id: I9daf97fd9b7fc55d0d56d815b185f9b4e3ef9f5a Signed-off-by: Martin Roth <martin.roth(a)se-eng.com> Reviewed-on: http://review.coreboot.org/6260 Reviewed-by: Mike Loptien <mike.loptien(a)se-eng.com> Tested-by: build bot (Jenkins) See http://review.coreboot.org/6260 for details. -gerrit

1 0

Patch set updated for coreboot: af8c0d8 board_status.sh: Read coreboot boot log from a serial device
by Martin Roth 21 Jul '14

21 Jul '14

Martin Roth (gaumless(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6260 -gerrit commit af8c0d86e2f4a5aec1f535e3e0f068c103e41770 Author: Martin Roth <martin.roth(a)se-eng.com> Date: Thu Jul 10 15:00:35 2014 -0600 board_status.sh: Read coreboot boot log from a serial device - Read the boot log from a serial device. Change-Id: I9daf97fd9b7fc55d0d56d815b185f9b4e3ef9f5a Signed-off-by: Martin Roth <martin.roth(a)se-eng.com> --- util/board_status/board_status.sh | 68 ++++++++++++++++++++++++++++++++++++--- 1 file changed, 64 insertions(+), 4 deletions(-) diff --git a/util/board_status/board_status.sh b/util/board_status/board_status.sh index 65576f4..6032c8c 100755 --- a/util/board_status/board_status.sh +++ b/util/board_status/board_status.sh @@ -3,6 +3,7 @@ # This file is part of the coreboot project. # # Copyright (C) 2013 Google Inc. +# Copyright (C) 2014 Sage Electronic Engineering, LLC. # EXIT_SUCCESS=0 @@ -12,6 +13,7 @@ EXIT_FAILURE=1 REMOTE_HOST="" CLOBBER_OUTPUT=0 UPLOAD_RESULTS=0 +SERIAL_PORT_SPEED=115200 # Used to specify whether a command should always be run locally or # if command should be run remoteley when a remote host is specified. @@ -96,6 +98,50 @@ cmd_nonfatal() rm -f "$3" # don't leave an empty file } +# read from a serial port device +# +# $1: serial device to read from +# $2: serial port speed +# $3: filename to direct output of command into +get_serial_bootlog () { + + if [ ! -c "$1" ]; then + echo "$1 is not a valid serial device" + exit $EXIT_FAILURE + fi + + # make the text more noticible + test_cmd $LOCAL "tput" $NONFATAL + tput_not_available=$? + if [ $tput_not_available -eq 0 ]; then + tput bold + tput setaf 10 # set bright green + fi + + echo + echo "Waiting to receive boot log from $1" + echo "Press [Enter] when the boot is complete and the" + echo "system is ready for ssh to get the dmesg log." + + if [ $tput_not_available -eq 0 ]; then + tput sgr0 + fi + + # set up the serial port + cmd $LOCAL "stty -F $1 $2 cs8 -cstopb" + + # read from the serial port - user must press enter when complete + test_cmd $LOCAL "tee" + cat "$SERIAL_DEVICE" | tee "$3" & + PID=$! + + read + kill "$PID" 2>/dev/null & + + # remove the binary zero value that gets inserted into the file. + sed -i 's/\x00//' "$3" +} + show_help() { echo "Usage: ${0} <option> @@ -107,12 +153,16 @@ Options Clobber temporary output when finished. Useful for debugging. -r <host> Obtain machine information from remote host (using ssh). + -s </dev/xxx> + Obtain boot log via serial device. + -S <speed> + Set the port speed for the serial device (Default is 115200). -u Upload results to coreboot.org. " } -while getopts "Chr:u" opt; do +while getopts "Chr:s:S:u" opt; do case "$opt" in h) show_help @@ -124,6 +174,12 @@ while getopts "Chr:u" opt; do r) REMOTE_HOST="$OPTARG" ;; + s) + SERIAL_DEVICE="$OPTARG" + ;; + S) + SERIAL_PORT_SPEED="$OPTARG" + ;; u) UPLOAD_RESULTS=1 ;; @@ -170,9 +226,13 @@ printf "Upstream revision: %s\n" $($getrevision -u) >> ${tmpdir}/${results}/revi printf "Upstream URL: %s\n" $($getrevision -U)>> ${tmpdir}/${results}/revision.txt printf "Timestamp: %s\n" "$timestamp" >> ${tmpdir}/${results}/revision.txt -test_cmd $REMOTE "cbmem" -cmd $REMOTE "cbmem -c" "${tmpdir}/${results}/coreboot_console.txt" -cmd_nonfatal $REMOTE "cbmem -t" "${tmpdir}/${results}/coreboot_timestamps.txt" +if [ -z "$SERIAL_DEVICE" ]; then + test_cmd $REMOTE "cbmem" + cmd $REMOTE "cbmem -c" "${tmpdir}/${results}/coreboot_console.txt" + cmd_nonfatal $REMOTE "cbmem -t" "${tmpdir}/${results}/coreboot_timestamps.txt" +else + get_serial_bootlog "$SERIAL_DEVICE" "$SERIAL_PORT_SPEED" "${tmpdir}/${results}/coreboot_console.txt" +fi cmd $REMOTE dmesg "${tmpdir}/${results}/kernel_log.txt"

1 0

Patch merged into coreboot/master: 13c7db8 board_status.sh: name temp dir and print the name
by gerrit＠coreboot.org 21 Jul '14

21 Jul '14

the following patch was just integrated into master: commit 13c7db8fe805e5b535356a7d86df17b81dff5d2a Author: Martin Roth <martin.roth(a)se-eng.com> Date: Thu Jul 10 14:59:11 2014 -0600 board_status.sh: name temp dir and print the name - give a template to the temp dir so they're recognizable. - show the location of the temp files again at the end of the script. Change-Id: Ieb031ee249043697f6a75e42284c23d0b9bad1b3 Signed-off-by: Martin Roth <martin.roth(a)se-eng.com> Reviewed-on: http://review.coreboot.org/6259 Reviewed-by: David Hendricks <dhendrix(a)chromium.org> Tested-by: build bot (Jenkins) See http://review.coreboot.org/6259 for details. -gerrit

1 0

Patch merged into coreboot/master: 2246177 board_status.sh allow cmd() to not save output
by gerrit＠coreboot.org 21 Jul '14

21 Jul '14

the following patch was just integrated into master: commit 224617752b7457c3eb086cb3ad52b468a94a0eb7 Author: Martin Roth <martin.roth(a)se-eng.com> Date: Thu Jul 10 14:57:34 2014 -0600 board_status.sh allow cmd() to not save output - allow for cmd() to be run, but not pipe to a file. Change-Id: I3e1650e421a49a06218e082ceb5a60b7b4808ce8 Signed-off-by: Martin Roth <martin.roth(a)se-eng.com> Reviewed-on: http://review.coreboot.org/6258 Tested-by: build bot (Jenkins) Reviewed-by: David Hendricks <dhendrix(a)chromium.org> See http://review.coreboot.org/6258 for details. -gerrit

1 0

Patch set updated for coreboot: fb4bc15 Re-structuring Payload loading
by Naman Govil 21 Jul '14

21 Jul '14

Naman Govil (namangov(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/6303 -gerrit commit fb4bc154d9855e2af1908d66b7696362eb05a88f Author: Naman Govil <namangov(a)gmail.com> Date: Fri Jul 18 16:20:38 2014 +0530 Re-structuring Payload loading Removing dependency for mapping entire segments for payload loading by segragating segments by reading metadata and then processing them. Change-Id: I87a52cca7f0270cf7575d2bf5133e17fbb6c9470 Signed-off-by: Naman Govil <namangov(a)gmail.com> --- src/include/payload_loader.h | 4 + src/lib/loaders/cbfs_payload_loader.c | 24 +++-- src/lib/loaders/load_and_run_payload.c | 3 - src/lib/selfboot.c | 161 +++++++++++++++++++++------------ 4 files changed, 122 insertions(+), 70 deletions(-) diff --git a/src/include/payload_loader.h b/src/include/payload_loader.h index 7a3f045..cac7d27 100644 --- a/src/include/payload_loader.h +++ b/src/include/payload_loader.h @@ -2,6 +2,7 @@ * This file is part of the coreboot project. * * Copyright (C) 2014 Google Inc. + * Copyright (C) 2014 Naman Govil <namangov(a)gmail.com> * * 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 @@ -21,6 +22,7 @@ #include <stdint.h> #include <stddef.h> +#include <cbfs_core.h> struct buffer_area { void *data; @@ -32,6 +34,8 @@ struct payload { struct buffer_area backing_store; /* Used when payload wants memory coreboot ramstage is running at. */ struct buffer_area bounce; + struct cbfs_media *media; + struct cbfs_file_handle f; void *entry; }; diff --git a/src/lib/loaders/cbfs_payload_loader.c b/src/lib/loaders/cbfs_payload_loader.c index 2c1d179..42f9f33 100644 --- a/src/lib/loaders/cbfs_payload_loader.c +++ b/src/lib/loaders/cbfs_payload_loader.c @@ -2,6 +2,7 @@ * This file is part of the coreboot project. * * Copyright (C) 2014 Google Inc. + * Copyright (C) 2014 Naman Govil <namangov(a)gmail.com> * * 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 @@ -19,21 +20,30 @@ #include <cbfs.h> #include <payload_loader.h> +#include <cbfs_core.h> static int cbfs_locate_payload(struct payload *payload) { - void *buffer; - size_t size; const int type = CBFS_TYPE_PAYLOAD; + struct cbfs_media default_media, *m; + struct cbfs_file_handle fh; + int c; + m = CBFS_DEFAULT_MEDIA; - buffer = cbfs_get_file_content(CBFS_DEFAULT_MEDIA, payload->name, - type, &size); + if (m == CBFS_DEFAULT_MEDIA) { + m = &default_media; + if(init_default_cbfs_media(m) != 0) + return -1; + } - if (buffer == NULL) + c = cbfs_find_file(m, &fh, payload->name, type); + + if (c < 0) return -1; - payload->backing_store.data = buffer; - payload->backing_store.size = size; + + payload->media = CBFS_DEFAULT_MEDIA; + payload->f = fh; return 0; } diff --git a/src/lib/loaders/load_and_run_payload.c b/src/lib/loaders/load_and_run_payload.c index 2204090..0dcecfb 100644 --- a/src/lib/loaders/load_and_run_payload.c +++ b/src/lib/loaders/load_and_run_payload.c @@ -58,9 +58,6 @@ struct payload *payload_load(void) ops->name); continue; } - printk(BIOS_DEBUG, "%s: located payload @ %p, %zu bytes.\n", - ops->name, payload->backing_store.data, - payload->backing_store.size); break; } diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c index 8e9e0de..2390931 100644 --- a/src/lib/selfboot.c +++ b/src/lib/selfboot.c @@ -3,7 +3,7 @@ * * Copyright (C) 2003 Eric W. Biederman <ebiederm(a)xmission.com> * Copyright (C) 2009 Ron Minnich <rminnich(a)gmail.com> - * + * Copyright (C) 2014 Naman Govil <namangov(a)gmail.com> * 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. @@ -28,6 +28,7 @@ #include <lib.h> #include <bootmem.h> #include <payload_loader.h> +#include <cbfs_core.h> /* from ramstage.ld: */ extern unsigned char _ram_seg; @@ -40,9 +41,9 @@ struct segment { struct segment *next; struct segment *prev; unsigned long s_dstaddr; - unsigned long s_srcaddr; unsigned long s_memsz; unsigned long s_filesz; + unsigned long s_offset; int compression; }; @@ -140,7 +141,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) new->s_memsz = len; seg->s_memsz -= len; seg->s_dstaddr += len; - seg->s_srcaddr += len; + seg->s_offset += len; if (seg->s_filesz > len) { new->s_filesz = len; seg->s_filesz -= len; @@ -176,7 +177,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) seg->s_memsz = len; new->s_memsz -= len; new->s_dstaddr += len; - new->s_srcaddr += len; + new->s_offset += len; if (seg->s_filesz > len) { seg->s_filesz = len; new->s_filesz -= len; @@ -217,63 +218,81 @@ static int build_self_segment_list( struct payload *payload, uintptr_t *entry) { struct segment *new; - struct segment *ptr; - struct cbfs_payload_segment *segment, *first_segment; - struct cbfs_payload *cbfs_payload; - cbfs_payload = payload->backing_store.data; + struct cbfs_payload_segment segment; + struct cbfs_media default_media, *media; + unsigned long current_offset; + + media = payload->media; + + if (media == CBFS_DEFAULT_MEDIA) { + media = &default_media; + if (init_default_cbfs_media(media) != 0) { + printk(BIOS_ERR, "Failed to initialize media\n"); + return -1; + } + } + memset(head, 0, sizeof(*head)); head->next = head->prev = head; - first_segment = segment = &cbfs_payload->segments; - while(1) { - printk(BIOS_DEBUG, "Loading segment from rom address 0x%p\n", segment); - switch(segment->type) { + current_offset = payload->f.data_offset; + media->open(media); + + while(media->read(media, &segment, current_offset, sizeof(segment)) + == sizeof(segment)) { + //reading metadata for each payload segment + printk(BIOS_DEBUG, "Forming self_segment_list\n"); + printk(BIOS_DEBUG, "Loading segment from rom address 0x%p\n", &segment); + + segment.compression = ntohl(segment.compression); + segment.offset = ntohl(segment.offset); + segment.load_addr = ntohll(segment.load_addr); + segment.mem_len = ntohl(segment.mem_len); + segment.len = ntohl(segment.len); + + switch(segment.type) { case PAYLOAD_SEGMENT_PARAMS: printk(BIOS_DEBUG, " parameter section (skipped)\n"); - segment++; + current_offset += sizeof(segment); + //going for next segment continue; case PAYLOAD_SEGMENT_CODE: case PAYLOAD_SEGMENT_DATA: printk(BIOS_DEBUG, " %s (compression=%x)\n", - segment->type == PAYLOAD_SEGMENT_CODE ? "code" : "data", - ntohl(segment->compression)); + segment.type == PAYLOAD_SEGMENT_CODE ? "code" : "data", + segment.compression); new = malloc(sizeof(*new)); - new->s_dstaddr = ntohll(segment->load_addr); - new->s_memsz = ntohl(segment->mem_len); - new->compression = ntohl(segment->compression); - - new->s_srcaddr = (uintptr_t) - ((unsigned char *)first_segment) - + ntohl(segment->offset); - new->s_filesz = ntohl(segment->len); - printk(BIOS_DEBUG, " New segment dstaddr 0x%lx memsize 0x%lx srcaddr 0x%lx filesize 0x%lx\n", - new->s_dstaddr, new->s_memsz, new->s_srcaddr, new->s_filesz); + new->s_dstaddr = segment.load_addr; + new->s_memsz = segment.mem_len; + new->compression = segment.compression; + new->s_filesz = segment.len; + new->s_offset = segment.offset; + + printk(BIOS_DEBUG, " New segment dstaddr 0x%lx memsize 0x%lx src_offset 0x%lx filesize 0x%lx\n", + new->s_dstaddr, new->s_memsz, new->s_offset, new->s_filesz); /* Clean up the values */ if (new->s_filesz > new->s_memsz) { new->s_filesz = new->s_memsz; } - printk(BIOS_DEBUG, " (cleaned up) New segment addr 0x%lx size 0x%lx offset 0x%lx filesize 0x%lx\n", - new->s_dstaddr, new->s_memsz, new->s_srcaddr, new->s_filesz); + printk(BIOS_DEBUG, " (cleaned up) New segment addr 0x%lx size 0x%lx src_offset 0x%lx filesize 0x%lx\n", + new->s_dstaddr, new->s_memsz, new->s_offset, new->s_filesz); break; case PAYLOAD_SEGMENT_BSS: - printk(BIOS_DEBUG, " BSS 0x%p (%d byte)\n", (void *) - (intptr_t)ntohll(segment->load_addr), - ntohl(segment->mem_len)); + printk(BIOS_DEBUG, " BSS 0x%p (%d byte)\n", + (void *)(intptr_t)segment.load_addr, segment.mem_len); new = malloc(sizeof(*new)); new->s_filesz = 0; - new->s_srcaddr = (uintptr_t) - ((unsigned char *)first_segment) - + ntohl(segment->offset); - new->s_dstaddr = ntohll(segment->load_addr); - new->s_memsz = ntohl(segment->mem_len); + new->s_offset = segment.offset; + new->s_dstaddr = segment.load_addr; + new->s_memsz = segment.mem_len; break; case PAYLOAD_SEGMENT_ENTRY: printk(BIOS_DEBUG, " Entry Point 0x%p\n", - (void *)(intptr_t)ntohll(segment->load_addr)); - *entry = ntohll(segment->load_addr); + (void *)(intptr_t)segment.load_addr); + *entry = segment.load_addr; /* Per definition, a payload always has the entry point * as last segment. Thus, we use the occurrence of the * entry point as break condition for the loop. @@ -285,26 +304,22 @@ static int build_self_segment_list( /* We found something that we don't know about. Throw * hands into the sky and run away! */ - printk(BIOS_EMERG, "Bad segment type %x\n", segment->type); + printk(BIOS_EMERG, "Bad segment type %x\n", segment.type); return -1; } /* We have found another CODE, DATA or BSS segment */ - segment++; - - /* Find place where to insert our segment */ - for(ptr = head->next; ptr != head; ptr = ptr->next) { - if (new->s_srcaddr < ntohll(segment->load_addr)) - break; - } - - /* Order by stream offset */ - new->next = ptr; - new->prev = ptr->prev; - ptr->prev->next = new; - ptr->prev = new; + /* Everything is accessed in terms of offsets since it is + * not memory mapped */ + current_offset += sizeof(segment); + + /* Insert to the end of the list */ + new->next = head; + new->prev = head->prev; + head->prev->next = new; + head->prev = new; } - + media->close(media); return 1; } @@ -313,8 +328,18 @@ static int load_self_segments( struct payload *payload) { struct segment *ptr; + struct cbfs_media default_media, *media; const unsigned long one_meg = (1UL << 20); unsigned long bounce_high = lb_end; + media = payload->media; + + if (media == CBFS_DEFAULT_MEDIA) { + media = &default_media; + if (init_default_cbfs_media(media) != 0) { + printk(BIOS_ERR, "Failed to initialize media\n"); + return -1; + } + } for(ptr = head->next; ptr != head; ptr = ptr->next) { if (bootmem_region_targets_usable_ram(ptr->s_dstaddr, @@ -362,7 +387,7 @@ static int load_self_segments( payload->bounce.size = bounce_size; for(ptr = head->next; ptr != head; ptr = ptr->next) { - unsigned char *dest, *src; + unsigned char *dest; printk(BIOS_DEBUG, "Loading Segment: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016lx\n", ptr->s_dstaddr, ptr->s_memsz, ptr->s_filesz); @@ -378,7 +403,8 @@ static int load_self_segments( /* Compute the boundaries of the segment */ dest = (unsigned char *)(ptr->s_dstaddr); - src = (unsigned char *)(ptr->s_srcaddr); + int v_read; + void *v_map; /* Copy data from the initial buffer */ if (ptr->s_filesz) { @@ -388,14 +414,30 @@ static int load_self_segments( switch(ptr->compression) { case CBFS_COMPRESS_LZMA: { printk(BIOS_DEBUG, "using LZMA\n"); - len = ulzma(src, dest); + printk(BIOS_DEBUG, "need to map first\n"); + media->open(media); + v_map = media->map(media, payload->f.data_offset + ptr->s_offset, + len); + if (v_map == CBFS_MEDIA_INVALID_MAP_ADDRESS) { + printk(BIOS_ERR, "Failed to map\n"); + return -1; + } + len = ulzma(v_map, dest); + media->close(media); if (!len) /* Decompression Error. */ return 0; break; } case CBFS_COMPRESS_NONE: { - printk(BIOS_DEBUG, "it's not compressed!\n"); - memcpy(dest, src, len); + printk(BIOS_DEBUG, "it's not compressed! hence read directly\n"); + media->open(media); + v_read = media->read(media, dest, payload->f.data_offset + ptr->s_offset, + len); + if (v_read != len) { + printk(BIOS_ERR, "Reading of uncompressed segments not successful\n"); + return -1; + } + media->close(media); break; } default: @@ -404,11 +446,10 @@ static int load_self_segments( } end = dest + ptr->s_memsz; middle = dest + len; - printk(BIOS_SPEW, "[ 0x%08lx, %08lx, 0x%08lx) <- %08lx\n", + printk(BIOS_SPEW, "[ 0x%08lx, %08lx, 0x%08lx ]\n", (unsigned long)dest, (unsigned long)middle, - (unsigned long)end, - (unsigned long)src); + (unsigned long)end); /* Zero the extra bytes between middle & end */ if (middle < end) {

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
87
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit July 2014