coreboot-gerrit January 2017

coreboot-gerrit@coreboot.org

1 participants
852 discussions

Patch set updated for coreboot: riscv: fix up issues related to lb_tables
by Ronald G. Minnich 15 Jan '17

15 Jan '17

Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18139 -gerrit commit c65807e6cba4f12ac3c9077ec26b959451087863 Author: Ronald G. Minnich <rminnich(a)gmail.com> Date: Fri Jan 13 18:27:34 2017 -0800 riscv: fix up issues related to lb_tables In the lb_tables code, some functions made a reasonable effort to align structs on reasonable boundaries, and others did not. Even the ones that did did not get it quite right, setting alignments to 32 bits, not 64, such that riscv will still take alignment traps in a mode (M-mode) in which such traps are fatal. Change lb_new_record to take a tag and size parameter. This further removes the need for each function to assign tag and size to the record. And, it lets the allocator (lb_new_record) get some idea of the final size. Most importantly, it lets the allocator ensure that entities are 128-bit aligned, and hence future proof for 128-bit processors (and note that the rv128 qemu implementation is already available). This gets me back up to a shell prompt on harvey on the lowriscv, where before we would fail with an alignment trap in coreboot. Change-Id: Id683fe2baa8cbea9abfccab72cf66a44fc04429e Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> --- src/arch/x86/cpu.c | 5 +- src/drivers/intel/fsp2_0/graphics.c | 7 +-- src/include/boot/coreboot_tables.h | 4 +- src/lib/coreboot_table.c | 69 ++++++++++++++------------ src/lib/imd_cbmem.c | 6 +-- src/mainboard/google/gale/mainboard.c | 5 +- src/mainboard/google/nyan_big/mainboard.c | 5 +- src/mainboard/google/peach_pit/mainboard.c | 5 +- src/mainboard/google/storm/mainboard.c | 5 +- src/mainboard/google/veyron/mainboard.c | 5 +- src/mainboard/google/veyron_rialto/mainboard.c | 5 +- src/vendorcode/google/chromeos/ramoops.c | 6 +-- src/vendorcode/google/chromeos/vpd_serialno.c | 6 +-- 13 files changed, 67 insertions(+), 66 deletions(-) diff --git a/src/arch/x86/cpu.c b/src/arch/x86/cpu.c index 1e74d0c..0bcc3a4 100644 --- a/src/arch/x86/cpu.c +++ b/src/arch/x86/cpu.c @@ -307,9 +307,8 @@ void lb_arch_add_records(struct lb_header *header) if (freq_khz == 0) return; - tsc_info = (void *)lb_new_record(header); - tsc_info->tag = LB_TAG_TSC_INFO; - tsc_info->size = sizeof(*tsc_info); + tsc_info = (void *) + lb_new_record(header, LB_TAG_TSC_INFO, sizeof(*tsc_info)); tsc_info->freq_khz = freq_khz; } diff --git a/src/drivers/intel/fsp2_0/graphics.c b/src/drivers/intel/fsp2_0/graphics.c index 97fffdc..45a6ddd 100644 --- a/src/drivers/intel/fsp2_0/graphics.c +++ b/src/drivers/intel/fsp2_0/graphics.c @@ -88,8 +88,6 @@ enum cb_err fsp_fill_lb_framebuffer(struct lb_framebuffer *framebuffer) framebuffer->blue_mask_size = fbinfo->blue.size; framebuffer->reserved_mask_pos = fbinfo->rsvd.pos; framebuffer->reserved_mask_size = fbinfo->rsvd.pos; - framebuffer->tag = LB_TAG_FRAMEBUFFER; - framebuffer->size = sizeof(*framebuffer); return CB_SUCCESS; } @@ -121,7 +119,10 @@ void lb_framebuffer(struct lb_header *header) return; } - framebuffer = (void *)lb_new_record(header); + framebuffer = (void *)lb_new_record(header, + LB_TAG_FRAMEBUFFER, + sizeof(*framebuffer)); + ret = fsp_fill_lb_framebuffer(framebuffer); if (ret != CB_SUCCESS) { printk(BIOS_ALERT, "FSP did not return a valid framebuffer\n"); diff --git a/src/include/boot/coreboot_tables.h b/src/include/boot/coreboot_tables.h index 5647629..f7e76dd 100644 --- a/src/include/boot/coreboot_tables.h +++ b/src/include/boot/coreboot_tables.h @@ -36,6 +36,8 @@ void lb_table_add_macs_from_vpd(struct lb_header *header); void lb_table_add_serialno_from_vpd(struct lb_header *header); -struct lb_record *lb_new_record(struct lb_header *header); +struct lb_record *lb_new_record(struct lb_header *header, + uint32_t tag, + uint32_t size); #endif /* COREBOOT_TABLES_H */ diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c index f8da658..c09a360 100644 --- a/src/lib/coreboot_table.c +++ b/src/lib/coreboot_table.c @@ -82,7 +82,8 @@ static struct lb_record *lb_last_record(struct lb_header *header) return rec; } -struct lb_record *lb_new_record(struct lb_header *header) +struct lb_record *lb_new_record(struct lb_header *header, + uint32_t tag, uint32_t size) { struct lb_record *rec; rec = lb_last_record(header); @@ -91,8 +92,17 @@ struct lb_record *lb_new_record(struct lb_header *header) } rec = lb_last_record(header); header->table_entries++; - rec->tag = LB_TAG_UNUSED; - rec->size = sizeof(*rec); + rec->tag = tag; + // If the rec->size is not aligned to something reasonable, + // some architectures can take alignment traps. + // Round up table_bytes to something that is future-proof, + // namely 128 bits (16 bytes). This will ensure that even + // the 128-bit RISCV won't get traps. + // We have roundup macros all over the tree; we need to + // clean that up at some point. + // Note that all table types include an lb_record, so we + // need only use the passed-in size. + rec->size = (size + 0xf) & ~0xf; return rec; } @@ -100,10 +110,8 @@ static struct lb_memory *lb_memory(struct lb_header *header) { struct lb_record *rec; struct lb_memory *mem; - rec = lb_new_record(header); + rec = lb_new_record(header, LB_TAG_MEMORY, sizeof(*mem)); mem = (struct lb_memory *)rec; - mem->tag = LB_TAG_MEMORY; - mem->size = sizeof(*mem); return mem; } @@ -112,9 +120,9 @@ void lb_add_serial(struct lb_serial *new_serial, void *data) struct lb_header *header = (struct lb_header *)data; struct lb_serial *serial; - serial = (struct lb_serial *)lb_new_record(header); - serial->tag = LB_TAG_SERIAL; - serial->size = sizeof(*serial); + serial = (struct lb_serial *)lb_new_record(header, + LB_TAG_SERIAL, + sizeof(*serial)); serial->type = new_serial->type; serial->baseaddr = new_serial->baseaddr; serial->baud = new_serial->baud; @@ -128,9 +136,9 @@ void lb_add_console(uint16_t consoletype, void *data) struct lb_header *header = (struct lb_header *)data; struct lb_console *console; - console = (struct lb_console *)lb_new_record(header); - console->tag = LB_TAG_CONSOLE; - console->size = sizeof(*console); + console = (struct lb_console *)lb_new_record(header, + LB_TAG_CONSOLE, + sizeof(*console)); console->type = consoletype; } @@ -276,9 +284,8 @@ static void lb_boot_media_params(struct lb_header *header) if (boot_dev == NULL) return; - bmp = (struct lb_boot_media_params *)lb_new_record(header); - bmp->tag = LB_TAG_BOOT_MEDIA_PARAMS; - bmp->size = sizeof(*bmp); + bmp = (struct lb_boot_media_params *) + lb_new_record(header, LB_TAG_BOOT_MEDIA_PARAMS, sizeof(*bmp)); bmp->cbfs_offset = props.offset; bmp->cbfs_size = props.size; @@ -329,7 +336,9 @@ static void add_cbmem_pointers(struct lb_header *header) if (!cbmem_addr) continue; /* This section is not present */ - cbmem_ref = (struct lb_cbmem_ref *)lb_new_record(header); + cbmem_ref = (struct lb_cbmem_ref *) + lb_new_record(header, sid->table_tag, + sizeof(*cbmem_ref)); if (!cbmem_ref) { printk(BIOS_ERR, "No more room in coreboot table!\n"); break; @@ -344,14 +353,13 @@ static struct lb_mainboard *lb_mainboard(struct lb_header *header) { struct lb_record *rec; struct lb_mainboard *mainboard; - rec = lb_new_record(header); - mainboard = (struct lb_mainboard *)rec; - mainboard->tag = LB_TAG_MAINBOARD; + rec = lb_new_record(header, LB_TAG_MAINBOARD, + sizeof(*mainboard) + + strlen(mainboard_vendor) + 1 + + strlen(mainboard_part_number) + 1); - mainboard->size = (sizeof(*mainboard) + - strlen(mainboard_vendor) + 1 + - strlen(mainboard_part_number) + 1 + - 3) & ~3; + + mainboard = (struct lb_mainboard *)rec; mainboard->vendor_idx = 0; mainboard->part_number_idx = strlen(mainboard_vendor) + 1; @@ -399,10 +407,10 @@ static void lb_strings(struct lb_header *header) for(i = 0; i < ARRAY_SIZE(strings); i++) { struct lb_string *rec; size_t len; - rec = (struct lb_string *)lb_new_record(header); len = strlen(strings[i].string); - rec->tag = strings[i].tag; - rec->size = (sizeof(*rec) + len + 1 + 3) & ~3; + rec = (struct lb_string *)lb_new_record(header, + strings[i].tag, + sizeof(*rec) + len + 1); memcpy(rec->string, strings[i].string, len+1); } @@ -411,9 +419,8 @@ static void lb_strings(struct lb_header *header) static void lb_record_version_timestamp(struct lb_header *header) { struct lb_timestamp *rec; - rec = (struct lb_timestamp *)lb_new_record(header); - rec->tag = LB_TAG_VERSION_TIMESTAMP; - rec->size = sizeof(*rec); + rec = (struct lb_timestamp *) + lb_new_record(header, LB_TAG_VERSION_TIMESTAMP, sizeof(*rec)); rec->timestamp = coreboot_version_timestamp; } @@ -431,10 +438,8 @@ static struct lb_forward *lb_forward(struct lb_header *header, struct lb_header { struct lb_record *rec; struct lb_forward *forward; - rec = lb_new_record(header); + rec = lb_new_record(header, LB_TAG_FORWARD, sizeof(*forward)); forward = (struct lb_forward *)rec; - forward->tag = LB_TAG_FORWARD; - forward->size = sizeof(*forward); forward->forward = (uint64_t)(unsigned long)next_header; return forward; } diff --git a/src/lib/imd_cbmem.c b/src/lib/imd_cbmem.c index b0273f4..8187ffa 100644 --- a/src/lib/imd_cbmem.c +++ b/src/lib/imd_cbmem.c @@ -335,9 +335,9 @@ void cbmem_add_records_to_cbtable(struct lb_header *header) if (id == CBMEM_ID_IMD_ROOT || id == CBMEM_ID_IMD_SMALL) continue; - lbe = (struct lb_cbmem_entry *)lb_new_record(header); - lbe->tag = LB_TAG_CBMEM_ENTRY; - lbe->size = sizeof(*lbe); + lbe = (struct lb_cbmem_entry *)lb_new_record(header, + LB_TAG_CBMEM_ENTRY, + sizeof(*lbe)); lbe->address = (uintptr_t)imd_entry_at(imd, e); lbe->entry_size = imd_entry_size(imd, e); lbe->id = id; diff --git a/src/mainboard/google/gale/mainboard.c b/src/mainboard/google/gale/mainboard.c index f27421b..e7199b4 100644 --- a/src/mainboard/google/gale/mainboard.c +++ b/src/mainboard/google/gale/mainboard.c @@ -74,9 +74,8 @@ void lb_board(struct lb_header *header) { struct lb_range *dma; - dma = (struct lb_range *)lb_new_record(header); - dma->tag = LB_TAB_DMA; - dma->size = sizeof(*dma); + dma = (struct lb_range *)lb_new_record(header, + LB_TAB_DMA, sizeof(*dma)); dma->range_start = (uintptr_t)_dma_coherent; dma->range_size = _dma_coherent_size; diff --git a/src/mainboard/google/nyan_big/mainboard.c b/src/mainboard/google/nyan_big/mainboard.c index 0c0fe5e..35d4d7e 100644 --- a/src/mainboard/google/nyan_big/mainboard.c +++ b/src/mainboard/google/nyan_big/mainboard.c @@ -256,9 +256,8 @@ void lb_board(struct lb_header *header) { struct lb_range *dma; - dma = (struct lb_range *)lb_new_record(header); - dma->tag = LB_TAB_DMA; - dma->size = sizeof(*dma); + dma = (struct lb_range *)lb_new_record(header, + LB_TAB_DMA, sizeof(*dma)); dma->range_start = (uintptr_t)_dma_coherent; dma->range_size = _dma_coherent_size; } diff --git a/src/mainboard/google/peach_pit/mainboard.c b/src/mainboard/google/peach_pit/mainboard.c index 4cc72f1..b86502b 100644 --- a/src/mainboard/google/peach_pit/mainboard.c +++ b/src/mainboard/google/peach_pit/mainboard.c @@ -484,9 +484,8 @@ void lb_board(struct lb_header *header) { struct lb_range *dma; - dma = (struct lb_range *)lb_new_record(header); - dma->tag = LB_TAB_DMA; - dma->size = sizeof(*dma); + dma = (struct lb_range *) + lb_new_record(header, LB_TAB_DMA, sizeof(*dma)); dma->range_start = (uintptr_t)_dma_coherent; dma->range_size = _dma_coherent_size; } diff --git a/src/mainboard/google/storm/mainboard.c b/src/mainboard/google/storm/mainboard.c index e3e7b68..54a3f9f 100644 --- a/src/mainboard/google/storm/mainboard.c +++ b/src/mainboard/google/storm/mainboard.c @@ -118,9 +118,8 @@ void lb_board(struct lb_header *header) { struct lb_range *dma; - dma = (struct lb_range *)lb_new_record(header); - dma->tag = LB_TAB_DMA; - dma->size = sizeof(*dma); + dma = (struct lb_range *)lb_new_record(header, + LB_TAB_DMA, sizeof(*dma)); dma->range_start = (uintptr_t)_dma_coherent; dma->range_size = _dma_coherent_size; diff --git a/src/mainboard/google/veyron/mainboard.c b/src/mainboard/google/veyron/mainboard.c index a6bbf88..a3290e9 100644 --- a/src/mainboard/google/veyron/mainboard.c +++ b/src/mainboard/google/veyron/mainboard.c @@ -123,9 +123,8 @@ void lb_board(struct lb_header *header) { struct lb_range *dma; - dma = (struct lb_range *)lb_new_record(header); - dma->tag = LB_TAB_DMA; - dma->size = sizeof(*dma); + dma = (struct lb_range *) + lb_new_record(header, LB_TAB_DMA, sizeof(*dma)); dma->range_start = (uintptr_t)_dma_coherent; dma->range_size = _dma_coherent_size; } diff --git a/src/mainboard/google/veyron_rialto/mainboard.c b/src/mainboard/google/veyron_rialto/mainboard.c index b9b6a22..28791c1 100644 --- a/src/mainboard/google/veyron_rialto/mainboard.c +++ b/src/mainboard/google/veyron_rialto/mainboard.c @@ -107,9 +107,8 @@ void lb_board(struct lb_header *header) { struct lb_range *dma; - dma = (struct lb_range *)lb_new_record(header); - dma->tag = LB_TAB_DMA; - dma->size = sizeof(*dma); + dma = (struct lb_range *)lb_new_record(header, + LB_TAB_DMA, sizeof(*dma)); dma->range_start = (uintptr_t)_dma_coherent; dma->range_size = _dma_coherent_size; } diff --git a/src/vendorcode/google/chromeos/ramoops.c b/src/vendorcode/google/chromeos/ramoops.c index 313025d..8776192 100644 --- a/src/vendorcode/google/chromeos/ramoops.c +++ b/src/vendorcode/google/chromeos/ramoops.c @@ -121,9 +121,9 @@ void lb_ramoops(struct lb_header *header) return; struct lb_range *ramoops; - ramoops = (struct lb_range *)lb_new_record(header); - ramoops->tag = LB_TAG_RAM_OOPS; - ramoops->size = sizeof(*ramoops); + ramoops = (struct lb_range *)lb_new_record(header, + LB_TAG_RAM_OOPS, + sizeof(*ramoops)); ramoops->range_start = (uintptr_t)buffer; ramoops->range_size = CONFIG_CHROMEOS_RAMOOPS_RAM_SIZE; } diff --git a/src/vendorcode/google/chromeos/vpd_serialno.c b/src/vendorcode/google/chromeos/vpd_serialno.c index e9a771e..c3d5ab5 100644 --- a/src/vendorcode/google/chromeos/vpd_serialno.c +++ b/src/vendorcode/google/chromeos/vpd_serialno.c @@ -36,9 +36,9 @@ void lb_table_add_serialno_from_vpd(struct lb_header *header) len = strlen(serialno) + 1; ASSERT(len <= 32); - serialno_rec = (struct lb_string *)lb_new_record(header); - serialno_rec->tag = LB_TAG_SERIALNO; + serialno_rec = (struct lb_string *) + lb_new_record(header, LB_TAG_SERIALNO, + ALIGN_UP(sizeof(*serialno_rec) + len, 8)); - serialno_rec->size = ALIGN_UP(sizeof(*serialno_rec) + len, 8); memcpy(&serialno_rec->string, serialno, len); }

1 0

Patch set updated for coreboot: riscv: fix up issues related to lb_tables
by Ronald G. Minnich 15 Jan '17

15 Jan '17

Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18139 -gerrit commit 755aad83cbe34f88aca1e163462d8dfd34796778 Author: Ronald G. Minnich <rminnich(a)gmail.com> Date: Fri Jan 13 18:27:34 2017 -0800 riscv: fix up issues related to lb_tables In the lb_tables code, some functions made a reasonable effort to align structs on reasonable boundaries, and others did not. Even the ones that did did not get it quite right, setting alignments to 32 bits, not 64, such that riscv will still take alignment traps in a mode (M-mode) in which such traps are fatal. Change lb_new_record to take a tag and size parameter. This further removes the need for each function to assign tag and size to the record. And, it lets the allocator (lb_new_record) get some idea of the final size. Most importantly, it lets the allocator ensure that entities are 128-bit aligned, and hence future proof for 128-bit processors (and note that the rv128 qemu implementation is already available). This gets me back up to a shell prompt on harvey on the lowriscv, where before we would fail with an alignment trap in coreboot. Change-Id: Id683fe2baa8cbea9abfccab72cf66a44fc04429e Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> --- src/arch/x86/cpu.c | 5 +- src/drivers/intel/fsp2_0/graphics.c | 7 +-- src/include/boot/coreboot_tables.h | 4 +- src/lib/coreboot_table.c | 67 ++++++++++++++------------ src/lib/imd_cbmem.c | 6 +-- src/mainboard/google/gale/mainboard.c | 5 +- src/mainboard/google/nyan_big/mainboard.c | 5 +- src/mainboard/google/peach_pit/mainboard.c | 5 +- src/mainboard/google/storm/mainboard.c | 5 +- src/mainboard/google/veyron/mainboard.c | 5 +- src/mainboard/google/veyron_rialto/mainboard.c | 5 +- src/vendorcode/google/chromeos/ramoops.c | 6 +-- src/vendorcode/google/chromeos/vpd_serialno.c | 6 +-- 13 files changed, 65 insertions(+), 66 deletions(-) diff --git a/src/arch/x86/cpu.c b/src/arch/x86/cpu.c index 1e74d0c..0bcc3a4 100644 --- a/src/arch/x86/cpu.c +++ b/src/arch/x86/cpu.c @@ -307,9 +307,8 @@ void lb_arch_add_records(struct lb_header *header) if (freq_khz == 0) return; - tsc_info = (void *)lb_new_record(header); - tsc_info->tag = LB_TAG_TSC_INFO; - tsc_info->size = sizeof(*tsc_info); + tsc_info = (void *) + lb_new_record(header, LB_TAG_TSC_INFO, sizeof(*tsc_info)); tsc_info->freq_khz = freq_khz; } diff --git a/src/drivers/intel/fsp2_0/graphics.c b/src/drivers/intel/fsp2_0/graphics.c index 97fffdc..45a6ddd 100644 --- a/src/drivers/intel/fsp2_0/graphics.c +++ b/src/drivers/intel/fsp2_0/graphics.c @@ -88,8 +88,6 @@ enum cb_err fsp_fill_lb_framebuffer(struct lb_framebuffer *framebuffer) framebuffer->blue_mask_size = fbinfo->blue.size; framebuffer->reserved_mask_pos = fbinfo->rsvd.pos; framebuffer->reserved_mask_size = fbinfo->rsvd.pos; - framebuffer->tag = LB_TAG_FRAMEBUFFER; - framebuffer->size = sizeof(*framebuffer); return CB_SUCCESS; } @@ -121,7 +119,10 @@ void lb_framebuffer(struct lb_header *header) return; } - framebuffer = (void *)lb_new_record(header); + framebuffer = (void *)lb_new_record(header, + LB_TAG_FRAMEBUFFER, + sizeof(*framebuffer)); + ret = fsp_fill_lb_framebuffer(framebuffer); if (ret != CB_SUCCESS) { printk(BIOS_ALERT, "FSP did not return a valid framebuffer\n"); diff --git a/src/include/boot/coreboot_tables.h b/src/include/boot/coreboot_tables.h index 5647629..f7e76dd 100644 --- a/src/include/boot/coreboot_tables.h +++ b/src/include/boot/coreboot_tables.h @@ -36,6 +36,8 @@ void lb_table_add_macs_from_vpd(struct lb_header *header); void lb_table_add_serialno_from_vpd(struct lb_header *header); -struct lb_record *lb_new_record(struct lb_header *header); +struct lb_record *lb_new_record(struct lb_header *header, + uint32_t tag, + uint32_t size); #endif /* COREBOOT_TABLES_H */ diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c index f8da658..9f3df30 100644 --- a/src/lib/coreboot_table.c +++ b/src/lib/coreboot_table.c @@ -82,7 +82,8 @@ static struct lb_record *lb_last_record(struct lb_header *header) return rec; } -struct lb_record *lb_new_record(struct lb_header *header) +struct lb_record *lb_new_record(struct lb_header *header, + uint32_t tag, uint32_t size) { struct lb_record *rec; rec = lb_last_record(header); @@ -91,8 +92,15 @@ struct lb_record *lb_new_record(struct lb_header *header) } rec = lb_last_record(header); header->table_entries++; - rec->tag = LB_TAG_UNUSED; - rec->size = sizeof(*rec); + rec->tag = tag; + // If the rec->size is not aligned to something reasonable, + // some architectures can take alignment traps. + // Round up table_bytes to something that is future-proof, + // namely 128 bits (16 bytes). This will ensure that even + // the 128-bit RISCV won't get traps. + // We have roundup macros all over the tree; we need to + // clean that up at some point. + rec->size = (sizeof(*rec) + size + 0xf) & ~0xf; return rec; } @@ -100,10 +108,8 @@ static struct lb_memory *lb_memory(struct lb_header *header) { struct lb_record *rec; struct lb_memory *mem; - rec = lb_new_record(header); + rec = lb_new_record(header, LB_TAG_MEMORY, sizeof(*mem)); mem = (struct lb_memory *)rec; - mem->tag = LB_TAG_MEMORY; - mem->size = sizeof(*mem); return mem; } @@ -112,9 +118,9 @@ void lb_add_serial(struct lb_serial *new_serial, void *data) struct lb_header *header = (struct lb_header *)data; struct lb_serial *serial; - serial = (struct lb_serial *)lb_new_record(header); - serial->tag = LB_TAG_SERIAL; - serial->size = sizeof(*serial); + serial = (struct lb_serial *)lb_new_record(header, + LB_TAG_SERIAL, + sizeof(*serial)); serial->type = new_serial->type; serial->baseaddr = new_serial->baseaddr; serial->baud = new_serial->baud; @@ -128,9 +134,9 @@ void lb_add_console(uint16_t consoletype, void *data) struct lb_header *header = (struct lb_header *)data; struct lb_console *console; - console = (struct lb_console *)lb_new_record(header); - console->tag = LB_TAG_CONSOLE; - console->size = sizeof(*console); + console = (struct lb_console *)lb_new_record(header, + LB_TAG_CONSOLE, + sizeof(*console)); console->type = consoletype; } @@ -276,9 +282,8 @@ static void lb_boot_media_params(struct lb_header *header) if (boot_dev == NULL) return; - bmp = (struct lb_boot_media_params *)lb_new_record(header); - bmp->tag = LB_TAG_BOOT_MEDIA_PARAMS; - bmp->size = sizeof(*bmp); + bmp = (struct lb_boot_media_params *) + lb_new_record(header, LB_TAG_BOOT_MEDIA_PARAMS, sizeof(*bmp)); bmp->cbfs_offset = props.offset; bmp->cbfs_size = props.size; @@ -329,7 +334,9 @@ static void add_cbmem_pointers(struct lb_header *header) if (!cbmem_addr) continue; /* This section is not present */ - cbmem_ref = (struct lb_cbmem_ref *)lb_new_record(header); + cbmem_ref = (struct lb_cbmem_ref *) + lb_new_record(header, sid->table_tag, + sizeof(*cbmem_ref)); if (!cbmem_ref) { printk(BIOS_ERR, "No more room in coreboot table!\n"); break; @@ -344,14 +351,13 @@ static struct lb_mainboard *lb_mainboard(struct lb_header *header) { struct lb_record *rec; struct lb_mainboard *mainboard; - rec = lb_new_record(header); - mainboard = (struct lb_mainboard *)rec; - mainboard->tag = LB_TAG_MAINBOARD; + rec = lb_new_record(header, LB_TAG_MAINBOARD, + sizeof(*mainboard) + + strlen(mainboard_vendor) + 1 + + strlen(mainboard_part_number) + 1); - mainboard->size = (sizeof(*mainboard) + - strlen(mainboard_vendor) + 1 + - strlen(mainboard_part_number) + 1 + - 3) & ~3; + + mainboard = (struct lb_mainboard *)rec; mainboard->vendor_idx = 0; mainboard->part_number_idx = strlen(mainboard_vendor) + 1; @@ -399,10 +405,10 @@ static void lb_strings(struct lb_header *header) for(i = 0; i < ARRAY_SIZE(strings); i++) { struct lb_string *rec; size_t len; - rec = (struct lb_string *)lb_new_record(header); len = strlen(strings[i].string); - rec->tag = strings[i].tag; - rec->size = (sizeof(*rec) + len + 1 + 3) & ~3; + rec = (struct lb_string *)lb_new_record(header, + strings[i].tag, + sizeof(*rec) + len + 1); memcpy(rec->string, strings[i].string, len+1); } @@ -411,9 +417,8 @@ static void lb_strings(struct lb_header *header) static void lb_record_version_timestamp(struct lb_header *header) { struct lb_timestamp *rec; - rec = (struct lb_timestamp *)lb_new_record(header); - rec->tag = LB_TAG_VERSION_TIMESTAMP; - rec->size = sizeof(*rec); + rec = (struct lb_timestamp *) + lb_new_record(header, LB_TAG_VERSION_TIMESTAMP, sizeof(*rec)); rec->timestamp = coreboot_version_timestamp; } @@ -431,10 +436,8 @@ static struct lb_forward *lb_forward(struct lb_header *header, struct lb_header { struct lb_record *rec; struct lb_forward *forward; - rec = lb_new_record(header); + rec = lb_new_record(header, LB_TAG_FORWARD, sizeof(*forward)); forward = (struct lb_forward *)rec; - forward->tag = LB_TAG_FORWARD; - forward->size = sizeof(*forward); forward->forward = (uint64_t)(unsigned long)next_header; return forward; } diff --git a/src/lib/imd_cbmem.c b/src/lib/imd_cbmem.c index b0273f4..8187ffa 100644 --- a/src/lib/imd_cbmem.c +++ b/src/lib/imd_cbmem.c @@ -335,9 +335,9 @@ void cbmem_add_records_to_cbtable(struct lb_header *header) if (id == CBMEM_ID_IMD_ROOT || id == CBMEM_ID_IMD_SMALL) continue; - lbe = (struct lb_cbmem_entry *)lb_new_record(header); - lbe->tag = LB_TAG_CBMEM_ENTRY; - lbe->size = sizeof(*lbe); + lbe = (struct lb_cbmem_entry *)lb_new_record(header, + LB_TAG_CBMEM_ENTRY, + sizeof(*lbe)); lbe->address = (uintptr_t)imd_entry_at(imd, e); lbe->entry_size = imd_entry_size(imd, e); lbe->id = id; diff --git a/src/mainboard/google/gale/mainboard.c b/src/mainboard/google/gale/mainboard.c index f27421b..e7199b4 100644 --- a/src/mainboard/google/gale/mainboard.c +++ b/src/mainboard/google/gale/mainboard.c @@ -74,9 +74,8 @@ void lb_board(struct lb_header *header) { struct lb_range *dma; - dma = (struct lb_range *)lb_new_record(header); - dma->tag = LB_TAB_DMA; - dma->size = sizeof(*dma); + dma = (struct lb_range *)lb_new_record(header, + LB_TAB_DMA, sizeof(*dma)); dma->range_start = (uintptr_t)_dma_coherent; dma->range_size = _dma_coherent_size; diff --git a/src/mainboard/google/nyan_big/mainboard.c b/src/mainboard/google/nyan_big/mainboard.c index 0c0fe5e..35d4d7e 100644 --- a/src/mainboard/google/nyan_big/mainboard.c +++ b/src/mainboard/google/nyan_big/mainboard.c @@ -256,9 +256,8 @@ void lb_board(struct lb_header *header) { struct lb_range *dma; - dma = (struct lb_range *)lb_new_record(header); - dma->tag = LB_TAB_DMA; - dma->size = sizeof(*dma); + dma = (struct lb_range *)lb_new_record(header, + LB_TAB_DMA, sizeof(*dma)); dma->range_start = (uintptr_t)_dma_coherent; dma->range_size = _dma_coherent_size; } diff --git a/src/mainboard/google/peach_pit/mainboard.c b/src/mainboard/google/peach_pit/mainboard.c index 4cc72f1..b86502b 100644 --- a/src/mainboard/google/peach_pit/mainboard.c +++ b/src/mainboard/google/peach_pit/mainboard.c @@ -484,9 +484,8 @@ void lb_board(struct lb_header *header) { struct lb_range *dma; - dma = (struct lb_range *)lb_new_record(header); - dma->tag = LB_TAB_DMA; - dma->size = sizeof(*dma); + dma = (struct lb_range *) + lb_new_record(header, LB_TAB_DMA, sizeof(*dma)); dma->range_start = (uintptr_t)_dma_coherent; dma->range_size = _dma_coherent_size; } diff --git a/src/mainboard/google/storm/mainboard.c b/src/mainboard/google/storm/mainboard.c index e3e7b68..54a3f9f 100644 --- a/src/mainboard/google/storm/mainboard.c +++ b/src/mainboard/google/storm/mainboard.c @@ -118,9 +118,8 @@ void lb_board(struct lb_header *header) { struct lb_range *dma; - dma = (struct lb_range *)lb_new_record(header); - dma->tag = LB_TAB_DMA; - dma->size = sizeof(*dma); + dma = (struct lb_range *)lb_new_record(header, + LB_TAB_DMA, sizeof(*dma)); dma->range_start = (uintptr_t)_dma_coherent; dma->range_size = _dma_coherent_size; diff --git a/src/mainboard/google/veyron/mainboard.c b/src/mainboard/google/veyron/mainboard.c index a6bbf88..a3290e9 100644 --- a/src/mainboard/google/veyron/mainboard.c +++ b/src/mainboard/google/veyron/mainboard.c @@ -123,9 +123,8 @@ void lb_board(struct lb_header *header) { struct lb_range *dma; - dma = (struct lb_range *)lb_new_record(header); - dma->tag = LB_TAB_DMA; - dma->size = sizeof(*dma); + dma = (struct lb_range *) + lb_new_record(header, LB_TAB_DMA, sizeof(*dma)); dma->range_start = (uintptr_t)_dma_coherent; dma->range_size = _dma_coherent_size; } diff --git a/src/mainboard/google/veyron_rialto/mainboard.c b/src/mainboard/google/veyron_rialto/mainboard.c index b9b6a22..28791c1 100644 --- a/src/mainboard/google/veyron_rialto/mainboard.c +++ b/src/mainboard/google/veyron_rialto/mainboard.c @@ -107,9 +107,8 @@ void lb_board(struct lb_header *header) { struct lb_range *dma; - dma = (struct lb_range *)lb_new_record(header); - dma->tag = LB_TAB_DMA; - dma->size = sizeof(*dma); + dma = (struct lb_range *)lb_new_record(header, + LB_TAB_DMA, sizeof(*dma)); dma->range_start = (uintptr_t)_dma_coherent; dma->range_size = _dma_coherent_size; } diff --git a/src/vendorcode/google/chromeos/ramoops.c b/src/vendorcode/google/chromeos/ramoops.c index 313025d..8776192 100644 --- a/src/vendorcode/google/chromeos/ramoops.c +++ b/src/vendorcode/google/chromeos/ramoops.c @@ -121,9 +121,9 @@ void lb_ramoops(struct lb_header *header) return; struct lb_range *ramoops; - ramoops = (struct lb_range *)lb_new_record(header); - ramoops->tag = LB_TAG_RAM_OOPS; - ramoops->size = sizeof(*ramoops); + ramoops = (struct lb_range *)lb_new_record(header, + LB_TAG_RAM_OOPS, + sizeof(*ramoops)); ramoops->range_start = (uintptr_t)buffer; ramoops->range_size = CONFIG_CHROMEOS_RAMOOPS_RAM_SIZE; } diff --git a/src/vendorcode/google/chromeos/vpd_serialno.c b/src/vendorcode/google/chromeos/vpd_serialno.c index e9a771e..c3d5ab5 100644 --- a/src/vendorcode/google/chromeos/vpd_serialno.c +++ b/src/vendorcode/google/chromeos/vpd_serialno.c @@ -36,9 +36,9 @@ void lb_table_add_serialno_from_vpd(struct lb_header *header) len = strlen(serialno) + 1; ASSERT(len <= 32); - serialno_rec = (struct lb_string *)lb_new_record(header); - serialno_rec->tag = LB_TAG_SERIALNO; + serialno_rec = (struct lb_string *) + lb_new_record(header, LB_TAG_SERIALNO, + ALIGN_UP(sizeof(*serialno_rec) + len, 8)); - serialno_rec->size = ALIGN_UP(sizeof(*serialno_rec) + len, 8); memcpy(&serialno_rec->string, serialno, len); }

1 0

Patch set updated for coreboot: riscv: fix up issues related to lb_tables
by Ronald G. Minnich 15 Jan '17

15 Jan '17

Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18139 -gerrit commit 5c0006e4c1f12a435011b24ddbc8d189f3637da1 Author: Ronald G. Minnich <rminnich(a)gmail.com> Date: Fri Jan 13 18:27:34 2017 -0800 riscv: fix up issues related to lb_tables In the lb_tables code, some functions made a reasonable effort to align structs on reasonable boundaries, and others did not. Even the ones that did did not get it quite right, setting alignments to 32 bits, not 64, such that riscv will still take alignment traps in a mode (M-mode) in which such traps are fatal. Change lb_new_record to take a tag and size parameter. This further removes the need for each function to assign tag and size to the record. And, it lets the allocator (lb_new_record) get some idea of the final size. Most importantly, it lets the allocator ensure that entities are 128-bit aligned, and hence future proof for 128-bit processors (and note that the rv128 qemu implementation is already available). This gets me back up to a shell prompt on harvey on the lowriscv, where before we would fail with an alignment trap in coreboot. Change-Id: Id683fe2baa8cbea9abfccab72cf66a44fc04429e Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> --- src/include/boot/coreboot_tables.h | 4 ++- src/lib/coreboot_table.c | 67 ++++++++++++++++++++------------------ src/lib/imd_cbmem.c | 6 ++-- 3 files changed, 41 insertions(+), 36 deletions(-) diff --git a/src/include/boot/coreboot_tables.h b/src/include/boot/coreboot_tables.h index 5647629..f7e76dd 100644 --- a/src/include/boot/coreboot_tables.h +++ b/src/include/boot/coreboot_tables.h @@ -36,6 +36,8 @@ void lb_table_add_macs_from_vpd(struct lb_header *header); void lb_table_add_serialno_from_vpd(struct lb_header *header); -struct lb_record *lb_new_record(struct lb_header *header); +struct lb_record *lb_new_record(struct lb_header *header, + uint32_t tag, + uint32_t size); #endif /* COREBOOT_TABLES_H */ diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c index f8da658..9f3df30 100644 --- a/src/lib/coreboot_table.c +++ b/src/lib/coreboot_table.c @@ -82,7 +82,8 @@ static struct lb_record *lb_last_record(struct lb_header *header) return rec; } -struct lb_record *lb_new_record(struct lb_header *header) +struct lb_record *lb_new_record(struct lb_header *header, + uint32_t tag, uint32_t size) { struct lb_record *rec; rec = lb_last_record(header); @@ -91,8 +92,15 @@ struct lb_record *lb_new_record(struct lb_header *header) } rec = lb_last_record(header); header->table_entries++; - rec->tag = LB_TAG_UNUSED; - rec->size = sizeof(*rec); + rec->tag = tag; + // If the rec->size is not aligned to something reasonable, + // some architectures can take alignment traps. + // Round up table_bytes to something that is future-proof, + // namely 128 bits (16 bytes). This will ensure that even + // the 128-bit RISCV won't get traps. + // We have roundup macros all over the tree; we need to + // clean that up at some point. + rec->size = (sizeof(*rec) + size + 0xf) & ~0xf; return rec; } @@ -100,10 +108,8 @@ static struct lb_memory *lb_memory(struct lb_header *header) { struct lb_record *rec; struct lb_memory *mem; - rec = lb_new_record(header); + rec = lb_new_record(header, LB_TAG_MEMORY, sizeof(*mem)); mem = (struct lb_memory *)rec; - mem->tag = LB_TAG_MEMORY; - mem->size = sizeof(*mem); return mem; } @@ -112,9 +118,9 @@ void lb_add_serial(struct lb_serial *new_serial, void *data) struct lb_header *header = (struct lb_header *)data; struct lb_serial *serial; - serial = (struct lb_serial *)lb_new_record(header); - serial->tag = LB_TAG_SERIAL; - serial->size = sizeof(*serial); + serial = (struct lb_serial *)lb_new_record(header, + LB_TAG_SERIAL, + sizeof(*serial)); serial->type = new_serial->type; serial->baseaddr = new_serial->baseaddr; serial->baud = new_serial->baud; @@ -128,9 +134,9 @@ void lb_add_console(uint16_t consoletype, void *data) struct lb_header *header = (struct lb_header *)data; struct lb_console *console; - console = (struct lb_console *)lb_new_record(header); - console->tag = LB_TAG_CONSOLE; - console->size = sizeof(*console); + console = (struct lb_console *)lb_new_record(header, + LB_TAG_CONSOLE, + sizeof(*console)); console->type = consoletype; } @@ -276,9 +282,8 @@ static void lb_boot_media_params(struct lb_header *header) if (boot_dev == NULL) return; - bmp = (struct lb_boot_media_params *)lb_new_record(header); - bmp->tag = LB_TAG_BOOT_MEDIA_PARAMS; - bmp->size = sizeof(*bmp); + bmp = (struct lb_boot_media_params *) + lb_new_record(header, LB_TAG_BOOT_MEDIA_PARAMS, sizeof(*bmp)); bmp->cbfs_offset = props.offset; bmp->cbfs_size = props.size; @@ -329,7 +334,9 @@ static void add_cbmem_pointers(struct lb_header *header) if (!cbmem_addr) continue; /* This section is not present */ - cbmem_ref = (struct lb_cbmem_ref *)lb_new_record(header); + cbmem_ref = (struct lb_cbmem_ref *) + lb_new_record(header, sid->table_tag, + sizeof(*cbmem_ref)); if (!cbmem_ref) { printk(BIOS_ERR, "No more room in coreboot table!\n"); break; @@ -344,14 +351,13 @@ static struct lb_mainboard *lb_mainboard(struct lb_header *header) { struct lb_record *rec; struct lb_mainboard *mainboard; - rec = lb_new_record(header); - mainboard = (struct lb_mainboard *)rec; - mainboard->tag = LB_TAG_MAINBOARD; + rec = lb_new_record(header, LB_TAG_MAINBOARD, + sizeof(*mainboard) + + strlen(mainboard_vendor) + 1 + + strlen(mainboard_part_number) + 1); - mainboard->size = (sizeof(*mainboard) + - strlen(mainboard_vendor) + 1 + - strlen(mainboard_part_number) + 1 + - 3) & ~3; + + mainboard = (struct lb_mainboard *)rec; mainboard->vendor_idx = 0; mainboard->part_number_idx = strlen(mainboard_vendor) + 1; @@ -399,10 +405,10 @@ static void lb_strings(struct lb_header *header) for(i = 0; i < ARRAY_SIZE(strings); i++) { struct lb_string *rec; size_t len; - rec = (struct lb_string *)lb_new_record(header); len = strlen(strings[i].string); - rec->tag = strings[i].tag; - rec->size = (sizeof(*rec) + len + 1 + 3) & ~3; + rec = (struct lb_string *)lb_new_record(header, + strings[i].tag, + sizeof(*rec) + len + 1); memcpy(rec->string, strings[i].string, len+1); } @@ -411,9 +417,8 @@ static void lb_strings(struct lb_header *header) static void lb_record_version_timestamp(struct lb_header *header) { struct lb_timestamp *rec; - rec = (struct lb_timestamp *)lb_new_record(header); - rec->tag = LB_TAG_VERSION_TIMESTAMP; - rec->size = sizeof(*rec); + rec = (struct lb_timestamp *) + lb_new_record(header, LB_TAG_VERSION_TIMESTAMP, sizeof(*rec)); rec->timestamp = coreboot_version_timestamp; } @@ -431,10 +436,8 @@ static struct lb_forward *lb_forward(struct lb_header *header, struct lb_header { struct lb_record *rec; struct lb_forward *forward; - rec = lb_new_record(header); + rec = lb_new_record(header, LB_TAG_FORWARD, sizeof(*forward)); forward = (struct lb_forward *)rec; - forward->tag = LB_TAG_FORWARD; - forward->size = sizeof(*forward); forward->forward = (uint64_t)(unsigned long)next_header; return forward; } diff --git a/src/lib/imd_cbmem.c b/src/lib/imd_cbmem.c index b0273f4..8187ffa 100644 --- a/src/lib/imd_cbmem.c +++ b/src/lib/imd_cbmem.c @@ -335,9 +335,9 @@ void cbmem_add_records_to_cbtable(struct lb_header *header) if (id == CBMEM_ID_IMD_ROOT || id == CBMEM_ID_IMD_SMALL) continue; - lbe = (struct lb_cbmem_entry *)lb_new_record(header); - lbe->tag = LB_TAG_CBMEM_ENTRY; - lbe->size = sizeof(*lbe); + lbe = (struct lb_cbmem_entry *)lb_new_record(header, + LB_TAG_CBMEM_ENTRY, + sizeof(*lbe)); lbe->address = (uintptr_t)imd_entry_at(imd, e); lbe->entry_size = imd_entry_size(imd, e); lbe->id = id;

1 0

Patch set updated for coreboot: riscv: fix up issues related to lb_tables
by Ronald G. Minnich 15 Jan '17

15 Jan '17

Ronald G. Minnich (rminnich(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18139 -gerrit commit 359db64884d8ebcb66bc7c3f5c37ae4eb94bf7a4 Author: Ronald G. Minnich <rminnich(a)gmail.com> Date: Fri Jan 13 18:27:34 2017 -0800 riscv: fix up issues related to lb_tables In the lb_tables code, some functions made a reasonable effort to align structs on reasonable boundaries, and others did not. Even the ones that did did not get it quite right, setting alignments to 32 bits, not 64, such that riscv will still take alignment traps in a mode (M-mode) in which such traps are fatal. Change lb_new_record to take a tag and size parameter. This further removes the need for each function to assign tag and size to the record. And, it lets the allocator (lb_new_record) get some idea of the final size. Most importantly, it lets the allocator ensure that entities are 128-bit rounded, and hence future proof for 128-bit processors. This gets me back up to a shell prompt on harvey on the lowriscv, where before we would fail with an alignment trap in coreboot. Change-Id: Id683fe2baa8cbea9abfccab72cf66a44fc04429e Signed-off-by: Ronald G. Minnich <rminnich(a)gmail.com> --- src/include/boot/coreboot_tables.h | 4 ++- src/lib/coreboot_table.c | 67 ++++++++++++++++++++------------------ src/lib/imd_cbmem.c | 6 ++-- 3 files changed, 41 insertions(+), 36 deletions(-) diff --git a/src/include/boot/coreboot_tables.h b/src/include/boot/coreboot_tables.h index 5647629..f7e76dd 100644 --- a/src/include/boot/coreboot_tables.h +++ b/src/include/boot/coreboot_tables.h @@ -36,6 +36,8 @@ void lb_table_add_macs_from_vpd(struct lb_header *header); void lb_table_add_serialno_from_vpd(struct lb_header *header); -struct lb_record *lb_new_record(struct lb_header *header); +struct lb_record *lb_new_record(struct lb_header *header, + uint32_t tag, + uint32_t size); #endif /* COREBOOT_TABLES_H */ diff --git a/src/lib/coreboot_table.c b/src/lib/coreboot_table.c index f8da658..9f3df30 100644 --- a/src/lib/coreboot_table.c +++ b/src/lib/coreboot_table.c @@ -82,7 +82,8 @@ static struct lb_record *lb_last_record(struct lb_header *header) return rec; } -struct lb_record *lb_new_record(struct lb_header *header) +struct lb_record *lb_new_record(struct lb_header *header, + uint32_t tag, uint32_t size) { struct lb_record *rec; rec = lb_last_record(header); @@ -91,8 +92,15 @@ struct lb_record *lb_new_record(struct lb_header *header) } rec = lb_last_record(header); header->table_entries++; - rec->tag = LB_TAG_UNUSED; - rec->size = sizeof(*rec); + rec->tag = tag; + // If the rec->size is not aligned to something reasonable, + // some architectures can take alignment traps. + // Round up table_bytes to something that is future-proof, + // namely 128 bits (16 bytes). This will ensure that even + // the 128-bit RISCV won't get traps. + // We have roundup macros all over the tree; we need to + // clean that up at some point. + rec->size = (sizeof(*rec) + size + 0xf) & ~0xf; return rec; } @@ -100,10 +108,8 @@ static struct lb_memory *lb_memory(struct lb_header *header) { struct lb_record *rec; struct lb_memory *mem; - rec = lb_new_record(header); + rec = lb_new_record(header, LB_TAG_MEMORY, sizeof(*mem)); mem = (struct lb_memory *)rec; - mem->tag = LB_TAG_MEMORY; - mem->size = sizeof(*mem); return mem; } @@ -112,9 +118,9 @@ void lb_add_serial(struct lb_serial *new_serial, void *data) struct lb_header *header = (struct lb_header *)data; struct lb_serial *serial; - serial = (struct lb_serial *)lb_new_record(header); - serial->tag = LB_TAG_SERIAL; - serial->size = sizeof(*serial); + serial = (struct lb_serial *)lb_new_record(header, + LB_TAG_SERIAL, + sizeof(*serial)); serial->type = new_serial->type; serial->baseaddr = new_serial->baseaddr; serial->baud = new_serial->baud; @@ -128,9 +134,9 @@ void lb_add_console(uint16_t consoletype, void *data) struct lb_header *header = (struct lb_header *)data; struct lb_console *console; - console = (struct lb_console *)lb_new_record(header); - console->tag = LB_TAG_CONSOLE; - console->size = sizeof(*console); + console = (struct lb_console *)lb_new_record(header, + LB_TAG_CONSOLE, + sizeof(*console)); console->type = consoletype; } @@ -276,9 +282,8 @@ static void lb_boot_media_params(struct lb_header *header) if (boot_dev == NULL) return; - bmp = (struct lb_boot_media_params *)lb_new_record(header); - bmp->tag = LB_TAG_BOOT_MEDIA_PARAMS; - bmp->size = sizeof(*bmp); + bmp = (struct lb_boot_media_params *) + lb_new_record(header, LB_TAG_BOOT_MEDIA_PARAMS, sizeof(*bmp)); bmp->cbfs_offset = props.offset; bmp->cbfs_size = props.size; @@ -329,7 +334,9 @@ static void add_cbmem_pointers(struct lb_header *header) if (!cbmem_addr) continue; /* This section is not present */ - cbmem_ref = (struct lb_cbmem_ref *)lb_new_record(header); + cbmem_ref = (struct lb_cbmem_ref *) + lb_new_record(header, sid->table_tag, + sizeof(*cbmem_ref)); if (!cbmem_ref) { printk(BIOS_ERR, "No more room in coreboot table!\n"); break; @@ -344,14 +351,13 @@ static struct lb_mainboard *lb_mainboard(struct lb_header *header) { struct lb_record *rec; struct lb_mainboard *mainboard; - rec = lb_new_record(header); - mainboard = (struct lb_mainboard *)rec; - mainboard->tag = LB_TAG_MAINBOARD; + rec = lb_new_record(header, LB_TAG_MAINBOARD, + sizeof(*mainboard) + + strlen(mainboard_vendor) + 1 + + strlen(mainboard_part_number) + 1); - mainboard->size = (sizeof(*mainboard) + - strlen(mainboard_vendor) + 1 + - strlen(mainboard_part_number) + 1 + - 3) & ~3; + + mainboard = (struct lb_mainboard *)rec; mainboard->vendor_idx = 0; mainboard->part_number_idx = strlen(mainboard_vendor) + 1; @@ -399,10 +405,10 @@ static void lb_strings(struct lb_header *header) for(i = 0; i < ARRAY_SIZE(strings); i++) { struct lb_string *rec; size_t len; - rec = (struct lb_string *)lb_new_record(header); len = strlen(strings[i].string); - rec->tag = strings[i].tag; - rec->size = (sizeof(*rec) + len + 1 + 3) & ~3; + rec = (struct lb_string *)lb_new_record(header, + strings[i].tag, + sizeof(*rec) + len + 1); memcpy(rec->string, strings[i].string, len+1); } @@ -411,9 +417,8 @@ static void lb_strings(struct lb_header *header) static void lb_record_version_timestamp(struct lb_header *header) { struct lb_timestamp *rec; - rec = (struct lb_timestamp *)lb_new_record(header); - rec->tag = LB_TAG_VERSION_TIMESTAMP; - rec->size = sizeof(*rec); + rec = (struct lb_timestamp *) + lb_new_record(header, LB_TAG_VERSION_TIMESTAMP, sizeof(*rec)); rec->timestamp = coreboot_version_timestamp; } @@ -431,10 +436,8 @@ static struct lb_forward *lb_forward(struct lb_header *header, struct lb_header { struct lb_record *rec; struct lb_forward *forward; - rec = lb_new_record(header); + rec = lb_new_record(header, LB_TAG_FORWARD, sizeof(*forward)); forward = (struct lb_forward *)rec; - forward->tag = LB_TAG_FORWARD; - forward->size = sizeof(*forward); forward->forward = (uint64_t)(unsigned long)next_header; return forward; } diff --git a/src/lib/imd_cbmem.c b/src/lib/imd_cbmem.c index b0273f4..8187ffa 100644 --- a/src/lib/imd_cbmem.c +++ b/src/lib/imd_cbmem.c @@ -335,9 +335,9 @@ void cbmem_add_records_to_cbtable(struct lb_header *header) if (id == CBMEM_ID_IMD_ROOT || id == CBMEM_ID_IMD_SMALL) continue; - lbe = (struct lb_cbmem_entry *)lb_new_record(header); - lbe->tag = LB_TAG_CBMEM_ENTRY; - lbe->size = sizeof(*lbe); + lbe = (struct lb_cbmem_entry *)lb_new_record(header, + LB_TAG_CBMEM_ENTRY, + sizeof(*lbe)); lbe->address = (uintptr_t)imd_entry_at(imd, e); lbe->entry_size = imd_entry_size(imd, e); lbe->id = id;

1 0

Patch merged into coreboot/master: riscv: Move mcall numbers to mcall.h, adjust their names
by gerrit＠coreboot.org 15 Jan '17

15 Jan '17

the following patch was just integrated into master: commit c5ebb1d005e1a176b94be136aa21734c03d34d08 Author: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> Date: Mon Jan 16 00:31:34 2017 +0100 riscv: Move mcall numbers to mcall.h, adjust their names The new name and location make more sense: - The instruction used to call into machine mode isn't called "ecall" anymore; it's mcall now. - Having SBI_ in the name is slightly wrong, too: these numbers are not part of the Supervisor Binary Interface, they are just used to forward SBI calls (they could be renumbered arbitrarily without breaking an OS that's run under coreboot). Also remove mcall_dev_{req,resp} and the corresponding mcall numbers, which are no longer used. Change-Id: I76a8cb04e4ace51964b1cb4f67d49cfee9850da7 Signed-off-by: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> Reviewed-on: https://review.coreboot.org/18146 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com> See https://review.coreboot.org/18146 for details. -gerrit

1 0

Patch merged into coreboot/master: riscv/spike: Remove obsolete DRAM_SIZE_MB setting
by gerrit＠coreboot.org 15 Jan '17

15 Jan '17

the following patch was just integrated into master: commit f676aa4afdadac5dce93ca10a9fe2c4d9ca4edfb Author: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> Date: Mon Jan 16 00:31:34 2017 +0100 riscv/spike: Remove obsolete DRAM_SIZE_MB setting Change-Id: I4077739ac2be09107d8c5a3e4ae7ebd0da3cb876 Signed-off-by: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> Reviewed-on: https://review.coreboot.org/18147 Tested-by: build bot (Jenkins) Reviewed-by: Ronald G. Minnich <rminnich(a)gmail.com> See https://review.coreboot.org/18147 for details. -gerrit

1 0

Patch set updated for coreboot: resource: Add prefetchable memory resource for PCI domain
by Kyösti Mälkki 15 Jan '17

15 Jan '17

Kyösti Mälkki (kyosti.malkki(a)gmail.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/8892 -gerrit commit 33c2b0da978b81b0b76473e06bedf10ff82f1a76 Author: Kyösti Mälkki <kyosti.malkki(a)gmail.com> Date: Thu Mar 26 23:27:54 2015 +0200 resource: Add prefetchable memory resource for PCI domain With the change, prefetchable and non-prefetchable MMIO resources will no longer be interleaved for the domain, but one window will appear below the other in memory space. There is no need to negotiate the resource limits via intermediate limits structure. Recursively walk the devicetree for each type of resource and apply the constraints directly on the domain path. Change-ID: Ibf44deab0aed0a05759e78855e23146fc45cdc43 Signed-off-by: Kyösti Mälkki <kyosti.malkki(a)gmail.com> --- src/device/device.c | 169 +++++++++++++----------------------------------- src/device/pci_device.c | 6 ++ 2 files changed, 50 insertions(+), 125 deletions(-) diff --git a/src/device/device.c b/src/device/device.c index 9ea32cc..28b0bcb 100644 --- a/src/device/device.c +++ b/src/device/device.c @@ -285,10 +285,11 @@ static void pick_largest_resource(void *gp, struct device *dev, static struct device *largest_resource(struct bus *bus, struct resource **result_res, - unsigned long type_mask, - unsigned long type) + struct resource *bridge) { struct pick_largest_state state; + u32 type_mask = (IORESOURCE_TYPE_MASK | IORESOURCE_PREFETCH); + u32 type = bridge->flags & type_mask; state.last = *result_res; state.result_dev = NULL; @@ -302,6 +303,20 @@ static struct device *largest_resource(struct bus *bus, return state.result_dev; } +static int resource_match(struct resource *res, struct resource *lim) +{ + return (res->flags & IORESOURCE_TYPE_MASK) == + (lim->flags & IORESOURCE_TYPE_MASK); +} + +static int resource_match_bridge(struct resource *res, struct resource *win) +{ + u32 type_mask = (IORESOURCE_TYPE_MASK | IORESOURCE_PREFETCH); + if (!(res->flags & IORESOURCE_BRIDGE)) + return 0; + return (res->flags & type_mask) == (win->flags & type_mask); +} + /** * This function is the guts of the resource allocator. * @@ -331,12 +346,8 @@ static struct device *largest_resource(struct bus *bus, * * @param bus The bus we are traversing. * @param bridge The bridge resource which must contain the bus' resources. - * @param type_mask This value gets ANDed with the resource type. - * @param type This value must match the result of the AND. - * @return TODO */ -static void compute_resources(struct bus *bus, struct resource *bridge, - unsigned long type_mask, unsigned long type) +static void compute_resources(struct bus *bus, struct resource *bridge) { struct device *dev; struct resource *resource; @@ -360,17 +371,9 @@ static void compute_resources(struct bus *bus, struct resource *bridge, child_bridge = child_bridge->next) { struct bus* link; - if (!(child_bridge->flags & IORESOURCE_BRIDGE) - || (child_bridge->flags & type_mask) != type) + if (!resource_match_bridge(child_bridge, bridge)) continue; - /* - * Split prefetchable memory if combined. Many domains - * use the same address space for prefetchable memory - * and non-prefetchable memory. Bridges below them need - * it separated. Add the PREFETCH flag to the type_mask - * and type. - */ link = dev->link_list; while (link && link->link_num != IOINDEX_LINK(child_bridge->index)) @@ -382,10 +385,7 @@ static void compute_resources(struct bus *bus, struct resource *bridge, dev_path(dev)); } - compute_resources(link, child_bridge, - type_mask | IORESOURCE_PREFETCH, - type | (child_bridge->flags & - IORESOURCE_PREFETCH)); + compute_resources(link, child_bridge); } } @@ -397,7 +397,7 @@ static void compute_resources(struct bus *bus, struct resource *bridge, * amount of address space taken by them. Take granularity and * alignment into account. */ - while ((dev = largest_resource(bus, &resource, type_mask, type))) { + while ((dev = largest_resource(bus, &resource, bridge))) { /* Size 0 resources can be skipped. */ if (!resource->size) @@ -474,13 +474,10 @@ static void compute_resources(struct bus *bus, struct resource *bridge, * * @param bus The bus we are traversing. * @param bridge The bridge resource which must contain the bus' resources. - * @param type_mask This value gets ANDed with the resource type. - * @param type This value must match the result of the AND. * * @see compute_resources */ -static void allocate_resources(struct bus *bus, struct resource *bridge, - unsigned long type_mask, unsigned long type) +static void allocate_resources(struct bus *bus, struct resource *bridge) { struct device *dev; struct resource *resource; @@ -499,7 +496,7 @@ static void allocate_resources(struct bus *bus, struct resource *bridge, * Walk through all the resources on the current bus and allocate them * address space. */ - while ((dev = largest_resource(bus, &resource, type_mask, type))) { + while ((dev = largest_resource(bus, &resource, bridge))) { /* Propagate the bridge limit to the resource register. */ if (resource->limit > bridge->limit) @@ -590,17 +587,9 @@ static void allocate_resources(struct bus *bus, struct resource *bridge, child_bridge = child_bridge->next) { struct bus* link; - if (!(child_bridge->flags & IORESOURCE_BRIDGE) || - (child_bridge->flags & type_mask) != type) + if (!resource_match_bridge(child_bridge, bridge)) continue; - /* - * Split prefetchable memory if combined. Many domains - * use the same address space for prefetchable memory - * and non-prefetchable memory. Bridges below them need - * it separated. Add the PREFETCH flag to the type_mask - * and type. - */ link = dev->link_list; while (link && link->link_num != IOINDEX_LINK(child_bridge->index)) @@ -610,47 +599,25 @@ static void allocate_resources(struct bus *bus, struct resource *bridge, IOINDEX_LINK(child_bridge->index), dev_path(dev)); - allocate_resources(link, child_bridge, - type_mask | IORESOURCE_PREFETCH, - type | (child_bridge->flags & - IORESOURCE_PREFETCH)); + allocate_resources(link, child_bridge); } } } -static int resource_is(struct resource *res, u32 type) -{ - return (res->flags & IORESOURCE_TYPE_MASK) == type; -} - -struct constraints { - struct resource io, mem; -}; - -static struct resource * resource_limit(struct constraints *limits, struct resource *res) -{ - struct resource *lim = NULL; - - /* MEM, or I/O - skip any others. */ - if (resource_is(res, IORESOURCE_MEM)) - lim = &limits->mem; - else if (resource_is(res, IORESOURCE_IO)) - lim = &limits->io; - - return lim; -} - -static void constrain_resources(struct device *dev, struct constraints* limits) +static void constrain_resources(struct device *dev, struct resource *lim) { struct device *child; struct resource *res; - struct resource *lim; struct bus *link; /* Constrain limits based on the fixed resources of this device. */ for (res = dev->resource_list; res; res = res->next) { if (!(res->flags & IORESOURCE_FIXED)) continue; + + if (!resource_match(res, lim)) + continue; + if (!res->size) { /* It makes no sense to have 0-sized, fixed resources.*/ printk(BIOS_ERR, "skipping %s@%lx fixed resource, " @@ -658,10 +625,6 @@ static void constrain_resources(struct device *dev, struct constraints* limits) continue; } - lim = resource_limit(limits, res); - if (!lim) - continue; - /* * Is it a fixed resource outside the current known region? * If so, we don't have to consider it - it will be handled @@ -691,63 +654,35 @@ static void constrain_resources(struct device *dev, struct constraints* limits) for (link = dev->link_list; link; link = link->next) { for (child = link->children; child; child = child->sibling) { if (child->enabled) - constrain_resources(child, limits); + constrain_resources(child, lim); } } } static void avoid_fixed_resources(struct device *dev) { - struct constraints limits; struct resource *res; - struct resource *lim; + resource_t mem_limit = 0xffffffffULL; printk(BIOS_SPEW, "%s: %s\n", __func__, dev_path(dev)); - /* Initialize constraints to maximum size. */ - limits.io.base = 0; - limits.io.limit = 0xffffffffffffffffULL; - limits.mem.base = 0; - limits.mem.limit = 0xffffffffffffffffULL; - /* Constrain the limits to dev's initial resources. */ for (res = dev->resource_list; res; res = res->next) { if ((res->flags & IORESOURCE_FIXED)) continue; - printk(BIOS_SPEW, "%s:@%s %02lx limit %08llx\n", __func__, - dev_path(dev), res->index, res->limit); - - lim = resource_limit(&limits, res); - if (!lim) - continue; - - if (res->base > lim->base) - lim->base = res->base; - if (res->limit < lim->limit) - lim->limit = res->limit; - } - - /* Look through the tree for fixed resources and update the limits. */ - constrain_resources(dev, &limits); - - /* Update dev's resources with new limits. */ - for (res = dev->resource_list; res; res = res->next) { - if ((res->flags & IORESOURCE_FIXED)) - continue; - lim = resource_limit(&limits, res); - if (!lim) - continue; + /* Place MEM resources one after other. */ + if ((res->flags & IORESOURCE_MEM) && (res->limit > mem_limit)) + res->limit = mem_limit; - /* Is the resource outside the limits? */ - if (lim->base > res->base) - res->base = lim->base; - if (res->limit > lim->limit) - res->limit = lim->limit; + /* Look through the tree for fixed resources and update the limits. */ + constrain_resources(dev, res); /* MEM resources need to start at the highest address manageable. */ - if (res->flags & IORESOURCE_MEM) + if (res->flags & IORESOURCE_MEM) { res->base = resource_max(res); + mem_limit = res->base - 1; + } printk(BIOS_SPEW, "%s:@%s %02lx base %08llx limit %08llx\n", __func__, dev_path(dev), res->index, res->base, res->limit); @@ -1050,16 +985,8 @@ void dev_configure(void) for (res = child->resource_list; res; res = res->next) { if (res->flags & IORESOURCE_FIXED) continue; - if (res->flags & IORESOURCE_MEM) { - compute_resources(child->link_list, - res, IORESOURCE_TYPE_MASK, IORESOURCE_MEM); - continue; - } - if (res->flags & IORESOURCE_IO) { - compute_resources(child->link_list, - res, IORESOURCE_TYPE_MASK, IORESOURCE_IO); - continue; - } + + compute_resources(child->link_list, res); } } @@ -1077,16 +1004,8 @@ void dev_configure(void) for (res = child->resource_list; res; res = res->next) { if (res->flags & IORESOURCE_FIXED) continue; - if (res->flags & IORESOURCE_MEM) { - allocate_resources(child->link_list, - res, IORESOURCE_TYPE_MASK, IORESOURCE_MEM); - continue; - } - if (res->flags & IORESOURCE_IO) { - allocate_resources(child->link_list, - res, IORESOURCE_TYPE_MASK, IORESOURCE_IO); - continue; - } + + allocate_resources(child->link_list, res); } } assign_resources(root->link_list); diff --git a/src/device/pci_device.c b/src/device/pci_device.c index 06294d0..0f44353 100644 --- a/src/device/pci_device.c +++ b/src/device/pci_device.c @@ -459,6 +459,12 @@ void pci_domain_read_resources(struct device *dev) res->limit = 0xffffffffULL; res->flags = IORESOURCE_MEM | IORESOURCE_SUBTRACTIVE | IORESOURCE_ASSIGNED; + + /* Initialize the system-wide memory resources constraints. */ + res = new_resource(dev, IOINDEX_SUBTRACTIVE(2, 0)); + res->limit = 0xffffffffULL; + res->flags = IORESOURCE_MEM | IORESOURCE_PREFETCH | IORESOURCE_SUBTRACTIVE | + IORESOURCE_ASSIGNED; } static void pci_set_resource(struct device *dev, struct resource *resource)

1 0

Patch merged into coreboot/master: mainboard/google/poppy: SD card changes
by gerrit＠coreboot.org 15 Jan '17

15 Jan '17

the following patch was just integrated into master: commit d093e4a387d5b15502955841bfc1f44d33059eba Author: Furquan Shaikh <furquan(a)chromium.org> Date: Fri Jan 13 17:27:36 2017 -0800 mainboard/google/poppy: SD card changes 1. Disable WP 2. Pass SD card detect info in ACPI BUG=chrome-os-partner:60713 BRANCH=None TEST=Verified that OS is able to detect SD card and read/write to it. Change-Id: Ide84d4b86c0fac50a07520dfd76d6d3a921f2ecc Signed-off-by: Furquan Shaikh <furquan(a)chromium.org> Reviewed-on: https://review.coreboot.org/18138 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin(a)chromium.org> See https://review.coreboot.org/18138 for details. -gerrit

1 0

Patch merged into coreboot/master: mainboard/google/poppy: Update DQS and DQ Byte mappings for poppy
by gerrit＠coreboot.org 15 Jan '17

15 Jan '17

the following patch was just integrated into master: commit b4a159706ec45c1f8e06b694c3531f94231097d6 Author: Rizwan Qureshi <rizwan.qureshi(a)intel.com> Date: Fri Jan 13 12:45:19 2017 +0530 mainboard/google/poppy: Update DQS and DQ Byte mappings for poppy poppy schematics have undergone change after review, update DQS and DQ Byte mappings based on the new schematics. BUG=chrome-os-partner:61856 BRANCH=None TEST= Build and boot all the poppy proto SKUs to OS. Change-Id: Ie4532035f37c25540abb26122234f6e3346ede69 Signed-off-by: Rizwan Qureshi <rizwan.qureshi(a)intel.com> Signed-off-by: Furquan Shaikh <furquan(a)chromium.org> Reviewed-on: https://review.coreboot.org/18133 Reviewed-by: Furquan Shaikh <furquan(a)google.com> Tested-by: build bot (Jenkins) Reviewed-by: Paul Menzel <paulepanter(a)users.sourceforge.net> See https://review.coreboot.org/18133 for details. -gerrit

1 0

New patch to review for coreboot: riscv/spike: Remove obsolete DRAM_SIZE_MB setting
by Jonathan Neuschäfer 15 Jan '17

15 Jan '17

Jonathan Neuschäfer (j.neuschaefer(a)gmx.net) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/18147 -gerrit commit e15df62824ac2dc0a9528d6c6409ca61743107f8 Author: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> Date: Mon Jan 16 00:31:34 2017 +0100 riscv/spike: Remove obsolete DRAM_SIZE_MB setting Change-Id: I4077739ac2be09107d8c5a3e4ae7ebd0da3cb876 Signed-off-by: Jonathan Neuschäfer <j.neuschaefer(a)gmx.net> --- src/mainboard/emulation/spike-riscv/Kconfig | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/mainboard/emulation/spike-riscv/Kconfig b/src/mainboard/emulation/spike-riscv/Kconfig index 574f23c..755b114 100644 --- a/src/mainboard/emulation/spike-riscv/Kconfig +++ b/src/mainboard/emulation/spike-riscv/Kconfig @@ -41,10 +41,6 @@ config MAINBOARD_VENDOR string default "UCB" -config DRAM_SIZE_MB - int - default 32768 - # Memory map for qemu riscv # # 0x0000_0000: jump instruction (by qemu)

1 0

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

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit January 2017