coreboot-gerrit March 2013

coreboot-gerrit@coreboot.org

1 participants
443 discussions

Patch merged into coreboot/master: 3cc0d1e exynos5250: assign RAM resources in cpu_init()
by gerrit＠coreboot.org 27 Mar '13

27 Mar '13

the following patch was just integrated into master: commit 3cc0d1eb3f611cb7bf0e45d8ccdb0c84f54f54dc Author: David Hendricks <dhendrix(a)chromium.org> Date: Tue Mar 26 16:28:21 2013 -0700 exynos5250: assign RAM resources in cpu_init() This moves the ram resource allocation into cpu_init() so that we no longer rely on declaring a domain in devicetree.cb (which is kind of weird for this platform). This does not cause any actual changes to the coreboot memory table, and paves the way for further updates to Snow's devicetree. Change-Id: I141277f59b5d48288f409257bf556a1cfa7a8463 Signed-off-by: David Hendricks <dhendrix(a)chromium.org> Reviewed-on: http://review.coreboot.org/2923 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com> Build-Tested: build bot (Jenkins) at Wed Mar 27 01:15:34 2013, giving +1 Reviewed-By: Ronald G. Minnich <rminnich(a)gmail.com> at Wed Mar 27 02:00:51 2013, giving +2 See http://review.coreboot.org/2923 for details. -gerrit

1 0

Patch merged into coreboot/master: 6b0d0d6 cbfstool: Add update-fit command
by gerrit＠coreboot.org 27 Mar '13

27 Mar '13

the following patch was just integrated into master: commit 6b0d0d6e14f8e385e1457df5699136473144ed60 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Fri Dec 14 17:16:21 2012 -0600 cbfstool: Add update-fit command Add support for filling in the Firmware Interface Table. For now it only supports adding microcode entries. It takes 2 options: 1. Name of file in cbfs where the mircocode is located 2. The number of empty entries in the table. Verified with go firmware tools. Also commented out updating microcode in the bootblock. When romstage runs, the CPUs indicate their microcode is already loaded. Change-Id: Iaccaa9c226ee24868a5f4c0ba79729015d15bbef Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> Signed-off-by: Stefan Reinauer <reinauer(a)google.com> Reviewed-on: http://review.coreboot.org/2712 Reviewed-by: Aaron Durbin <adurbin(a)google.com> Tested-by: build bot (Jenkins) Build-Tested: build bot (Jenkins) at Wed Mar 27 01:03:16 2013, giving +1 See http://review.coreboot.org/2712 for details. -gerrit

1 0

Patch merged into coreboot/master: dc7bc8e cbfstool: Fix cbfs_image.c
by gerrit＠coreboot.org 27 Mar '13

27 Mar '13

