coreboot-gerrit November 2013

coreboot-gerrit@coreboot.org

1 participants
856 discussions

New patch to review for coreboot: 85b3fc7 qemu: load acpi tables from fw_cfg.
by Gerd Hoffmann 12 Nov '13

12 Nov '13

Gerd Hoffmann (kraxel(a)redhat.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4040 -gerrit commit 85b3fc7ce5419c3eae86537609c56f89c656db8e Author: Gerd Hoffmann <kraxel(a)redhat.com> Date: Thu Jul 25 15:59:07 2013 +0200 qemu: load acpi tables from fw_cfg. Starting with release 1.7 qemu provides acpi tables via fw_cfg. Main advantage is that new (virtual) hardware which needs acpi support JustWorks[tm] without having to patch & update the firmware (seabios, coreboot, ...) accordingly. So if we find acpi tables in fw_cfg try loading them, otherwise fallback to the builtin acpi tables. Change-Id: I792232829b870ff6ed8414a3007e0af17f6c4223 Signed-off-by: Gerd Hoffmann <kraxel(a)redhat.com> --- src/mainboard/emulation/qemu-i440fx/acpi_tables.c | 6 + src/mainboard/emulation/qemu-i440fx/fw_cfg.c | 187 ++++++++++++++++++++++ src/mainboard/emulation/qemu-i440fx/fw_cfg.h | 1 + src/mainboard/emulation/qemu-q35/acpi_tables.c | 6 + 4 files changed, 200 insertions(+) diff --git a/src/mainboard/emulation/qemu-i440fx/acpi_tables.c b/src/mainboard/emulation/qemu-i440fx/acpi_tables.c index 904fe0f..8be187a 100644 --- a/src/mainboard/emulation/qemu-i440fx/acpi_tables.c +++ b/src/mainboard/emulation/qemu-i440fx/acpi_tables.c @@ -29,6 +29,8 @@ #include <device/pci_ids.h> #include <cpu/x86/msr.h> +#include "fw_cfg.h" + extern const unsigned char AmlCode[]; #if CONFIG_HAVE_ACPI_SLIC unsigned long acpi_create_slic(unsigned long current); @@ -88,6 +90,10 @@ unsigned long write_acpi_tables(unsigned long start) acpi_header_t *ssdt; acpi_header_t *dsdt; + current = fw_cfg_acpi_tables(start); + if (current) + return current; + current = start; /* Align ACPI tables to 16byte */ diff --git a/src/mainboard/emulation/qemu-i440fx/fw_cfg.c b/src/mainboard/emulation/qemu-i440fx/fw_cfg.c index b85a163..03b8dfa 100644 --- a/src/mainboard/emulation/qemu-i440fx/fw_cfg.c +++ b/src/mainboard/emulation/qemu-i440fx/fw_cfg.c @@ -19,6 +19,7 @@ #include <swab.h> #include <console/console.h> #include <arch/io.h> +#include <arch/acpigen.h> #include "fw_cfg.h" #include "fw_cfg_if.h" @@ -116,3 +117,189 @@ int fw_cfg_max_cpus(void) fw_cfg_get(FW_CFG_MAX_CPUS, &max_cpus, sizeof(max_cpus)); return max_cpus; } + +/* ---------------------------------------------------------------------- */ +/* + * Starting with release 1.7 qemu provides acpi tables via fw_cfg. + * Main advantage is that new (virtual) hardware which needs acpi + * support JustWorks[tm] without having to patch & update the firmware + * (seabios, coreboot, ...) accordingly. + * + * Qemu provides a etc/table-loader file with instructions for the + * firmware: + * - A "load" instruction to fetch acpi data from fw_cfg. + * - A "pointer" instruction to patch a pointer. This is needed to + * get table-to-table references right, it is basically a + * primitive dynamic linker for acpi tables. + * - A "checksum" instruction to generate acpi table checksums. + * + * If a etc/table-loader file is found we'll go try loading the acpi + * tables from fw_cfg, otherwise we'll fallback to the acpi tables + * compiled in. + */ + +#define BIOS_LINKER_LOADER_FILESZ 56 + +struct BiosLinkerLoaderEntry { + uint32_t command; + union { + /* + * COMMAND_ALLOCATE - allocate a table from @alloc.file + * subject to @alloc.align alignment (must be power of 2) + * and @alloc.zone (can be HIGH or FSEG) requirements. + * + * Must appear exactly once for each file, and before + * this file is referenced by any other command. + */ + struct { + char file[BIOS_LINKER_LOADER_FILESZ]; + uint32_t align; + uint8_t zone; + } alloc; + + /* + * COMMAND_ADD_POINTER - patch the table (originating from + * @dest_file) at @pointer.offset, by adding a pointer to the table + * originating from @src_file. 1,2,4 or 8 byte unsigned + * addition is used depending on @pointer.size. + */ + struct { + char dest_file[BIOS_LINKER_LOADER_FILESZ]; + char src_file[BIOS_LINKER_LOADER_FILESZ]; + uint32_t offset; + uint8_t size; + } pointer; + + /* + * COMMAND_ADD_CHECKSUM - calculate checksum of the range specified by + * @cksum_start and @cksum_length fields, + * and then add the value at @cksum.offset. + * Checksum simply sums -X for each byte X in the range + * using 8-bit math. + */ + struct { + char file[BIOS_LINKER_LOADER_FILESZ]; + uint32_t offset; + uint32_t start; + uint32_t length; + } cksum; + + /* padding */ + char pad[124]; + }; +} __attribute__((packed)); +typedef struct BiosLinkerLoaderEntry BiosLinkerLoaderEntry; + +enum { + BIOS_LINKER_LOADER_COMMAND_ALLOCATE = 0x1, + BIOS_LINKER_LOADER_COMMAND_ADD_POINTER = 0x2, + BIOS_LINKER_LOADER_COMMAND_ADD_CHECKSUM = 0x3, +}; + +enum { + BIOS_LINKER_LOADER_ALLOC_ZONE_HIGH = 0x1, + BIOS_LINKER_LOADER_ALLOC_ZONE_FSEG = 0x2, +}; + +unsigned long fw_cfg_acpi_tables(unsigned long start) +{ + BiosLinkerLoaderEntry *s; + unsigned long *addrs, current; + uint32_t *ptr4; + uint64_t *ptr8; + int rc, i, j, src, dst, max; + + rc = fw_cfg_check_file("etc/table-loader"); + if (rc < 0) + return 0; + + printk(BIOS_DEBUG, "QEMU: found acpi tables in fw_cfg.\n"); + + max = rc / sizeof(*s); + s = malloc(rc); + addrs = malloc(max * sizeof(*addrs)); + fw_cfg_load_file("etc/table-loader", s); + + current = start; + for (i = 0; i < max && s[i].command != 0; i++) { + switch (s[i].command) { + case BIOS_LINKER_LOADER_COMMAND_ALLOCATE: + current += (s[i].alloc.align-1); + current &= ~(s[i].alloc.align-1); + printk(BIOS_DEBUG, "QEMU: loading \"%s\" to 0x%lx\n", + s[i].alloc.file, current); + + rc = fw_cfg_check_file(s[i].alloc.file); + if (rc < 0) + goto err; + fw_cfg_load_file(s[i].alloc.file, (void*)current); + addrs[i] = current; + current += rc; + break; + + case BIOS_LINKER_LOADER_COMMAND_ADD_POINTER: + src = -1; dst = -1; + for (j = 0; j < i; j++) { + if (s[j].command != BIOS_LINKER_LOADER_COMMAND_ALLOCATE) + continue; + if (strcmp(s[j].alloc.file, s[i].pointer.dest_file) == 0) + dst = j; + if (strcmp(s[j].alloc.file, s[i].pointer.src_file) == 0) + src = j; + } + if (src == -1 || dst == -1) + goto err; + + switch (s[i].pointer.size) { + case 4: + ptr4 = (uint32_t*)(addrs[dst]+s[i].pointer.offset); + *ptr4 += addrs[src]; + break; + + case 8: + ptr8 = (uint64_t*)(addrs[dst]+s[i].pointer.offset); + *ptr8 += addrs[src]; + break; + + default: + printk(BIOS_DEBUG, "QEMU: acpi: FIXME: ptr size %d\n", + s[i].pointer.size); + goto err; + } + break; + + case BIOS_LINKER_LOADER_COMMAND_ADD_CHECKSUM: + dst = -1; + for (j = 0; j < i; j++) { + if (s[j].command != BIOS_LINKER_LOADER_COMMAND_ALLOCATE) + continue; + if (strcmp(s[j].alloc.file, s[i].cksum.file) == 0) + dst = j; + } + if (dst == -1) + goto err; + + ptr4 = (uint32_t*)(addrs[dst]+s[i].cksum.offset); + *ptr4 = 0; + *ptr4 = acpi_checksum((void *)(addrs[dst]+s[i].cksum.start), + s[i].cksum.length); + break; + + default: + printk(BIOS_DEBUG, "QEMU: acpi: unknown script cmd 0x%x @ %p\n", + s[i].command, s+i); + goto err; + }; + } + + printk(BIOS_DEBUG, "QEMU: loaded acpi tables from fw_cfg.\n"); + free(s); + free(addrs); + return ALIGN(current, 16); + +err: + printk(BIOS_DEBUG, "QEMU: loading acpi tables from fw_cfg failed.\n"); + free(s); + free(addrs); + return 0; +} diff --git a/src/mainboard/emulation/qemu-i440fx/fw_cfg.h b/src/mainboard/emulation/qemu-i440fx/fw_cfg.h index 2a10d8b..5ab024f 100644 --- a/src/mainboard/emulation/qemu-i440fx/fw_cfg.h +++ b/src/mainboard/emulation/qemu-i440fx/fw_cfg.h @@ -19,3 +19,4 @@ void fw_cfg_get(int entry, void *dst, int dstlen); int fw_cfg_check_file(const char *name); void fw_cfg_load_file(const char *name, void *dst); int fw_cfg_max_cpus(void); +unsigned long fw_cfg_acpi_tables(unsigned long start); diff --git a/src/mainboard/emulation/qemu-q35/acpi_tables.c b/src/mainboard/emulation/qemu-q35/acpi_tables.c index d894dc1..4e79b2c 100644 --- a/src/mainboard/emulation/qemu-q35/acpi_tables.c +++ b/src/mainboard/emulation/qemu-q35/acpi_tables.c @@ -29,6 +29,8 @@ #include <device/pci_ids.h> #include <cpu/x86/msr.h> +#include "../qemu-i440fx/fw_cfg.h" + extern const unsigned char AmlCode[]; #if CONFIG_HAVE_ACPI_SLIC unsigned long acpi_create_slic(unsigned long current); @@ -238,6 +240,10 @@ unsigned long write_acpi_tables(unsigned long start) acpi_header_t *ssdt; acpi_header_t *dsdt; + current = fw_cfg_acpi_tables(start); + if (current) + return current; + current = start; /* Align ACPI tables to 16byte */

1 0

Patch set updated for coreboot: 4a4c08c Updates to the board status script
by David Hendricks 12 Nov '13

12 Nov '13

David Hendricks (dhendrix(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4039 -gerrit commit 4a4c08c26e4009622a7cf5800ed806c249777820 Author: David Hendricks <dhendrix(a)chromium.org> Date: Mon Nov 11 18:44:05 2013 -0800 Updates to the board status script This is the first major re-work for the board status script. Summary: - Results are placed in a dynamically generated temporary location. This makes it easy to do multiple trial runs and avoids polluting the coreboot directory. - Results are stored in a directory with the following form: <vendor>/<mainboard>/<revision>/<timestamp>/ Vendor and mainboard are obtained from CONFIG_MAINBOARD_DIR so that hierarchy is consistent between coreboot and board-status. - The results directory is used as the commit message. - board-status repository is checked out automatically if results are to be uploaded. TODO: - Add ability to run commands which may fail. Currently we assume any failure should terminate the script, but some commands can be made optional. Successfully uploaded first result to board-status repository. See http://review.coreboot.org/gitweb?p=board-status.git;a=summary . Change-Id: Icba41ccad4e6e6ee829b8092a2459c2d72a3365b Signed-off-by: David Hendricks <dhendrix(a)chromium.org> --- .gitignore | 1 + util/board_status/board_status.sh | 102 ++++++++++++++++++++++++++++---------- 2 files changed, 78 insertions(+), 25 deletions(-) diff --git a/.gitignore b/.gitignore index 1cdabfc..c172244 100644 --- a/.gitignore +++ b/.gitignore @@ -55,6 +55,7 @@ tarballs/ util/*/.dependencies util/*/.test +util/board_status/board-status util/cbfstool/cbfstool util/cbmem/.dependencies util/cbmem/cbmem diff --git a/util/board_status/board_status.sh b/util/board_status/board_status.sh index d2955e0..8221a4d 100644 --- a/util/board_status/board_status.sh +++ b/util/board_status/board_status.sh @@ -7,13 +7,17 @@ EXIT_SUCCESS=0 EXIT_FAILURE=1 -OUTDIR="status" # Stuff from command-line switches REMOTE_HOST="" CLOBBER_OUTPUT=0 UPLOAD_RESULTS=0 +# Used to specify whether a command should always be run locally or +# if command should be run remoteley when a remote host is specified. +LOCAL=0 +REMOTE=1 + show_help() { echo "Usage: ${0} <option> @@ -22,7 +26,7 @@ Options -h Show this message. -c - Clobber output when finished. + Clobber temporary output when finished. Useful when not uploading. -r <host> Obtain machine information from remote host (using ssh). -u @@ -42,7 +46,7 @@ test_cmd() return fi - if [[ $1 -eq 1 && "$REMOTE_HOST" ]]; then + if [[ $1 -eq $REMOTE && -n "$REMOTE_HOST" ]]; then ssh root@${REMOTE_HOST} which "$2" >/dev/null rc=$? else @@ -68,7 +72,7 @@ cmd() return fi - if [[ $1 -eq 1 && -n "$REMOTE_HOST" ]]; then + if [[ $1 -eq $REMOTE && -n "$REMOTE_HOST" ]]; then ssh root@${REMOTE_HOST} "$2" else $2 @@ -100,38 +104,86 @@ while getopts "chr:u" opt; do esac done -if [ -e "$OUTDIR" ]; then - echo "Output directory exists, aborting." +grep -rH 'coreboot.org' .git/config >/dev/null 2>&1 +if [ $? -ne 0 ]; then + echo "Script must be run from root of coreboot directory" exit $EXIT_FAILURE fi -mkdir "$OUTDIR" +# Results will be placed in a tempoary location until we're ready to upload. +# If the user does not wish to upload, results will remain in /tmp. +tmpdir=$(mktemp -d) + +# Obtain board and revision info to form the directory structure: +# <vendor>/<board>/<revision>/<timestamp> +cbfstool_cmd="util/cbfstool/cbfstool" +test_cmd $LOCAL "$cbfstool_cmd" +$cbfstool_cmd build/coreboot.rom extract -n config -f ${tmpdir}/config.txt +mainboard_dir="$(grep CONFIG_MAINBOARD_DIR ${tmpdir}/config.txt | awk -F '"' '{ print $2 }')" +vendor=$(echo "$mainboard_dir" | awk -F '/' '{ print $1 }') +mainboard=$(echo "$mainboard_dir" | awk -F '/' '{ print $2 }') getrevision="util/board_status/getrevision.sh" -test_cmd 0 $getrevision -touch ${OUTDIR}/revision.txt -printf "Local revision: %s\n" $($getrevision -l) >> ${OUTDIR}/revision.txt -printf "Upstream revision: %s\n" $($getrevision -u) >> ${OUTDIR}/revision.txt -printf "Upstream URL: %s\n" $($getrevision -U)>> ${OUTDIR}/revision.txt -printf "Timestamp: %s\n" $($getrevision -t) >> ${OUTDIR}/revision.txt +test_cmd $LOCAL $getrevision +local_version=$($getrevision -l) +timestamp=$($getrevision -t) -cbfstool_cmd="util/cbfstool/cbfstool" -test_cmd 0 "$cbfstool_cmd" -$cbfstool_cmd build/coreboot.rom extract -n config -f ${OUTDIR}/config.txt +results="${vendor}/${mainboard}/${local_version}/${timestamp}" + +echo "Temporarily placing output in ${tmpdir}/${results}" +mkdir -p "${tmpdir}/${results}" + +mv "${tmpdir}/config.txt" "${tmpdir}/${results}" + +touch ${tmpdir}/${results}/revision.txt +printf "Local revision: %s\n" "$local_version" >> ${tmpdir}/${results}/revision.txt +printf "Upstream revision: %s\n" $($getrevision -u) >> ${tmpdir}/${results}/revision.txt +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 -test_cmd 1 "cbmem" -cmd 1 "cbmem -c" > ${OUTDIR}/coreboot_console.txt -cmd 1 "cbmem -t" > ${OUTDIR}/coreboot_timestamps.txt -cmd 1 "cbmem -C" > ${OUTDIR}/coreboot_coverage.txt +# TODO: Some commands should be optional and be non-fatal in case of error. +#cmd $REMOTE "cbmem -t" > ${outdir}/coreboot_timestamps.txt -cmd 1 dmesg > ${OUTDIR}/kernel_log.txt +cmd $REMOTE dmesg > ${tmpdir}/${results}/kernel_log.txt -#if [ $UPLOAD_RESULTS -eq 1 ]; then -# FIXME: implement this part -#fi +# FIXME: the board-status directory might get big over time. Is there a way we +# can push the results without fetching the whole repo? +coreboot_dir=`pwd` +if [ $UPLOAD_RESULTS -eq 1 ]; then + # extract username from ssh://<username>@review.coreboot.org/blah + username=$(git config --get remote.origin.url | sed 's/ssh\:\/\///' | sed 's/@.*//') + + cd "util/status/" + if [ ! -e "board-status" ]; then + git clone "ssh://${username}@review.coreboot.org:29418/board-status" + if [ $? -ne 0 ]; then + "Error cloning board-status repo, aborting." + exit $EXIT_FAILURE + fi + fi + + cd "board-status" + echo "Copying results to $(pwd)/${results}" + + # Note: Result directory should be unique due to the timestamp. + cp -R "${tmpdir}/${vendor}" . + + echo "Uploading results" + git add "${vendor}" + git commit -a -am "${mainboard_dir}/${local_version}/${timestamp}" + git push origin + + # Results have been uploaded so it's pointless to keep the + # temporary files around. + rm -rf "${tmpdir}" +fi +cd "$coreboot_dir" if [ $CLOBBER_OUTPUT -eq 1 ]; then - rm -rf ${OUTDIR} + rm -rf ${tmpdir} fi exit $EXIT_SUCCESS

1 0

Patch set updated for coreboot: 31a0eb1 Updates to the board status script
by David Hendricks 12 Nov '13

12 Nov '13

David Hendricks (dhendrix(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4039 -gerrit commit 31a0eb1f40d37492324922d6d59e94506c7bd140 Author: David Hendricks <dhendrix(a)chromium.org> Date: Mon Nov 11 18:44:05 2013 -0800 Updates to the board status script This is the first major re-work for the board status script. Summary: - Results are placed in a dynamically generated temporary location. This makes it easy to do multiple trial runs and avoids polluting the coreboot directory. - Results are stored in a directory with the following form: <vendor>/<mainboard>/<revision>/<timestamp>/ Vendor and mainboard are obtained from CONFIG_MAINBOARD_DIR so that hierarchy is consistent between coreboot and board-status. - The results directory is used as the commit message. - board-status repository is checked out automatically if results are to be uploaded. TODO: - Add ability to run commands which may fail. Currently we assume any failure should terminate the script, but some commands can be made optional. Successfully uploaded first result to board-status repository. See http://review.coreboot.org/gitweb?p=board-status.git;a=summary . Change-Id: Icba41ccad4e6e6ee829b8092a2459c2d72a3365b Signed-off-by: David Hendricks <dhendrix(a)chromium.org> --- .gitignore | 1 + util/board_status/board_status.sh | 98 ++++++++++++++++++++++++++++++--------- 2 files changed, 76 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 1cdabfc..c172244 100644 --- a/.gitignore +++ b/.gitignore @@ -55,6 +55,7 @@ tarballs/ util/*/.dependencies util/*/.test +util/board_status/board-status util/cbfstool/cbfstool util/cbmem/.dependencies util/cbmem/cbmem diff --git a/util/board_status/board_status.sh b/util/board_status/board_status.sh index d2955e0..d22c2a1 100644 --- a/util/board_status/board_status.sh +++ b/util/board_status/board_status.sh @@ -7,13 +7,17 @@ EXIT_SUCCESS=0 EXIT_FAILURE=1 -OUTDIR="status" # Stuff from command-line switches REMOTE_HOST="" CLOBBER_OUTPUT=0 UPLOAD_RESULTS=0 +# Used to specify whether a command should always be run locally or +# if command should be run remoteley when a remote host is specified. +LOCAL=0 +REMOTE=1 + show_help() { echo "Usage: ${0} <option> @@ -22,7 +26,7 @@ Options -h Show this message. -c - Clobber output when finished. + Clobber temporary output when finished. Useful when not uploading. -r <host> Obtain machine information from remote host (using ssh). -u @@ -100,38 +104,86 @@ while getopts "chr:u" opt; do esac done -if [ -e "$OUTDIR" ]; then - echo "Output directory exists, aborting." +grep -rH 'coreboot.org' .git/config >/dev/null 2>&1 +if [ $? -ne 0 ]; then + echo "Script must be run from root of coreboot directory" exit $EXIT_FAILURE fi -mkdir "$OUTDIR" +# Results will be placed in a tempoary location until we're ready to upload. +# If the user does not wish to upload, results will remain in /tmp. +tmpdir=$(mktemp -d) + +# Obtain board and revision info to form the directory structure: +# <vendor>/<board>/<revision>/<timestamp> +cbfstool_cmd="util/cbfstool/cbfstool" +test_cmd $LOCAL "$cbfstool_cmd" +$cbfstool_cmd build/coreboot.rom extract -n config -f ${tmpdir}/config.txt +mainboard_dir="$(grep CONFIG_MAINBOARD_DIR ${tmpdir}/config.txt | awk -F '"' '{ print $2 }')" +vendor=$(echo "$mainboard_dir" | awk -F '/' '{ print $1 }') +mainboard=$(echo "$mainboard_dir" | awk -F '/' '{ print $2 }') getrevision="util/board_status/getrevision.sh" -test_cmd 0 $getrevision -touch ${OUTDIR}/revision.txt -printf "Local revision: %s\n" $($getrevision -l) >> ${OUTDIR}/revision.txt -printf "Upstream revision: %s\n" $($getrevision -u) >> ${OUTDIR}/revision.txt -printf "Upstream URL: %s\n" $($getrevision -U)>> ${OUTDIR}/revision.txt -printf "Timestamp: %s\n" $($getrevision -t) >> ${OUTDIR}/revision.txt +test_cmd $LOCAL $getrevision +local_version=$($getrevision -l) +timestamp=$($getrevision -t) -cbfstool_cmd="util/cbfstool/cbfstool" -test_cmd 0 "$cbfstool_cmd" -$cbfstool_cmd build/coreboot.rom extract -n config -f ${OUTDIR}/config.txt +results="${vendor}/${mainboard}/${local_version}/${timestamp}" + +echo "Temporarily placing output in ${tmpdir}/${results}" +mkdir -p "${tmpdir}/${results}" + +mv "${tmpdir}/config.txt" "${tmpdir}/${results}" + +touch ${tmpdir}/${results}/revision.txt +printf "Local revision: %s\n" "$local_version" >> ${tmpdir}/${results}/revision.txt +printf "Upstream revision: %s\n" $($getrevision -u) >> ${tmpdir}/${results}/revision.txt +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 -test_cmd 1 "cbmem" -cmd 1 "cbmem -c" > ${OUTDIR}/coreboot_console.txt -cmd 1 "cbmem -t" > ${OUTDIR}/coreboot_timestamps.txt -cmd 1 "cbmem -C" > ${OUTDIR}/coreboot_coverage.txt +# TODO: Some commands should be optional and be non-fatal in case of error. +#cmd $REMOTE "cbmem -t" > ${outdir}/coreboot_timestamps.txt -cmd 1 dmesg > ${OUTDIR}/kernel_log.txt +cmd $REMOTE dmesg > ${tmpdir}/${results}/kernel_log.txt -#if [ $UPLOAD_RESULTS -eq 1 ]; then -# FIXME: implement this part -#fi +# FIXME: the board-status directory might get big over time. Is there a way we +# can push the results without fetching the whole repo? +coreboot_dir=`pwd` +if [ $UPLOAD_RESULTS -eq 1 ]; then + # extract username from ssh://<username>@review.coreboot.org/blah + username=$(git config --get remote.origin.url | sed 's/ssh\:\/\///' | sed 's/@.*//') + + cd "util/status/" + if [ ! -e "board-status" ]; then + git clone "ssh://${username}@review.coreboot.org:29418/board-status" + if [ $? -ne 0 ]; then + "Error cloning board-status repo, aborting." + exit $EXIT_FAILURE + fi + fi + + cd "board-status" + echo "Copying results to $(pwd)/${results}" + + # Note: Result directory should be unique due to the timestamp. + cp -R "${tmpdir}/${vendor}" . + + echo "Uploading results" + git add "${vendor}" + git commit -a -am "${mainboard_dir}/${local_version}/${timestamp}" + git push origin + + # Results have been uploaded so it's pointless to keep the + # temporary files around. + rm -rf "${tmpdir}" +fi +cd "$coreboot_dir" if [ $CLOBBER_OUTPUT -eq 1 ]; then - rm -rf ${OUTDIR} + rm -rf ${tmpdir} fi exit $EXIT_SUCCESS

1 0

Patch set updated for coreboot: 40800fd Updates to the board status script
by David Hendricks 12 Nov '13

12 Nov '13

David Hendricks (dhendrix(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4039 -gerrit commit 40800fdbd76d0a726eed0ee674fd6e95e2b4418d Author: David Hendricks <dhendrix(a)chromium.org> Date: Mon Nov 11 18:44:05 2013 -0800 Updates to the board status script This is the first major re-work for the board status script. Summary: - Results are placed in a dynamically generated temporary location. This makes it easy to do multiple trial runs and avoids polluting the coreboot directory. - Results directory has the following form: <vendor>/<mainboard>/<revision>/<timestamp> Vendor and mainboard are obtained from CONFIG_MAINBOARD_DIR so that hierarchy is consistent between coreboot and board-status. - The results directory is used as the commit message. - board-status repository is checked out automatically if results are to be uploaded. TODO: - Add ability to run commands which may fail. Currently we assume any failure should terminate the script, but some commands can be made optional. Successfully uploaded first result to board-status repository. See http://review.coreboot.org/gitweb?p=board-status.git;a=summary . Change-Id: Icba41ccad4e6e6ee829b8092a2459c2d72a3365b Signed-off-by: David Hendricks <dhendrix(a)chromium.org> --- .gitignore | 1 + util/board_status/board_status.sh | 98 ++++++++++++++++++++++++++++++--------- 2 files changed, 76 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 1cdabfc..c172244 100644 --- a/.gitignore +++ b/.gitignore @@ -55,6 +55,7 @@ tarballs/ util/*/.dependencies util/*/.test +util/board_status/board-status util/cbfstool/cbfstool util/cbmem/.dependencies util/cbmem/cbmem diff --git a/util/board_status/board_status.sh b/util/board_status/board_status.sh index d2955e0..1845e95 100644 --- a/util/board_status/board_status.sh +++ b/util/board_status/board_status.sh @@ -7,13 +7,17 @@ EXIT_SUCCESS=0 EXIT_FAILURE=1 -OUTDIR="status" # Stuff from command-line switches REMOTE_HOST="" CLOBBER_OUTPUT=0 UPLOAD_RESULTS=0 +# Used to specify whether a command should always be run locally or +# if command should be run remoteley when a remote host is specified. +LOCAL=0 +REMOTE=1 + show_help() { echo "Usage: ${0} <option> @@ -22,7 +26,7 @@ Options -h Show this message. -c - Clobber output when finished. + Clobber temporary output when finished. Useful when not uploading. -r <host> Obtain machine information from remote host (using ssh). -u @@ -100,38 +104,86 @@ while getopts "chr:u" opt; do esac done -if [ -e "$OUTDIR" ]; then - echo "Output directory exists, aborting." +grep -rH 'coreboot.org' .git/config >/dev/null 2>&1 +if [ $? -ne 0 ]; then + echo "Script must be run from root of coreboot directory" exit $EXIT_FAILURE fi -mkdir "$OUTDIR" +# Results will be placed in a tempoary location until we're ready to upload. +# If the user does not wish to upload, results will remain in /tmp. +tmpdir=$(mktemp -d) + +# Obtain board and revision info to form the directory structure: +# <vendor>/<board>/<revision>/<timestamp> +cbfstool_cmd="util/cbfstool/cbfstool" +test_cmd $LOCAL "$cbfstool_cmd" +$cbfstool_cmd build/coreboot.rom extract -n config -f ${tmpdir}/config.txt +mainboard_dir="$(grep CONFIG_MAINBOARD_DIR ${tmpdir}/config.txt | awk -F '"' '{ print $2 }')" +vendor=$(echo "$mainboard_dir" | awk -F '/' '{ print $1 }') +mainboard=$(echo "$mainboard_dir" | awk -F '/' '{ print $2 }') getrevision="util/board_status/getrevision.sh" -test_cmd 0 $getrevision -touch ${OUTDIR}/revision.txt -printf "Local revision: %s\n" $($getrevision -l) >> ${OUTDIR}/revision.txt -printf "Upstream revision: %s\n" $($getrevision -u) >> ${OUTDIR}/revision.txt -printf "Upstream URL: %s\n" $($getrevision -U)>> ${OUTDIR}/revision.txt -printf "Timestamp: %s\n" $($getrevision -t) >> ${OUTDIR}/revision.txt +test_cmd $LOCAL $getrevision +local_version=$($getrevision -l) +timestamp=$($getrevision -t) -cbfstool_cmd="util/cbfstool/cbfstool" -test_cmd 0 "$cbfstool_cmd" -$cbfstool_cmd build/coreboot.rom extract -n config -f ${OUTDIR}/config.txt +results="${vendor}/${mainboard}/${local_version}/${timestamp}" + +echo "Temporarily placing output in ${tmpdir}/${results}" +mkdir -p "${tmpdir}/${results}" + +mv "${tmpdir}/config.txt" "${tmpdir}/${results}" + +touch ${tmpdir}/${results}/revision.txt +printf "Local revision: %s\n" "$local_version" >> ${tmpdir}/${results}/revision.txt +printf "Upstream revision: %s\n" $($getrevision -u) >> ${tmpdir}/${results}/revision.txt +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 -test_cmd 1 "cbmem" -cmd 1 "cbmem -c" > ${OUTDIR}/coreboot_console.txt -cmd 1 "cbmem -t" > ${OUTDIR}/coreboot_timestamps.txt -cmd 1 "cbmem -C" > ${OUTDIR}/coreboot_coverage.txt +# TODO: Some commands should be optional and be non-fatal in case of error. +#cmd $REMOTE "cbmem -t" > ${outdir}/coreboot_timestamps.txt -cmd 1 dmesg > ${OUTDIR}/kernel_log.txt +cmd $REMOTE dmesg > ${tmpdir}/${results}/kernel_log.txt -#if [ $UPLOAD_RESULTS -eq 1 ]; then -# FIXME: implement this part -#fi +# FIXME: the board-status directory might get big over time. Is there a way we +# can push the results without fetching the whole repo? +coreboot_dir=`pwd` +if [ $UPLOAD_RESULTS -eq 1 ]; then + # extract username from ssh://<username>@review.coreboot.org/blah + username=$(git config --get remote.origin.url | sed 's/ssh\:\/\///' | sed 's/@.*//') + + cd "util/status/" + if [ ! -e "board-status" ]; then + git clone "ssh://${username}@review.coreboot.org:29418/board-status" + if [ $? -ne 0 ]; then + "Error cloning board-status repo, aborting." + exit $EXIT_FAILURE + fi + fi + + cd "board-status" + echo "Copying results to $(pwd)/${results}" + + # Note: Result directory should be unique due to the timestamp. + cp -R "${tmpdir}/${vendor}" . + + echo "Uploading results" + git add "${vendor}" + git commit -a -am "${mainboard_dir}/${local_version}/${timestamp}" + git push origin + + # Results have been uploaded so it's pointless to keep the + # temporary files around. + rm -rf "${tmpdir}" +fi +cd "$coreboot_dir" if [ $CLOBBER_OUTPUT -eq 1 ]; then - rm -rf ${OUTDIR} + rm -rf ${tmpdir} fi exit $EXIT_SUCCESS

1 0

New patch to review for coreboot: ad28462 Updates to the board status script
by David Hendricks 12 Nov '13

12 Nov '13

David Hendricks (dhendrix(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4039 -gerrit commit ad2846292e1307ecec05ea32be4f62e01a531fee Author: David Hendricks <dhendrix(a)chromium.org> Date: Mon Nov 11 18:44:05 2013 -0800 Updates to the board status script This is the first major re-work for the board status script. Summary: - Results are placed in a dynamically generated temporary location. This makes it easy to do multiple trial runs and avoids polluting the coreboot directory. - Results are stored in the following form: <vendor>/<mainboard>/<revision>/<timestamp> Vendor and mainboard are obtained from CONFIG_MAINBOARD_DIR so that hierarchy is consistent between coreboot and board-status. - board-status repository is checked out automatically if results are to be uploaded. TODO: - Add ability to run commands which may fail. Currently we assume any failure should terminate the script, but some commands can be made optional. Successfully uploaded first result to board-status repository. See http://review.coreboot.org/gitweb?p=board-status.git;a=summary . Change-Id: Icba41ccad4e6e6ee829b8092a2459c2d72a3365b Signed-off-by: David Hendricks <dhendrix(a)chromium.org> --- .gitignore | 1 + util/board_status/board_status.sh | 98 ++++++++++++++++++++++++++++++--------- 2 files changed, 76 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index 1cdabfc..c172244 100644 --- a/.gitignore +++ b/.gitignore @@ -55,6 +55,7 @@ tarballs/ util/*/.dependencies util/*/.test +util/board_status/board-status util/cbfstool/cbfstool util/cbmem/.dependencies util/cbmem/cbmem diff --git a/util/board_status/board_status.sh b/util/board_status/board_status.sh index d2955e0..1845e95 100644 --- a/util/board_status/board_status.sh +++ b/util/board_status/board_status.sh @@ -7,13 +7,17 @@ EXIT_SUCCESS=0 EXIT_FAILURE=1 -OUTDIR="status" # Stuff from command-line switches REMOTE_HOST="" CLOBBER_OUTPUT=0 UPLOAD_RESULTS=0 +# Used to specify whether a command should always be run locally or +# if command should be run remoteley when a remote host is specified. +LOCAL=0 +REMOTE=1 + show_help() { echo "Usage: ${0} <option> @@ -22,7 +26,7 @@ Options -h Show this message. -c - Clobber output when finished. + Clobber temporary output when finished. Useful when not uploading. -r <host> Obtain machine information from remote host (using ssh). -u @@ -100,38 +104,86 @@ while getopts "chr:u" opt; do esac done -if [ -e "$OUTDIR" ]; then - echo "Output directory exists, aborting." +grep -rH 'coreboot.org' .git/config >/dev/null 2>&1 +if [ $? -ne 0 ]; then + echo "Script must be run from root of coreboot directory" exit $EXIT_FAILURE fi -mkdir "$OUTDIR" +# Results will be placed in a tempoary location until we're ready to upload. +# If the user does not wish to upload, results will remain in /tmp. +tmpdir=$(mktemp -d) + +# Obtain board and revision info to form the directory structure: +# <vendor>/<board>/<revision>/<timestamp> +cbfstool_cmd="util/cbfstool/cbfstool" +test_cmd $LOCAL "$cbfstool_cmd" +$cbfstool_cmd build/coreboot.rom extract -n config -f ${tmpdir}/config.txt +mainboard_dir="$(grep CONFIG_MAINBOARD_DIR ${tmpdir}/config.txt | awk -F '"' '{ print $2 }')" +vendor=$(echo "$mainboard_dir" | awk -F '/' '{ print $1 }') +mainboard=$(echo "$mainboard_dir" | awk -F '/' '{ print $2 }') getrevision="util/board_status/getrevision.sh" -test_cmd 0 $getrevision -touch ${OUTDIR}/revision.txt -printf "Local revision: %s\n" $($getrevision -l) >> ${OUTDIR}/revision.txt -printf "Upstream revision: %s\n" $($getrevision -u) >> ${OUTDIR}/revision.txt -printf "Upstream URL: %s\n" $($getrevision -U)>> ${OUTDIR}/revision.txt -printf "Timestamp: %s\n" $($getrevision -t) >> ${OUTDIR}/revision.txt +test_cmd $LOCAL $getrevision +local_version=$($getrevision -l) +timestamp=$($getrevision -t) -cbfstool_cmd="util/cbfstool/cbfstool" -test_cmd 0 "$cbfstool_cmd" -$cbfstool_cmd build/coreboot.rom extract -n config -f ${OUTDIR}/config.txt +results="${vendor}/${mainboard}/${local_version}/${timestamp}" + +echo "Temporarily placing output in ${tmpdir}/${results}" +mkdir -p "${tmpdir}/${results}" + +mv "${tmpdir}/config.txt" "${tmpdir}/${results}" + +touch ${tmpdir}/${results}/revision.txt +printf "Local revision: %s\n" "$local_version" >> ${tmpdir}/${results}/revision.txt +printf "Upstream revision: %s\n" $($getrevision -u) >> ${tmpdir}/${results}/revision.txt +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 -test_cmd 1 "cbmem" -cmd 1 "cbmem -c" > ${OUTDIR}/coreboot_console.txt -cmd 1 "cbmem -t" > ${OUTDIR}/coreboot_timestamps.txt -cmd 1 "cbmem -C" > ${OUTDIR}/coreboot_coverage.txt +# TODO: Some commands should be optional and be non-fatal in case of error. +#cmd $REMOTE "cbmem -t" > ${outdir}/coreboot_timestamps.txt -cmd 1 dmesg > ${OUTDIR}/kernel_log.txt +cmd $REMOTE dmesg > ${tmpdir}/${results}/kernel_log.txt -#if [ $UPLOAD_RESULTS -eq 1 ]; then -# FIXME: implement this part -#fi +# FIXME: the board-status directory might get big over time. Is there a way we +# can push the results without fetching the whole repo? +coreboot_dir=`pwd` +if [ $UPLOAD_RESULTS -eq 1 ]; then + # extract username from ssh://<username>@review.coreboot.org/blah + username=$(git config --get remote.origin.url | sed 's/ssh\:\/\///' | sed 's/@.*//') + + cd "util/status/" + if [ ! -e "board-status" ]; then + git clone "ssh://${username}@review.coreboot.org:29418/board-status" + if [ $? -ne 0 ]; then + "Error cloning board-status repo, aborting." + exit $EXIT_FAILURE + fi + fi + + cd "board-status" + echo "Copying results to $(pwd)/${results}" + + # Note: Result directory should be unique due to the timestamp. + cp -R "${tmpdir}/${vendor}" . + + echo "Uploading results" + git add "${vendor}" + git commit -a -am "${mainboard_dir}/${local_version}/${timestamp}" + git push origin + + # Results have been uploaded so it's pointless to keep the + # temporary files around. + rm -rf "${tmpdir}" +fi +cd "$coreboot_dir" if [ $CLOBBER_OUTPUT -eq 1 ]; then - rm -rf ${OUTDIR} + rm -rf ${tmpdir} fi exit $EXIT_SUCCESS

1 0

New patch to review for coreboot: 84998dc rename status-related stuff to board_status
by David Hendricks 12 Nov '13

12 Nov '13

David Hendricks (dhendrix(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4038 -gerrit commit 84998dc8327dcfc87738c594d62767e0b0947214 Author: David Hendricks <dhendrix(a)chromium.org> Date: Mon Nov 11 18:43:39 2013 -0800 rename status-related stuff to board_status This just moves stuff to be more clear about the purpose of the script. Other suggestions are welcome. Change-Id: Ic6095fd4eb347daa5a03eff21b5952d2d42a6bfd Signed-off-by: David Hendricks <dhendrix(a)chromium.org> --- util/board_status/board_status.sh | 137 +++++++++++++++++++++++ util/board_status/getrevision.sh | 228 ++++++++++++++++++++++++++++++++++++++ util/status/getrevision.sh | 228 -------------------------------------- util/status/status.sh | 137 ----------------------- 4 files changed, 365 insertions(+), 365 deletions(-) diff --git a/util/board_status/board_status.sh b/util/board_status/board_status.sh new file mode 100644 index 0000000..d2955e0 --- /dev/null +++ b/util/board_status/board_status.sh @@ -0,0 +1,137 @@ +#!/bin/sh +# +# This file is part of the coreboot project. +# +# Copyright (C) 2013 Google Inc. +# + +EXIT_SUCCESS=0 +EXIT_FAILURE=1 +OUTDIR="status" + +# Stuff from command-line switches +REMOTE_HOST="" +CLOBBER_OUTPUT=0 +UPLOAD_RESULTS=0 + +show_help() { + echo "Usage: + ${0} <option> + +Options + -h + Show this message. + -c + Clobber output when finished. + -r <host> + Obtain machine information from remote host (using ssh). + -u + Upload results to coreboot.org. +" +} + +# test a command +# +# $1: test command on remote host (0=no, 1=yes) +# $2: command to test +test_cmd() +{ + local rc + + if [ -e "$2" ]; then + return + fi + + if [[ $1 -eq 1 && "$REMOTE_HOST" ]]; then + ssh root@${REMOTE_HOST} which "$2" >/dev/null + rc=$? + else + which "$2" >/dev/null + rc=$? + fi + + if [ $rc -eq 0 ]; then + return + fi + + echo "$2 not found" + exit $EXIT_FAILURE +} + +# run a command +# +# $1: 0 to run command locally, 1 to run remotely if remote host defined +# $2: command +cmd() +{ + if [ -e "$2" ]; then + return + fi + + if [[ $1 -eq 1 && -n "$REMOTE_HOST" ]]; then + ssh root@${REMOTE_HOST} "$2" + else + $2 + fi + + if [ $? -eq 0 ]; then + return + fi + + echo "Failed to run command: $2" + exit $EXIT_FAILURE +} + +while getopts "chr:u" opt; do + case "$opt" in + h) + show_help + exit $EXIT_SUCCESS + ;; + c) + CLOBBER_OUTPUT=1 + ;; + r) + REMOTE_HOST="$OPTARG" + ;; + u) + UPLOAD_RESULTS=1 + ;; + esac +done + +if [ -e "$OUTDIR" ]; then + echo "Output directory exists, aborting." + exit $EXIT_FAILURE +fi + +mkdir "$OUTDIR" + +getrevision="util/board_status/getrevision.sh" +test_cmd 0 $getrevision +touch ${OUTDIR}/revision.txt +printf "Local revision: %s\n" $($getrevision -l) >> ${OUTDIR}/revision.txt +printf "Upstream revision: %s\n" $($getrevision -u) >> ${OUTDIR}/revision.txt +printf "Upstream URL: %s\n" $($getrevision -U)>> ${OUTDIR}/revision.txt +printf "Timestamp: %s\n" $($getrevision -t) >> ${OUTDIR}/revision.txt + +cbfstool_cmd="util/cbfstool/cbfstool" +test_cmd 0 "$cbfstool_cmd" +$cbfstool_cmd build/coreboot.rom extract -n config -f ${OUTDIR}/config.txt + +test_cmd 1 "cbmem" +cmd 1 "cbmem -c" > ${OUTDIR}/coreboot_console.txt +cmd 1 "cbmem -t" > ${OUTDIR}/coreboot_timestamps.txt +cmd 1 "cbmem -C" > ${OUTDIR}/coreboot_coverage.txt + +cmd 1 dmesg > ${OUTDIR}/kernel_log.txt + +#if [ $UPLOAD_RESULTS -eq 1 ]; then +# FIXME: implement this part +#fi + +if [ $CLOBBER_OUTPUT -eq 1 ]; then + rm -rf ${OUTDIR} +fi + +exit $EXIT_SUCCESS diff --git a/util/board_status/getrevision.sh b/util/board_status/getrevision.sh new file mode 100755 index 0000000..c8c126a --- /dev/null +++ b/util/board_status/getrevision.sh @@ -0,0 +1,228 @@ +#!/bin/sh +# +# This file is part of the coreboot project. It originated in the +# flashrom project but has been heavily modified since then. +# +# Copyright (C) 2013 Stefan Tauner +# Copyright (C) 2013 Google Inc. +# +# 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; either version 2 of the License, or +# (at your option) any later version. +# +# 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 +# + +EXIT_SUCCESS=0 +EXIT_FAILURE=1 + +# Make sure we don't get translated output +export LC_ALL=C +# nor local times or dates +export TZ=UTC0 + +# Helper functions +git_has_local_changes() { + git update-index -q --refresh >/dev/null + ! git diff-index --quiet HEAD -- "$1" +} + +git_last_commit() { + git log --pretty=format:"%h" -1 -- "$1" +} + +git_is_file_tracked() { + git ls-files --error-unmatch -- "$1" >/dev/null 2>&1 +} + +is_file_tracked() { + git_is_file_tracked "$1" +} + +# Tries to find a remote source for the changes committed locally. +# This includes the URL of the remote repository including the last commit and a suitable branch name. +# Takes one optional argument: the path to inspect +git_url() { + # Note: This may not work as expected if multiple remotes are fetched from. + echo $(git remote -v | \ + awk '/fetch/ {split($2, pieces, "@"); print pieces[2]; exit 0}') +} + +# Returns a string indicating where others can get the current source code (excluding uncommitted changes) +# Takes one optional argument: the path to inspect +scm_url() { + local url + + url="$(git_url "$1")" + + echo "${url}" +} + +# Retrieve timestamp since last modification. If the sources are pristine, +# then the timestamp will match that of the SCM's most recent modification +# date. +timestamp() { + local t + + # date syntaxes are manifold: + # gnu date [-d input]... [+FORMAT] + # netbsd date [-ajnu] [-d date] [-r seconds] [+format] [[[[[[CC]yy]mm]dd]HH]MM[.SS]] + # freebsd date [-jnu] [-d dst] [-r seconds] [-f fmt date | [[[[[cc]yy]mm]dd]HH]MM[.ss]] [+format] [...] + # dragonflybsd date [-jnu] [-d dst] [-r seconds] [-f fmt date | [[[[[cc]yy]mm]dd]HH]MM[.ss]] [+format] [...] + # openbsd date [-aju] [-d dst] [-r seconds] [+format] [[[[[[cc]yy]mm]dd]HH]MM[.SS]] [...] + if git_is_file_tracked "$2" ; then + # are there local changes? + if git_has_local_changes "$2" ; then + t=$(date -u "${1}") + else + # No local changes, get date of the last commit + case $(uname) in + # Most BSD dates do not support parsing date values from user input with -d but all of + # them support parsing epoch seconds with -r. Thanks to git we can easily use that: + NetBSD|OpenBSD|DragonFly|FreeBSD) + t=$(date -u -r "$(git log --pretty=format:%ct -1 -- $2)" "$1" 2>/dev/null);; + *) + t=$(date -d "$(git log --pretty=format:%cD -1 -- $2)" -u "$1" 2>/dev/null);; + esac + fi + else + t=$(date -u "$1") + fi + + if [ -z "$t" ]; then + echo "Warning: Could not determine timestamp." 2>/dev/null + fi + echo "${t}" +} + +# Retrieve local SCM revision info. This is useful if we're working in a different SCM than upstream and/or +# have local changes. +local_revision() { + local r + + if git_is_file_tracked "$1" ; then + r=$(git_last_commit "$1") + + if git_has_local_changes "$1" ; then + r="$r-dirty" + fi + else + return ${EXIT_FAILURE} + fi + + echo "${r}" +} + +upstream_revision() { + local r= + + r=$(git log remotes/origin/master -1 --format=format:%h) + + if [ -z "$r" ]; then + r="unknown" # default to unknown + fi + echo "${r}" +} + +show_help() { + echo "Usage: + ${0} <command> [path] + +Commands + -h or --help + this message + -l or --local + local revision information including an indicator for uncommitted changes + -u or --upstream + upstream revision + -U or --url + URL associated with the latest commit + -d or --date + date of most recent modification + -t or --timestamp + timestamp of most recent modification +" + return +} + +check_action() { + if [ -n "$action" ]; then + echo "Error: Multiple actions given.">&2 + exit ${EXIT_FAILURE} + fi +} + +main() { + local query_path= + local action= + + # The is the main loop + while [ $# -gt 0 ]; + do + case ${1} in + -h|--help) + action=show_help; + shift;; + -l|--local) + check_action $1 + action=local_revision + shift;; + -u|--upstream) + check_action $1 + action=upstream_revision + shift;; + -U|--url) + check_action $1 + action=scm_url + shift;; + -d|--date) + check_action $1 + action="timestamp +%Y-%m-%d" # refrain from suffixing 'Z' to indicate it's UTC + shift;; + -t|--timestamp) + check_action $1 + action="timestamp +%Y-%m-%dT%H:%M:%SZ" # There is only one valid time format! ISO 8601 + shift;; + -*) + show_help; + echo "Error: Invalid option: ${1}" + exit ${EXIT_FAILURE};; + *) + if [ -z "$query_path" ] ; then + if [ ! -e "$1" ] ; then + echo "Error: Path \"${1}\" does not exist.">&2 + exit ${EXIT_FAILURE} + fi + query_path=$1 + else + echo "Warning: Ignoring over-abundant paramter: \"${1}\"">&2 + fi + shift;; + esac; + done + + # default to current directory (usually equals the whole repository) + if [ -z "$query_path" ] ; then + query_path=. + fi + if ! is_file_tracked "$query_path" ; then + echo "Warning: Path \"${query_path}\" is not under version control.">&2 + fi + if [ -z "$action" ] ; then + show_help + echo "Error: No actions specified" + exit ${EXIT_FAILURE} + fi + + $action "$query_path" +} + +main $@ diff --git a/util/status/getrevision.sh b/util/status/getrevision.sh deleted file mode 100755 index c8c126a..0000000 --- a/util/status/getrevision.sh +++ /dev/null @@ -1,228 +0,0 @@ -#!/bin/sh -# -# This file is part of the coreboot project. It originated in the -# flashrom project but has been heavily modified since then. -# -# Copyright (C) 2013 Stefan Tauner -# Copyright (C) 2013 Google Inc. -# -# 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; either version 2 of the License, or -# (at your option) any later version. -# -# 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 -# - -EXIT_SUCCESS=0 -EXIT_FAILURE=1 - -# Make sure we don't get translated output -export LC_ALL=C -# nor local times or dates -export TZ=UTC0 - -# Helper functions -git_has_local_changes() { - git update-index -q --refresh >/dev/null - ! git diff-index --quiet HEAD -- "$1" -} - -git_last_commit() { - git log --pretty=format:"%h" -1 -- "$1" -} - -git_is_file_tracked() { - git ls-files --error-unmatch -- "$1" >/dev/null 2>&1 -} - -is_file_tracked() { - git_is_file_tracked "$1" -} - -# Tries to find a remote source for the changes committed locally. -# This includes the URL of the remote repository including the last commit and a suitable branch name. -# Takes one optional argument: the path to inspect -git_url() { - # Note: This may not work as expected if multiple remotes are fetched from. - echo $(git remote -v | \ - awk '/fetch/ {split($2, pieces, "@"); print pieces[2]; exit 0}') -} - -# Returns a string indicating where others can get the current source code (excluding uncommitted changes) -# Takes one optional argument: the path to inspect -scm_url() { - local url - - url="$(git_url "$1")" - - echo "${url}" -} - -# Retrieve timestamp since last modification. If the sources are pristine, -# then the timestamp will match that of the SCM's most recent modification -# date. -timestamp() { - local t - - # date syntaxes are manifold: - # gnu date [-d input]... [+FORMAT] - # netbsd date [-ajnu] [-d date] [-r seconds] [+format] [[[[[[CC]yy]mm]dd]HH]MM[.SS]] - # freebsd date [-jnu] [-d dst] [-r seconds] [-f fmt date | [[[[[cc]yy]mm]dd]HH]MM[.ss]] [+format] [...] - # dragonflybsd date [-jnu] [-d dst] [-r seconds] [-f fmt date | [[[[[cc]yy]mm]dd]HH]MM[.ss]] [+format] [...] - # openbsd date [-aju] [-d dst] [-r seconds] [+format] [[[[[[cc]yy]mm]dd]HH]MM[.SS]] [...] - if git_is_file_tracked "$2" ; then - # are there local changes? - if git_has_local_changes "$2" ; then - t=$(date -u "${1}") - else - # No local changes, get date of the last commit - case $(uname) in - # Most BSD dates do not support parsing date values from user input with -d but all of - # them support parsing epoch seconds with -r. Thanks to git we can easily use that: - NetBSD|OpenBSD|DragonFly|FreeBSD) - t=$(date -u -r "$(git log --pretty=format:%ct -1 -- $2)" "$1" 2>/dev/null);; - *) - t=$(date -d "$(git log --pretty=format:%cD -1 -- $2)" -u "$1" 2>/dev/null);; - esac - fi - else - t=$(date -u "$1") - fi - - if [ -z "$t" ]; then - echo "Warning: Could not determine timestamp." 2>/dev/null - fi - echo "${t}" -} - -# Retrieve local SCM revision info. This is useful if we're working in a different SCM than upstream and/or -# have local changes. -local_revision() { - local r - - if git_is_file_tracked "$1" ; then - r=$(git_last_commit "$1") - - if git_has_local_changes "$1" ; then - r="$r-dirty" - fi - else - return ${EXIT_FAILURE} - fi - - echo "${r}" -} - -upstream_revision() { - local r= - - r=$(git log remotes/origin/master -1 --format=format:%h) - - if [ -z "$r" ]; then - r="unknown" # default to unknown - fi - echo "${r}" -} - -show_help() { - echo "Usage: - ${0} <command> [path] - -Commands - -h or --help - this message - -l or --local - local revision information including an indicator for uncommitted changes - -u or --upstream - upstream revision - -U or --url - URL associated with the latest commit - -d or --date - date of most recent modification - -t or --timestamp - timestamp of most recent modification -" - return -} - -check_action() { - if [ -n "$action" ]; then - echo "Error: Multiple actions given.">&2 - exit ${EXIT_FAILURE} - fi -} - -main() { - local query_path= - local action= - - # The is the main loop - while [ $# -gt 0 ]; - do - case ${1} in - -h|--help) - action=show_help; - shift;; - -l|--local) - check_action $1 - action=local_revision - shift;; - -u|--upstream) - check_action $1 - action=upstream_revision - shift;; - -U|--url) - check_action $1 - action=scm_url - shift;; - -d|--date) - check_action $1 - action="timestamp +%Y-%m-%d" # refrain from suffixing 'Z' to indicate it's UTC - shift;; - -t|--timestamp) - check_action $1 - action="timestamp +%Y-%m-%dT%H:%M:%SZ" # There is only one valid time format! ISO 8601 - shift;; - -*) - show_help; - echo "Error: Invalid option: ${1}" - exit ${EXIT_FAILURE};; - *) - if [ -z "$query_path" ] ; then - if [ ! -e "$1" ] ; then - echo "Error: Path \"${1}\" does not exist.">&2 - exit ${EXIT_FAILURE} - fi - query_path=$1 - else - echo "Warning: Ignoring over-abundant paramter: \"${1}\"">&2 - fi - shift;; - esac; - done - - # default to current directory (usually equals the whole repository) - if [ -z "$query_path" ] ; then - query_path=. - fi - if ! is_file_tracked "$query_path" ; then - echo "Warning: Path \"${query_path}\" is not under version control.">&2 - fi - if [ -z "$action" ] ; then - show_help - echo "Error: No actions specified" - exit ${EXIT_FAILURE} - fi - - $action "$query_path" -} - -main $@ diff --git a/util/status/status.sh b/util/status/status.sh deleted file mode 100644 index 4b5496c..0000000 --- a/util/status/status.sh +++ /dev/null @@ -1,137 +0,0 @@ -#!/bin/sh -# -# This file is part of the coreboot project. -# -# Copyright (C) 2013 Google Inc. -# - -EXIT_SUCCESS=0 -EXIT_FAILURE=1 -OUTDIR="status" - -# Stuff from command-line switches -REMOTE_HOST="" -CLOBBER_OUTPUT=0 -UPLOAD_RESULTS=0 - -show_help() { - echo "Usage: - ${0} <option> - -Options - -h - Show this message. - -c - Clobber output when finished. - -r <host> - Obtain machine information from remote host (using ssh). - -u - Upload results to coreboot.org. -" -} - -# test a command -# -# $1: test command on remote host (0=no, 1=yes) -# $2: command to test -test_cmd() -{ - local rc - - if [ -e "$2" ]; then - return - fi - - if [[ $1 -eq 1 && "$REMOTE_HOST" ]]; then - ssh root@${REMOTE_HOST} which "$2" >/dev/null - rc=$? - else - which "$2" >/dev/null - rc=$? - fi - - if [ $rc -eq 0 ]; then - return - fi - - echo "$2 not found" - exit $EXIT_FAILURE -} - -# run a command -# -# $1: 0 to run command locally, 1 to run remotely if remote host defined -# $2: command -cmd() -{ - if [ -e "$2" ]; then - return - fi - - if [[ $1 -eq 1 && -n "$REMOTE_HOST" ]]; then - ssh root@${REMOTE_HOST} "$2" - else - $2 - fi - - if [ $? -eq 0 ]; then - return - fi - - echo "Failed to run command: $2" - exit $EXIT_FAILURE -} - -while getopts "chr:u" opt; do - case "$opt" in - h) - show_help - exit $EXIT_SUCCESS - ;; - c) - CLOBBER_OUTPUT=1 - ;; - r) - REMOTE_HOST="$OPTARG" - ;; - u) - UPLOAD_RESULTS=1 - ;; - esac -done - -if [ -e "$OUTDIR" ]; then - echo "Output directory exists, aborting." - exit $EXIT_FAILURE -fi - -mkdir "$OUTDIR" - -getrevision="util/status/getrevision.sh" -test_cmd 0 $getrevision -touch ${OUTDIR}/revision.txt -printf "Local revision: %s\n" $($getrevision -l) >> ${OUTDIR}/revision.txt -printf "Upstream revision: %s\n" $($getrevision -u) >> ${OUTDIR}/revision.txt -printf "Upstream URL: %s\n" $($getrevision -U)>> ${OUTDIR}/revision.txt -printf "Timestamp: %s\n" $($getrevision -t) >> ${OUTDIR}/revision.txt - -cbfstool_cmd="util/cbfstool/cbfstool" -test_cmd 0 "$cbfstool_cmd" -$cbfstool_cmd build/coreboot.rom extract -n config -f ${OUTDIR}/config.txt - -test_cmd 1 "cbmem" -cmd 1 "cbmem -c" > ${OUTDIR}/coreboot_console.txt -cmd 1 "cbmem -t" > ${OUTDIR}/coreboot_timestamps.txt -cmd 1 "cbmem -C" > ${OUTDIR}/coreboot_coverage.txt - -cmd 1 dmesg > ${OUTDIR}/kernel_log.txt - -#if [ $UPLOAD_RESULTS -eq 1 ]; then -# FIXME: implement this part -#fi - -if [ $CLOBBER_OUTPUT -eq 1 ]; then - rm -rf ${OUTDIR} -fi - -exit $EXIT_SUCCESS

1 0

Patch set updated for coreboot: be85a80 cbfs: 64-bit cleanups
by Ronald G. Minnich 11 Nov '13

11 Nov '13

Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4037 -gerrit commit be85a80cbf23f4f5894e08824eb903ebd29014d1 Author: Ronald G. Minnich <rminnich(a)google.com> Date: Mon Nov 11 10:36:28 2013 -0800 cbfs: 64-bit cleanups cbfs used u32 in a number of cases where uintptr_t was correct. This change builds for both 64-bit and 32-bit boards. Also, add a function to convert a network byte order element of the struct to a void *. Change-Id: If42c722a8a9e8d565d3827f65ed6c2cb8e90ba60 Signed-off-by: Ronald G. Minnich <rminnich(a)google.com> --- src/lib/cbfs.c | 34 +++++++++++++++++++++++++--------- src/lib/cbmem.c | 2 +- src/lib/selfboot.c | 9 +++++---- 3 files changed, 31 insertions(+), 14 deletions(-) diff --git a/src/lib/cbfs.c b/src/lib/cbfs.c index 4ccc9e6..ffe2705 100644 --- a/src/lib/cbfs.c +++ b/src/lib/cbfs.c @@ -254,13 +254,27 @@ void * cbfs_load_stage(struct cbfs_media *media, const char *name) #else +static void *cbfs_pointer(u64 value) +{ + void *v; + + /* there has to be a better way to do this. Do we need + * CONFIG_WORD_SIZE or something? + */ +#if (CONFIG_ARCH_X86 == 1) || (CONFIG_ARCH_ARMV7 == 1) + v = (void *)ntohl(value); +#else + v = (void *)ntohll(value); +#endif + return v; +} + void * cbfs_load_stage(struct cbfs_media *media, const char *name) { 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; + + void *load, *entry; uint32_t final_size; if (stage == NULL) @@ -271,22 +285,22 @@ void * cbfs_load_stage(struct cbfs_media *media, const char *name) (uint32_t) stage->load, stage->memlen, stage->entry); + load = cbfs_pointer(stage->load); final_size = cbfs_decompress(stage->compression, ((unsigned char *) stage) + sizeof(struct cbfs_stage), - (void *) (uint32_t) stage->load, + (void *) load, stage->len); if (!final_size) return (void *) -1; /* Stages rely the below clearing so that the bss is initialized. */ - memset((void *)((uintptr_t)stage->load + final_size), 0, + memset((void *)(load + final_size), 0, stage->memlen - final_size); DEBUG("stage loaded.\n"); - entry = stage->entry; - // entry = ntohll(stage->entry); + entry = cbfs_pointer(stage->entry); return (void *) entry; } @@ -294,6 +308,7 @@ void * cbfs_load_stage(struct cbfs_media *media, const char *name) int cbfs_execute_stage(struct cbfs_media *media, const char *name) { + void * entry; struct cbfs_stage *stage = (struct cbfs_stage *) cbfs_get_file_content(media, name, CBFS_TYPE_STAGE); @@ -307,8 +322,9 @@ int cbfs_execute_stage(struct cbfs_media *media, const char *name) } /* FIXME: This isn't right */ - LOG("run @ %p\n", (void *) ntohl((uint32_t) stage->entry)); - return run_address((void *)(uintptr_t)ntohll(stage->entry)); + entry = cbfs_pointer(stage->entry); + LOG("run @ %p\n", entry); + return run_address(entry); } #if !CONFIG_ALT_CBFS_LOAD_PAYLOAD diff --git a/src/lib/cbmem.c b/src/lib/cbmem.c index de49816..6449b55 100644 --- a/src/lib/cbmem.c +++ b/src/lib/cbmem.c @@ -200,7 +200,7 @@ void *cbmem_add(u32 id, u64 size) cbmem_toc[0].base += size; cbmem_toc[0].size -= size; - return (void *)(u32)cbmem_toc[i].base; + return (void *)(uintptr_t)cbmem_toc[i].base; } void *cbmem_find(u32 id) diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c index f69ad14..222eae2 100644 --- a/src/lib/selfboot.c +++ b/src/lib/selfboot.c @@ -305,7 +305,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) static int build_self_segment_list( struct segment *head, struct lb_memory *mem, - struct cbfs_payload *payload, u32 *entry) + struct cbfs_payload *payload, uintptr_t *entry) { struct segment *new; struct segment *ptr; @@ -332,8 +332,9 @@ static int build_self_segment_list( new->s_memsz = ntohl(segment->mem_len); new->compression = ntohl(segment->compression); - new->s_srcaddr = (u32) ((unsigned char *)first_segment) - + ntohl(segment->offset); + 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); @@ -504,7 +505,7 @@ static int load_self_segments( void *selfload(struct lb_memory *mem, struct cbfs_payload *payload) { - u32 entry=0; + uintptr_t entry = 0; struct segment head; /* Preprocess the self segments */

1 0

Patch set updated for coreboot: f667c5e lenovo/x60: export reboot_bits nvram configuration.
by Denis Carikli 11 Nov '13

11 Nov '13

Denis Carikli (GNUtoo(a)no-log.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3992 -gerrit commit f667c5eea0786d4fb68fd7bfd902ef476448d8b6 Author: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> Date: Sat Oct 26 22:35:46 2013 +0200 lenovo/x60: export reboot_bits nvram configuration. This permits any software running after the ramstage to tell coreboot that the boot was successfull. Change-Id: I6b19160dcf1ea1948360db71d02e344a3bcb44ef Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> --- src/mainboard/lenovo/x60/cmos.layout | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mainboard/lenovo/x60/cmos.layout b/src/mainboard/lenovo/x60/cmos.layout index ab51a84..a6e1a4c 100644 --- a/src/mainboard/lenovo/x60/cmos.layout +++ b/src/mainboard/lenovo/x60/cmos.layout @@ -71,7 +71,7 @@ entries # RTC_BOOT_BYTE (coreboot hardcoded) 384 1 e 4 boot_option 385 1 e 4 last_boot -388 4 r 0 reboot_bits +388 4 h 0 reboot_bits #390 2 r 0 unused? # -----------------------------------------------------------------

1 0

Patch set updated for coreboot: 645b955 Move set_boot_successful to drivers/pc80/mc146818rtc.c
by Denis Carikli 11 Nov '13

11 Nov '13

Denis Carikli (GNUtoo(a)no-log.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3996 -gerrit commit 645b9554f7283e9b1d22c3249a56fa14ef5de21e Author: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> Date: Sun Oct 27 17:58:11 2013 +0100 Move set_boot_successful to drivers/pc80/mc146818rtc.c set_boot_successful depends on CONFIG_PC80_SYSTEM, it also is specific to the mc146818 RTC. Change-Id: I57d28d7c81ea595ce06bd4ec9c4981fa71566db9 Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> --- src/drivers/pc80/mc146818rtc.c | 23 +++++++++++++++++++++++ src/include/fallback.h | 7 ++++--- src/include/pc80/mc146818rtc.h | 1 + src/lib/fallback_boot.c | 33 +++------------------------------ 4 files changed, 31 insertions(+), 33 deletions(-) diff --git a/src/drivers/pc80/mc146818rtc.c b/src/drivers/pc80/mc146818rtc.c index be52454..1f064ea 100644 --- a/src/drivers/pc80/mc146818rtc.c +++ b/src/drivers/pc80/mc146818rtc.c @@ -3,6 +3,7 @@ #include <console/console.h> #include <pc80/mc146818rtc.h> #include <boot/coreboot_tables.h> +#include <fallback.h> #include <string.h> #if CONFIG_USE_OPTION_TABLE #include "option_table.h" @@ -322,3 +323,25 @@ void rtc_check_update_cmos_date(u8 has_century) rtc_update_cmos_date(has_century); } } + +/* Reset the boot count if the boot is considered successfull */ +void set_boot_successful(void) +{ + /* Remember I successfully booted by setting + * the initial boot direction + * to the direction that I booted. + */ + unsigned char index, byte; + index = inb(RTC_PORT(0)) & 0x80; + index |= RTC_BOOT_BYTE; + outb(index, RTC_PORT(0)); + + byte = inb(RTC_PORT(1)); + byte &= 0xfe; + byte |= (byte & (1 << 1)) >> 1; + + /* If we are in normal mode set the boot count to 0 */ + if(byte & 1) + byte &= 0x0f; + outb(byte, RTC_PORT(1)); +} diff --git a/src/include/fallback.h b/src/include/fallback.h index 7f3c823..5607dd8 100644 --- a/src/include/fallback.h +++ b/src/include/fallback.h @@ -5,8 +5,9 @@ void boot_successful(void); -#endif /* __ASSEMBLER__ */ - -#define RTC_BOOT_BYTE 48 +#if CONFIG_PC80_SYSTEM +void set_boot_successful(void); +#endif /* CONFIG_PC80_SYSTEM */ +#endif /* __ASSEMBLER__ */ #endif /* FALLBACK_H */ diff --git a/src/include/pc80/mc146818rtc.h b/src/include/pc80/mc146818rtc.h index 170a433..76935f5 100644 --- a/src/include/pc80/mc146818rtc.h +++ b/src/include/pc80/mc146818rtc.h @@ -14,6 +14,7 @@ #define RTC_REG_C 12 #define RTC_REG_D 13 +#define RTC_BOOT_BYTE 48 /********************************************************************** * register details diff --git a/src/lib/fallback_boot.c b/src/lib/fallback_boot.c index b956c94..97263da 100644 --- a/src/lib/fallback_boot.c +++ b/src/lib/fallback_boot.c @@ -3,36 +3,6 @@ #include <watchdog.h> #include <arch/io.h> -#if CONFIG_PC80_SYSTEM -#include <pc80/mc146818rtc.h> - -static void set_boot_successful(void) -{ - /* Remember I successfully booted by setting - * the initial boot direction - * to the direction that I booted. - */ - unsigned char index, byte; - index = inb(RTC_PORT(0)) & 0x80; - index |= RTC_BOOT_BYTE; - outb(index, RTC_PORT(0)); - - byte = inb(RTC_PORT(1)); - byte &= 0xfe; - byte |= (byte & (1 << 1)) >> 1; - - /* If we are in normal mode set the boot count to 0 */ - if(byte & 1) - byte &= 0x0f; - outb(byte, RTC_PORT(1)); -} -#else -static void set_boot_successful(void) -{ - /* To be implemented */ -} -#endif - void boot_successful(void) { #if CONFIG_FRAMEBUFFER_SET_VESA_MODE && !CONFIG_FRAMEBUFFER_KEEP_VESA_MODE @@ -40,8 +10,11 @@ void boot_successful(void) vbe_textmode_console(); #endif + +#if CONFIG_PC80_SYSTEM /* Remember this was a successful boot */ set_boot_successful(); +#endif /* turn off the boot watchdog */ watchdog_off();

1 0

Patch set updated for coreboot: dcab843 X86 Kconfig: Make the MAX_REBOOT_CNT selectable in X86_BOOTBLOCK_NORMAL mode.
by Denis Carikli 11 Nov '13

11 Nov '13

Denis Carikli (GNUtoo(a)no-log.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3991 -gerrit commit dcab843a001bd645dd4aca98dbc87611bdb4ad42 Author: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> Date: Sun Oct 20 23:37:35 2013 +0200 X86 Kconfig: Make the MAX_REBOOT_CNT selectable in X86_BOOTBLOCK_NORMAL mode. src/arch/x86/Kconfig defined MAX_REBOOT_CNT as 3. In the bootblock, the reboot_bits cmos option is increased by one at each boot. If the boot is successful, the respective nvram settings have to be reset to boot on the normal/ prefix next time. If KEEP_BOOT_COUNT is selected, it has to be done after the ramstage, if not, it's done in the ramstage. In case of a failed boot, the reboot_bits keeps increasing until it reach KEEP_BOOT_COUNT. Once it is reached, it will swtich to fallback/ at next boot. With KEEP_BOOT_COUNT beeing hidden in make menuconfig, and set to 3, the user probably won't know that coreboot will only switch to fallback after 3 failed boots, and will act as if the computer will not boot anymore with its current coreboot image. This patch makes KEEP_BOOT_COUNT selectable. This patch was tested on the Lenovo X60. Change-Id: I746df11c933dfe62e01e1591479ca96a84907dc0 Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo(a)no-log.org> --- src/arch/x86/Kconfig | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig index 0a21fcc..52bafbd 100644 --- a/src/arch/x86/Kconfig +++ b/src/arch/x86/Kconfig @@ -42,12 +42,6 @@ config STACK_SIZE hex default 0x1000 -# Maximum reboot count -# TODO: Improve description. -config MAX_REBOOT_CNT - int - default 3 - # This is something you almost certainly don't want to mess with. # How many SIPIs do we send when starting up APs and cores? # The answer in 2000 or so was '2'. Nowadays, on many systems, @@ -72,6 +66,20 @@ config X86_BOOTBLOCK_NORMAL endchoice +# Maximum reboot count +config MAX_REBOOT_CNT + int "Number of failed boot attempts before switching back to fallback/" + default 3 + depends on X86_BOOTBLOCK_NORMAL + help + Note that the minimum number of reset a machine has to do to boot + can vary across machines. + If you set it to a number that is less that the machine minimum, + the machine will then switch to fallback/ during the next boot. + Once in fallback/, the machine will keep that settings unless + the nvram is reset, which will make it switch to fallback/ + again during the next boot. + config BOOTBLOCK_SOURCE string default "bootblock_simple.c" if X86_BOOTBLOCK_SIMPLE

1 0

← Newer
1
...
69
70
71
72
73
74
75
...
86
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit November 2013