coreboot-gerrit August 2015

coreboot-gerrit@coreboot.org

1 participants
814 discussions

Patch set updated for coreboot: cbfstool: factor out parsing compression file attributes
by Patrick Georgi 31 Aug '15

31 Aug '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11361 -gerrit commit 6d933faf720bd4b533396f1e7e76663374b52528 Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Wed Aug 26 12:23:26 2015 +0200 cbfstool: factor out parsing compression file attributes cbfstool extract also needs it. Change-Id: I8302bb18c5f797eb0a43ec4e4269790f3d49a896 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- util/cbfstool/cbfs_image.c | 33 ++++++++++++++++++++++----------- 1 file changed, 22 insertions(+), 11 deletions(-) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 8eef91c..082fe06 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -178,6 +178,26 @@ static void cbfs_decode_payload_segment(struct cbfs_payload_segment *output, assert(seg.size == 0); } +static int cbfs_file_get_compression_info(struct cbfs_file *entry, + uint32_t *decompressed_size) +{ + unsigned int compression = CBFS_COMPRESS_NONE; + *decompressed_size = ntohl(entry->len); + for (struct cbfs_file_attribute *attr = cbfs_file_first_attr(entry); + attr != NULL; + attr = cbfs_file_next_attr(entry, attr)) { + if (attr->tag == CBFS_FILE_ATTR_TAG_COMPRESSION) { + struct cbfs_file_attr_compression *ac = + (struct cbfs_file_attr_compression *)attr; + compression = ntohl(ac->compression); + if (decompressed_size) + *decompressed_size = + ntohl(ac->decompressed_size); + } + } + return compression; +} + void cbfs_get_header(struct cbfs_header *header, void *src) { struct buffer outheader; @@ -777,18 +797,9 @@ int cbfs_print_entry_info(struct cbfs_image *image, struct cbfs_file *entry, if (!fp) fp = stdout; - unsigned int compression = CBFS_COMPRESS_NONE; unsigned int decompressed_size = 0; - for (struct cbfs_file_attribute *attr = cbfs_file_first_attr(entry); - attr != NULL; - attr = cbfs_file_next_attr(entry, attr)) { - if (attr->tag == CBFS_FILE_ATTR_TAG_COMPRESSION) { - struct cbfs_file_attr_compression *ac = - (struct cbfs_file_attr_compression *)attr; - compression = ntohl(ac->compression); - decompressed_size = ntohl(ac->decompressed_size); - } - } + unsigned int compression = cbfs_file_get_compression_info(entry, + &decompressed_size); if (compression == CBFS_COMPRESS_NONE) { fprintf(fp, "%-30s 0x%-8x %-12s %d\n",

1 0

Patch set updated for coreboot: cbfstool: allow compression at file header level
by Patrick Georgi 31 Aug '15

