coreboot-gerrit July 2016

coreboot-gerrit@coreboot.org

1 participants
1820 discussions

Patch set updated for coreboot: lib/selfboot: Replace rdev_mmap_full()
by Antonello Dettori 01 Jul '16

01 Jul '16

Antonello Dettori (dev(a)dettori.io) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15525 -gerrit commit 07cd2e2f68f8ff1c43007d6e6ca0f5b269f5f69f Author: Antonello Dettori <dev(a)dettori.io> Date: Fri Jul 1 14:28:17 2016 +0200 lib/selfboot: Replace rdev_mmap_full() Avoid loading the entire payload into memory, instead read each segment when it is required. If the segment is uncompressed rdev_readat() it into memory, otherwise rdev_mmap() the segment and uncompress it. The purpose of the change is to improve the performance during the payload load phase by avoiding any unnecessary mmap operation where possible. Change-Id: I27cd4358a1747a65a79995114df23e296d1410fd Signed-off-by: Antonello Dettori <dev(a)dettori.io> --- src/lib/selfboot.c | 114 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 67 insertions(+), 47 deletions(-) diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c index 75d6725..8cee9cc 100644 --- a/src/lib/selfboot.c +++ b/src/lib/selfboot.c @@ -36,9 +36,10 @@ struct segment { struct segment *next; struct segment *prev; unsigned long s_dstaddr; - unsigned long s_srcaddr; unsigned long s_memsz; - unsigned long s_filesz; + /* src->offset is the distance from the beginning of the boot_device. + * src->size is the filesize of the boot_device. */ + struct region src; int compression; }; @@ -121,7 +122,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) die ("bounce buffer not supported"); start = seg->s_dstaddr; - middle = start + seg->s_filesz; + middle = start + seg->src.size; end = start + seg->s_memsz; printk(BIOS_SPEW, "segment: [0x%016lx, 0x%016lx, 0x%016lx)\n", @@ -139,12 +140,12 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) new->s_memsz = len; seg->s_memsz -= len; seg->s_dstaddr += len; - seg->s_srcaddr += len; - if (seg->s_filesz > len) { - new->s_filesz = len; - seg->s_filesz -= len; + seg->src.offset += len; + if (seg->src.size > len) { + new->src.size = len; + seg->src.size -= len; } else { - seg->s_filesz = 0; + seg->src.size = 0; } /* Order by stream offset */ @@ -158,7 +159,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) printk(BIOS_SPEW, " early: [0x%016lx, 0x%016lx, 0x%016lx)\n", new->s_dstaddr, - new->s_dstaddr + new->s_filesz, + new->s_dstaddr + new->src.size, new->s_dstaddr + new->s_memsz); ret = 1; @@ -175,12 +176,12 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) seg->s_memsz = len; new->s_memsz -= len; new->s_dstaddr += len; - new->s_srcaddr += len; - if (seg->s_filesz > len) { - seg->s_filesz = len; - new->s_filesz -= len; + new->src.offset += len; + if (seg->src.size > len) { + seg->src.size = len; + new->src.size -= len; } else { - new->s_filesz = 0; + new->src.size = 0; } /* Order by stream offset */ new->next = seg->next; @@ -190,7 +191,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) printk(BIOS_SPEW, " late: [0x%016lx, 0x%016lx, 0x%016lx)\n", new->s_dstaddr, - new->s_dstaddr + new->s_filesz, + new->s_dstaddr + new->src.size, new->s_dstaddr + new->s_memsz); } } @@ -204,7 +205,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) printk(BIOS_SPEW, " bounce: [0x%016lx, 0x%016lx, 0x%016lx)\n", seg->s_dstaddr, - seg->s_dstaddr + seg->s_filesz, + seg->s_dstaddr + seg->src.size, seg->s_dstaddr + seg->s_memsz); return ret; @@ -226,17 +227,27 @@ static void cbfs_decode_payload_segment(struct cbfs_payload_segment *segment, static int build_self_segment_list( struct segment *head, - struct cbfs_payload *cbfs_payload, uintptr_t *entry) + struct region_device *cbfs_payload, uintptr_t *entry) { struct segment *new; struct cbfs_payload_segment *current_segment, *first_segment, segment; + size_t offset = 0; memset(head, 0, sizeof(*head)); head->next = head->prev = head; - first_segment = &cbfs_payload->segments; + first_segment = malloc(sizeof(struct cbfs_payload_segment)); + current_segment = malloc(sizeof(struct cbfs_payload_segment)); - for (current_segment = first_segment;; ++current_segment) { + rdev_readat(cbfs_payload, first_segment, 0, + sizeof(struct cbfs_payload_segment)); + memcpy(current_segment, first_segment, + sizeof(struct cbfs_payload_segment)); + + if (first_segment == NULL || current_segment == NULL) + return -1; + + while (true) { printk(BIOS_DEBUG, "Loading segment from rom address 0x%p\n", current_segment); @@ -258,20 +269,19 @@ static int build_self_segment_list( new->s_dstaddr = segment.load_addr; new->s_memsz = segment.mem_len; new->compression = segment.compression; - new->s_srcaddr = (uintptr_t) - ((unsigned char *)first_segment) - + segment.offset; - new->s_filesz = segment.len; + new->src.size = segment.len; + new->src.offset = segment.offset; - printk(BIOS_DEBUG, " New segment dstaddr 0x%lx memsize 0x%lx srcaddr 0x%lx filesize 0x%lx\n", - new->s_dstaddr, new->s_memsz, new->s_srcaddr, new->s_filesz); + printk(BIOS_DEBUG, " New segment dstaddr 0x%lx memsize 0x%lx offset 0x%zx filesize 0x%zx\n", + new->s_dstaddr, new->s_memsz, new->src.offset, + new->src.size); /* Clean up the values */ - if (new->s_filesz > new->s_memsz) { - new->s_filesz = new->s_memsz; + if (new->src.size > new->s_memsz) { + new->src.size = new->s_memsz; printk(BIOS_DEBUG, - " cleaned up filesize 0x%lx\n", - new->s_filesz); + " cleaned up filesize 0x%zx\n", + new->src.size); } break; @@ -280,12 +290,10 @@ static int build_self_segment_list( (intptr_t)segment.load_addr, segment.mem_len); new = malloc(sizeof(*new)); - new->s_filesz = 0; - new->s_srcaddr = (uintptr_t) - ((unsigned char *)first_segment) - + segment.offset; new->s_dstaddr = segment.load_addr; new->s_memsz = segment.mem_len; + new->src.size = 0; + new->src.offset = segment.offset; break; case PAYLOAD_SEGMENT_ENTRY: @@ -315,8 +323,15 @@ static int build_self_segment_list( new->prev = head->prev; head->prev->next = new; head->prev = new; + + rdev_readat(cbfs_payload, current_segment, offset, + sizeof(struct cbfs_payload_segment)); + offset += sizeof(struct cbfs_payload_segment); } + free(first_segment); + free(current_segment); + return 1; } @@ -332,7 +347,7 @@ static int load_self_segments( /* Determine last non-empty loaded segment. */ last_non_empty = NULL; for(ptr = head->next; ptr != head; ptr = ptr->next) - if (ptr->s_filesz != 0) + if (ptr->src.size != 0) last_non_empty = ptr; for(ptr = head->next; ptr != head; ptr = ptr->next) { @@ -378,8 +393,8 @@ static int load_self_segments( for(ptr = head->next; ptr != head; ptr = ptr->next) { unsigned char *dest, *src; - printk(BIOS_DEBUG, "Loading Segment: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016lx\n", - ptr->s_dstaddr, ptr->s_memsz, ptr->s_filesz); + printk(BIOS_DEBUG, "Loading Segment: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016zx\n", + ptr->s_dstaddr, ptr->s_memsz, ptr->src.size); /* Modify the segment to load onto the bounce_buffer if necessary. */ @@ -388,23 +403,27 @@ static int load_self_segments( continue; } - printk(BIOS_DEBUG, "Post relocation: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016lx\n", - ptr->s_dstaddr, ptr->s_memsz, ptr->s_filesz); + printk(BIOS_DEBUG, "Post relocation: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016zx\n", + ptr->s_dstaddr, ptr->s_memsz, ptr->src.size); /* Compute the boundaries of the segment */ dest = (unsigned char *)(ptr->s_dstaddr); - src = (unsigned char *)(ptr->s_srcaddr); + src = NULL; /* Copy data from the initial buffer */ - if (ptr->s_filesz) { + if (ptr->src.size) { unsigned char *middle, *end; - size_t len = ptr->s_filesz; + size_t len = ptr->src.size; size_t memsz = ptr->s_memsz; + size_t offset = ptr->src.offset; switch(ptr->compression) { case CBFS_COMPRESS_LZMA: { printk(BIOS_DEBUG, "using LZMA\n"); timestamp_add_now(TS_START_ULZMA); + src = rdev_mmap(prog_rdev(payload), + offset, len); len = ulzman(src, len, dest, memsz); + rdev_munmap(prog_rdev(payload), src); timestamp_add_now(TS_END_ULZMA); if (!len) /* Decompression Error. */ return 0; @@ -413,7 +432,10 @@ static int load_self_segments( case CBFS_COMPRESS_LZ4: { printk(BIOS_DEBUG, "using LZ4\n"); timestamp_add_now(TS_START_ULZ4F); + src = rdev_mmap(prog_rdev(payload), + offset, len); len = ulz4fn(src, len, dest, memsz); + rdev_munmap(prog_rdev(payload), src); timestamp_add_now(TS_END_ULZ4F); if (!len) /* Decompression Error. */ return 0; @@ -421,7 +443,8 @@ static int load_self_segments( } case CBFS_COMPRESS_NONE: { printk(BIOS_DEBUG, "it's not compressed!\n"); - memcpy(dest, src, len); + rdev_readat(prog_rdev(payload), dest, + offset, len); break; } default: @@ -479,9 +502,9 @@ void *selfload(struct prog *payload) { uintptr_t entry = 0; struct segment head; - void *data; + struct region_device *data; - data = rdev_mmap_full(prog_rdev(payload)); + data = prog_rdev(payload); if (data == NULL) return NULL; @@ -496,8 +519,6 @@ void *selfload(struct prog *payload) printk(BIOS_SPEW, "Loaded segments\n"); - rdev_munmap(prog_rdev(payload), data); - /* Update the payload's area with the bounce buffer information. */ prog_set_area(payload, (void *)(uintptr_t)bounce_buffer, bounce_size); @@ -507,6 +528,5 @@ void *selfload(struct prog *payload) return (void *)entry; out: - rdev_munmap(prog_rdev(payload), data); return NULL; }

1 0

New patch to review for coreboot: lib: remove ulzma()
by Aaron Durbin 01 Jul '16

01 Jul '16

Aaron Durbin (adurbin(a)chromium.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15526 -gerrit commit 97e1c75a4fe2058a88190c53206457de2d7ae6f2 Author: Aaron Durbin <adurbin(a)chromium.org> Date: Fri Jul 1 10:06:29 2016 -0500 lib: remove ulzma() That function is no longer used. All users have been updated to use the ulzman() function which specifies lengths for the input and output buffers. Change-Id: Ie630172be914a88ace010ec3ff4ff97da414cb5e Signed-off-by: Aaron Durbin <adurbin(a)chromium.org> --- src/include/lib.h | 1 - src/lib/lzma.c | 5 ----- 2 files changed, 6 deletions(-) diff --git a/src/include/lib.h b/src/include/lib.h index 5bcd07d..3edc372 100644 --- a/src/include/lib.h +++ b/src/include/lib.h @@ -21,7 +21,6 @@ #include <types.h> /* Defined in src/lib/lzma.c. Returns decompressed size or 0 on error. */ -size_t ulzma(const void *src, void *dst); size_t ulzman(const void *src, size_t srcn, void *dst, size_t dstn); /* Defined in src/lib/ramtest.c */ diff --git a/src/lib/lzma.c b/src/lib/lzma.c index d0b4c35..3efcbc0 100644 --- a/src/lib/lzma.c +++ b/src/lib/lzma.c @@ -55,8 +55,3 @@ size_t ulzman(const void *src, size_t srcn, void *dst, size_t dstn) } return outProcessed; } - -size_t ulzma(const void *src, void *dst) -{ - return ulzman(src, ~(size_t)0, dst, ~(size_t)0); -}

1 0

Patch set updated for coreboot: lib/selfboot: Replace rdev_mmap_full()
by Antonello Dettori 01 Jul '16

01 Jul '16

Antonello Dettori (dev(a)dettori.io) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15525 -gerrit commit b90f47c569107ff9be680cdf7b5cc65c5a54e73c Author: Antonello Dettori <dev(a)dettori.io> Date: Fri Jul 1 14:28:17 2016 +0200 lib/selfboot: Replace rdev_mmap_full() Avoid loading the entire payload into memory, instead read each segment when it is required. If the segment is uncompressed rdev_readat() it into memory, otherwise rdev_mmap() the segment and uncompress it. The purpose of the change is to improve the performance during the payload load phase by avoiding any unnecessary mmap operation where possible. Change-Id: I27cd4358a1747a65a79995114df23e296d1410fd Signed-off-by: Antonello Dettori <dev(a)dettori.io> --- src/lib/selfboot.c | 112 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 65 insertions(+), 47 deletions(-) diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c index 75d6725..5d6b121 100644 --- a/src/lib/selfboot.c +++ b/src/lib/selfboot.c @@ -36,9 +36,10 @@ struct segment { struct segment *next; struct segment *prev; unsigned long s_dstaddr; - unsigned long s_srcaddr; unsigned long s_memsz; - unsigned long s_filesz; + /* src->offset is the distance from the beginning of the boot_device. + * src->size is the filesize of the boot_device. */ + struct region src; int compression; }; @@ -121,7 +122,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) die ("bounce buffer not supported"); start = seg->s_dstaddr; - middle = start + seg->s_filesz; + middle = start + seg->src.size; end = start + seg->s_memsz; printk(BIOS_SPEW, "segment: [0x%016lx, 0x%016lx, 0x%016lx)\n", @@ -139,12 +140,12 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) new->s_memsz = len; seg->s_memsz -= len; seg->s_dstaddr += len; - seg->s_srcaddr += len; - if (seg->s_filesz > len) { - new->s_filesz = len; - seg->s_filesz -= len; + seg->src.offset += len; + if (seg->src.size > len) { + new->src.size = len; + seg->src.size -= len; } else { - seg->s_filesz = 0; + seg->src.size = 0; } /* Order by stream offset */ @@ -158,7 +159,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) printk(BIOS_SPEW, " early: [0x%016lx, 0x%016lx, 0x%016lx)\n", new->s_dstaddr, - new->s_dstaddr + new->s_filesz, + new->s_dstaddr + new->src.size, new->s_dstaddr + new->s_memsz); ret = 1; @@ -175,12 +176,12 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) seg->s_memsz = len; new->s_memsz -= len; new->s_dstaddr += len; - new->s_srcaddr += len; - if (seg->s_filesz > len) { - seg->s_filesz = len; - new->s_filesz -= len; + new->src.offset += len; + if (seg->src.size > len) { + seg->src.size = len; + new->src.size -= len; } else { - new->s_filesz = 0; + new->src.size = 0; } /* Order by stream offset */ new->next = seg->next; @@ -190,7 +191,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) printk(BIOS_SPEW, " late: [0x%016lx, 0x%016lx, 0x%016lx)\n", new->s_dstaddr, - new->s_dstaddr + new->s_filesz, + new->s_dstaddr + new->src.size, new->s_dstaddr + new->s_memsz); } } @@ -204,7 +205,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) printk(BIOS_SPEW, " bounce: [0x%016lx, 0x%016lx, 0x%016lx)\n", seg->s_dstaddr, - seg->s_dstaddr + seg->s_filesz, + seg->s_dstaddr + seg->src.size, seg->s_dstaddr + seg->s_memsz); return ret; @@ -226,17 +227,27 @@ static void cbfs_decode_payload_segment(struct cbfs_payload_segment *segment, static int build_self_segment_list( struct segment *head, - struct cbfs_payload *cbfs_payload, uintptr_t *entry) + struct region_device *cbfs_payload, uintptr_t *entry) { struct segment *new; struct cbfs_payload_segment *current_segment, *first_segment, segment; + size_t offset = 0; memset(head, 0, sizeof(*head)); head->next = head->prev = head; - first_segment = &cbfs_payload->segments; + first_segment = malloc(sizeof(struct cbfs_payload_segment)); + current_segment = malloc(sizeof(struct cbfs_payload_segment)); - for (current_segment = first_segment;; ++current_segment) { + rdev_readat(cbfs_payload, first_segment, 0, + sizeof(struct cbfs_payload_segment)); + memcpy(current_segment, first_segment, + sizeof(struct cbfs_payload_segment)); + + if (first_segment == NULL || current_segment == NULL) + return -1; + + while (true) { printk(BIOS_DEBUG, "Loading segment from rom address 0x%p\n", current_segment); @@ -258,20 +269,19 @@ static int build_self_segment_list( new->s_dstaddr = segment.load_addr; new->s_memsz = segment.mem_len; new->compression = segment.compression; - new->s_srcaddr = (uintptr_t) - ((unsigned char *)first_segment) - + segment.offset; - new->s_filesz = segment.len; + new->src.size = segment.len; + new->src.offset = segment.offset; - printk(BIOS_DEBUG, " New segment dstaddr 0x%lx memsize 0x%lx srcaddr 0x%lx filesize 0x%lx\n", - new->s_dstaddr, new->s_memsz, new->s_srcaddr, new->s_filesz); + printk(BIOS_DEBUG, " New segment dstaddr 0x%lx memsize 0x%lx offset 0x%zx filesize 0x%zx\n", + new->s_dstaddr, new->s_memsz, new->src.offset, + new->src.size); /* Clean up the values */ - if (new->s_filesz > new->s_memsz) { - new->s_filesz = new->s_memsz; + if (new->src.size > new->s_memsz) { + new->src.size = new->s_memsz; printk(BIOS_DEBUG, - " cleaned up filesize 0x%lx\n", - new->s_filesz); + " cleaned up filesize 0x%zx\n", + new->src.size); } break; @@ -280,12 +290,10 @@ static int build_self_segment_list( (intptr_t)segment.load_addr, segment.mem_len); new = malloc(sizeof(*new)); - new->s_filesz = 0; - new->s_srcaddr = (uintptr_t) - ((unsigned char *)first_segment) - + segment.offset; new->s_dstaddr = segment.load_addr; new->s_memsz = segment.mem_len; + new->src.size = 0; + new->src.offset = segment.offset; break; case PAYLOAD_SEGMENT_ENTRY: @@ -315,8 +323,15 @@ static int build_self_segment_list( new->prev = head->prev; head->prev->next = new; head->prev = new; + + rdev_readat(cbfs_payload, current_segment, offset, + sizeof(struct cbfs_payload_segment)); + offset += sizeof(struct cbfs_payload_segment); } + free(first_segment); + free(current_segment); + return 1; } @@ -332,7 +347,7 @@ static int load_self_segments( /* Determine last non-empty loaded segment. */ last_non_empty = NULL; for(ptr = head->next; ptr != head; ptr = ptr->next) - if (ptr->s_filesz != 0) + if (ptr->src.size != 0) last_non_empty = ptr; for(ptr = head->next; ptr != head; ptr = ptr->next) { @@ -378,8 +393,8 @@ static int load_self_segments( for(ptr = head->next; ptr != head; ptr = ptr->next) { unsigned char *dest, *src; - printk(BIOS_DEBUG, "Loading Segment: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016lx\n", - ptr->s_dstaddr, ptr->s_memsz, ptr->s_filesz); + printk(BIOS_DEBUG, "Loading Segment: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016zx\n", + ptr->s_dstaddr, ptr->s_memsz, ptr->src.size); /* Modify the segment to load onto the bounce_buffer if necessary. */ @@ -388,22 +403,25 @@ static int load_self_segments( continue; } - printk(BIOS_DEBUG, "Post relocation: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016lx\n", - ptr->s_dstaddr, ptr->s_memsz, ptr->s_filesz); + printk(BIOS_DEBUG, "Post relocation: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016zx\n", + ptr->s_dstaddr, ptr->s_memsz, ptr->src.size); /* Compute the boundaries of the segment */ dest = (unsigned char *)(ptr->s_dstaddr); - src = (unsigned char *)(ptr->s_srcaddr); + src = NULL; /* Copy data from the initial buffer */ - if (ptr->s_filesz) { + if (ptr->src.size) { unsigned char *middle, *end; - size_t len = ptr->s_filesz; + size_t len = ptr->src.size; size_t memsz = ptr->s_memsz; + size_t offset = ptr->src.offset; switch(ptr->compression) { case CBFS_COMPRESS_LZMA: { printk(BIOS_DEBUG, "using LZMA\n"); timestamp_add_now(TS_START_ULZMA); + src = rdev_mmap(prog_rdev(payload), + offset, len); len = ulzman(src, len, dest, memsz); timestamp_add_now(TS_END_ULZMA); if (!len) /* Decompression Error. */ @@ -413,6 +431,8 @@ static int load_self_segments( case CBFS_COMPRESS_LZ4: { printk(BIOS_DEBUG, "using LZ4\n"); timestamp_add_now(TS_START_ULZ4F); + src = rdev_mmap(prog_rdev(payload), + offset, len); len = ulz4fn(src, len, dest, memsz); timestamp_add_now(TS_END_ULZ4F); if (!len) /* Decompression Error. */ @@ -421,7 +441,8 @@ static int load_self_segments( } case CBFS_COMPRESS_NONE: { printk(BIOS_DEBUG, "it's not compressed!\n"); - memcpy(dest, src, len); + rdev_readat(prog_rdev(payload), dest, + offset, len); break; } default: @@ -479,9 +500,9 @@ void *selfload(struct prog *payload) { uintptr_t entry = 0; struct segment head; - void *data; + struct region_device *data; - data = rdev_mmap_full(prog_rdev(payload)); + data = prog_rdev(payload); if (data == NULL) return NULL; @@ -496,8 +517,6 @@ void *selfload(struct prog *payload) printk(BIOS_SPEW, "Loaded segments\n"); - rdev_munmap(prog_rdev(payload), data); - /* Update the payload's area with the bounce buffer information. */ prog_set_area(payload, (void *)(uintptr_t)bounce_buffer, bounce_size); @@ -507,6 +526,5 @@ void *selfload(struct prog *payload) return (void *)entry; out: - rdev_munmap(prog_rdev(payload), data); return NULL; }

1 0

Patch set updated for coreboot: lib/selfboot: Replace rdev_mmap_full()
by Antonello Dettori 01 Jul '16

01 Jul '16

Antonello Dettori (dev(a)dettori.io) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15525 -gerrit commit 97c7c38e8671463707513e8155fcb40f321f5b76 Author: Antonello Dettori <dev(a)dettori.io> Date: Fri Jul 1 14:28:17 2016 +0200 lib/selfboot: Replace rdev_mmap_full() Avoid loading the entire payload into memory, instead read each segment when it is required. If the segment is uncompressed rdev_readat() it into memory, otherwise rdev_mmap() the segment and uncompress it. The purpose of the change is to improve the performance during the payload load phase by avoiding any unnecessary mmap operation where possible. Change-Id: I27cd4358a1747a65a79995114df23e296d1410fd Signed-off-by: Antonello Dettori <dev(a)dettori.io> --- src/lib/selfboot.c | 112 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 65 insertions(+), 47 deletions(-) diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c index 75d6725..5d6b121 100644 --- a/src/lib/selfboot.c +++ b/src/lib/selfboot.c @@ -36,9 +36,10 @@ struct segment { struct segment *next; struct segment *prev; unsigned long s_dstaddr; - unsigned long s_srcaddr; unsigned long s_memsz; - unsigned long s_filesz; + /* src->offset is the distance from the beginning of the boot_device. + * src->size is the filesize of the boot_device. */ + struct region src; int compression; }; @@ -121,7 +122,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) die ("bounce buffer not supported"); start = seg->s_dstaddr; - middle = start + seg->s_filesz; + middle = start + seg->src.size; end = start + seg->s_memsz; printk(BIOS_SPEW, "segment: [0x%016lx, 0x%016lx, 0x%016lx)\n", @@ -139,12 +140,12 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) new->s_memsz = len; seg->s_memsz -= len; seg->s_dstaddr += len; - seg->s_srcaddr += len; - if (seg->s_filesz > len) { - new->s_filesz = len; - seg->s_filesz -= len; + seg->src.offset += len; + if (seg->src.size > len) { + new->src.size = len; + seg->src.size -= len; } else { - seg->s_filesz = 0; + seg->src.size = 0; } /* Order by stream offset */ @@ -158,7 +159,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) printk(BIOS_SPEW, " early: [0x%016lx, 0x%016lx, 0x%016lx)\n", new->s_dstaddr, - new->s_dstaddr + new->s_filesz, + new->s_dstaddr + new->src.size, new->s_dstaddr + new->s_memsz); ret = 1; @@ -175,12 +176,12 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) seg->s_memsz = len; new->s_memsz -= len; new->s_dstaddr += len; - new->s_srcaddr += len; - if (seg->s_filesz > len) { - seg->s_filesz = len; - new->s_filesz -= len; + new->src.offset += len; + if (seg->src.size > len) { + seg->src.size = len; + new->src.size -= len; } else { - new->s_filesz = 0; + new->src.size = 0; } /* Order by stream offset */ new->next = seg->next; @@ -190,7 +191,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) printk(BIOS_SPEW, " late: [0x%016lx, 0x%016lx, 0x%016lx)\n", new->s_dstaddr, - new->s_dstaddr + new->s_filesz, + new->s_dstaddr + new->src.size, new->s_dstaddr + new->s_memsz); } } @@ -204,7 +205,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) printk(BIOS_SPEW, " bounce: [0x%016lx, 0x%016lx, 0x%016lx)\n", seg->s_dstaddr, - seg->s_dstaddr + seg->s_filesz, + seg->s_dstaddr + seg->src.size, seg->s_dstaddr + seg->s_memsz); return ret; @@ -226,17 +227,27 @@ static void cbfs_decode_payload_segment(struct cbfs_payload_segment *segment, static int build_self_segment_list( struct segment *head, - struct cbfs_payload *cbfs_payload, uintptr_t *entry) + struct region_device *cbfs_payload, uintptr_t *entry) { struct segment *new; struct cbfs_payload_segment *current_segment, *first_segment, segment; + size_t offset = 0; memset(head, 0, sizeof(*head)); head->next = head->prev = head; - first_segment = &cbfs_payload->segments; + first_segment = malloc(sizeof(struct cbfs_payload_segment)); + current_segment = malloc(sizeof(struct cbfs_payload_segment)); - for (current_segment = first_segment;; ++current_segment) { + rdev_readat(cbfs_payload, first_segment, 0, + sizeof(struct cbfs_payload_segment)); + memcpy(current_segment, first_segment, + sizeof(struct cbfs_payload_segment)); + + if (first_segment == NULL || current_segment == NULL) + return -1; + + while (true) { printk(BIOS_DEBUG, "Loading segment from rom address 0x%p\n", current_segment); @@ -258,20 +269,19 @@ static int build_self_segment_list( new->s_dstaddr = segment.load_addr; new->s_memsz = segment.mem_len; new->compression = segment.compression; - new->s_srcaddr = (uintptr_t) - ((unsigned char *)first_segment) - + segment.offset; - new->s_filesz = segment.len; + new->src.size = segment.len; + new->src.offset = segment.offset; - printk(BIOS_DEBUG, " New segment dstaddr 0x%lx memsize 0x%lx srcaddr 0x%lx filesize 0x%lx\n", - new->s_dstaddr, new->s_memsz, new->s_srcaddr, new->s_filesz); + printk(BIOS_DEBUG, " New segment dstaddr 0x%lx memsize 0x%lx offset 0x%zx filesize 0x%zx\n", + new->s_dstaddr, new->s_memsz, new->src.offset, + new->src.size); /* Clean up the values */ - if (new->s_filesz > new->s_memsz) { - new->s_filesz = new->s_memsz; + if (new->src.size > new->s_memsz) { + new->src.size = new->s_memsz; printk(BIOS_DEBUG, - " cleaned up filesize 0x%lx\n", - new->s_filesz); + " cleaned up filesize 0x%zx\n", + new->src.size); } break; @@ -280,12 +290,10 @@ static int build_self_segment_list( (intptr_t)segment.load_addr, segment.mem_len); new = malloc(sizeof(*new)); - new->s_filesz = 0; - new->s_srcaddr = (uintptr_t) - ((unsigned char *)first_segment) - + segment.offset; new->s_dstaddr = segment.load_addr; new->s_memsz = segment.mem_len; + new->src.size = 0; + new->src.offset = segment.offset; break; case PAYLOAD_SEGMENT_ENTRY: @@ -315,8 +323,15 @@ static int build_self_segment_list( new->prev = head->prev; head->prev->next = new; head->prev = new; + + rdev_readat(cbfs_payload, current_segment, offset, + sizeof(struct cbfs_payload_segment)); + offset += sizeof(struct cbfs_payload_segment); } + free(first_segment); + free(current_segment); + return 1; } @@ -332,7 +347,7 @@ static int load_self_segments( /* Determine last non-empty loaded segment. */ last_non_empty = NULL; for(ptr = head->next; ptr != head; ptr = ptr->next) - if (ptr->s_filesz != 0) + if (ptr->src.size != 0) last_non_empty = ptr; for(ptr = head->next; ptr != head; ptr = ptr->next) { @@ -378,8 +393,8 @@ static int load_self_segments( for(ptr = head->next; ptr != head; ptr = ptr->next) { unsigned char *dest, *src; - printk(BIOS_DEBUG, "Loading Segment: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016lx\n", - ptr->s_dstaddr, ptr->s_memsz, ptr->s_filesz); + printk(BIOS_DEBUG, "Loading Segment: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016zx\n", + ptr->s_dstaddr, ptr->s_memsz, ptr->src.size); /* Modify the segment to load onto the bounce_buffer if necessary. */ @@ -388,22 +403,25 @@ static int load_self_segments( continue; } - printk(BIOS_DEBUG, "Post relocation: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016lx\n", - ptr->s_dstaddr, ptr->s_memsz, ptr->s_filesz); + printk(BIOS_DEBUG, "Post relocation: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016zx\n", + ptr->s_dstaddr, ptr->s_memsz, ptr->src.size); /* Compute the boundaries of the segment */ dest = (unsigned char *)(ptr->s_dstaddr); - src = (unsigned char *)(ptr->s_srcaddr); + src = NULL; /* Copy data from the initial buffer */ - if (ptr->s_filesz) { + if (ptr->src.size) { unsigned char *middle, *end; - size_t len = ptr->s_filesz; + size_t len = ptr->src.size; size_t memsz = ptr->s_memsz; + size_t offset = ptr->src.offset; switch(ptr->compression) { case CBFS_COMPRESS_LZMA: { printk(BIOS_DEBUG, "using LZMA\n"); timestamp_add_now(TS_START_ULZMA); + src = rdev_mmap(prog_rdev(payload), + offset, len); len = ulzman(src, len, dest, memsz); timestamp_add_now(TS_END_ULZMA); if (!len) /* Decompression Error. */ @@ -413,6 +431,8 @@ static int load_self_segments( case CBFS_COMPRESS_LZ4: { printk(BIOS_DEBUG, "using LZ4\n"); timestamp_add_now(TS_START_ULZ4F); + src = rdev_mmap(prog_rdev(payload), + offset, len); len = ulz4fn(src, len, dest, memsz); timestamp_add_now(TS_END_ULZ4F); if (!len) /* Decompression Error. */ @@ -421,7 +441,8 @@ static int load_self_segments( } case CBFS_COMPRESS_NONE: { printk(BIOS_DEBUG, "it's not compressed!\n"); - memcpy(dest, src, len); + rdev_readat(prog_rdev(payload), dest, + offset, len); break; } default: @@ -479,9 +500,9 @@ void *selfload(struct prog *payload) { uintptr_t entry = 0; struct segment head; - void *data; + struct region_device *data; - data = rdev_mmap_full(prog_rdev(payload)); + data = prog_rdev(payload); if (data == NULL) return NULL; @@ -496,8 +517,6 @@ void *selfload(struct prog *payload) printk(BIOS_SPEW, "Loaded segments\n"); - rdev_munmap(prog_rdev(payload), data); - /* Update the payload's area with the bounce buffer information. */ prog_set_area(payload, (void *)(uintptr_t)bounce_buffer, bounce_size); @@ -507,6 +526,5 @@ void *selfload(struct prog *payload) return (void *)entry; out: - rdev_munmap(prog_rdev(payload), data); return NULL; }

1 0

Patch set updated for coreboot: Add support for Exynos7 SoC
by Stefan Reinauer 01 Jul '16

01 Jul '16

Stefan Reinauer (stefan.reinauer(a)coreboot.org) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14902 -gerrit commit 5617465f7ea356560501fb7bcead28fa0631eee7 Author: Akshay Saraswat <akshay.s(a)samsung.com> Date: Thu Aug 7 14:07:12 2014 +0530 Add support for Exynos7 SoC Adding new directory and corresponding files in soc/samsung for new SoC version Exynos7 to provide basic boot support. BUG=None BRANCH=None TEST=Compiled and booted coreboot over Jazz with this series Change-Id: I21fc956e88d754311c74eec0313ca833f9e33b14 Signed-off-by: Akshay Saraswat <akshay.s(a)samsung.com> --- src/soc/samsung/exynos7/Kconfig | 136 +++++++++++++++++++ src/soc/samsung/exynos7/Makefile.inc | 36 +++++ src/soc/samsung/exynos7/bootblock.c | 33 +++++ src/soc/samsung/exynos7/cpu.c | 43 ++++++ .../samsung/exynos7/include/soc/bootblock_exynos.h | 21 +++ src/soc/samsung/exynos7/include/soc/cpu.h | 151 +++++++++++++++++++++ src/soc/samsung/exynos7/include/soc/periph.h | 67 +++++++++ src/soc/samsung/exynos7/memlayout.ld | 37 +++++ 8 files changed, 524 insertions(+) diff --git a/src/soc/samsung/exynos7/Kconfig b/src/soc/samsung/exynos7/Kconfig new file mode 100644 index 0000000..db2b063 --- /dev/null +++ b/src/soc/samsung/exynos7/Kconfig @@ -0,0 +1,136 @@ +## +## This file is part of the coreboot project. +## +## Copyright 2014 Samsung Electronics +## +## 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. +## + +config SOC_SAMSUNG_EXYNOS7 + select HAVE_MONOTONIC_TIMER + select HAVE_UART_SPECIAL + select RELOCATABLE_MODULES + select BOOTBLOCK_CONSOLE + select ARCH_BOOTBLOCK_ARMV8_64 + select ARCH_ROMSTAGE_ARMV8_64 + select ARCH_RAMSTAGE_ARMV8_64 + bool + default n + +if SOC_SAMSUNG_EXYNOS7 + +config BOOTBLOCK_CPU_INIT + default "soc/samsung/exynos7/include/soc/bootblock_exynos.h" + +# ROM image layout. +# +# 0x0000: vendor-provided BL1 (8k). +# 0x2000: variable length bootblock checksum header +# 0x2010: bootblock +# 0x9F80-0xA000: reserved for CBFS master header. +# 0xA000: Free for CBFS data. + +config BOOTBLOCK_ROM_OFFSET + hex + default 0 + +config CBFS_HEADER_ROM_OFFSET + hex "offset of master CBFS header in ROM" + default 0xBF80 + +config CBFS_ROM_OFFSET + # Calculated by BOOTBLOCK_ROM_OFFSET + max bootblock size. + hex "offset of CBFS data in ROM" + default 0x0C000 + +config SYS_SDRAM_BASE + hex + default 0x40000000 + +# Example SRAM/iRAM map for Exynos7 platform: +# +# 0x0210_0000: Reserved for device specific information. +# 0x0210_1800: Samsung trusted BL1. +# 0x0210_3800: Reserved for secure contents. +# 0x0210_4000: Variable length bootblock checksum header. +# 0x0210_4010: Bootblock, assume up to 64KB in size +# 0x0211_4000: Romstage, assume up to 176KB in size. +# 0x0214_0000: TTB buffer, 64KB in size. +# 0x0214_8000: Romstage Stack Bottom. +# 0x0214_C000: Romstage Stack Top. +# 0x0215_0000: Generic Stack Top. +# 0xF000_0000: Cache for CBFS data, 1M in size. + +config BOOTBLOCK_BASE + hex + default 0x02104010 + +config ROMSTAGE_BASE + hex + default 0x02114000 + +config RAMSTAGE_BASE + hex + default SYS_SDRAM_BASE + +config CBFS_CACHE_ADDRESS + hex "memory address to put CBFS cache data" + default 0xF0000000 + +config CBFS_CACHE_SIZE + hex "size of CBFS cache data" + default 0x00100000 + +config TTB_BUFFER + hex "memory address of the TTB buffer" + default 0x02140000 + +config TTB_SIZE + hex "size of the TTB buffer" + default 0x10000 + +choice CONSOLE_SERIAL_UART_CHOICES + prompt "Serial Console UART" + default CONSOLE_SERIAL_UART2 + depends on DRIVERS_UART + +config CONSOLE_SERIAL_UART0 + bool "UART0" + help + Serial console on UART0 + +config CONSOLE_SERIAL_UART1 + bool "UART1" + help + Serial console on UART1 + +config CONSOLE_SERIAL_UART2 + bool "UART2" + help + Serial console on UART2 + +config CONSOLE_SERIAL_UART3 + bool "UART3" + help + Serial console on UART3 + +endchoice + +config CONSOLE_SERIAL_UART_ADDRESS + hex + depends on DRIVERS_UART + default 0x13630000 if CONSOLE_SERIAL_UART0 + default 0x14c20000 if CONSOLE_SERIAL_UART1 + default 0x14c30000 if CONSOLE_SERIAL_UART2 + default 0x14c40000 if CONSOLE_SERIAL_UART3 + help + Map the UART names to the respective MMIO address. + +endif diff --git a/src/soc/samsung/exynos7/Makefile.inc b/src/soc/samsung/exynos7/Makefile.inc new file mode 100644 index 0000000..11d0fd3 --- /dev/null +++ b/src/soc/samsung/exynos7/Makefile.inc @@ -0,0 +1,36 @@ +## +## This file is part of the coreboot project. +## +## Copyright (C) 2014 Samsung Electronics +## +## 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. +## + +ifeq ($(CONFIG_SOC_SAMSUNG_EXYNOS7),y) + +CPPFLAGS_common += -Isrc/soc/samsung/exynos7/include/ + +# BOOTBLOCK : UART related and minimum required hardware init +bootblock-y += bootblock.c + +# ROMSTAGE : Run primitive tests and remaining basic stuff + +# RAMSTAGE : Prepare and load payload +ramstage-y += cpu.c + +$(objcbfs)/bootblock.raw.elf: $(objcbfs)/bootblock.elf + cp $< $@ + +$(objcbfs)/bootblock.bin: $(objcbfs)/bootblock.raw.bin + @printf " BL1, CKSUM $(subst $(obj)/,,$(@))\n" + util/exynos/variable_cksum.py $< $<.cksum size_in_blocks sha256 + cat 3rdparty/cpu/samsung/exynos7/bl1.bin $<.cksum > $@ + +endif diff --git a/src/soc/samsung/exynos7/bootblock.c b/src/soc/samsung/exynos7/bootblock.c new file mode 100644 index 0000000..7336392 --- /dev/null +++ b/src/soc/samsung/exynos7/bootblock.c @@ -0,0 +1,33 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2014 Samsung Electronics + * + * 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. + */ + +#include <arch/cache.h> +#include <arch/clock.h> +#include <bootblock_common.h> +#include <stdlib.h> + +#include <soc/cpu.h> + +void bootblock_cpu_init(void) +{ + /* SCR_EL3.NS|IRQ|FIQ|EA */ + raw_write_scr_el3(raw_read_scr_el3() | 0xf); + + /* Enable FP/SIMD */ + raw_write_cptr_el3(0); + + /* Set Counter Frequency */ + set_cntfrq(EXYNOS7_COUNTER_FREQ); +} diff --git a/src/soc/samsung/exynos7/cpu.c b/src/soc/samsung/exynos7/cpu.c new file mode 100644 index 0000000..476e973 --- /dev/null +++ b/src/soc/samsung/exynos7/cpu.c @@ -0,0 +1,43 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2014 Samsung Electronics + * + * 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. + */ + +#include <stdlib.h> +#include <string.h> +#include <stddef.h> +#include <delay.h> +#include <console/console.h> +#include <device/device.h> +#include <cbmem.h> +#include <arch/cache.h> +#include <soc/cpu.h> + +static struct device_operations cpu_ops = { + .read_resources = NULL, + .set_resources = NULL, + .enable_resources = NULL, + .init = NULL, + .scan_bus = NULL, +}; + +static void enable_exynos7_dev(device_t dev) +{ + /* DUMMY: Add stuff when required */ + dev->ops = &cpu_ops; +} + +struct chip_operations soc_samsung_exynos7_ops = { + CHIP_NAME("Samsung Exynos") + .enable_dev = enable_exynos7_dev, +}; diff --git a/src/soc/samsung/exynos7/include/soc/bootblock_exynos.h b/src/soc/samsung/exynos7/include/soc/bootblock_exynos.h new file mode 100644 index 0000000..f881d03 --- /dev/null +++ b/src/soc/samsung/exynos7/include/soc/bootblock_exynos.h @@ -0,0 +1,21 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2014 Samsung Electronics + * + * 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. + */ + +#ifndef _CPU_SAMSUNG_BOOTBLOCK_EXYNOS_H_ +#define _CPU_SAMSUNG_BOOTBLOCK_EXYNOS_H_ + +void bootblock_cpu_init(void); + +#endif /* _CPU_SAMSUNG_BOOTBLOCK_EXYNOS7_H_ */ diff --git a/src/soc/samsung/exynos7/include/soc/cpu.h b/src/soc/samsung/exynos7/include/soc/cpu.h new file mode 100644 index 0000000..513938f --- /dev/null +++ b/src/soc/samsung/exynos7/include/soc/cpu.h @@ -0,0 +1,151 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2014 Samsung Electronics + * + * 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. + */ + +#ifndef _CPU_SAMSUNG_EXYNOS7_CPU_H_ +#define _CPU_SAMSUNG_EXYNOS7_CPU_H_ + +#include <arch/io.h> + +#define AP_PPN 0xD07 +#define EXYNOS7_SRAM_BASE 0x02100000 +#define EXYNOS7_COUNTER_FREQ 0x1800000 +#define EXYNOS7_CHECK_SLEEP 0x00000BAD +#define PHY_IRAM_BASE 0x02100000 +#define COREBOOT_RESERVED 0x50000 +#define PHY_IRAM_NS_BASE (PHY_IRAM_BASE \ + + COREBOOT_RESERVED \ + + 0xb000) + +/* Base address registers */ +#define EXYNOS7_PRO_ID 0x10000000 +#define EXYNOS7_PMU_PERIS_BASE 0x10010000 +#define EXYNOS7_CMU_PERIS_BASE 0x10040000 +#define EXYNOS7_SYSREG_BASE 0x10050000 +#define EXYNOS7_TMU_BASE 0x10060000 +#define EXYNOS7_TZPC_BASE 0x10100000 +#define EXYNOS7_MCT_BASE 0x101C0000 +#define EXYNOS7_WATCHDOG_AP_BASE 0x101D0000 +#define EXYNOS7_CMU_TOPC_BASE 0x10570000 +#define EXYNOS7_GPIO_ALIVE_BASE 0x10580000 +#define EXYNOS7_CMU_CCORE_BASE 0x105B0000 +#define EXYNOS7_PMU_ALIVE_BASE 0x105C0000 +#define EXYNOS7_SWRESET 0x105C0400 +#define EXYNOS7_CMU_TOP0_BASE 0x105D0000 +#define EXYNOS7_CMU_TOP1_BASE 0x105E0000 +#define EXYNOS7_PMU_CCORE_BASE 0x105F0000 +#define EXYNOS7_DMC_DREX0_BASE 0x10800000 +#define EXYNOS7_DMC_ASP0_BASE 0x10810000 +#define EXYNOS7_DMC_PHY0_BASE 0x10820000 +#define EXYNOS7_PMU_MIF0_BASE 0x10840000 +#define EXYNOS7_CMU_MIF0_BASE 0x10850000 +#define EXYNOS7_DMC_VTMON0_BASE 0x10890000 +#define EXYNOS7_DMC_DREX1_BASE 0x10900000 +#define EXYNOS7_DMC_ASP1_BASE 0x10910000 +#define EXYNOS7_DMC_PHY1_BASE 0x10920000 +#define EXYNOS7_PMU_MIF1_BASE 0x10940000 +#define EXYNOS7_CMU_MIF1_BASE 0x10950000 +#define EXYNOS7_DMC_VTMON1_BASE 0x10990000 +#define EXYNOS7_DMC_DREX2_BASE 0x10A00000 +#define EXYNOS7_DMC_ASP2_BASE 0x10A10000 +#define EXYNOS7_DMC_PHY2_BASE 0x10A20000 +#define EXYNOS7_PMU_MIF2_BASE 0x10A40000 +#define EXYNOS7_CMU_MIF2_BASE 0x10A50000 +#define EXYNOS7_DMC_VTMON2_BASE 0x10A90000 +#define EXYNOS7_DMC_DREX3_BASE 0x10B00000 +#define EXYNOS7_DMC_ASP3_BASE 0x10B10000 +#define EXYNOS7_DMC_PHY3_BASE 0x10B20000 +#define EXYNOS7_PMU_MIF3_BASE 0x10B40000 +#define EXYNOS7_CMU_MIF3_BASE 0x10B50000 +#define EXYNOS7_DMC_VTMON3_BASE 0x10B90000 +#define EXYNOS7_GPIO_FSYS0_BASE 0x10E60000 +#define EXYNOS7_PMU_FSYS0_BASE 0x10E70000 +#define EXYNOS7_CMU_FSYS0_BASE 0x10E90000 +#define EXYNOS7_GIC_BASE 0x11000000 +#define EXYNOS7_CMU_IMEM_BASE 0x11060000 +#define EXYNOS7_PMU_IMEM_BASE 0x11070000 +#define EXYNOS7_MI2S_BASE 0x11440000 +#define EXYNOS7_GPIO_AUD_BASE 0x114B0000 +#define EXYNOS7_CMU_AUD_BASE 0x114C0000 +#define EXYNOS7_PMU_AUD_BASE 0x114D0000 +#define EXYNOS7_CMU_AP_BASE 0x11800000 +#define EXYNOS7_PMU_AP_BASE 0x11820000 +#define EXYNOS7_MMC_BASE 0x12200000 +#define EXYNOS7_CMU_G2D_BASE 0x12460000 +#define EXYNOS7_PMU_G2D_BASE 0x12470000 +#define EXYNOS7_CMU_BUS0_BASE 0x13400000 +#define EXYNOS7_PMU_BUS0_BASE 0x13420000 +#define EXYNOS7_GPIO_BUS0_BASE 0x13470000 +#define EXYNOS7_PMU_PERIC0_BASE 0x13600000 +#define EXYNOS7_CMU_PERIC0_BASE 0x13610000 +#define EXYNOS7_UART00_BASE 0x13630000 +#define EXYNOS7_HSI2C0_BASE 0x13640000 +#define EXYNOS7_HSI2C1_BASE 0x13650000 +#define EXYNOS7_HSI2C4_BASE 0x13660000 +#define EXYNOS7_HSI2C5_BASE 0x13670000 +#define EXYNOS7_HSI2C9_BASE 0x13680000 +#define EXYNOS7_HSI2C10_BASE 0x13690000 +#define EXYNOS7_HSI2C11_BASE 0x136A0000 +#define EXYNOS7_PWMTIMER_BASE 0x136C0000 +#define EXYNOS7_CMU_DISP_BASE 0x13AD0000 +#define EXYNOS7_CMU_VPP_BASE 0x13ED0000 +#define EXYNOS7_PMU_VPP_BASE 0x13EE0000 +#define EXYNOS7_CMU_ISP0_LOCAL_BASE 0x14290000 +#define EXYNOS7_CMU_ISP1_LOCAL_BASE 0x142F0000 +#define EXYNOS7_PMU_DISP_BASE 0x145E0000 +#define EXYNOS7_CMU_ISP0_BASE 0x146D0000 +#define EXYNOS7_PMU_ISP0_BASE 0x146E0000 +#define EXYNOS7_CMU_ISP1_BASE 0x147D0000 +#define EXYNOS7_PMU_ISP1_BASE 0x147E0000 +#define EXYNOS7_CMU_BUS1_BASE 0x14800000 +#define EXYNOS7_PMU_BUS1_BASE 0x14820000 +#define EXYNOS7_GPIO_BUS1_BASE 0x14870000 +#define EXYNOS7_PMU_G3D_BASE 0x14A40000 +#define EXYNOS7_CMU_G3D_BASE 0x14AA0000 +#define EXYNOS7_UART10_BASE 0x14C20000 +#define EXYNOS7_UART11_BASE 0x14C30000 +#define EXYNOS7_UART12_BASE 0x14C40000 +#define EXYNOS7_PMU_PERIC1_BASE 0x14C70000 +#define EXYNOS7_CMU_PERIC1_BASE 0x14C80000 +#define EXYNOS7_GPIO_FF_BASE 0x14C90000 +#define EXYNOS7_GPIO_ESE_BASE 0x14CA0000 +#define EXYNOS7_GPIO_PERIC_BASE 0x14CC0000 +#define EXYNOS7_GPIO_NFC_BASE 0x14CD0000 +#define EXYNOS7_GPIO_TOUCH_BASE 0x14CE0000 +#define EXYNOS7_SPI0_BASE 0x14D20000 +#define EXYNOS7_SPI1_BASE 0x14D30000 +#define EXYNOS7_SPI2_BASE 0x14D40000 +#define EXYNOS7_SPI3_BASE 0x14D50000 +#define EXYNOS7_MI2S_V51_BASE 0x14D60000 +#define EXYNOS7_SPI4_BASE 0x14D70000 +#define EXYNOS7_HSI2C6_BASE 0x14E00000 +#define EXYNOS7_HSI2C7_BASE 0x14E10000 +#define EXYNOS7_HSI2C8_BASE 0x14E20000 +#define EXYNOS7_HSI2C2_BASE 0x14E60000 +#define EXYNOS7_HSI2C3_BASE 0x14E70000 +#define EXYNOS7_CMU_HEVC_BASE 0x14F80000 +#define EXYNOS7_PMU_HEVC_BASE 0x14F90000 +#define EXYNOS7_CMU_MSCL_BASE 0x150D0000 +#define EXYNOS7_PMU_MSCL_BASE 0x150F0000 +#define EXYNOS7_CMU_MFC_BASE 0x15280000 +#define EXYNOS7_PMU_MFC_BASE 0x15290000 +#define EXYNOS7_USB_DRD0_DWC3_BASE 0x15400000 +#define EXYNOS7_USB_DRD1_DWC3_BASE 0x15500000 +#define EXYNOS7_USB_DRD0_PHY_BASE 0x15510000 +#define EXYNOS7_USB_HOST_PHY_BASE 0x15530000 +#define EXYNOS7_GPIO_FSYS1_BASE 0x15690000 +#define EXYNOS7_PMU_FSYS1_BASE 0x156C0000 +#define EXYNOS7_CMU_FSYS1_BASE 0x156E0000 + +#endif /* _CPU_SAMSUNG_EXYNOS7_CPU_H_ */ diff --git a/src/soc/samsung/exynos7/include/soc/periph.h b/src/soc/samsung/exynos7/include/soc/periph.h new file mode 100644 index 0000000..1492ee2 --- /dev/null +++ b/src/soc/samsung/exynos7/include/soc/periph.h @@ -0,0 +1,67 @@ +/* + * This file is part of the coreboot project. + * + * Copyright (C) 2014 Samsung Electronics + * + * 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. + */ + +#ifndef CPU_SAMSUNG_EXYNOS7_PERIPH_H +#define CPU_SAMSUNG_EXYNOS7_PERIPH_H + +/* + * Peripherals requiring clock/pinmux configuration. List will + * grow with support for more devices getting added. + * + * At present the order is arbitrary - we may be able to take advantage + * of some orthogonality later. + */ +enum periph_id { + PERIPH_ID_UART0, + PERIPH_ID_UART1, + PERIPH_ID_UART2, + PERIPH_ID_UART3, + PERIPH_ID_SDMMC0, + PERIPH_ID_SDMMC1, + PERIPH_ID_SDMMC2, + PERIPH_ID_SDMMC3, + PERIPH_ID_SPI0, + PERIPH_ID_SPI1, + PERIPH_ID_SPI2, + PERIPH_ID_SPI3, + PERIPH_ID_SPI4, + PERIPH_ID_LCD, + PERIPH_ID_BACKLIGHT, + PERIPH_ID_I2C0, + PERIPH_ID_I2C1, + PERIPH_ID_I2C2, + PERIPH_ID_I2C3, + PERIPH_ID_I2C4, + PERIPH_ID_I2C5, + PERIPH_ID_I2C6, + PERIPH_ID_I2C7, + PERIPH_ID_I2C8, + PERIPH_ID_I2C9, + PERIPH_ID_I2C10, + PERIPH_ID_I2C11, + PERIPH_ID_DPHPD, /* eDP hot plug detect */ + PERIPH_ID_PWM0, + PERIPH_ID_PWM1, + PERIPH_ID_PWM2, + PERIPH_ID_PWM3, + PERIPH_ID_PWM4, + PERIPH_ID_I2S1, + PERIPH_ID_SATA, + + PERIPH_ID_COUNT, + PERIPH_ID_NONE = -1, +}; + +#endif diff --git a/src/soc/samsung/exynos7/memlayout.ld b/src/soc/samsung/exynos7/memlayout.ld new file mode 100644 index 0000000..ef6e3ec --- /dev/null +++ b/src/soc/samsung/exynos7/memlayout.ld @@ -0,0 +1,37 @@ +/* + * This file is part of the coreboot project. + * + * Copyright 2014 Samsung Electronics + * + * 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. + */ + +#include <memlayout.h> + +#include <arch/header.ld> + +/* + * Note: The BootROM loads the 8K BL1 at [0x2101800:0x2103800), so the bootblock + * must be placed after that. After the handoff, the space can be reclaimed. + */ + +SECTIONS +{ + SRAM_START(0x2100000) + /* 16K hole, includes BL1 */ + /* Bootblock is preceeded by 16 byte variable length BL2 checksum. */ + BOOTBLOCK(0x2104010, 64K - 16) + ROMSTAGE(0x2114000, 176K) + STACK(0x2150000, 32K) + SRAM_END(0x2160000) + DRAM_START(0x40000000) + RAMSTAGE(0x40000000, 256K) + CBFS_CACHE(0xf0000000, 1M) +}

1 0

Patch set updated for coreboot: lib/selfboot: Replace rdev_mmap_full()
by Antonello Dettori 01 Jul '16

01 Jul '16

Antonello Dettori (dev(a)dettori.io) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15525 -gerrit commit 6b2c5200e9cf3f1f5cbc6f8dfa537934d6fe3cff Author: Antonello Dettori <dev(a)dettori.io> Date: Fri Jul 1 14:28:17 2016 +0200 lib/selfboot: Replace rdev_mmap_full() Avoid loading the entire payload into memory, instead read each segment when it is required. If the segment is uncompressed rdev_readat() it into memory, otherwise rdev_mmap() the segment and uncompress it. Change-Id: I27cd4358a1747a65a79995114df23e296d1410fd Signed-off-by: Antonello Dettori <dev(a)dettori.io> --- src/lib/selfboot.c | 112 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 65 insertions(+), 47 deletions(-) diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c index 75d6725..5d6b121 100644 --- a/src/lib/selfboot.c +++ b/src/lib/selfboot.c @@ -36,9 +36,10 @@ struct segment { struct segment *next; struct segment *prev; unsigned long s_dstaddr; - unsigned long s_srcaddr; unsigned long s_memsz; - unsigned long s_filesz; + /* src->offset is the distance from the beginning of the boot_device. + * src->size is the filesize of the boot_device. */ + struct region src; int compression; }; @@ -121,7 +122,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) die ("bounce buffer not supported"); start = seg->s_dstaddr; - middle = start + seg->s_filesz; + middle = start + seg->src.size; end = start + seg->s_memsz; printk(BIOS_SPEW, "segment: [0x%016lx, 0x%016lx, 0x%016lx)\n", @@ -139,12 +140,12 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) new->s_memsz = len; seg->s_memsz -= len; seg->s_dstaddr += len; - seg->s_srcaddr += len; - if (seg->s_filesz > len) { - new->s_filesz = len; - seg->s_filesz -= len; + seg->src.offset += len; + if (seg->src.size > len) { + new->src.size = len; + seg->src.size -= len; } else { - seg->s_filesz = 0; + seg->src.size = 0; } /* Order by stream offset */ @@ -158,7 +159,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) printk(BIOS_SPEW, " early: [0x%016lx, 0x%016lx, 0x%016lx)\n", new->s_dstaddr, - new->s_dstaddr + new->s_filesz, + new->s_dstaddr + new->src.size, new->s_dstaddr + new->s_memsz); ret = 1; @@ -175,12 +176,12 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) seg->s_memsz = len; new->s_memsz -= len; new->s_dstaddr += len; - new->s_srcaddr += len; - if (seg->s_filesz > len) { - seg->s_filesz = len; - new->s_filesz -= len; + new->src.offset += len; + if (seg->src.size > len) { + seg->src.size = len; + new->src.size -= len; } else { - new->s_filesz = 0; + new->src.size = 0; } /* Order by stream offset */ new->next = seg->next; @@ -190,7 +191,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) printk(BIOS_SPEW, " late: [0x%016lx, 0x%016lx, 0x%016lx)\n", new->s_dstaddr, - new->s_dstaddr + new->s_filesz, + new->s_dstaddr + new->src.size, new->s_dstaddr + new->s_memsz); } } @@ -204,7 +205,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) printk(BIOS_SPEW, " bounce: [0x%016lx, 0x%016lx, 0x%016lx)\n", seg->s_dstaddr, - seg->s_dstaddr + seg->s_filesz, + seg->s_dstaddr + seg->src.size, seg->s_dstaddr + seg->s_memsz); return ret; @@ -226,17 +227,27 @@ static void cbfs_decode_payload_segment(struct cbfs_payload_segment *segment, static int build_self_segment_list( struct segment *head, - struct cbfs_payload *cbfs_payload, uintptr_t *entry) + struct region_device *cbfs_payload, uintptr_t *entry) { struct segment *new; struct cbfs_payload_segment *current_segment, *first_segment, segment; + size_t offset = 0; memset(head, 0, sizeof(*head)); head->next = head->prev = head; - first_segment = &cbfs_payload->segments; + first_segment = malloc(sizeof(struct cbfs_payload_segment)); + current_segment = malloc(sizeof(struct cbfs_payload_segment)); - for (current_segment = first_segment;; ++current_segment) { + rdev_readat(cbfs_payload, first_segment, 0, + sizeof(struct cbfs_payload_segment)); + memcpy(current_segment, first_segment, + sizeof(struct cbfs_payload_segment)); + + if (first_segment == NULL || current_segment == NULL) + return -1; + + while (true) { printk(BIOS_DEBUG, "Loading segment from rom address 0x%p\n", current_segment); @@ -258,20 +269,19 @@ static int build_self_segment_list( new->s_dstaddr = segment.load_addr; new->s_memsz = segment.mem_len; new->compression = segment.compression; - new->s_srcaddr = (uintptr_t) - ((unsigned char *)first_segment) - + segment.offset; - new->s_filesz = segment.len; + new->src.size = segment.len; + new->src.offset = segment.offset; - printk(BIOS_DEBUG, " New segment dstaddr 0x%lx memsize 0x%lx srcaddr 0x%lx filesize 0x%lx\n", - new->s_dstaddr, new->s_memsz, new->s_srcaddr, new->s_filesz); + printk(BIOS_DEBUG, " New segment dstaddr 0x%lx memsize 0x%lx offset 0x%zx filesize 0x%zx\n", + new->s_dstaddr, new->s_memsz, new->src.offset, + new->src.size); /* Clean up the values */ - if (new->s_filesz > new->s_memsz) { - new->s_filesz = new->s_memsz; + if (new->src.size > new->s_memsz) { + new->src.size = new->s_memsz; printk(BIOS_DEBUG, - " cleaned up filesize 0x%lx\n", - new->s_filesz); + " cleaned up filesize 0x%zx\n", + new->src.size); } break; @@ -280,12 +290,10 @@ static int build_self_segment_list( (intptr_t)segment.load_addr, segment.mem_len); new = malloc(sizeof(*new)); - new->s_filesz = 0; - new->s_srcaddr = (uintptr_t) - ((unsigned char *)first_segment) - + segment.offset; new->s_dstaddr = segment.load_addr; new->s_memsz = segment.mem_len; + new->src.size = 0; + new->src.offset = segment.offset; break; case PAYLOAD_SEGMENT_ENTRY: @@ -315,8 +323,15 @@ static int build_self_segment_list( new->prev = head->prev; head->prev->next = new; head->prev = new; + + rdev_readat(cbfs_payload, current_segment, offset, + sizeof(struct cbfs_payload_segment)); + offset += sizeof(struct cbfs_payload_segment); } + free(first_segment); + free(current_segment); + return 1; } @@ -332,7 +347,7 @@ static int load_self_segments( /* Determine last non-empty loaded segment. */ last_non_empty = NULL; for(ptr = head->next; ptr != head; ptr = ptr->next) - if (ptr->s_filesz != 0) + if (ptr->src.size != 0) last_non_empty = ptr; for(ptr = head->next; ptr != head; ptr = ptr->next) { @@ -378,8 +393,8 @@ static int load_self_segments( for(ptr = head->next; ptr != head; ptr = ptr->next) { unsigned char *dest, *src; - printk(BIOS_DEBUG, "Loading Segment: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016lx\n", - ptr->s_dstaddr, ptr->s_memsz, ptr->s_filesz); + printk(BIOS_DEBUG, "Loading Segment: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016zx\n", + ptr->s_dstaddr, ptr->s_memsz, ptr->src.size); /* Modify the segment to load onto the bounce_buffer if necessary. */ @@ -388,22 +403,25 @@ static int load_self_segments( continue; } - printk(BIOS_DEBUG, "Post relocation: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016lx\n", - ptr->s_dstaddr, ptr->s_memsz, ptr->s_filesz); + printk(BIOS_DEBUG, "Post relocation: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016zx\n", + ptr->s_dstaddr, ptr->s_memsz, ptr->src.size); /* Compute the boundaries of the segment */ dest = (unsigned char *)(ptr->s_dstaddr); - src = (unsigned char *)(ptr->s_srcaddr); + src = NULL; /* Copy data from the initial buffer */ - if (ptr->s_filesz) { + if (ptr->src.size) { unsigned char *middle, *end; - size_t len = ptr->s_filesz; + size_t len = ptr->src.size; size_t memsz = ptr->s_memsz; + size_t offset = ptr->src.offset; switch(ptr->compression) { case CBFS_COMPRESS_LZMA: { printk(BIOS_DEBUG, "using LZMA\n"); timestamp_add_now(TS_START_ULZMA); + src = rdev_mmap(prog_rdev(payload), + offset, len); len = ulzman(src, len, dest, memsz); timestamp_add_now(TS_END_ULZMA); if (!len) /* Decompression Error. */ @@ -413,6 +431,8 @@ static int load_self_segments( case CBFS_COMPRESS_LZ4: { printk(BIOS_DEBUG, "using LZ4\n"); timestamp_add_now(TS_START_ULZ4F); + src = rdev_mmap(prog_rdev(payload), + offset, len); len = ulz4fn(src, len, dest, memsz); timestamp_add_now(TS_END_ULZ4F); if (!len) /* Decompression Error. */ @@ -421,7 +441,8 @@ static int load_self_segments( } case CBFS_COMPRESS_NONE: { printk(BIOS_DEBUG, "it's not compressed!\n"); - memcpy(dest, src, len); + rdev_readat(prog_rdev(payload), dest, + offset, len); break; } default: @@ -479,9 +500,9 @@ void *selfload(struct prog *payload) { uintptr_t entry = 0; struct segment head; - void *data; + struct region_device *data; - data = rdev_mmap_full(prog_rdev(payload)); + data = prog_rdev(payload); if (data == NULL) return NULL; @@ -496,8 +517,6 @@ void *selfload(struct prog *payload) printk(BIOS_SPEW, "Loaded segments\n"); - rdev_munmap(prog_rdev(payload), data); - /* Update the payload's area with the bounce buffer information. */ prog_set_area(payload, (void *)(uintptr_t)bounce_buffer, bounce_size); @@ -507,6 +526,5 @@ void *selfload(struct prog *payload) return (void *)entry; out: - rdev_munmap(prog_rdev(payload), data); return NULL; }

1 0

Patch set updated for coreboot: lib/selfboot: Replace rdev_mmap_full()
by Antonello Dettori 01 Jul '16

01 Jul '16

Antonello Dettori (dev(a)dettori.io) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15525 -gerrit commit 1ed31510ce76d091a8dbc6c94f6d0b7b25c1c8dd Author: Antonello Dettori <dev(a)dettori.io> Date: Fri Jul 1 14:28:17 2016 +0200 lib/selfboot: Replace rdev_mmap_full() Avoid loading the entire payload into memory, instead read each segment when it is required. If the segment is uncompressed rdev_readat() it into memory, otherwise rdev_mmap() the segment and uncompress it. Change-Id: I27cd4358a1747a65a79995114df23e296d1410fd Signed-off-by: Antonello Dettori <dev(a)dettori.io> --- src/lib/selfboot.c | 106 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 62 insertions(+), 44 deletions(-) diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c index 75d6725..226ad99 100644 --- a/src/lib/selfboot.c +++ b/src/lib/selfboot.c @@ -36,9 +36,10 @@ struct segment { struct segment *next; struct segment *prev; unsigned long s_dstaddr; - unsigned long s_srcaddr; unsigned long s_memsz; - unsigned long s_filesz; + /* src->offset is the distance from the beginning of the boot_device. + * src->size is the filesize of the boot_device. */ + struct region src; int compression; }; @@ -121,7 +122,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) die ("bounce buffer not supported"); start = seg->s_dstaddr; - middle = start + seg->s_filesz; + middle = start + seg->src.size; end = start + seg->s_memsz; printk(BIOS_SPEW, "segment: [0x%016lx, 0x%016lx, 0x%016lx)\n", @@ -139,12 +140,12 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) new->s_memsz = len; seg->s_memsz -= len; seg->s_dstaddr += len; - seg->s_srcaddr += len; - if (seg->s_filesz > len) { - new->s_filesz = len; - seg->s_filesz -= len; + seg->src.offset += len; + if (seg->src.size > len) { + new->src.size = len; + seg->src.size -= len; } else { - seg->s_filesz = 0; + seg->src.size = 0; } /* Order by stream offset */ @@ -158,7 +159,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) printk(BIOS_SPEW, " early: [0x%016lx, 0x%016lx, 0x%016lx)\n", new->s_dstaddr, - new->s_dstaddr + new->s_filesz, + new->s_dstaddr + new->src.size, new->s_dstaddr + new->s_memsz); ret = 1; @@ -175,12 +176,12 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) seg->s_memsz = len; new->s_memsz -= len; new->s_dstaddr += len; - new->s_srcaddr += len; - if (seg->s_filesz > len) { - seg->s_filesz = len; - new->s_filesz -= len; + new->src.offset += len; + if (seg->src.size > len) { + seg->src.size = len; + new->src.size -= len; } else { - new->s_filesz = 0; + new->src.size = 0; } /* Order by stream offset */ new->next = seg->next; @@ -190,7 +191,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) printk(BIOS_SPEW, " late: [0x%016lx, 0x%016lx, 0x%016lx)\n", new->s_dstaddr, - new->s_dstaddr + new->s_filesz, + new->s_dstaddr + new->src.size, new->s_dstaddr + new->s_memsz); } } @@ -204,7 +205,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) printk(BIOS_SPEW, " bounce: [0x%016lx, 0x%016lx, 0x%016lx)\n", seg->s_dstaddr, - seg->s_dstaddr + seg->s_filesz, + seg->s_dstaddr + seg->src.size, seg->s_dstaddr + seg->s_memsz); return ret; @@ -226,17 +227,27 @@ static void cbfs_decode_payload_segment(struct cbfs_payload_segment *segment, static int build_self_segment_list( struct segment *head, - struct cbfs_payload *cbfs_payload, uintptr_t *entry) + struct region_device *cbfs_payload, uintptr_t *entry) { struct segment *new; struct cbfs_payload_segment *current_segment, *first_segment, segment; + size_t offset = 0; memset(head, 0, sizeof(*head)); head->next = head->prev = head; - first_segment = &cbfs_payload->segments; + first_segment = malloc(sizeof(struct cbfs_payload_segment)); + current_segment = malloc(sizeof(struct cbfs_payload_segment)); - for (current_segment = first_segment;; ++current_segment) { + rdev_readat(cbfs_payload, first_segment, 0, + sizeof(struct cbfs_payload_segment)); + memcpy(current_segment, first_segment, + sizeof(struct cbfs_payload_segment)); + + if (first_segment == NULL || current_segment == NULL) + return -1; + + while (true) { printk(BIOS_DEBUG, "Loading segment from rom address 0x%p\n", current_segment); @@ -258,20 +269,19 @@ static int build_self_segment_list( new->s_dstaddr = segment.load_addr; new->s_memsz = segment.mem_len; new->compression = segment.compression; - new->s_srcaddr = (uintptr_t) - ((unsigned char *)first_segment) - + segment.offset; - new->s_filesz = segment.len; + new->src.size = segment.len; + new->src.offset = segment.offset; - printk(BIOS_DEBUG, " New segment dstaddr 0x%lx memsize 0x%lx srcaddr 0x%lx filesize 0x%lx\n", - new->s_dstaddr, new->s_memsz, new->s_srcaddr, new->s_filesz); + printk(BIOS_DEBUG, " New segment dstaddr 0x%lx memsize 0x%lx offset 0x%lx filesize 0x%lx\n", + new->s_dstaddr, new->s_memsz, new->src.offset, + new->src.size); /* Clean up the values */ - if (new->s_filesz > new->s_memsz) { - new->s_filesz = new->s_memsz; + if (new->src.size > new->s_memsz) { + new->src.size = new->s_memsz; printk(BIOS_DEBUG, " cleaned up filesize 0x%lx\n", - new->s_filesz); + new->src.size); } break; @@ -280,12 +290,10 @@ static int build_self_segment_list( (intptr_t)segment.load_addr, segment.mem_len); new = malloc(sizeof(*new)); - new->s_filesz = 0; - new->s_srcaddr = (uintptr_t) - ((unsigned char *)first_segment) - + segment.offset; new->s_dstaddr = segment.load_addr; new->s_memsz = segment.mem_len; + new->src.size = 0; + new->src.offset = segment.offset; break; case PAYLOAD_SEGMENT_ENTRY: @@ -315,8 +323,15 @@ static int build_self_segment_list( new->prev = head->prev; head->prev->next = new; head->prev = new; + + rdev_readat(cbfs_payload, current_segment, offset, + sizeof(struct cbfs_payload_segment)); + offset += sizeof(struct cbfs_payload_segment); } + free(first_segment); + free(current_segment); + return 1; } @@ -332,7 +347,7 @@ static int load_self_segments( /* Determine last non-empty loaded segment. */ last_non_empty = NULL; for(ptr = head->next; ptr != head; ptr = ptr->next) - if (ptr->s_filesz != 0) + if (ptr->src.size != 0) last_non_empty = ptr; for(ptr = head->next; ptr != head; ptr = ptr->next) { @@ -379,7 +394,7 @@ static int load_self_segments( for(ptr = head->next; ptr != head; ptr = ptr->next) { unsigned char *dest, *src; printk(BIOS_DEBUG, "Loading Segment: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016lx\n", - ptr->s_dstaddr, ptr->s_memsz, ptr->s_filesz); + ptr->s_dstaddr, ptr->s_memsz, ptr->src.size); /* Modify the segment to load onto the bounce_buffer if necessary. */ @@ -389,21 +404,24 @@ static int load_self_segments( } printk(BIOS_DEBUG, "Post relocation: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016lx\n", - ptr->s_dstaddr, ptr->s_memsz, ptr->s_filesz); + ptr->s_dstaddr, ptr->s_memsz, ptr->src.size); /* Compute the boundaries of the segment */ dest = (unsigned char *)(ptr->s_dstaddr); - src = (unsigned char *)(ptr->s_srcaddr); + src = NULL; /* Copy data from the initial buffer */ - if (ptr->s_filesz) { + if (ptr->src.size) { unsigned char *middle, *end; - size_t len = ptr->s_filesz; + size_t len = ptr->src.size; size_t memsz = ptr->s_memsz; + size_t offset = ptr->src.offset; switch(ptr->compression) { case CBFS_COMPRESS_LZMA: { printk(BIOS_DEBUG, "using LZMA\n"); timestamp_add_now(TS_START_ULZMA); + src = rdev_mmap(prog_rdev(payload), + offset, len); len = ulzman(src, len, dest, memsz); timestamp_add_now(TS_END_ULZMA); if (!len) /* Decompression Error. */ @@ -413,6 +431,8 @@ static int load_self_segments( case CBFS_COMPRESS_LZ4: { printk(BIOS_DEBUG, "using LZ4\n"); timestamp_add_now(TS_START_ULZ4F); + src = rdev_mmap(prog_rdev(payload), + offset, len); len = ulz4fn(src, len, dest, memsz); timestamp_add_now(TS_END_ULZ4F); if (!len) /* Decompression Error. */ @@ -421,7 +441,8 @@ static int load_self_segments( } case CBFS_COMPRESS_NONE: { printk(BIOS_DEBUG, "it's not compressed!\n"); - memcpy(dest, src, len); + rdev_readat(prog_rdev(payload), dest, + offset, len); break; } default: @@ -479,9 +500,9 @@ void *selfload(struct prog *payload) { uintptr_t entry = 0; struct segment head; - void *data; + struct region_device *data; - data = rdev_mmap_full(prog_rdev(payload)); + data = prog_rdev(payload); if (data == NULL) return NULL; @@ -496,8 +517,6 @@ void *selfload(struct prog *payload) printk(BIOS_SPEW, "Loaded segments\n"); - rdev_munmap(prog_rdev(payload), data); - /* Update the payload's area with the bounce buffer information. */ prog_set_area(payload, (void *)(uintptr_t)bounce_buffer, bounce_size); @@ -507,6 +526,5 @@ void *selfload(struct prog *payload) return (void *)entry; out: - rdev_munmap(prog_rdev(payload), data); return NULL; }

1 0

Patch set updated for coreboot: lib/selfboot: Replace rdev_mmap_full()
by Antonello Dettori 01 Jul '16

01 Jul '16

Antonello Dettori (dev(a)dettori.io) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15525 -gerrit commit 8d0d9bcbb3193f6b90544a5fb111069bf9b55fb8 Author: Antonello Dettori <dev(a)dettori.io> Date: Fri Jul 1 14:28:17 2016 +0200 lib/selfboot: Replace rdev_mmap_full() Avoid loading the entire payload into memory, instead read each segment when it is required. If the segment is uncompressed rdev_readat() it into memory, otherwise rdev_mmap() the segment and uncompress it. Change-Id: I27cd4358a1747a65a79995114df23e296d1410fd Signed-off-by: Antonello Dettori <dev(a)dettori.io> --- src/lib/selfboot.c | 112 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 65 insertions(+), 47 deletions(-) diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c index 75d6725..c7b3fa61 100644 --- a/src/lib/selfboot.c +++ b/src/lib/selfboot.c @@ -36,9 +36,10 @@ struct segment { struct segment *next; struct segment *prev; unsigned long s_dstaddr; - unsigned long s_srcaddr; unsigned long s_memsz; - unsigned long s_filesz; + /* src->offset is the distance from the beginning of the boot_device. + * src->size is the filesize of the boot_device. */ + struct region src; int compression; }; @@ -121,7 +122,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) die ("bounce buffer not supported"); start = seg->s_dstaddr; - middle = start + seg->s_filesz; + middle = start + seg->src.size; end = start + seg->s_memsz; printk(BIOS_SPEW, "segment: [0x%016lx, 0x%016lx, 0x%016lx)\n", @@ -139,12 +140,12 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) new->s_memsz = len; seg->s_memsz -= len; seg->s_dstaddr += len; - seg->s_srcaddr += len; - if (seg->s_filesz > len) { - new->s_filesz = len; - seg->s_filesz -= len; + seg->src.offset += len; + if (seg->src.size > len) { + new->src.size = len; + seg->src.size -= len; } else { - seg->s_filesz = 0; + seg->src.size = 0; } /* Order by stream offset */ @@ -158,7 +159,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) printk(BIOS_SPEW, " early: [0x%016lx, 0x%016lx, 0x%016lx)\n", new->s_dstaddr, - new->s_dstaddr + new->s_filesz, + new->s_dstaddr + new->src.size, new->s_dstaddr + new->s_memsz); ret = 1; @@ -175,12 +176,12 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) seg->s_memsz = len; new->s_memsz -= len; new->s_dstaddr += len; - new->s_srcaddr += len; - if (seg->s_filesz > len) { - seg->s_filesz = len; - new->s_filesz -= len; + new->src.offset += len; + if (seg->src.size > len) { + seg->src.size = len; + new->src.size -= len; } else { - new->s_filesz = 0; + new->src.size = 0; } /* Order by stream offset */ new->next = seg->next; @@ -190,7 +191,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) printk(BIOS_SPEW, " late: [0x%016lx, 0x%016lx, 0x%016lx)\n", new->s_dstaddr, - new->s_dstaddr + new->s_filesz, + new->s_dstaddr + new->src.size, new->s_dstaddr + new->s_memsz); } } @@ -204,7 +205,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) printk(BIOS_SPEW, " bounce: [0x%016lx, 0x%016lx, 0x%016lx)\n", seg->s_dstaddr, - seg->s_dstaddr + seg->s_filesz, + seg->s_dstaddr + seg->src.size, seg->s_dstaddr + seg->s_memsz); return ret; @@ -226,17 +227,27 @@ static void cbfs_decode_payload_segment(struct cbfs_payload_segment *segment, static int build_self_segment_list( struct segment *head, - struct cbfs_payload *cbfs_payload, uintptr_t *entry) + struct region_device *cbfs_payload, uintptr_t *entry) { struct segment *new; struct cbfs_payload_segment *current_segment, *first_segment, segment; + size_t offset = 0; memset(head, 0, sizeof(*head)); head->next = head->prev = head; - first_segment = &cbfs_payload->segments; + first_segment = malloc(sizeof(struct cbfs_payload_segment)); + current_segment = malloc(sizeof(struct cbfs_payload_segment)); - for (current_segment = first_segment;; ++current_segment) { + rdev_readat(cbfs_payload, first_segment, 0, + sizeof(struct cbfs_payload_segment)); + memcpy(current_segment, first_segment, + sizeof(struct cbfs_payload_segment)); + + if (first_segment == NULL || current_segment == NULL) + return -1; + + while (true) { printk(BIOS_DEBUG, "Loading segment from rom address 0x%p\n", current_segment); @@ -258,20 +269,19 @@ static int build_self_segment_list( new->s_dstaddr = segment.load_addr; new->s_memsz = segment.mem_len; new->compression = segment.compression; - new->s_srcaddr = (uintptr_t) - ((unsigned char *)first_segment) - + segment.offset; - new->s_filesz = segment.len; + new->src.size = segment.len; + new->src.offset = segment.offset; - printk(BIOS_DEBUG, " New segment dstaddr 0x%lx memsize 0x%lx srcaddr 0x%lx filesize 0x%lx\n", - new->s_dstaddr, new->s_memsz, new->s_srcaddr, new->s_filesz); + printk(BIOS_DEBUG, " New segment dstaddr 0x%lx memsize 0x%lx offset 0x%x filesize 0x%x\n", + new->s_dstaddr, new->s_memsz, new->src.offset, + new->src.size); /* Clean up the values */ - if (new->s_filesz > new->s_memsz) { - new->s_filesz = new->s_memsz; + if (new->src.size > new->s_memsz) { + new->src.size = new->s_memsz; printk(BIOS_DEBUG, - " cleaned up filesize 0x%lx\n", - new->s_filesz); + " cleaned up filesize 0x%x\n", + new->src.size); } break; @@ -280,12 +290,10 @@ static int build_self_segment_list( (intptr_t)segment.load_addr, segment.mem_len); new = malloc(sizeof(*new)); - new->s_filesz = 0; - new->s_srcaddr = (uintptr_t) - ((unsigned char *)first_segment) - + segment.offset; new->s_dstaddr = segment.load_addr; new->s_memsz = segment.mem_len; + new->src.size = 0; + new->src.offset = segment.offset; break; case PAYLOAD_SEGMENT_ENTRY: @@ -315,8 +323,15 @@ static int build_self_segment_list( new->prev = head->prev; head->prev->next = new; head->prev = new; + + rdev_readat(cbfs_payload, current_segment, offset, + sizeof(struct cbfs_payload_segment)); + offset += sizeof(struct cbfs_payload_segment); } + free(first_segment); + free(current_segment); + return 1; } @@ -332,7 +347,7 @@ static int load_self_segments( /* Determine last non-empty loaded segment. */ last_non_empty = NULL; for(ptr = head->next; ptr != head; ptr = ptr->next) - if (ptr->s_filesz != 0) + if (ptr->src.size != 0) last_non_empty = ptr; for(ptr = head->next; ptr != head; ptr = ptr->next) { @@ -378,8 +393,8 @@ static int load_self_segments( for(ptr = head->next; ptr != head; ptr = ptr->next) { unsigned char *dest, *src; - printk(BIOS_DEBUG, "Loading Segment: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016lx\n", - ptr->s_dstaddr, ptr->s_memsz, ptr->s_filesz); + printk(BIOS_DEBUG, "Loading Segment: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016x\n", + ptr->s_dstaddr, ptr->s_memsz, ptr->src.size); /* Modify the segment to load onto the bounce_buffer if necessary. */ @@ -388,22 +403,25 @@ static int load_self_segments( continue; } - printk(BIOS_DEBUG, "Post relocation: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016lx\n", - ptr->s_dstaddr, ptr->s_memsz, ptr->s_filesz); + printk(BIOS_DEBUG, "Post relocation: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016x\n", + ptr->s_dstaddr, ptr->s_memsz, ptr->src.size); /* Compute the boundaries of the segment */ dest = (unsigned char *)(ptr->s_dstaddr); - src = (unsigned char *)(ptr->s_srcaddr); + src = NULL; /* Copy data from the initial buffer */ - if (ptr->s_filesz) { + if (ptr->src.size) { unsigned char *middle, *end; - size_t len = ptr->s_filesz; + size_t len = ptr->src.size; size_t memsz = ptr->s_memsz; + size_t offset = ptr->src.offset; switch(ptr->compression) { case CBFS_COMPRESS_LZMA: { printk(BIOS_DEBUG, "using LZMA\n"); timestamp_add_now(TS_START_ULZMA); + src = rdev_mmap(prog_rdev(payload), + offset, len); len = ulzman(src, len, dest, memsz); timestamp_add_now(TS_END_ULZMA); if (!len) /* Decompression Error. */ @@ -413,6 +431,8 @@ static int load_self_segments( case CBFS_COMPRESS_LZ4: { printk(BIOS_DEBUG, "using LZ4\n"); timestamp_add_now(TS_START_ULZ4F); + src = rdev_mmap(prog_rdev(payload), + offset, len); len = ulz4fn(src, len, dest, memsz); timestamp_add_now(TS_END_ULZ4F); if (!len) /* Decompression Error. */ @@ -421,7 +441,8 @@ static int load_self_segments( } case CBFS_COMPRESS_NONE: { printk(BIOS_DEBUG, "it's not compressed!\n"); - memcpy(dest, src, len); + rdev_readat(prog_rdev(payload), dest, + offset, len); break; } default: @@ -479,9 +500,9 @@ void *selfload(struct prog *payload) { uintptr_t entry = 0; struct segment head; - void *data; + struct region_device *data; - data = rdev_mmap_full(prog_rdev(payload)); + data = prog_rdev(payload); if (data == NULL) return NULL; @@ -496,8 +517,6 @@ void *selfload(struct prog *payload) printk(BIOS_SPEW, "Loaded segments\n"); - rdev_munmap(prog_rdev(payload), data); - /* Update the payload's area with the bounce buffer information. */ prog_set_area(payload, (void *)(uintptr_t)bounce_buffer, bounce_size); @@ -507,6 +526,5 @@ void *selfload(struct prog *payload) return (void *)entry; out: - rdev_munmap(prog_rdev(payload), data); return NULL; }

1 0

New patch to review for coreboot: lib/selfboot: Replace rdev_mmap_full()
by Antonello Dettori 01 Jul '16

01 Jul '16

Antonello Dettori (dev(a)dettori.io) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15525 -gerrit commit 1f631b710e41a235e087bc8e5db65511ca1a6de3 Author: Antonello Dettori <dev(a)dettori.io> Date: Fri Jul 1 14:28:17 2016 +0200 lib/selfboot: Replace rdev_mmap_full() Avoid loading the entire payload into memory, instead read each segment when it is required. If the segment is uncompressed rdev_readat() it into memory, otherwise rdev_mmap() the segment and uncompress it. Change-Id: I27cd4358a1747a65a79995114df23e296d1410fd Signed-off-by: Antonello Dettori <dev(a)dettori.io> --- src/lib/selfboot.c | 104 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 61 insertions(+), 43 deletions(-) diff --git a/src/lib/selfboot.c b/src/lib/selfboot.c index 75d6725..d55ade4 100644 --- a/src/lib/selfboot.c +++ b/src/lib/selfboot.c @@ -36,9 +36,10 @@ struct segment { struct segment *next; struct segment *prev; unsigned long s_dstaddr; - unsigned long s_srcaddr; unsigned long s_memsz; - unsigned long s_filesz; + /* src->offset is the distance from the beginning of the boot_device. + * src->size is the filesize of the boot_device. */ + struct region src; int compression; }; @@ -121,7 +122,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) die ("bounce buffer not supported"); start = seg->s_dstaddr; - middle = start + seg->s_filesz; + middle = start + seg->src.size; end = start + seg->s_memsz; printk(BIOS_SPEW, "segment: [0x%016lx, 0x%016lx, 0x%016lx)\n", @@ -139,12 +140,12 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) new->s_memsz = len; seg->s_memsz -= len; seg->s_dstaddr += len; - seg->s_srcaddr += len; - if (seg->s_filesz > len) { - new->s_filesz = len; - seg->s_filesz -= len; + seg->src.offset += len; + if (seg->src.size > len) { + new->src.size = len; + seg->src.size -= len; } else { - seg->s_filesz = 0; + seg->src.size = 0; } /* Order by stream offset */ @@ -158,7 +159,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) printk(BIOS_SPEW, " early: [0x%016lx, 0x%016lx, 0x%016lx)\n", new->s_dstaddr, - new->s_dstaddr + new->s_filesz, + new->s_dstaddr + new->src.size, new->s_dstaddr + new->s_memsz); ret = 1; @@ -175,12 +176,12 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) seg->s_memsz = len; new->s_memsz -= len; new->s_dstaddr += len; - new->s_srcaddr += len; - if (seg->s_filesz > len) { - seg->s_filesz = len; - new->s_filesz -= len; + new->src.offset += len; + if (seg->src.size > len) { + seg->src.size = len; + new->src.size -= len; } else { - new->s_filesz = 0; + new->src.size = 0; } /* Order by stream offset */ new->next = seg->next; @@ -190,7 +191,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) printk(BIOS_SPEW, " late: [0x%016lx, 0x%016lx, 0x%016lx)\n", new->s_dstaddr, - new->s_dstaddr + new->s_filesz, + new->s_dstaddr + new->src.size, new->s_dstaddr + new->s_memsz); } } @@ -204,7 +205,7 @@ static int relocate_segment(unsigned long buffer, struct segment *seg) printk(BIOS_SPEW, " bounce: [0x%016lx, 0x%016lx, 0x%016lx)\n", seg->s_dstaddr, - seg->s_dstaddr + seg->s_filesz, + seg->s_dstaddr + seg->src.size, seg->s_dstaddr + seg->s_memsz); return ret; @@ -226,17 +227,27 @@ static void cbfs_decode_payload_segment(struct cbfs_payload_segment *segment, static int build_self_segment_list( struct segment *head, - struct cbfs_payload *cbfs_payload, uintptr_t *entry) + struct region_device *cbfs_payload, uintptr_t *entry) { struct segment *new; struct cbfs_payload_segment *current_segment, *first_segment, segment; + size_t offset = 0; memset(head, 0, sizeof(*head)); head->next = head->prev = head; - first_segment = &cbfs_payload->segments; + first_segment = malloc(sizeof(struct cbfs_payload_segment)); + current_segment = malloc(sizeof(struct cbfs_payload_segment)); - for (current_segment = first_segment;; ++current_segment) { + rdev_readat(cbfs_payload, first_segment, 0, + sizeof(struct cbfs_payload_segment)); + memcpy(current_segment, first_segment, + sizeof(struct cbfs_payload_segment)); + + if (first_segment == NULL || current_segment == NULL) + return -1; + + while (true) { printk(BIOS_DEBUG, "Loading segment from rom address 0x%p\n", current_segment); @@ -258,20 +269,19 @@ static int build_self_segment_list( new->s_dstaddr = segment.load_addr; new->s_memsz = segment.mem_len; new->compression = segment.compression; - new->s_srcaddr = (uintptr_t) - ((unsigned char *)first_segment) - + segment.offset; - new->s_filesz = segment.len; + new->src.size = segment.len; + new->src.offset = segment.offset; printk(BIOS_DEBUG, " New segment dstaddr 0x%lx memsize 0x%lx srcaddr 0x%lx filesize 0x%lx\n", - new->s_dstaddr, new->s_memsz, new->s_srcaddr, new->s_filesz); + new->s_dstaddr, new->s_memsz, new->src.offset, + new->src.size); /* Clean up the values */ - if (new->s_filesz > new->s_memsz) { - new->s_filesz = new->s_memsz; + if (new->src.size > new->s_memsz) { + new->src.size = new->s_memsz; printk(BIOS_DEBUG, " cleaned up filesize 0x%lx\n", - new->s_filesz); + new->src.size); } break; @@ -280,12 +290,10 @@ static int build_self_segment_list( (intptr_t)segment.load_addr, segment.mem_len); new = malloc(sizeof(*new)); - new->s_filesz = 0; - new->s_srcaddr = (uintptr_t) - ((unsigned char *)first_segment) - + segment.offset; new->s_dstaddr = segment.load_addr; new->s_memsz = segment.mem_len; + new->src.size = 0; + new->src.offset = segment.offset; break; case PAYLOAD_SEGMENT_ENTRY: @@ -315,8 +323,15 @@ static int build_self_segment_list( new->prev = head->prev; head->prev->next = new; head->prev = new; + + rdev_readat(cbfs_payload, current_segment, offset, + sizeof(struct cbfs_payload_segment)); + offset += sizeof(struct cbfs_payload_segment); } + free(first_segment); + free(current_segment); + return 1; } @@ -332,7 +347,7 @@ static int load_self_segments( /* Determine last non-empty loaded segment. */ last_non_empty = NULL; for(ptr = head->next; ptr != head; ptr = ptr->next) - if (ptr->s_filesz != 0) + if (ptr->src.size != 0) last_non_empty = ptr; for(ptr = head->next; ptr != head; ptr = ptr->next) { @@ -379,7 +394,7 @@ static int load_self_segments( for(ptr = head->next; ptr != head; ptr = ptr->next) { unsigned char *dest, *src; printk(BIOS_DEBUG, "Loading Segment: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016lx\n", - ptr->s_dstaddr, ptr->s_memsz, ptr->s_filesz); + ptr->s_dstaddr, ptr->s_memsz, ptr->src.size); /* Modify the segment to load onto the bounce_buffer if necessary. */ @@ -389,21 +404,24 @@ static int load_self_segments( } printk(BIOS_DEBUG, "Post relocation: addr: 0x%016lx memsz: 0x%016lx filesz: 0x%016lx\n", - ptr->s_dstaddr, ptr->s_memsz, ptr->s_filesz); + ptr->s_dstaddr, ptr->s_memsz, ptr->src.size); /* Compute the boundaries of the segment */ dest = (unsigned char *)(ptr->s_dstaddr); - src = (unsigned char *)(ptr->s_srcaddr); + src = NULL; /* Copy data from the initial buffer */ - if (ptr->s_filesz) { + if (ptr->src.size) { unsigned char *middle, *end; - size_t len = ptr->s_filesz; + size_t len = ptr->src.size; size_t memsz = ptr->s_memsz; + size_t offset = ptr->src.offset; switch(ptr->compression) { case CBFS_COMPRESS_LZMA: { printk(BIOS_DEBUG, "using LZMA\n"); timestamp_add_now(TS_START_ULZMA); + src = rdev_mmap(prog_rdev(payload), + offset, len); len = ulzman(src, len, dest, memsz); timestamp_add_now(TS_END_ULZMA); if (!len) /* Decompression Error. */ @@ -413,6 +431,8 @@ static int load_self_segments( case CBFS_COMPRESS_LZ4: { printk(BIOS_DEBUG, "using LZ4\n"); timestamp_add_now(TS_START_ULZ4F); + src = rdev_mmap(prog_rdev(payload), + offset, len); len = ulz4fn(src, len, dest, memsz); timestamp_add_now(TS_END_ULZ4F); if (!len) /* Decompression Error. */ @@ -421,7 +441,8 @@ static int load_self_segments( } case CBFS_COMPRESS_NONE: { printk(BIOS_DEBUG, "it's not compressed!\n"); - memcpy(dest, src, len); + rdev_readat(prog_rdev(payload), dest, + offset, len); break; } default: @@ -479,9 +500,9 @@ void *selfload(struct prog *payload) { uintptr_t entry = 0; struct segment head; - void *data; + struct region_device *data; - data = rdev_mmap_full(prog_rdev(payload)); + data = prog_rdev(payload); if (data == NULL) return NULL; @@ -496,8 +517,6 @@ void *selfload(struct prog *payload) printk(BIOS_SPEW, "Loaded segments\n"); - rdev_munmap(prog_rdev(payload), data); - /* Update the payload's area with the bounce buffer information. */ prog_set_area(payload, (void *)(uintptr_t)bounce_buffer, bounce_size); @@ -507,6 +526,5 @@ void *selfload(struct prog *payload) return (void *)entry; out: - rdev_munmap(prog_rdev(payload), data); return NULL; }

1 0

Patch set updated for coreboot: soc/intel/apollolake: Add GPE routing code
by Shaunak Saha 01 Jul '16

01 Jul '16

Shaunak Saha (shaunak.saha(a)intel.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/15324 -gerrit commit 5cc746e765b90931b6d3eca85e28ca6203103f77 Author: Shaunak Saha <shaunak.saha(a)intel.com> Date: Tue Jun 7 02:06:28 2016 -0700 soc/intel/apollolake: Add GPE routing code This patch adds the basic framework for SCI to GPE routing code. BUG = chrome-os-partner:53438 TEST = Toogle pch_sci_l from ec console using gpioset command and see that the sci counter increases in /sys/firmware/acpi/interrupt and also 9 in /proc/interrupts. Change-Id: I3b3198276530bf6513d94e9bea02ab9751212adf Signed-off-by: Shaunak Saha <shaunak.saha(a)intel.com> --- src/soc/intel/apollolake/chip.h | 6 ++ src/soc/intel/apollolake/gpio.c | 68 +++++++++++++++ src/soc/intel/apollolake/include/soc/gpe.h | 102 +++++++++++++++++++++++ src/soc/intel/apollolake/include/soc/gpio.h | 13 +++ src/soc/intel/apollolake/include/soc/gpio_defs.h | 22 +++++ src/soc/intel/apollolake/include/soc/pm.h | 19 ++++- src/soc/intel/apollolake/pmc.c | 63 ++++++++++++++ 7 files changed, 290 insertions(+), 3 deletions(-) diff --git a/src/soc/intel/apollolake/chip.h b/src/soc/intel/apollolake/chip.h index ef82c53..5571672 100644 --- a/src/soc/intel/apollolake/chip.h +++ b/src/soc/intel/apollolake/chip.h @@ -18,6 +18,8 @@ #ifndef _SOC_APOLLOLAKE_CHIP_H_ #define _SOC_APOLLOLAKE_CHIP_H_ +#include <soc/pm.h> + #define CLKREQ_DISABLED 0xf /* Serial IRQ control. SERIRQ_QUIET is the default (0). */ @@ -79,6 +81,10 @@ struct soc_intel_apollolake_config { /* Integrated Sensor Hub */ uint8_t integrated_sensor_hub_enable; + + uint8_t gpe0_dw1; /* GPE0_63_32 STS/EN */ + uint8_t gpe0_dw2; /* GPE0_95_64 STS/EN */ + uint8_t gpe0_dw3; /* GPE0_127_96 STS/EN */ }; #endif /* _SOC_APOLLOLAKE_CHIP_H_ */ diff --git a/src/soc/intel/apollolake/gpio.c b/src/soc/intel/apollolake/gpio.c index d0ef648..9aea7f7 100644 --- a/src/soc/intel/apollolake/gpio.c +++ b/src/soc/intel/apollolake/gpio.c @@ -19,6 +19,7 @@ #include <gpio.h> #include <soc/gpio.h> #include <soc/iosf.h> +#include <soc/pm.h> /* This list must be in order, from highest pad numbers, to lowest pad numbers*/ static const struct pad_community { @@ -132,3 +133,70 @@ const char *gpio_acpi_path(gpio_t gpio_num) return NULL; } + +/* Helper function to map PMC register groups to tier1 sci groups */ +static int pmc_gpe_route_to_gpio(int route) +{ + switch(route) { + case PMC_GPE_SW_31_0: + return GPIO_GPE_SW_31_0; + case PMC_GPE_SW_63_32: + return GPIO_GPE_SW_63_32; + case PMC_GPE_NW_31_0: + return GPIO_GPE_NW_31_0; + case PMC_GPE_NW_63_32: + return GPIO_GPE_NW_63_32; + case PMC_GPE_NW_95_64: + return GPIO_GPE_NW_95_64; + case PMC_GPE_N_31_0: + return GPIO_GPE_N_31_0; + case PMC_GPE_N_63_32: + return GPIO_GPE_N_63_32; + case PMC_GPE_W_31_0: + return GPIO_GPE_W_31_0; + default: + return -1; + } +} + +void gpio_route_gpe(int gpe0b, int gpe0c, int gpe0d) +{ + int i; + uint32_t misccfg_mask; + uint32_t misccfg_value; + uint32_t value; + + /* Get the group here for community specific MISCCFG register. + * If any of these returns -1 then there is some error in devicetree + * where the group is probably hardcoded and does not comply with the + * PMC group defines. So we return from here and MISCFG is set to + * default. + */ + gpe0b = pmc_gpe_route_to_gpio(gpe0b); + if(gpe0b == -1) + return; + gpe0c = pmc_gpe_route_to_gpio(gpe0c); + if(gpe0c == -1) + return; + gpe0d = pmc_gpe_route_to_gpio(gpe0d); + if(gpe0d == -1) + return; + + misccfg_value = gpe0b << MISCCFG_GPE0_DW0_SHIFT; + misccfg_value |= gpe0c << MISCCFG_GPE0_DW1_SHIFT; + misccfg_value |= gpe0d << MISCCFG_GPE0_DW2_SHIFT; + + /* Program GPIO_MISCCFG */ + misccfg_mask = ~(MISCCFG_GPE0_DW2_MASK | + MISCCFG_GPE0_DW1_MASK | + MISCCFG_GPE0_DW0_MASK); + + for (i = 0; i < ARRAY_SIZE(gpio_communities); i++) { + const struct pad_community *comm = &gpio_communities[i]; + + value = iosf_read(comm->port, GPIO_MISCCFG); + value &= misccfg_mask; + value |= misccfg_value; + iosf_write(comm->port, GPIO_MISCCFG, value); + } +} diff --git a/src/soc/intel/apollolake/include/soc/gpe.h b/src/soc/intel/apollolake/include/soc/gpe.h index 8abbad8..5482ed3 100644 --- a/src/soc/intel/apollolake/include/soc/gpe.h +++ b/src/soc/intel/apollolake/include/soc/gpe.h @@ -34,4 +34,106 @@ #define GPE0A_SMB_WAK_STS 16 #define GPE0A_SATA_PME_STS 17 +/* Group DW0 is reserved in Apollolake */ + +/* GPE_63_32 */ +#define GPE0_DW1_00 32 +#define GPE0_DW1_01 33 +#define GPE0_DW1_02 34 +#define GPE0_DW1_03 36 +#define GPE0_DW1_04 36 +#define GPE0_DW1_05 37 +#define GPE0_DW1_06 38 +#define GPE0_DW1_07 39 +#define GPE0_DW1_08 40 +#define GPE0_DW1_09 41 +#define GPE0_DW1_10 42 +#define GPE0_DW1_11 43 +#define GPE0_DW1_12 44 +#define GPE0_DW1_13 45 +#define GPE0_DW1_14 46 +#define GPE0_DW1_15 47 +#define GPE0_DW1_16 48 +#define GPE0_DW1_17 49 +#define GPE0_DW1_18 50 +#define GPE0_DW1_19 51 +#define GPE0_DW1_20 52 +#define GPE0_DW1_21 53 +#define GPE0_DW1_22 54 +#define GPE0_DW1_23 55 +#define GPE0_DW1_24 56 +#define GPE0_DW1_25 57 +#define GPE0_DW1_26 58 +#define GPE0_DW1_27 59 +#define GPE0_DW1_28 60 +#define GPE0_DW1_29 61 +#define GPE0_DW1_30 62 +#define GPE0_DW1_31 63 +/* GPE_95_64 */ +#define GPE0_DW2_00 64 +#define GPE0_DW2_01 65 +#define GPE0_DW2_02 66 +#define GPE0_DW2_03 67 +#define GPE0_DW2_04 68 +#define GPE0_DW2_05 69 +#define GPE0_DW2_06 70 +#define GPE0_DW2_07 71 +#define GPE0_DW2_08 72 +#define GPE0_DW2_09 73 +#define GPE0_DW2_10 74 +#define GPE0_DW2_11 75 +#define GPE0_DW2_12 76 +#define GPE0_DW2_13 77 +#define GPE0_DW2_14 78 +#define GPE0_DW2_15 79 +#define GPE0_DW2_16 80 +#define GPE0_DW2_17 81 +#define GPE0_DW2_18 82 +#define GPE0_DW2_19 83 +#define GPE0_DW2_20 84 +#define GPE0_DW2_21 85 +#define GPE0_DW2_22 86 +#define GPE0_DW2_23 87 +#define GPE0_DW2_24 88 +#define GPE0_DW2_25 89 +#define GPE0_DW2_26 90 +#define GPE0_DW2_27 91 +#define GPE0_DW2_28 92 +#define GPE0_DW2_29 93 +#define GPE0_DW2_30 94 +#define GPE0_DW2_31 95 +/* GPE_127_96 */ +#define GPE0_DW3_00 96 +#define GPE0_DW3_01 97 +#define GPE0_DW3_02 98 +#define GPE0_DW3_03 99 +#define GPE0_DW3_04 100 +#define GPE0_DW3_05 101 +#define GPE0_DW3_06 102 +#define GPE0_DW3_07 103 +#define GPE0_DW3_08 104 +#define GPE0_DW3_09 105 +#define GPE0_DW3_10 106 +#define GPE0_DW3_11 107 +#define GPE0_DW3_12 108 +#define GPE0_DW3_13 109 +#define GPE0_DW3_14 110 +#define GPE0_DW3_15 111 +#define GPE0_DW3_16 112 +#define GPE0_DW3_17 113 +#define GPE0_DW3_18 114 +#define GPE0_DW3_19 115 +#define GPE0_DW3_20 116 +#define GPE0_DW3_21 117 +#define GPE0_DW3_22 118 +#define GPE0_DW3_23 119 +#define GPE0_DW3_24 120 +#define GPE0_DW3_25 121 +#define GPE0_DW3_26 122 +#define GPE0_DW3_27 123 +#define GPE0_DW3_28 124 +#define GPE0_DW3_29 125 +#define GPE0_DW3_30 126 +#define GPE0_DW3_31 127 + #endif diff --git a/src/soc/intel/apollolake/include/soc/gpio.h b/src/soc/intel/apollolake/include/soc/gpio.h index c9d32cc..7605db2 100644 --- a/src/soc/intel/apollolake/include/soc/gpio.h +++ b/src/soc/intel/apollolake/include/soc/gpio.h @@ -99,5 +99,18 @@ struct pad_config { void gpio_configure_pad(const struct pad_config *cfg); void gpio_configure_pads(const struct pad_config *cfg, size_t num_pads); +/* + * Set the GPIO groups for the GPE blocks. The values from PMC register GPE_CFG + * are passed which is then mapped to proper groups for MISCCFG. The mapping + * from GPE_CFG to MISCCFG group is done by a static function + * pmc_gpe_route_to_gpio in pmc.c file. This basically sets the MISCCFG register + * bits: + * dw0 = gpe0_route[11:8]. This is ACPI GPE0b. + * dw1 = gpe0_route[15:12]. This is ACPI GPE0c. + * dw2 = gpe0_route[19:16]. This is ACPI GPE0d. + */ +void gpio_route_gpe(int gpe0b, int gpe0c, int gpe0d); + #endif /* __ACPI__ */ + #endif /* _SOC_APOLLOLAKE_GPIO_H_ */ diff --git a/src/soc/intel/apollolake/include/soc/gpio_defs.h b/src/soc/intel/apollolake/include/soc/gpio_defs.h index 30c4bdb..c6e2c3c 100644 --- a/src/soc/intel/apollolake/include/soc/gpio_defs.h +++ b/src/soc/intel/apollolake/include/soc/gpio_defs.h @@ -23,6 +23,28 @@ #ifndef _SOC_APOLLOLAKE_GPIO_DEFS_H_ #define _SOC_APOLLOLAKE_GPIO_DEFS_H_ +/* + * Miscellaneous Configuration register(MISCCFG).These are community specific + * registers and are meant to house miscellaneous configuration fields per + * community. There are 8 GPIO groups: GPP_0 -> GPP_8 (Group 3 is absent) + */ +#define GPIO_MISCCFG 0x10 /* Miscellaneous Configuration offset */ +#define GPIO_GPE_SW_31_0 0 /* SOUTHWEST GPIO# 0 ~ 31 belong to GROUP0 */ +#define GPIO_GPE_SW_63_32 1 /* SOUTHWEST GPIO# 32 ~ 42 belong to GROUP1 */ +#define GPIO_GPE_W_31_0 2 /* WEST GPIO# 0 ~ 25 belong to GROUP2 */ +#define GPIO_GPE_NW_31_0 4 /* NORTHWEST GPIO# 0 ~ 17 belong to GROUP4 */ +#define GPIO_GPE_NW_63_32 5 /* NORTHWEST GPIO# 32 ~ 63 belong to GROUP5 */ +#define GPIO_GPE_NW_95_64 6 /* NORTHWEST GPIO# 64 ~ 76 belong to GROUP6 */ +#define GPIO_GPE_N_31_0 7 /* NORTH GPIO# 0 ~ 31 belong to GROUP7 */ +#define GPIO_GPE_N_63_32 8 /* NORTH GPIO# 32 ~ 61 belong to GROUP8 */ + +#define MISCCFG_GPE0_DW0_SHIFT 8 +#define MISCCFG_GPE0_DW0_MASK (0xf << MISCCFG_GPE0_DW0_SHIFT) +#define MISCCFG_GPE0_DW1_SHIFT 12 +#define MISCCFG_GPE0_DW1_MASK (0xf << MISCCFG_GPE0_DW1_SHIFT) +#define MISCCFG_GPE0_DW2_SHIFT 16 +#define MISCCFG_GPE0_DW2_MASK (0xf << MISCCFG_GPE0_DW2_SHIFT) + #define PAD_CFG0_TX_STATE (1 << 0) #define PAD_CFG0_RX_STATE (1 << 1) #define PAD_CFG0_TX_DISABLE (1 << 8) diff --git a/src/soc/intel/apollolake/include/soc/pm.h b/src/soc/intel/apollolake/include/soc/pm.h index 72f74a6..99f922f 100644 --- a/src/soc/intel/apollolake/include/soc/pm.h +++ b/src/soc/intel/apollolake/include/soc/pm.h @@ -129,9 +129,22 @@ # define RPS (1 << 2) #define GEN_PMCON3 0x1028 #define ETR 0x1048 -# define CF9_LOCK (1 << 31) -# define CF9_GLB_RST (1 << 20) - +# define CF9_LOCK (1 << 31) +# define CF9_GLB_RST (1 << 20) +#define GPIO_GPE_CFG 0x1050 +#define GPE0_DWX_MASK 0xf +#define GPE0_DW1_SHIFT 4 +#define GPE0_DW2_SHIFT 8 +#define GPE0_DW3_SHIFT 12 + +#define PMC_GPE_SW_31_0 0 +#define PMC_GPE_SW_63_32 1 +#define PMC_GPE_NW_31_0 3 +#define PMC_GPE_NW_63_32 4 +#define PMC_GPE_NW_95_64 5 +#define PMC_GPE_N_31_0 6 +#define PMC_GPE_N_63_32 7 +#define PMC_GPE_W_31_0 9 /* Generic sleep state types */ #define SLEEP_STATE_S0 0 diff --git a/src/soc/intel/apollolake/pmc.c b/src/soc/intel/apollolake/pmc.c index c88e14c..49e2950 100644 --- a/src/soc/intel/apollolake/pmc.c +++ b/src/soc/intel/apollolake/pmc.c @@ -18,8 +18,13 @@ #include <device/device.h> #include <device/pci.h> #include <device/pci_ids.h> +#include <console/console.h> #include <soc/iomap.h> #include <soc/pci_ids.h> +#include <soc/gpio.h> +#include <soc/pci_devs.h> +#include <soc/pm.h> +#include "chip.h" /* * The ACPI IO BAR (offset 0x20) is not PCI compliant. We've observed cases @@ -58,10 +63,68 @@ static void set_resources(device_t dev) report_resource_stored(dev, res, " ACPI BAR"); } +static void pmc_gpe_init(void) +{ + uint32_t gpio_cfg = 0; + uint32_t gpio_cfg_reg; + struct soc_intel_apollolake_config *config; + + struct device *dev = NB_DEV_ROOT; + if (!dev || !dev->chip_info) { + printk(BIOS_ERR, "BUG! Could not find SOC devicetree config\n"); + return; + } + config = dev->chip_info; + + uintptr_t pmc_bar = get_pmc_mmio_bar(); + + const uint32_t gpio_cfg_mask = + (GPE0_DWX_MASK << GPE0_DW1_SHIFT) | + (GPE0_DWX_MASK << GPE0_DW2_SHIFT) | + (GPE0_DWX_MASK << GPE0_DW3_SHIFT); + + /* Making sure that bad values don't bleed into the other fields */ + config->gpe0_dw1 &= GPE0_DWX_MASK; + config->gpe0_dw2 &= GPE0_DWX_MASK; + config->gpe0_dw3 &= GPE0_DWX_MASK; + + /* Route the GPIOs to the GPE0 block. Determine that all values + * are different, and if they aren't use the reset values. + * DW0 is reserved/unused */ + if (config->gpe0_dw1 == config->gpe0_dw2 || + config->gpe0_dw2 == config->gpe0_dw3) { + printk(BIOS_INFO, "PMC: Using default GPE route.\n"); + gpio_cfg = read32((void *)pmc_bar + GPIO_GPE_CFG); + + config->gpe0_dw1 = (gpio_cfg >> GPE0_DW1_SHIFT) & GPE0_DWX_MASK; + config->gpe0_dw2 = (gpio_cfg >> GPE0_DW2_SHIFT) & GPE0_DWX_MASK; + config->gpe0_dw3 = (gpio_cfg >> GPE0_DW3_SHIFT) & GPE0_DWX_MASK; + } else { + gpio_cfg |= (uint32_t)config->gpe0_dw1 << GPE0_DW1_SHIFT; + gpio_cfg |= (uint32_t)config->gpe0_dw2 << GPE0_DW2_SHIFT; + gpio_cfg |= (uint32_t)config->gpe0_dw3 << GPE0_DW3_SHIFT; + } + + gpio_cfg_reg = read32((void *)pmc_bar + GPIO_GPE_CFG) & ~gpio_cfg_mask; + gpio_cfg_reg |= gpio_cfg & gpio_cfg_mask; + + write32((void *)pmc_bar + GPIO_GPE_CFG, gpio_cfg_reg); + + /* Set the routes in the GPIO communities as well. */ + gpio_route_gpe(config->gpe0_dw1, config->gpe0_dw2, config->gpe0_dw3); +} + +static void pmc_init(struct device *dev) +{ + /* Set up GPE configuration */ + pmc_gpe_init(); +} + static const struct device_operations device_ops = { .read_resources = read_resources, .set_resources = set_resources, .enable_resources = pci_dev_enable_resources, + .init = &pmc_init, }; static const struct pci_driver pmc __pci_driver = {

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit July 2016