the following patch was just integrated into master: commit dc7bc8e589c4b9f45e57327c2f989ef8f2a0e7c4 Author: Stefan Reinauer <reinauer(a)chromium.org> Date: Tue Mar 26 12:51:36 2013 -0700 cbfstool: Fix cbfs_image.c - The read-only structures are const now - cosmetic fixes - put { on a new line for functions - move code after structures Change-Id: Ib9131b80242b91bd5105feaebdf8306a844da1cc Signed-off-by: Stefan Reinauer <reinauer(a)google.com> Reviewed-on: http://review.coreboot.org/2922 Reviewed-by: Aaron Durbin <adurbin(a)google.com> Tested-by: build bot (Jenkins) Build-Tested: build bot (Jenkins) at Wed Mar 27 00:49:58 2013, giving +1 See http://review.coreboot.org/2922 for details. -gerrit

1 0

New patch to review for coreboot: f808bf9 exynos5250: assign RAM resources in cpu_init()
by David Hendricks 27 Mar '13

27 Mar '13

David Hendricks (dhendrix(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2923 -gerrit commit f808bf9fd006d97b13e2604e3becfeedec899404 Author: David Hendricks <dhendrix(a)chromium.org> Date: Tue Mar 26 16:28:21 2013 -0700 exynos5250: assign RAM resources in cpu_init() This moves the ram resource allocation into cpu_init() so that we no longer rely on declaring a domain in devicetree.cb (which is kind of weird for this platform). This does not cause any actual changes to the coreboot memory table, and paves the way for further updates to Snow's devicetree. Change-Id: I141277f59b5d48288f409257bf556a1cfa7a8463 Signed-off-by: David Hendricks <dhendrix(a)chromium.org> --- src/cpu/samsung/exynos5250/cpu.c | 29 ++--------------------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/src/cpu/samsung/exynos5250/cpu.c b/src/cpu/samsung/exynos5250/cpu.c index bcf4d22..b6eae46 100644 --- a/src/cpu/samsung/exynos5250/cpu.c +++ b/src/cpu/samsung/exynos5250/cpu.c @@ -4,32 +4,9 @@ #define RAM_BASE_KB (CONFIG_SYS_SDRAM_BASE >> 10) #define RAM_SIZE_KB (CONFIG_DRAM_SIZE_MB << 10UL) -static void domain_read_resources(device_t dev) -{ - ram_resource(dev, 0, RAM_BASE_KB, RAM_SIZE_KB); -} - -static void domain_set_resources(device_t dev) -{ - assign_resources(dev->link_list); -} - -static unsigned int domain_scan_bus(device_t dev, unsigned int max) -{ - return max; -} - - -static struct device_operations domain_ops = { - .read_resources = domain_read_resources, - .set_resources = domain_set_resources, - .enable_resources = NULL, - .init = NULL, - .scan_bus = domain_scan_bus, -}; - static void cpu_init(device_t dev) { + ram_resource(dev, 0, RAM_BASE_KB, RAM_SIZE_KB); } static void cpu_noop(device_t dev) @@ -47,9 +24,7 @@ static struct device_operations cpu_ops = { static void enable_dev(device_t dev) { /* Set the operations if it is a special bus type */ - if (dev->path.type == DEVICE_PATH_DOMAIN) { - dev->ops = &domain_ops; - } else if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { + if (dev->path.type == DEVICE_PATH_CPU_CLUSTER) { dev->ops = &cpu_ops; } }

1 0

Patch set updated for coreboot: bdea3f3 cbfstool: Add update-fit command
by Stefan Reinauer 26 Mar '13

26 Mar '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2712 -gerrit commit bdea3f3f498893b347f799704ba565ea8652b002 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Fri Dec 14 17:16:21 2012 -0600 cbfstool: Add update-fit command Add support for filling in the Firmware Interface Table. For now it only supports adding microcode entries. It takes 2 options: 1. Name of file in cbfs where the mircocode is located 2. The number of empty entries in the table. Verified with go firmware tools. Also commented out updating microcode in the bootblock. When romstage runs, the CPUs indicate their microcode is already loaded. Change-Id: Iaccaa9c226ee24868a5f4c0ba79729015d15bbef Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> Signed-off-by: Stefan Reinauer <reinauer(a)google.com> --- util/cbfstool/Makefile | 2 +- util/cbfstool/Makefile.inc | 1 + util/cbfstool/cbfstool.c | 39 +++++++ util/cbfstool/fit.c | 277 +++++++++++++++++++++++++++++++++++++++++++++ util/cbfstool/fit.h | 25 ++++ 5 files changed, 343 insertions(+), 1 deletion(-) diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile index a14a76f..a51e6de 100644 --- a/util/cbfstool/Makefile +++ b/util/cbfstool/Makefile @@ -7,7 +7,7 @@ CFLAGS += -D_7ZIP_ST BINARY:=$(obj)/cbfstool -COMMON:=cbfstool.o common.o cbfs_image.o compress.o +COMMON:=cbfstool.o common.o cbfs_image.o compress.o fit.o COMMON+=cbfs-mkstage.o cbfs-mkpayload.o # LZMA COMMON+=lzma/lzma.o diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc index 2cee794..e3eb798 100644 --- a/util/cbfstool/Makefile.inc +++ b/util/cbfstool/Makefile.inc @@ -5,6 +5,7 @@ cbfsobj += compress.o cbfsobj += cbfs_image.o cbfsobj += cbfs-mkstage.o cbfsobj += cbfs-mkpayload.o +cbfsobj += fit.o # LZMA cbfsobj += lzma.o cbfsobj += LzFind.o diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index eeb6936..1a3d25e 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -28,6 +28,7 @@ #include "common.h" #include "cbfs.h" #include "cbfs_image.h" +#include "fit.h" struct command { const char *name; @@ -53,6 +54,7 @@ static struct param { uint32_t pagesize; uint32_t offset; uint32_t top_aligned; + int fit_empty_entries; comp_algo algo; } param = { /* All variables not listed are initialized as zero. */ @@ -415,6 +417,36 @@ static int cbfs_extract(void) return result; } +static int cbfs_update_fit(void) +{ + int ret = 0; + struct cbfs_image image; + + if (!param.name) { + ERROR("You need to specify -n/--name.\n"); + return 1; + } + + if (param.fit_empty_entries <= 0) { + ERROR("Invalid number of fit entries " + "(-x/--empty-fits): %d\n", param.fit_empty_entries); + return 1; + } + + if (cbfs_image_from_file(&image, param.cbfs_name) != 0) { + ERROR("Could not load ROM image '%s'.\n", + param.cbfs_name); + return 1; + } + + ret = fit_update_table(&image, param.fit_empty_entries, param.name); + if (!ret) + ret = cbfs_image_write_file(&image, param.cbfs_name); + + cbfs_image_delete(&image); + return ret; +} + static const struct command commands[] = { {"add", "f:n:t:b:vh?", cbfs_add}, {"add-payload", "f:n:t:c:b:vh?", cbfs_add_payload}, @@ -425,6 +457,7 @@ static const struct command commands[] = { {"locate", "f:n:P:a:Tvh?", cbfs_locate}, {"print", "vh?", cbfs_print}, {"extract", "n:f:vh?", cbfs_extract}, + {"update-fit", "n:x:vh?", cbfs_update_fit}, }; static struct option long_options[] = { @@ -442,6 +475,7 @@ static struct option long_options[] = { {"offset", required_argument, 0, 'o' }, {"file", required_argument, 0, 'f' }, {"arch", required_argument, 0, 'm' }, + {"empty-fits", required_argument, 0, 'x' }, {"verbose", no_argument, 0, 'v' }, {"help", no_argument, 0, 'h' }, {NULL, 0, 0, 0 } @@ -476,6 +510,8 @@ static void usage(char *name) "Show the contents of the ROM\n" " extract -n NAME -f FILE " "Extracts a raw payload from ROM\n" + " update-fit -n MICROCODE_BLOB_NAME -x EMTPY_FIT_ENTRIES\n " + "Updates the FIT table with microcode entries\n" "\n" "ARCHes:\n" " armv7, x86\n" @@ -586,6 +622,9 @@ int main(int argc, char **argv) case 'T': param.top_aligned = 1; break; + case 'x': + param.fit_empty_entries = strtol(optarg, NULL, 0); + break; case 'v': verbose++; break; diff --git a/util/cbfstool/fit.c b/util/cbfstool/fit.c new file mode 100644 index 0000000..12a7e3b --- /dev/null +++ b/util/cbfstool/fit.c @@ -0,0 +1,277 @@ +/* + * Firmware Interface Table support. + * + * Copyright (C) 2012 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; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA + */ + +#include <stdint.h> +#include <stdlib.h> +#include <string.h> +#include <stdio.h> + +#include "common.h" +#include "cbfs.h" +#include "cbfs_image.h" +#include "fit.h" + +/* FIXME: This code assumes it is being executed on a little endian machine. */ + +#define FIT_POINTER_LOCATION 0xffffffc0 +#define FIT_TABLE_LOWEST_ADDRESS ((uint32_t)(-(16 << 20))) +#define FIT_ENTRY_CHECKSUM_VALID 0x80 +#define FIT_TYPE_HEADER 0x0 +#define FIT_HEADER_VERSION 0x0100 +#define FIT_HEADER_ADDRESS "_FIT_ " +#define FIT_TYPE_MICROCODE 0x1 +#define FIT_MICROCODE_VERSION 0x0100 + +struct fit_entry { + uint64_t address; + uint32_t size_reserved; + uint16_t version; + uint8_t type_checksum_valid; + uint8_t checksum; +} __attribute__ ((packed)); + +struct fit_table { + struct fit_entry header; + struct fit_entry entries[0]; +} __attribute__ ((packed)); + +struct microcode_header { + uint32_t version; + uint32_t revision; + uint32_t date; + uint32_t processor_signature; + uint32_t checksum; + uint32_t loader_revision; + uint32_t processor_flags; + uint32_t data_size; + uint32_t total_size; + uint8_t reserved[12]; +} __attribute__ ((packed)); + +struct microcode_entry { + int offset; + int size; +}; + +static inline void *rom_buffer_pointer(struct cbfs_image *image, int offset) +{ + return &image->buffer.data[offset]; +} + +static inline int fit_entry_size_bytes(struct fit_entry *entry) +{ + return (entry->size_reserved & 0xffffff) << 4; +} + +static inline void fit_entry_update_size(struct fit_entry *entry, + int size_bytes) +{ + /* Size is multiples of 16 bytes. */ + entry->size_reserved = (size_bytes >> 4) & 0xffffff; +} + +static inline void fit_entry_add_size(struct fit_entry *entry, + int size_bytes) +{ + int size = fit_entry_size_bytes(entry); + size += size_bytes; + fit_entry_update_size(entry, size); +} + +static inline int fit_entry_type(struct fit_entry *entry) +{ + return entry->type_checksum_valid & ~FIT_ENTRY_CHECKSUM_VALID; +} + +/* + * Get an offset from a host pointer. This function assumes the ROM is located + * in the host address space at [4G - romsize -> 4G). It also assume all + * pointers have values within this address range. + */ +static inline int ptr_to_offset(uint32_t romsize, uint32_t host_ptr) +{ + return (int)(romsize + host_ptr); +} + +/* + * Get a pointer from an offset. This function assumes the ROM is located + * in the host address space at [4G - romsize -> 4G). It also assume all + * pointers have values within this address range. + */ +static inline uint32_t offset_to_ptr(uint32_t romsize, int offset) +{ + return -(romsize - (uint32_t )offset); +} + +static struct fit_table *locate_fit_table(struct cbfs_image *image) +{ + struct fit_table *table; + uint32_t *fit_pointer; + + fit_pointer = rom_buffer_pointer(image, + ptr_to_offset(image->buffer.size, FIT_POINTER_LOCATION)); + + /* Ensure pointer is below 4GiB and within 16MiB of 4GiB */ + if (fit_pointer[1] != 0 || fit_pointer[0] < FIT_TABLE_LOWEST_ADDRESS) + return NULL; + + table = rom_buffer_pointer(image, + ptr_to_offset(image->buffer.size, *fit_pointer)); + + /* Check that the address field has the proper signature. */ + if (strncmp((const char *)&table->header.address, FIT_HEADER_ADDRESS, + sizeof(table->header.address))) + return NULL; + + if (table->header.version != FIT_HEADER_VERSION) + return NULL; + + if (fit_entry_type(&table->header) != FIT_TYPE_HEADER) + return NULL; + + /* Assume that the FIT table only contains the header */ + if (fit_entry_size_bytes(&table->header) != sizeof(struct fit_entry)) + return NULL; + + return table; +} + +static void update_fit_checksum(struct fit_table *fit) +{ + int size_bytes; + uint8_t *buffer; + uint8_t result; + int i; + + fit->header.checksum = 0; + size_bytes = fit_entry_size_bytes(&fit->header); + result = 0; + buffer = (void *)fit; + for (i = 0; i < size_bytes; i++) + result += buffer[i]; + fit->header.checksum = -result; +} + +static void add_microcodde_entries(struct cbfs_image *image, + struct fit_table *fit, + struct microcode_entry *mcus, int num_mcus) +{ + int i; + + for (i = 0; i < num_mcus; i++) { + struct fit_entry *entry = &fit->entries[i]; + struct microcode_entry *mcu = &mcus[i]; + + entry->address = offset_to_ptr(image->buffer.size, mcu->offset); + fit_entry_update_size(entry, mcu->size); + entry->version = FIT_MICROCODE_VERSION; + entry->type_checksum_valid = FIT_TYPE_MICROCODE; + entry->checksum = 0; + fit_entry_add_size(&fit->header, sizeof(struct fit_entry)); + } +} + +static int parse_microcode_blob(struct cbfs_image *image, + struct cbfs_file *mcode_file, + struct microcode_entry *mcus, int *total_mcus) +{ + int num_mcus; + int current_offset; + int file_length; + + current_offset = (int)((char *)mcode_file - image->buffer.data); + current_offset += ntohl(mcode_file->offset); + file_length = ntohl(mcode_file->len); + + num_mcus = 0; + while (file_length > sizeof(struct microcode_header)) + { + struct microcode_header *mcu_header; + + mcu_header = rom_buffer_pointer(image, current_offset); + + /* FIXME: Should the checksum be validated? */ + mcus[num_mcus].offset = current_offset; + mcus[num_mcus].size = mcu_header->total_size; + + /* Proceed to next payload. */ + current_offset += mcus[num_mcus].size; + num_mcus++; + file_length -= mcus[num_mcus].size; + + /* Can't determine any more entries. */ + if (!mcu_header->total_size) + break; + + /* Reached limit of FIT entries. */ + if (num_mcus == *total_mcus) + break; + if (file_length < sizeof(struct microcode_header)) + break; + } + + /* Update how many microcode updates we found. */ + *total_mcus = num_mcus; + + return 0; +} + +int fit_update_table(struct cbfs_image *image, int empty_entries, + const char *microcode_blob_name) +{ + struct fit_table *fit; + struct cbfs_file *mcode_file; + struct microcode_entry *mcus; + int ret = 0; + // struct rom_image image = { .rom = rom, .size = romsize, }; + + fit = locate_fit_table(image); + + if (!fit) { + ERROR("FIT not found.\n"); + return 1; + } + + mcode_file = cbfs_get_entry(image, microcode_blob_name); + if (!mcode_file) { + ERROR("File '%s' not found in CBFS.\n", + microcode_blob_name); + return 1; + } + + mcus = malloc(sizeof(*mcus) * empty_entries); + + if (!mcus) { + ERROR("Couldn't allocate memory for microcode update entries.\n"); + return 1; + } + + if (parse_microcode_blob(image, mcode_file, mcus, &empty_entries)) { + ERROR("Couldn't parse microcode blob.\n"); + ret = 1; + goto out; + } + + add_microcodde_entries(image, fit, mcus, empty_entries); + update_fit_checksum(fit); + +out: + free(mcus); + return ret; +} diff --git a/util/cbfstool/fit.h b/util/cbfstool/fit.h new file mode 100644 index 0000000..63e22f4 --- /dev/null +++ b/util/cbfstool/fit.h @@ -0,0 +1,25 @@ +/* + * Firmware Interface Table support. + * + * Copyright (C) 2012 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; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA + */ + +#ifndef __CBFSTOOL_FIT_H +#define __CBFSTOOL_FIT_H + +int fit_update_table(struct cbfs_image *image, + int empty_entries, const char *microcode_blob_name); +#endif

1 0

New patch to review for coreboot: 31a26a8 cbfstool: Fix cbfs_image.c
by Stefan Reinauer 26 Mar '13

26 Mar '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2922 -gerrit commit 31a26a8c6bffcb4f35aefc1f69d7f42234616df7 Author: Stefan Reinauer <reinauer(a)chromium.org> Date: Tue Mar 26 12:51:36 2013 -0700 cbfstool: Fix cbfs_image.c - The read-only structures are const now - cosmetic fixes - put { on a new line for functions - move code after structures Change-Id: Ib9131b80242b91bd5105feaebdf8306a844da1cc Signed-off-by: Stefan Reinauer <reinauer(a)google.com> --- util/cbfstool/cbfs_image.c | 117 ++++++++++++++++++++++++++++----------------- 1 file changed, 74 insertions(+), 43 deletions(-) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index bd81542..44a9fe8 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -33,12 +33,6 @@ /* To make CBFS more friendly to ROM, fill -1 (0xFF) instead of zero. */ #define CBFS_CONTENT_DEFAULT_VALUE (-1) -static uint32_t align_up(uint32_t value, uint32_t align) { - if (value % align) - value += align - (value % align); - return value; -} - /* Type and format */ struct typedesc_t { @@ -46,7 +40,7 @@ struct typedesc_t { const char *name; }; -static struct typedesc_t types_cbfs_entry[] = { +static const struct typedesc_t types_cbfs_entry[] = { {CBFS_COMPONENT_STAGE, "stage"}, {CBFS_COMPONENT_PAYLOAD, "payload"}, {CBFS_COMPONENT_OPTIONROM, "optionrom"}, @@ -62,14 +56,22 @@ static struct typedesc_t types_cbfs_entry[] = { {0, NULL}, }; -static struct typedesc_t types_cbfs_compression[] = { +static const struct typedesc_t types_cbfs_compression[] = { {CBFS_COMPRESS_NONE, "none"}, {CBFS_COMPRESS_LZMA, "LZMA"}, {0, NULL}, }; -uint32_t lookup_type_by_name(struct typedesc_t *desc, const char *name, - uint32_t default_value) { +static uint32_t align_up(uint32_t value, uint32_t align) +{ + if (value % align) + value += align - (value % align); + return value; +} + +uint32_t lookup_type_by_name(const struct typedesc_t *desc, const char *name, + uint32_t default_value) +{ int i; for (i = 0; desc[i].name; i++) if (strcmp(desc[i].name, name) == 0) @@ -77,8 +79,9 @@ uint32_t lookup_type_by_name(struct typedesc_t *desc, const char *name, return default_value; } -const char *lookup_name_by_type(struct typedesc_t *desc, uint32_t type, - const char *default_value) { +const char *lookup_name_by_type(const struct typedesc_t *desc, uint32_t type, + const char *default_value) +{ int i; for (i = 0; desc[i].name; i++) if (desc[i].type == type) @@ -86,26 +89,31 @@ const char *lookup_name_by_type(struct typedesc_t *desc, uint32_t type, return default_value; } -uint32_t get_cbfs_entry_type(const char *name, uint32_t default_value) { +uint32_t get_cbfs_entry_type(const char *name, uint32_t default_value) +{ return lookup_type_by_name(types_cbfs_entry, name, default_value); } -const char *get_cbfs_entry_type_name(uint32_t type) { +const char *get_cbfs_entry_type_name(uint32_t type) +{ return lookup_name_by_type(types_cbfs_entry, type, "(unknown)"); } -uint32_t get_cbfs_compression(const char *name, uint32_t unknown) { +uint32_t get_cbfs_compression(const char *name, uint32_t unknown) +{ return lookup_type_by_name(types_cbfs_compression, name, unknown); } /* CBFS image */ -static int cbfs_calculate_file_header_size(const char *name) { +static int cbfs_calculate_file_header_size(const char *name) +{ return (sizeof(struct cbfs_file) + align_up(strlen(name) + 1, CBFS_FILENAME_ALIGN)); } -static int cbfs_fix_legacy_size(struct cbfs_image *image) { +static int cbfs_fix_legacy_size(struct cbfs_image *image) +{ // A bug in old cbfstool may produce extra few bytes (by alignment) and // cause cbfstool to overwrite things after free space -- which is // usually CBFS header on x86. We need to workaround that. @@ -226,7 +234,8 @@ int cbfs_image_create(struct cbfs_image *image, return 0; } -int cbfs_image_from_file(struct cbfs_image *image, const char *filename) { +int cbfs_image_from_file(struct cbfs_image *image, const char *filename) +{ if (buffer_from_file(&image->buffer, filename) != 0) return -1; DEBUG("read_cbfs_image: %s (%zd bytes)\n", image->buffer.name, @@ -243,12 +252,14 @@ int cbfs_image_from_file(struct cbfs_image *image, const char *filename) { return 0; } -int cbfs_image_write_file(struct cbfs_image *image, const char *filename) { +int cbfs_image_write_file(struct cbfs_image *image, const char *filename) +{ assert(image && image->buffer.data); return buffer_write_file(&image->buffer, filename); } -int cbfs_image_delete(struct cbfs_image *image) { +int cbfs_image_delete(struct cbfs_image *image) +{ buffer_delete(&image->buffer); image->header = NULL; return 0; @@ -261,7 +272,8 @@ static int cbfs_add_entry_at(struct cbfs_image *image, const char *name, uint32_t type, const void *data, - uint32_t content_offset) { + uint32_t content_offset) +{ struct cbfs_file *next = cbfs_find_next_entry(image, entry); uint32_t addr = cbfs_get_entry_addr(image, entry), addr_next = cbfs_get_entry_addr(image, next); @@ -329,7 +341,8 @@ static int cbfs_add_entry_at(struct cbfs_image *image, } int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, - const char *name, uint32_t type, uint32_t content_offset) { + const char *name, uint32_t type, uint32_t content_offset) +{ uint32_t entry_type; uint32_t addr, addr_next; struct cbfs_file *entry, *next; @@ -428,7 +441,8 @@ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer, return -1; } -struct cbfs_file *cbfs_get_entry(struct cbfs_image *image, const char *name) { +struct cbfs_file *cbfs_get_entry(struct cbfs_image *image, const char *name) +{ struct cbfs_file *entry; for (entry = cbfs_find_first_entry(image); entry && cbfs_is_valid_entry(image, entry); @@ -442,7 +456,8 @@ struct cbfs_file *cbfs_get_entry(struct cbfs_image *image, const char *name) { } int cbfs_export_entry(struct cbfs_image *image, const char *entry_name, - const char *filename) { + const char *filename) +{ struct cbfs_file *entry = cbfs_get_entry(image, entry_name); struct buffer buffer; if (!entry) { @@ -469,7 +484,8 @@ int cbfs_export_entry(struct cbfs_image *image, const char *entry_name, return 0; } -int cbfs_remove_entry(struct cbfs_image *image, const char *name) { +int cbfs_remove_entry(struct cbfs_image *image, const char *name) +{ struct cbfs_file *entry, *next; size_t len; entry = cbfs_get_entry(image, name); @@ -492,7 +508,8 @@ int cbfs_remove_entry(struct cbfs_image *image, const char *name) { return 0; } -int cbfs_print_header_info(struct cbfs_image *image) { +int cbfs_print_header_info(struct cbfs_image *image) +{ char *name = strdup(image->buffer.name); assert(image && image->header); printf("%s: %zd kB, bootblocksize %d, romsize %d, offset 0x%x\n" @@ -507,7 +524,8 @@ int cbfs_print_header_info(struct cbfs_image *image) { return 0; } -static int cbfs_print_stage_info(struct cbfs_stage *stage, FILE* fp) { +static int cbfs_print_stage_info(struct cbfs_stage *stage, FILE* fp) +{ fprintf(fp, " %s compression, entry: 0x%" PRIx64 ", load: 0x%" PRIx64 ", " "length: %d/%d\n", @@ -571,7 +589,8 @@ static int cbfs_print_payload_segment_info(struct cbfs_payload_segment *payload, } int cbfs_print_entry_info(struct cbfs_image *image, struct cbfs_file *entry, - void *arg) { + void *arg) +{ const char *name = CBFS_NAME(entry); struct cbfs_payload_segment *payload; FILE *fp = (FILE *)arg; @@ -622,7 +641,8 @@ int cbfs_print_entry_info(struct cbfs_image *image, struct cbfs_file *entry, return 0; } -int cbfs_print_directory(struct cbfs_image *image) { +int cbfs_print_directory(struct cbfs_image *image) +{ cbfs_print_header_info(image); printf("%-30s %-10s %-12s Size\n", "Name", "Offset", "Type"); cbfs_walk(image, cbfs_print_entry_info, NULL); @@ -630,7 +650,8 @@ int cbfs_print_directory(struct cbfs_image *image) { } int cbfs_merge_empty_entry(struct cbfs_image *image, struct cbfs_file *entry, - void *arg) { + void *arg) +{ struct cbfs_file *next; uint32_t type, addr, last_addr; @@ -673,7 +694,8 @@ int cbfs_merge_empty_entry(struct cbfs_image *image, struct cbfs_file *entry, } int cbfs_walk(struct cbfs_image *image, cbfs_entry_callback callback, - void *arg) { + void *arg) +{ int count = 0; struct cbfs_file *entry; for (entry = cbfs_find_first_entry(image); @@ -686,7 +708,8 @@ int cbfs_walk(struct cbfs_image *image, cbfs_entry_callback callback, return count; } -struct cbfs_header *cbfs_find_header(char *data, size_t size) { +struct cbfs_header *cbfs_find_header(char *data, size_t size) +{ size_t offset; int found = 0; uint32_t x86sig; @@ -722,14 +745,16 @@ struct cbfs_header *cbfs_find_header(char *data, size_t size) { } -struct cbfs_file *cbfs_find_first_entry(struct cbfs_image *image) { +struct cbfs_file *cbfs_find_first_entry(struct cbfs_image *image) +{ assert(image && image->header); return (struct cbfs_file *)(image->buffer.data + ntohl(image->header->offset)); } struct cbfs_file *cbfs_find_next_entry(struct cbfs_image *image, - struct cbfs_file *entry) { + struct cbfs_file *entry) +{ uint32_t addr = cbfs_get_entry_addr(image, entry); int align = ntohl(image->header->align); assert(entry && cbfs_is_valid_entry(image, entry)); @@ -738,12 +763,14 @@ struct cbfs_file *cbfs_find_next_entry(struct cbfs_image *image, return (struct cbfs_file *)(image->buffer.data + addr); } -uint32_t cbfs_get_entry_addr(struct cbfs_image *image, struct cbfs_file *entry) { +uint32_t cbfs_get_entry_addr(struct cbfs_image *image, struct cbfs_file *entry) +{ assert(image && image->buffer.data && entry); return (int32_t)((char *)entry - image->buffer.data); } -int cbfs_is_valid_entry(struct cbfs_image *image, struct cbfs_file *entry) { +int cbfs_is_valid_entry(struct cbfs_image *image, struct cbfs_file *entry) +{ return (entry && (char *)entry >= image->buffer.data && (char *)entry + sizeof(entry->magic) < @@ -753,7 +780,8 @@ int cbfs_is_valid_entry(struct cbfs_image *image, struct cbfs_file *entry) { } int cbfs_init_entry(struct cbfs_file *entry, - struct buffer *buffer) { + struct buffer *buffer) +{ memset(entry, 0, sizeof(*entry)); memcpy(entry->magic, CBFS_FILE_MAGIC, sizeof(entry->magic)); entry->len = htonl(buffer->size); @@ -762,7 +790,8 @@ int cbfs_init_entry(struct cbfs_file *entry, } int cbfs_create_empty_entry(struct cbfs_image *image, struct cbfs_file *entry, - size_t len, const char *name) { + size_t len, const char *name) +{ memset(entry, CBFS_CONTENT_DEFAULT_VALUE, sizeof(*entry)); memcpy(entry->magic, CBFS_FILE_MAGIC, sizeof(entry->magic)); entry->type = htonl(CBFS_COMPONENT_NULL); @@ -775,9 +804,9 @@ int cbfs_create_empty_entry(struct cbfs_image *image, struct cbfs_file *entry, return 0; } -/* Finds a place to hold whole data in same memory page. - */ -static int is_in_same_page(uint32_t start, uint32_t size, uint32_t page) { +/* Finds a place to hold whole data in same memory page. */ +static int is_in_same_page(uint32_t start, uint32_t size, uint32_t page) +{ if (!page) return 1; return (start / page) == (start + size - 1) / page; @@ -787,12 +816,14 @@ static int is_in_same_page(uint32_t start, uint32_t size, uint32_t page) { * start ->| header_len | offset (+ size) |<- end */ static int is_in_range(uint32_t start, uint32_t end, uint32_t header_len, - uint32_t offset, uint32_t size) { + uint32_t offset, uint32_t size) +{ return (offset >= start + header_len && offset + size <= end); } int32_t cbfs_locate_entry(struct cbfs_image *image, const char *name, - uint32_t size, uint32_t page_size, uint32_t align) { + uint32_t size, uint32_t page_size, uint32_t align) +{ struct cbfs_file *entry; size_t need_len; uint32_t addr, addr_next, addr2, addr3, offset, header_len;

1 0

Patch set updated for coreboot: a9656d4 cbfstool: Add update-fit command
by Stefan Reinauer 26 Mar '13

26 Mar '13

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2712 -gerrit commit a9656d4499084434901f67b852fbf5fc77800e99 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Fri Dec 14 17:16:21 2012 -0600 cbfstool: Add update-fit command Add support for filling in the Firmware Interface Table. For now it only supports adding microcode entries. It takes 2 options: 1. Name of file in cbfs where the mircocode is located 2. The number of empty entries in the table. Verified with go firmware tools. Also commented out updating microcode in the bootblock. When romstage runs, the CPUs indicate their microcode is already loaded. Change-Id: Iaccaa9c226ee24868a5f4c0ba79729015d15bbef Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> Signed-off-by: Stefan Reinauer <reinauer(a)google.com> --- util/cbfstool/Makefile | 2 +- util/cbfstool/Makefile.inc | 1 + util/cbfstool/cbfstool.c | 39 +++++++ util/cbfstool/fit.c | 277 +++++++++++++++++++++++++++++++++++++++++++++ util/cbfstool/fit.h | 25 ++++ 5 files changed, 343 insertions(+), 1 deletion(-) diff --git a/util/cbfstool/Makefile b/util/cbfstool/Makefile index a14a76f..a51e6de 100644 --- a/util/cbfstool/Makefile +++ b/util/cbfstool/Makefile @@ -7,7 +7,7 @@ CFLAGS += -D_7ZIP_ST BINARY:=$(obj)/cbfstool -COMMON:=cbfstool.o common.o cbfs_image.o compress.o +COMMON:=cbfstool.o common.o cbfs_image.o compress.o fit.o COMMON+=cbfs-mkstage.o cbfs-mkpayload.o # LZMA COMMON+=lzma/lzma.o diff --git a/util/cbfstool/Makefile.inc b/util/cbfstool/Makefile.inc index 2cee794..e3eb798 100644 --- a/util/cbfstool/Makefile.inc +++ b/util/cbfstool/Makefile.inc @@ -5,6 +5,7 @@ cbfsobj += compress.o cbfsobj += cbfs_image.o cbfsobj += cbfs-mkstage.o cbfsobj += cbfs-mkpayload.o +cbfsobj += fit.o # LZMA cbfsobj += lzma.o cbfsobj += LzFind.o diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index eeb6936..1a3d25e 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -28,6 +28,7 @@ #include "common.h" #include "cbfs.h" #include "cbfs_image.h" +#include "fit.h" struct command { const char *name; @@ -53,6 +54,7 @@ static struct param { uint32_t pagesize; uint32_t offset; uint32_t top_aligned; + int fit_empty_entries; comp_algo algo; } param = { /* All variables not listed are initialized as zero. */ @@ -415,6 +417,36 @@ static int cbfs_extract(void) return result; } +static int cbfs_update_fit(void) +{ + int ret = 0; + struct cbfs_image image; + + if (!param.name) { + ERROR("You need to specify -n/--name.\n"); + return 1; + } + + if (param.fit_empty_entries <= 0) { + ERROR("Invalid number of fit entries " + "(-x/--empty-fits): %d\n", param.fit_empty_entries); + return 1; + } + + if (cbfs_image_from_file(&image, param.cbfs_name) != 0) { + ERROR("Could not load ROM image '%s'.\n", + param.cbfs_name); + return 1; + } + + ret = fit_update_table(&image, param.fit_empty_entries, param.name); + if (!ret) + ret = cbfs_image_write_file(&image, param.cbfs_name); + + cbfs_image_delete(&image); + return ret; +} + static const struct command commands[] = { {"add", "f:n:t:b:vh?", cbfs_add}, {"add-payload", "f:n:t:c:b:vh?", cbfs_add_payload}, @@ -425,6 +457,7 @@ static const struct command commands[] = { {"locate", "f:n:P:a:Tvh?", cbfs_locate}, {"print", "vh?", cbfs_print}, {"extract", "n:f:vh?", cbfs_extract}, + {"update-fit", "n:x:vh?", cbfs_update_fit}, }; static struct option long_options[] = { @@ -442,6 +475,7 @@ static struct option long_options[] = { {"offset", required_argument, 0, 'o' }, {"file", required_argument, 0, 'f' }, {"arch", required_argument, 0, 'm' }, + {"empty-fits", required_argument, 0, 'x' }, {"verbose", no_argument, 0, 'v' }, {"help", no_argument, 0, 'h' }, {NULL, 0, 0, 0 } @@ -476,6 +510,8 @@ static void usage(char *name) "Show the contents of the ROM\n" " extract -n NAME -f FILE " "Extracts a raw payload from ROM\n" + " update-fit -n MICROCODE_BLOB_NAME -x EMTPY_FIT_ENTRIES\n " + "Updates the FIT table with microcode entries\n" "\n" "ARCHes:\n" " armv7, x86\n" @@ -586,6 +622,9 @@ int main(int argc, char **argv) case 'T': param.top_aligned = 1; break; + case 'x': + param.fit_empty_entries = strtol(optarg, NULL, 0); + break; case 'v': verbose++; break; diff --git a/util/cbfstool/fit.c b/util/cbfstool/fit.c new file mode 100644 index 0000000..ec83246 --- /dev/null +++ b/util/cbfstool/fit.c @@ -0,0 +1,277 @@ +/* + * Firmware Interface Table support. + * + * Copyright (C) 2012 ChromeOS Authors + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA + */ + +#include <stdint.h> +#include <stdlib.h> +#include <string.h> +#include <stdio.h> + +#include "common.h" +#include "cbfs.h" +#include "cbfs_image.h" +#include "fit.h" + +/* FIXME: This code assumes it is being executed on a little endian machine. */ + +#define FIT_POINTER_LOCATION 0xffffffc0 +#define FIT_TABLE_LOWEST_ADDRESS ((uint32_t)(-(16 << 20))) +#define FIT_ENTRY_CHECKSUM_VALID 0x80 +#define FIT_TYPE_HEADER 0x0 +#define FIT_HEADER_VERSION 0x0100 +#define FIT_HEADER_ADDRESS "_FIT_ " +#define FIT_TYPE_MICROCODE 0x1 +#define FIT_MICROCODE_VERSION 0x0100 + +struct fit_entry { + uint64_t address; + uint32_t size_reserved; + uint16_t version; + uint8_t type_checksum_valid; + uint8_t checksum; +} __attribute__ ((packed)); + +struct fit_table { + struct fit_entry header; + struct fit_entry entries[0]; +} __attribute__ ((packed)); + +struct microcode_header { + uint32_t version; + uint32_t revision; + uint32_t date; + uint32_t processor_signature; + uint32_t checksum; + uint32_t loader_revision; + uint32_t processor_flags; + uint32_t data_size; + uint32_t total_size; + uint8_t reserved[12]; +} __attribute__ ((packed)); + +struct microcode_entry { + int offset; + int size; +}; + +static inline void *rom_buffer_pointer(struct cbfs_image *image, int offset) +{ + return &image->buffer.data[offset]; +} + +static inline int fit_entry_size_bytes(struct fit_entry *entry) +{ + return (entry->size_reserved & 0xffffff) << 4; +} + +static inline void fit_entry_update_size(struct fit_entry *entry, + int size_bytes) +{ + /* Size is multiples of 16 bytes. */ + entry->size_reserved = (size_bytes >> 4) & 0xffffff; +} + +static inline void fit_entry_add_size(struct fit_entry *entry, + int size_bytes) +{ + int size = fit_entry_size_bytes(entry); + size += size_bytes; + fit_entry_update_size(entry, size); +} + +static inline int fit_entry_type(struct fit_entry *entry) +{ + return entry->type_checksum_valid & ~FIT_ENTRY_CHECKSUM_VALID; +} + +/* + * Get an offset from a host pointer. This function assumes the ROM is located + * in the host address space at [4G - romsize -> 4G). It also assume all + * pointers have values within this address range. + */ +static inline int ptr_to_offset(uint32_t romsize, uint32_t host_ptr) +{ + return (int)(romsize + host_ptr); +} + +/* + * Get a pointer from an offset. This function assumes the ROM is located + * in the host address space at [4G - romsize -> 4G). It also assume all + * pointers have values within this address range. + */ +static inline uint32_t offset_to_ptr(uint32_t romsize, int offset) +{ + return -(romsize - (uint32_t )offset); +} + +static struct fit_table *locate_fit_table(struct cbfs_image *image) +{ + struct fit_table *table; + uint32_t *fit_pointer; + + fit_pointer = rom_buffer_pointer(image, + ptr_to_offset(image->buffer.size, FIT_POINTER_LOCATION)); + + /* Ensure pointer is below 4GiB and within 16MiB of 4GiB */ + if (fit_pointer[1] != 0 || fit_pointer[0] < FIT_TABLE_LOWEST_ADDRESS) + return NULL; + + table = rom_buffer_pointer(image, + ptr_to_offset(image->buffer.size, *fit_pointer)); + + /* Check that the address field has the proper signature. */ + if (strncmp((const char *)&table->header.address, FIT_HEADER_ADDRESS, + sizeof(table->header.address))) + return NULL; + + if (table->header.version != FIT_HEADER_VERSION) + return NULL; + + if (fit_entry_type(&table->header) != FIT_TYPE_HEADER) + return NULL; + + /* Assume that the FIT table only contains the header */ + if (fit_entry_size_bytes(&table->header) != sizeof(struct fit_entry)) + return NULL; + + return table; +} + +static void update_fit_checksum(struct fit_table *fit) +{ + int size_bytes; + uint8_t *buffer; + uint8_t result; + int i; + + fit->header.checksum = 0; + size_bytes = fit_entry_size_bytes(&fit->header); + result = 0; + buffer = (void *)fit; + for (i = 0; i < size_bytes; i++) + result += buffer[i]; + fit->header.checksum = -result; +} + +static void add_microcodde_entries(struct cbfs_image *image, + struct fit_table *fit, + struct microcode_entry *mcus, int num_mcus) +{ + int i; + + for (i = 0; i < num_mcus; i++) { + struct fit_entry *entry = &fit->entries[i]; + struct microcode_entry *mcu = &mcus[i]; + + entry->address = offset_to_ptr(image->buffer.size, mcu->offset); + fit_entry_update_size(entry, mcu->size); + entry->version = FIT_MICROCODE_VERSION; + entry->type_checksum_valid = FIT_TYPE_MICROCODE; + entry->checksum = 0; + fit_entry_add_size(&fit->header, sizeof(struct fit_entry)); + } +} + +static int parse_microcode_blob(struct cbfs_image *image, + struct cbfs_file *mcode_file, + struct microcode_entry *mcus, int *total_mcus) +{ + int num_mcus; + int current_offset; + int file_length; + + current_offset = (int)((char *)mcode_file - image->buffer.data); + current_offset += ntohl(mcode_file->offset); + file_length = ntohl(mcode_file->len); + + num_mcus = 0; + while (file_length > sizeof(struct microcode_header)) + { + struct microcode_header *mcu_header; + + mcu_header = rom_buffer_pointer(image, current_offset); + + /* FIXME: Should the checksum be validated? */ + mcus[num_mcus].offset = current_offset; + mcus[num_mcus].size = mcu_header->total_size; + + /* Proceed to next payload. */ + current_offset += mcus[num_mcus].size; + num_mcus++; + file_length -= mcus[num_mcus].size; + + /* Can't determine any more entries. */ + if (!mcu_header->total_size) + break; + + /* Reached limit of FIT entries. */ + if (num_mcus == *total_mcus) + break; + if (file_length < sizeof(struct microcode_header)) + break; + } + + /* Update how many microcode updates we found. */ + *total_mcus = num_mcus; + + return 0; +} + +int fit_update_table(struct cbfs_image *image, int empty_entries, + const char *microcode_blob_name) +{ + struct fit_table *fit; + struct cbfs_file *mcode_file; + struct microcode_entry *mcus; + int ret = 0; + // struct rom_image image = { .rom = rom, .size = romsize, }; + + fit = locate_fit_table(image); + + if (!fit) { + ERROR("FIT not found.\n"); + return 1; + } + + mcode_file = cbfs_get_entry(image, microcode_blob_name); + if (!mcode_file) { + ERROR("File '%s' not found in CBFS.\n", + microcode_blob_name); + return 1; + } + + mcus = malloc(sizeof(*mcus) * empty_entries); + + if (!mcus) { + ERROR("Couldn't allocate memory for microcode update entries.\n"); + return 1; + } + + if (parse_microcode_blob(image, mcode_file, mcus, &empty_entries)) { + ERROR("Couldn't parse microcode blob.\n"); + ret = 1; + goto out; + } + + add_microcodde_entries(image, fit, mcus, empty_entries); + update_fit_checksum(fit); + +out: + free(mcus); + return ret; +} diff --git a/util/cbfstool/fit.h b/util/cbfstool/fit.h new file mode 100644 index 0000000..2d2a0ab --- /dev/null +++ b/util/cbfstool/fit.h @@ -0,0 +1,25 @@ +/* + * Firmware Interface Table support. + * + * Copyright (C) 2012 ChromeOS Authors + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA, 02110-1301 USA + */ + +#ifndef __CBFSTOOL_FIT_H +#define __CBFSTOOL_FIT_H + +int fit_update_table(struct cbfs_image *image, + int empty_entries, const char *microcode_blob_name); +#endif

1 0

New patch to review for coreboot: 57f6a36 chromeos: remote CACHE_ROM automatic selection
by Aaron Durbin 26 Mar '13

26 Mar '13

Aaron Durbin (adurbin(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2921 -gerrit commit 57f6a3673d5b2e15040d094e79150bf73d292f15 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Tue Mar 26 14:52:04 2013 -0500 chromeos: remote CACHE_ROM automatic selection It's not appropriate for the chromeos Kconfig to automatically select CACHE_ROM. The reason is that enabling CACHE_ROM is dependent on the board and chipset atrributes. Change-Id: I47429f1cceefd40226c4b943215d627a3c869c7b Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- src/vendorcode/google/chromeos/Kconfig | 1 - 1 file changed, 1 deletion(-) diff --git a/src/vendorcode/google/chromeos/Kconfig b/src/vendorcode/google/chromeos/Kconfig index e99e2c8..d5ca212 100644 --- a/src/vendorcode/google/chromeos/Kconfig +++ b/src/vendorcode/google/chromeos/Kconfig @@ -20,7 +20,6 @@ config CHROMEOS bool default n select TPM - select CACHE_ROM help Enable ChromeOS specific features like the GPIO sub table in the coreboot table. NOTE: Enabling this option on an unsupported

1 0

New patch to review for coreboot: 4787382 libpayload: add x86 ROM variable MTRR support
by Aaron Durbin 26 Mar '13

26 Mar '13

Aaron Durbin (adurbin(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2920 -gerrit commit 47873822c5a192d9be84f96f05988d651ec621b8 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Tue Mar 26 13:34:37 2013 -0500 libpayload: add x86 ROM variable MTRR support On x86, Coreboot may allocate a variable range MTRR for enabling caching of the system ROM. Add the ability to parse this structure and add the result to the sysinfo structure. Change-Id: I3bfe2028d8574d3adb1d85292abf8f1372cf97fa Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- payloads/libpayload/arch/x86/coreboot.c | 23 ++++++++++++++++++++++- payloads/libpayload/include/coreboot_tables.h | 12 ++++++++++++ payloads/libpayload/include/sysinfo.h | 5 +++++ 3 files changed, 39 insertions(+), 1 deletion(-) diff --git a/payloads/libpayload/arch/x86/coreboot.c b/payloads/libpayload/arch/x86/coreboot.c index f4f9b86..77e094f 100644 --- a/payloads/libpayload/arch/x86/coreboot.c +++ b/payloads/libpayload/arch/x86/coreboot.c @@ -158,6 +158,14 @@ static void cb_parse_framebuffer(void *ptr, struct sysinfo_t *info) } #endif +#if CONFIG_ARCH_X86 +static void cb_parse_x86_rom_var_mtrr(void *ptr, struct sysinfo_t *info) +{ + struct cb_x86_rom_mtrr *rom_mtrr = ptr; + info->x86_rom_var_mtrr_index = index; +} +#endif + static void cb_parse_string(unsigned char *ptr, char **info) { *info = (char *)((struct cb_string *)ptr)->string; @@ -281,6 +289,11 @@ static int cb_parse_header(void *addr, int len, struct sysinfo_t *info) case CB_TAG_MRC_CACHE: cb_parse_mrc_cache(ptr, info); break; +#if CONFIG_ARCH_X86 + case CB_TAG_X86_ROM_MTRR: + cb_parse_x86_rom_var_mtrr(ptr, info); + break; +#endif } ptr += rec->size; @@ -294,7 +307,15 @@ static int cb_parse_header(void *addr, int len, struct sysinfo_t *info) int get_coreboot_info(struct sysinfo_t *info) { - int ret = cb_parse_header(phys_to_virt(0x00000000), 0x1000, info); + int ret; + +#if CONFIG_ARCH_X86 + /* Ensure the variable range MTRR index covering the ROM is set to + * an invalid value. */ + info->x86_rom_var_mtrr_index = -1; +#endif + + ret = cb_parse_header(phys_to_virt(0x00000000), 0x1000, info); if (ret != 1) ret = cb_parse_header(phys_to_virt(0x000f0000), 0x1000, info); diff --git a/payloads/libpayload/include/coreboot_tables.h b/payloads/libpayload/include/coreboot_tables.h index 38bda55..02c9449 100644 --- a/payloads/libpayload/include/coreboot_tables.h +++ b/payloads/libpayload/include/coreboot_tables.h @@ -217,6 +217,18 @@ struct cb_vboot_handoff { uint32_t vboot_handoff_size; }; +#define CB_TAG_X86_ROM_MTRR 0x0021 +struct cb_x86_rom_mtrr { + uint32_t tag; + uint32_t size; + /* The variable range MTRR index covering the ROM. If one wants to + * enable caching the ROM, the variable MTRR needs to be set to + * write-protect. To disable the caching after enabling set the + * type to uncacheable. */ + uint32_t index; +}; + + #define CB_TAG_CMOS_OPTION_TABLE 0x00c8 struct cb_cmos_option_table { u32 tag; diff --git a/payloads/libpayload/include/sysinfo.h b/payloads/libpayload/include/sysinfo.h index e05ef9f..a4afd01 100644 --- a/payloads/libpayload/include/sysinfo.h +++ b/payloads/libpayload/include/sysinfo.h @@ -99,6 +99,11 @@ struct sysinfo_t { void *vdat_addr; u32 vdat_size; #endif + +#ifdef CONFIG_ARCH_X86 + long x86_rom_var_mtrr_index; +#endif + void *tstamp_table; void *cbmem_cons; void *mrc_cache;

1 0

New patch to review for coreboot: 9acee2e x86: add rom cache variable MTRR index to tables
by Aaron Durbin 26 Mar '13

26 Mar '13

Aaron Durbin (adurbin(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/2919 -gerrit commit 9acee2e50d5e5ff0ce917bae818b1d1dba8f6c1b Author: Aaron Durbin <adurbin(a)chromium.org> Date: Tue Mar 26 13:09:39 2013 -0500 x86: add rom cache variable MTRR index to tables Downstream payloads may need to take advantage of caching the ROM for performance reasons. Add the ability to communicate the variable range MTRR index to use to perform the caching enablement. Change-Id: I4d486cfb986629247ab2da7818486973c6720ef5 Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- src/include/boot/coreboot_tables.h | 8 ++++++++ src/include/cpu/x86/mtrr.h | 3 +++ src/lib/coreboot_table.c | 24 ++++++++++++++++++++++++ 3 files changed, 35 insertions(+) diff --git a/src/include/boot/coreboot_tables.h b/src/include/boot/coreboot_tables.h index f624ac1..a7e4ab0 100644 --- a/src/include/boot/coreboot_tables.h +++ b/src/include/boot/coreboot_tables.h @@ -250,6 +250,14 @@ struct lb_vboot_handoff { uint32_t vboot_handoff_size; }; +#define LB_TAG_X86_ROM_MTRR 0x0021 +struct lb_x86_rom_mtrr { + uint32_t tag; + uint32_t size; + /* The variable range MTRR index covering the ROM. */ + uint32_t index; +}; + /* The following structures are for the cmos definitions table */ #define LB_TAG_CMOS_OPTION_TABLE 200 /* cmos header record */ diff --git a/src/include/cpu/x86/mtrr.h b/src/include/cpu/x86/mtrr.h index bff736d..15a5cad 100644 --- a/src/include/cpu/x86/mtrr.h +++ b/src/include/cpu/x86/mtrr.h @@ -78,9 +78,12 @@ int x86_mtrr_check(void); #if CONFIG_CACHE_ROM void x86_mtrr_enable_rom_caching(void); void x86_mtrr_disable_rom_caching(void); +/* Return the variable range MTRR index of the ROM cache. */ +long x86_mtrr_rom_cache_var_index(void); #else static inline void x86_mtrr_enable_rom_caching(void) {} static inline void x86_mtrr_disable_rom_caching(void) {} +static inline long x86_mtrr_rom_cache_var_index(void) { return -1; } #endif /* CONFIG_CACHE_ROM */ #endif diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c index b9a82a8..b61f054 100644 --- a/src/lib/coreboot_table.c +++ b/src/lib/coreboot_table.c @@ -40,6 +40,9 @@ #include <vendorcode/google/chromeos/chromeos.h> #include <vendorcode/google/chromeos/gnvs.h> #endif +#if CONFIG_ARCH_X86 +#include <cpu/x86/mtrr.h> +#endif static struct lb_header *lb_table_init(unsigned long addr) { @@ -237,6 +240,25 @@ static inline void lb_vboot_handoff(struct lb_header *header) {} #endif /* CONFIG_VBOOT_VERIFY_FIRMWARE */ #endif /* CONFIG_CHROMEOS */ + +static void lb_x86_rom_cache(struct lb_header *header) +{ +#if CONFIG_ARCH_X86 + long mtrr_index; + struct lb_x86_rom_mtrr *lb_x86_rom_mtrr; + + mtrr_index = x86_mtrr_rom_cache_var_index(); + + if (mtrr_index < 0) + return; + + lb_x86_rom_mtrr = (struct lb_x86_rom_mtrr *)lb_new_record(header); + lb_x86_rom_mtrr->tag = LB_TAG_X86_ROM_MTRR; + lb_x86_rom_mtrr->size = sizeof(struct lb_x86_rom_mtrr); + lb_x86_rom_mtrr->index = mtrr_index; +#endif +} + static void add_cbmem_pointers(struct lb_header *header) { /* @@ -539,6 +561,8 @@ unsigned long write_coreboot_table( lb_strings(head); /* Record our framebuffer */ lb_framebuffer(head); + /* Communicate x86 variable MTRR ROM cache information. */ + lb_x86_rom_cache(head); #if CONFIG_CHROMEOS /* Record our GPIO settings (ChromeOS specific) */

1 0

← Newer
1
...
20
21
22
23
24
25
26
...
45
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit March 2013