31 Aug '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10935 -gerrit commit 7e5d3d0504cec3ec6fad85c7706353ba5ade82f7 Author: Daisuke Nojiri <dnojiri(a)chromium.org> Date: Thu Jul 9 15:07:45 2015 -0700 cbfstool: allow compression at file header level Currently, compression is only allowed at subheader level (e.g. cbfs_stage, cbfs_payload_segment). This change adds compression field to each file's header so that any cbfs file can be compressed. With the necessary additions in coreboot and libpayload, the following sample code can load a compressed file: const char *name = "foo.bmp"; struct cbfs_file *file = cbfs_get_file(media, name); void *dst = malloc(ntohl(file->uncompressed_size)); dst = cbfs_get_file_content(media, name, type, file, dst); cbfs_stage and cbfs_payload_segment continue to support compression at subheader level because stages and payloads have to be decompressed to the load address, which is stored in the subheader. For these, file level compression should be turned off. Change-Id: I9a00ec99dfc68ffb2771bb4a3cc5ba6ba8a326f4 Signed-off-by: Daisuke Nojiri <dnojiri(a)chromium.org> Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- util/cbfstool/cbfs.h | 9 +++++++++ util/cbfstool/cbfstool.c | 38 +++++++++++++++++++++++++++++++++++--- 2 files changed, 44 insertions(+), 3 deletions(-) diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h index 185bdde..524961f 100644 --- a/util/cbfstool/cbfs.h +++ b/util/cbfstool/cbfs.h @@ -104,6 +104,15 @@ struct cbfs_file_attribute { * 0xff. Support both. */ #define CBFS_FILE_ATTR_TAG_UNUSED 0 #define CBFS_FILE_ATTR_TAG_UNUSED2 0xffffffff +#define CBFS_FILE_ATTR_TAG_COMPRESSION ntohl(0x42435a4c) + +struct cbfs_file_attr_compression { + uint32_t tag; + uint32_t len; + /* whole file compression format. 0 if no compression. */ + uint32_t compression; + uint32_t decompressed_size; +} __PACKED; struct cbfs_stage { uint32_t compression; diff --git a/util/cbfstool/cbfstool.c b/util/cbfstool/cbfstool.c index 059acbf..679abf8 100644 --- a/util/cbfstool/cbfstool.c +++ b/util/cbfstool/cbfstool.c @@ -230,6 +230,38 @@ static int cbfs_add_component(const char *filename, return 0; } +static int cbfstool_convert_raw(struct buffer *buffer, + unused uint32_t *offset, struct cbfs_file *header) +{ + char *compressed; + int compressed_size; + + comp_func_ptr compress = compression_function(param.compression); + if (!compress) + return -1; + compressed = calloc(buffer->size, 1); + + if (compress(buffer->data, buffer->size, + compressed, &compressed_size)) { + WARN("Compression failed - disabled\n"); + } else { + struct cbfs_file_attr_compression *attrs = + (struct cbfs_file_attr_compression *) + cbfs_add_file_attr(header, + CBFS_FILE_ATTR_TAG_COMPRESSION, + sizeof(struct cbfs_file_attr_compression)); + if (attrs == NULL) + return -1; + free(buffer->data); + buffer->data = compressed; + attrs->compression = htonl(param.compression); + attrs->decompressed_size = htonl(buffer->size); + buffer->size = compressed_size; + header->len = htonl(buffer->size); + } + return 0; +} + static int cbfstool_convert_mkstage(struct buffer *buffer, uint32_t *offset, struct cbfs_file *header) { @@ -301,7 +333,7 @@ static int cbfs_add(void) param.type, param.baseaddress, param.headeroffset, - NULL); + cbfstool_convert_raw); } static int cbfs_add_stage(void) @@ -747,7 +779,7 @@ static bool cbfs_is_legacy_format(struct buffer *buffer) } static const struct command commands[] = { - {"add", "H:r:f:n:t:b:vh?", cbfs_add, true, true}, + {"add", "H:r:f:n:t:c:b:vh?", cbfs_add, true, true}, {"add-flat-binary", "H:r:f:n:l:e:c:b:vh?", cbfs_add_flat_binary, true, true}, {"add-payload", "H:r:f:n:t:c:b:C:I:vh?", cbfs_add_payload, true, true}, @@ -862,7 +894,7 @@ static void usage(char *name) " -h Display this help message\n\n" "COMMANDs:\n" " add [-r image,regions] -f FILE -n NAME -t TYPE \\\n" - " [-b base-address] " + " [-c compression] [-b base-address] " "Add a component\n" " add-payload [-r image,regions] -f FILE -n NAME \\\n" " [-c compression] [-b base-address] "

1 0

Patch set updated for coreboot: cbfstool: add extended file attributes for cbfs_file
by Patrick Georgi 31 Aug '15

31 Aug '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/10934 -gerrit commit 0809af22d51e44653d693fdc16239ba53cf9b099 Author: Patrick Georgi <pgeorgi(a)chromium.org> Date: Wed Jul 15 20:49:00 2015 +0200 cbfstool: add extended file attributes for cbfs_file cbfs_file_first_attr(struct cbfs_file *) and cbfs_file_next_attr(struct cbfs_file *, struct cbfs_file_attribute *) help navigate through extended attributes. cbfs_add_file_attr(header, tag, size) adds a new file attribute to header. Change-Id: I325965286c44f31abd95df684d340cebb0e68b75 Signed-off-by: Patrick Georgi <pgeorgi(a)chromium.org> --- util/cbfstool/cbfs.h | 11 +++++++ util/cbfstool/cbfs_image.c | 82 +++++++++++++++++++++++++++++++++++++++++++--- util/cbfstool/cbfs_image.h | 14 ++++++++ 3 files changed, 102 insertions(+), 5 deletions(-) diff --git a/util/cbfstool/cbfs.h b/util/cbfstool/cbfs.h index 3f80a04..185bdde 100644 --- a/util/cbfstool/cbfs.h +++ b/util/cbfstool/cbfs.h @@ -21,6 +21,10 @@ #include <stdint.h> +/* cbfstool will fail when trying to build a cbfs_file header that's larger + * than MAX_CBFS_FILE_HEADER_BUFFER. 1K should give plenty of room. */ +#define MAX_CBFS_FILE_HEADER_BUFFER 1024 + /* create a magic number in host-byte order. * b3 is the high order byte. * in the coreboot tools, we go with the 32-bit @@ -77,6 +81,7 @@ struct cbfs_file { /* length of file data */ uint32_t len; uint32_t type; + /* offset to struct cbfs_file_attribute or 0 */ uint32_t attributes_offset; /* length of header incl. variable data */ uint32_t offset; @@ -95,6 +100,11 @@ struct cbfs_file_attribute { uint8_t data[0]; } __PACKED; +/* Depending on how the header was initialized, it may be backed with 0x00 or + * 0xff. Support both. */ +#define CBFS_FILE_ATTR_TAG_UNUSED 0 +#define CBFS_FILE_ATTR_TAG_UNUSED2 0xffffffff + struct cbfs_stage { uint32_t compression; uint64_t entry; @@ -155,6 +165,7 @@ struct cbfs_payload { #define CBFS_COMPONENT_NULL 0xFFFFFFFF #define CBFS_SUBHEADER(_p) ( (void *) ((((uint8_t *) (_p)) + ntohl((_p)->offset))) ) + /* cbfs_image.c */ uint32_t get_cbfs_entry_type(const char *name, uint32_t default_value); uint32_t get_cbfs_compression(const char *name, uint32_t unknown); diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index e71d598..0c3073e 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -997,11 +997,8 @@ int cbfs_is_valid_entry(struct cbfs_image *image, struct cbfs_file *entry) struct cbfs_file *cbfs_create_file_header(int type, size_t len, const char *name) { - // assume that there won't be file names of ~1000 bytes - const int bufsize = 1024; - - struct cbfs_file *entry = malloc(bufsize); - memset(entry, CBFS_CONTENT_DEFAULT_VALUE, bufsize); + struct cbfs_file *entry = malloc(MAX_CBFS_FILE_HEADER_BUFFER); + memset(entry, CBFS_CONTENT_DEFAULT_VALUE, MAX_CBFS_FILE_HEADER_BUFFER); memcpy(entry->magic, CBFS_FILE_MAGIC, sizeof(entry->magic)); entry->type = htonl(type); entry->len = htonl(len); @@ -1022,6 +1019,81 @@ int cbfs_create_empty_entry(struct cbfs_file *entry, int type, return 0; } +struct cbfs_file_attribute *cbfs_file_first_attr(struct cbfs_file *file) +{ + /* attributes_offset should be 0 when there is no attribute, but all + * values that point into the cbfs_file header are invalid, too. */ + if (ntohl(file->attributes_offset) <= sizeof(*file)) + return NULL; + + /* There needs to be enough space for the file header and one + * attribute header for this to make sense. */ + if (ntohl(file->offset) <= + sizeof(*file) + sizeof(struct cbfs_file_attribute)) + return NULL; + + return (struct cbfs_file_attribute *) + (((uint8_t *)file) + file->attributes_offset); +} + +struct cbfs_file_attribute *cbfs_file_next_attr(struct cbfs_file *file, + struct cbfs_file_attribute *attr) +{ + /* ex falso sequitur quodlibet */ + if (attr == NULL) + return NULL; + + /* Is there enough space for another attribute? */ + if ((uint8_t *)attr + ntohl(attr->len) + + sizeof(struct cbfs_file_attribute) >= + (uint8_t *)file + ntohl(file->offset)) + return NULL; + + struct cbfs_file_attribute *next = + (struct cbfs_file_attribute *)(((uint8_t *)attr) + attr->len); + /* If any, "unused" attributes must come last. */ + if (next->tag == CBFS_FILE_ATTR_TAG_UNUSED) + return NULL; + if (next->tag == CBFS_FILE_ATTR_TAG_UNUSED2) + return NULL; + + return next; +} + +struct cbfs_file_attribute *cbfs_add_file_attr(struct cbfs_file *header, + uint32_t tag, + uint16_t size) +{ + struct cbfs_file_attribute *attr, *next; + next = cbfs_file_first_attr(header); + do { + attr = next; + next = cbfs_file_next_attr(header, attr); + } while (next != NULL); + uint32_t header_size = ntohl(header->offset) + size; + if (header_size > MAX_CBFS_FILE_HEADER_BUFFER) { + DEBUG("exceeding allocated space for cbfs_file headers"); + return NULL; + } + /* attr points to the last valid attribute now. + * If NULL, we have to create the first one. */ + if (attr == NULL) { + header->attributes_offset = header->offset; + attr = (struct cbfs_file_attribute *) + (((uint8_t *)header) + + ntohl(header->attributes_offset)); + } else { + attr = (struct cbfs_file_attribute *) + (((uint8_t *)attr) + + ntohl(attr->len)); + } + header->offset = htonl(header_size); + memset(attr, 0xff, size); + attr->tag = ntohl(tag); + attr->len = htonl(size); + return attr; +} + /* 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) { diff --git a/util/cbfstool/cbfs_image.h b/util/cbfstool/cbfs_image.h index 7a9b484..d38a861 100644 --- a/util/cbfstool/cbfs_image.h +++ b/util/cbfstool/cbfs_image.h @@ -170,4 +170,18 @@ int cbfs_merge_empty_entry(struct cbfs_image *image, struct cbfs_file *entry, /* Returns the size of a cbfs file header with no extensions */ size_t cbfs_calculate_file_header_size(const char *name); + +/* Given a cbfs_file, return the first file attribute, or NULL. */ +struct cbfs_file_attribute *cbfs_file_first_attr(struct cbfs_file *file); + +/* Given a cbfs_file and a cbfs_file_attribute, return the attribute that + * follows it, or NULL. */ +struct cbfs_file_attribute *cbfs_file_next_attr(struct cbfs_file *file, + struct cbfs_file_attribute *attr); + +/* Adds to header a new extended attribute tagged 'tag', sized 'size'. + * Returns pointer to the new attribute, or NULL on error. */ +struct cbfs_file_attribute *cbfs_add_file_attr(struct cbfs_file *header, + uint32_t tag, + uint16_t size); #endif

1 0

Patch set updated for coreboot: cbfstool: support compressed files in cbfstool print
by Patrick Georgi 31 Aug '15

31 Aug '15

Patrick Georgi (pgeorgi(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11359 -gerrit commit 9f0c2219965903fe9a419726d80f14ad93f0dd0c Author: Patrick Georgi <patrick(a)georgi-clan.de> Date: Wed Aug 26 12:13:03 2015 +0200 cbfstool: support compressed files in cbfstool print Display compressed and decompressed sizes, as well as the compression algorithm used, when a compressed file is encountered. Change-Id: I13c2332702c4a5bec379e1ebda72753e06f8e135 Signed-off-by: Patrick Georgi <patrick(a)georgi-clan.de> --- util/cbfstool/cbfs_image.c | 35 ++++++++++++++++++++++++++++++----- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/util/cbfstool/cbfs_image.c b/util/cbfstool/cbfs_image.c index 0c3073e..8eef91c 100644 --- a/util/cbfstool/cbfs_image.c +++ b/util/cbfstool/cbfs_image.c @@ -777,11 +777,36 @@ int cbfs_print_entry_info(struct cbfs_image *image, struct cbfs_file *entry, if (!fp) fp = stdout; - fprintf(fp, "%-30s 0x%-8x %-12s %d\n", - *name ? name : "(empty)", - cbfs_get_entry_addr(image, entry), - get_cbfs_entry_type_name(ntohl(entry->type)), - ntohl(entry->len)); + unsigned int compression = CBFS_COMPRESS_NONE; + unsigned int decompressed_size = 0; + for (struct cbfs_file_attribute *attr = cbfs_file_first_attr(entry); + attr != NULL; + attr = cbfs_file_next_attr(entry, attr)) { + if (attr->tag == CBFS_FILE_ATTR_TAG_COMPRESSION) { + struct cbfs_file_attr_compression *ac = + (struct cbfs_file_attr_compression *)attr; + compression = ntohl(ac->compression); + decompressed_size = ntohl(ac->decompressed_size); + } + } + + if (compression == CBFS_COMPRESS_NONE) { + fprintf(fp, "%-30s 0x%-8x %-12s %d\n", + *name ? name : "(empty)", + cbfs_get_entry_addr(image, entry), + get_cbfs_entry_type_name(ntohl(entry->type)), + ntohl(entry->len)); + } else { + fprintf(fp, "%-30s 0x%-8x %-12s %d (%d after %s decompression)\n", + *name ? name : "(empty)", + cbfs_get_entry_addr(image, entry), + get_cbfs_entry_type_name(ntohl(entry->type)), + ntohl(entry->len), + decompressed_size, + lookup_name_by_type(types_cbfs_compression, + compression, "(unknown)") + ); + } if (!verbose) return 0;

1 0

Patch set updated for coreboot: drivers/intel/fsp1_1: Take platform ID as a string, not integers
by Alexandru Gagniuc 31 Aug '15

31 Aug '15

Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11465 -gerrit commit 79dd884fb62a2f4b49175b84a28f5467c75cfb2f Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> Date: Sat Aug 29 18:53:43 2015 -0700 drivers/intel/fsp1_1: Take platform ID as a string, not integers The platform ID is an 8 character ASCII string, so our config should take it in as a string, rather than a set of two 32-bit integers. Change-Id: I76da85fab59fe4891fbc3b5edf430f2791b70ffb Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> --- src/drivers/intel/fsp1_1/Kconfig | 14 ++++---------- src/drivers/intel/fsp1_1/fsp_util.c | 11 +++++++++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/drivers/intel/fsp1_1/Kconfig b/src/drivers/intel/fsp1_1/Kconfig index 42c42c0..2ffa323 100644 --- a/src/drivers/intel/fsp1_1/Kconfig +++ b/src/drivers/intel/fsp1_1/Kconfig @@ -63,17 +63,11 @@ config FSP_FILE help The path and filename of the Intel FSP binary for this platform. -config FSP_IMAGE_ID_DWORD0 - hex "First 4 bytes of 8 byte platform string" +config FSP_IMAGE_ID_STRING + string "8 byte platform string identifying the FSP platform" help - The first four bytes of the eight byte platform specific string - used to identify the FSP binary that should be used. - -config FSP_IMAGE_ID_DWORD1 - hex "Second 4 bytes of 8 byte platform string" - help - The second four bytes of the eight byte platform specific string - used to identify the FSP binary that should be used. + 8 ASCII character byte signature string that will help match the FSP + binary to a supported hardware configuration. config FSP_INCLUDE_PATH string "Path for FSP specific include files" diff --git a/src/drivers/intel/fsp1_1/fsp_util.c b/src/drivers/intel/fsp1_1/fsp_util.c index 18e8648..efef430 100644 --- a/src/drivers/intel/fsp1_1/fsp_util.c +++ b/src/drivers/intel/fsp1_1/fsp_util.c @@ -36,6 +36,13 @@ FSP_INFO_HEADER *find_fsp(void) u8 *u8; u32 u32; } fsp_ptr; + static const union { + char str_id[8]; + u32 int_id[2]; + } fsp_id = { + .str_id = CONFIG_FSP_IMAGE_ID_STRING + }; + u32 *image_id; for (;;) { @@ -87,8 +94,8 @@ FSP_INFO_HEADER *find_fsp(void) /* Verify the FSP ID */ image_id = (u32 *)&fsp_ptr.fih->ImageId[0]; - if ((image_id[0] != CONFIG_FSP_IMAGE_ID_DWORD0) - || (image_id[1] != CONFIG_FSP_IMAGE_ID_DWORD1)) + if ((image_id[0] != fsp_id.int_id[0]) + || (image_id[1] != fsp_id.int_id[1])) fsp_ptr.u8 = (u8 *)ERROR_FSP_SIG_MISMATCH; break; }

1 0

Patch merged into coreboot/master: drivers/intel/fsp1_1/fsp_util.c: Use ALIGN_UP_macro
by gerrit＠coreboot.org 31 Aug '15

31 Aug '15

the following patch was just integrated into master: commit 3f2a945fb8a87c328205f5c8854489c475a41a43 Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> Date: Sat Aug 29 18:25:10 2015 -0700 drivers/intel/fsp1_1/fsp_util.c: Use ALIGN_UP_macro Change-Id: Iac4f275c14646b40ffe04fc5a6f6e1402cebfddf Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> Reviewed-on: http://review.coreboot.org/11464 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin(a)chromium.org> See http://review.coreboot.org/11464 for details. -gerrit

1 0

Patch set updated for coreboot: northbridge/intel/gm45/Kconfig: Remove IOMMU symbol choice
by Martin Roth 31 Aug '15

31 Aug '15

Martin Roth (martinroth(a)google.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11345 -gerrit commit fa20f0945213ada8eb7b21e86c4aaf4f867189a6 Author: Martin Roth <martinroth(a)google.com> Date: Tue Aug 25 17:04:59 2015 -0600 northbridge/intel/gm45/Kconfig: Remove IOMMU symbol choice In the gm45 code, IOMMU is always selected to be enabled. Instead this patch removes the Kconfig symbol and its dependencies. This leads to the same effect without the need for the symbol. The symbol is still used in the K8 code as it's not selected, simply defaulted to being enabled, and one of the mainboards disables it. Change-Id: Ibc5939cd1e297d497bf71b1787d852f7cc09a551 Signed-off-by: Martin Roth <martinroth(a)google.com> --- src/northbridge/intel/gm45/Kconfig | 1 - src/northbridge/intel/gm45/Makefile.inc | 2 +- src/northbridge/intel/gm45/acpi.c | 4 ---- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/northbridge/intel/gm45/Kconfig b/src/northbridge/intel/gm45/Kconfig index 2374a1f..a85cde2 100644 --- a/src/northbridge/intel/gm45/Kconfig +++ b/src/northbridge/intel/gm45/Kconfig @@ -27,7 +27,6 @@ config NORTHBRIDGE_SPECIFIC_OPTIONS # dummy select HAVE_DEBUG_RAM_SETUP select MMCONF_SUPPORT select MMCONF_SUPPORT_DEFAULT - select IOMMU select VGA select INTEL_EDID select INTEL_GMA_ACPI diff --git a/src/northbridge/intel/gm45/Makefile.inc b/src/northbridge/intel/gm45/Makefile.inc index 4050296..8bb083a 100644 --- a/src/northbridge/intel/gm45/Makefile.inc +++ b/src/northbridge/intel/gm45/Makefile.inc @@ -31,7 +31,7 @@ romstage-y += thermal.c romstage-y += igd.c romstage-y += pm.c romstage-y += ram_calc.c -romstage-$(CONFIG_IOMMU) += iommu.c +romstage-y += iommu.c ramstage-y += acpi.c diff --git a/src/northbridge/intel/gm45/acpi.c b/src/northbridge/intel/gm45/acpi.c index daa5aed..b1cb773 100644 --- a/src/northbridge/intel/gm45/acpi.c +++ b/src/northbridge/intel/gm45/acpi.c @@ -114,20 +114,16 @@ unsigned long northbridge_write_acpi_tables(device_t device, struct acpi_rsdp *rsdp) { unsigned long current; -#if CONFIG_IOMMU acpi_dmar_t *dmar; -#endif current = start; -#if CONFIG_IOMMU printk(BIOS_DEBUG, "ACPI: * DMAR\n"); dmar = (acpi_dmar_t *) current; acpi_create_dmar(dmar, acpi_fill_dmar); current += dmar->header.length; ALIGN_CURRENT; acpi_add_table(rsdp, dmar); -#endif ALIGN_CURRENT;

1 0

Patch set updated for coreboot: drivers/intel/fsp1_1/fsp_util.c: Use ALIGN_UP_macro
by Alexandru Gagniuc 31 Aug '15

31 Aug '15

Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11464 -gerrit commit 20939ac3cb9d6559a9ba47bebdc022335fbc1cf4 Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> Date: Sat Aug 29 18:25:10 2015 -0700 drivers/intel/fsp1_1/fsp_util.c: Use ALIGN_UP_macro Change-Id: Iac4f275c14646b40ffe04fc5a6f6e1402cebfddf Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> --- src/drivers/intel/fsp1_1/fsp_util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/drivers/intel/fsp1_1/fsp_util.c b/src/drivers/intel/fsp1_1/fsp_util.c index e5624b3..18e8648 100644 --- a/src/drivers/intel/fsp1_1/fsp_util.c +++ b/src/drivers/intel/fsp1_1/fsp_util.c @@ -51,7 +51,7 @@ FSP_INFO_HEADER *find_fsp(void) /* Locate the file header which follows the FV header. */ fsp_ptr.u8 += fsp_ptr.fvh->ExtHeaderOffset; fsp_ptr.u8 += fsp_ptr.fveh->ExtHeaderSize; - fsp_ptr.u8 = (u8 *)((fsp_ptr.u32 + 7) & 0xFFFFFFF8); + fsp_ptr.u8 = (u8 *)ALIGN_UP(fsp_ptr.u32, 8); /* Check the FFS GUID */ if ((((u32 *)&fsp_ptr.ffh->Name)[0] != 0x912740BE)

1 0

Patch set updated for coreboot: drivers/intel/fsp1_1: Take platform ID as a string, not integers
by Alexandru Gagniuc 31 Aug '15

31 Aug '15

Alexandru Gagniuc (mr.nuke.me(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/11465 -gerrit commit 7688a9b5dede754f28badf8c2aa6183a14e60374 Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> Date: Sat Aug 29 18:53:43 2015 -0700 drivers/intel/fsp1_1: Take platform ID as a string, not integers The platform ID is an 8 character ASCII string, so our config should take it in as a string, rather than a set of two 32-bit integers. Change-Id: I76da85fab59fe4891fbc3b5edf430f2791b70ffb Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> --- src/drivers/intel/fsp1_1/Kconfig | 14 ++++---------- src/drivers/intel/fsp1_1/fsp_util.c | 11 +++++++++-- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/drivers/intel/fsp1_1/Kconfig b/src/drivers/intel/fsp1_1/Kconfig index 42c42c0..2ffa323 100644 --- a/src/drivers/intel/fsp1_1/Kconfig +++ b/src/drivers/intel/fsp1_1/Kconfig @@ -63,17 +63,11 @@ config FSP_FILE help The path and filename of the Intel FSP binary for this platform. -config FSP_IMAGE_ID_DWORD0 - hex "First 4 bytes of 8 byte platform string" +config FSP_IMAGE_ID_STRING + string "8 byte platform string identifying the FSP platform" help - The first four bytes of the eight byte platform specific string - used to identify the FSP binary that should be used. - -config FSP_IMAGE_ID_DWORD1 - hex "Second 4 bytes of 8 byte platform string" - help - The second four bytes of the eight byte platform specific string - used to identify the FSP binary that should be used. + 8 ASCII character byte signature string that will help match the FSP + binary to a supported hardware configuration. config FSP_INCLUDE_PATH string "Path for FSP specific include files" diff --git a/src/drivers/intel/fsp1_1/fsp_util.c b/src/drivers/intel/fsp1_1/fsp_util.c index 18e8648..efef430 100644 --- a/src/drivers/intel/fsp1_1/fsp_util.c +++ b/src/drivers/intel/fsp1_1/fsp_util.c @@ -36,6 +36,13 @@ FSP_INFO_HEADER *find_fsp(void) u8 *u8; u32 u32; } fsp_ptr; + static const union { + char str_id[8]; + u32 int_id[2]; + } fsp_id = { + .str_id = CONFIG_FSP_IMAGE_ID_STRING + }; + u32 *image_id; for (;;) { @@ -87,8 +94,8 @@ FSP_INFO_HEADER *find_fsp(void) /* Verify the FSP ID */ image_id = (u32 *)&fsp_ptr.fih->ImageId[0]; - if ((image_id[0] != CONFIG_FSP_IMAGE_ID_DWORD0) - || (image_id[1] != CONFIG_FSP_IMAGE_ID_DWORD1)) + if ((image_id[0] != fsp_id.int_id[0]) + || (image_id[1] != fsp_id.int_id[1])) fsp_ptr.u8 = (u8 *)ERROR_FSP_SIG_MISMATCH; break; }

1 0

Patch merged into coreboot/master: soc/intel: Fix dependency of CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM
by gerrit＠coreboot.org 31 Aug '15

31 Aug '15

the following patch was just integrated into master: commit 27fea0675474c1c5fc37082a5ef6ae4cc7903e27 Author: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> Date: Sat Aug 29 20:00:24 2015 -0700 soc/intel: Fix dependency of CACHE_RELOCATED_RAMSTAGE_OUTSIDE_CBMEM This depends on RELOCATABLE_RAMSTAGE, and shouldn't be selected if its dependency is not activated. Change-Id: I8e7efc3f87e105715fe3377ed306891f0d209979 Signed-off-by: Alexandru Gagniuc <mr.nuke.me(a)gmail.com> Reviewed-on: http://review.coreboot.org/11473 Reviewed-by: Aaron Durbin <adurbin(a)chromium.org> Tested-by: build bot (Jenkins) See http://review.coreboot.org/11473 for details. -gerrit

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit August 2015