October 2016 - U-Boot

Re: [U-Boot] [bug report] sunxi: booting from eMMC
by Alexandr Bochkarev 02 Oct '16

02 Oct '16

Hi! I am trying to boot my A20 board from eMMC KLM4G1FE3B-B001, but has no success. Commenting mmc_change_freq has no effect. U-Boot 2016.03 just says Could not determine boot source I have found, that it stucks in sunxi_mmc_has_egon_boot_signature. int sunxi_mmc_has_egon_boot_signature(struct mmc *mmc) { char *buf = malloc(512); int valid_signature = 0; if (buf == NULL) panic("Failed to allocate memory\n"); if (mmc_getcd(mmc) && mmc_init(mmc) == 0 && mmc->block_dev.block_read(&mmc->block_dev, 16, 1, buf) == 1 && strncmp(&buf[4], "eGON.BT0", 8) == 0) valid_signature = 1; free(buf); return valid_signature; } mmc_init(mmc) return no errors, seems good, but block_read returns 0, seems it cant read emmc. U-Boot 2016.09 says: mmc_load_image_raw_sector: mmc block read error SPL: failed to boot from all boot devices ### ERROR ### Please RESET the board ###

2 3

[U-Boot] [PATCH v3 4/7] efi_loader: Track size of pool allocations to allow freeing
by Stefan Brüns 02 Oct '16

02 Oct '16

allocate_pool has to return a buffer which is 8-byte aligned. Shift the region returned by allocate_pages by 8 byte and store the size in the headroom. The 8 byte overhead is neglegible, but provides the required size when freeing the allocation later. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- include/efi_loader.h | 2 ++ lib/efi_loader/efi_boottime.c | 6 +++--- lib/efi_loader/efi_memory.c | 40 +++++++++++++++++++++++++++++++++++++++- 3 files changed, 44 insertions(+), 4 deletions(-) diff --git a/include/efi_loader.h b/include/efi_loader.h index 40e7beb..341d4a4 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -122,6 +122,8 @@ efi_status_t efi_free_pages(uint64_t memory, unsigned long pages); /* EFI memory allocator for small allocations, called by EFI payloads */ efi_status_t efi_allocate_pool(int pool_type, unsigned long size, void **buffer); +/* EFI pool memory free function. */ +efi_status_t efi_free_pool(void *buffer); /* Returns the EFI memory map */ efi_status_t efi_get_memory_map(unsigned long *memory_map_size, struct efi_mem_desc *memory_map, diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index eb74cb0..8274d8e 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -141,12 +141,12 @@ static efi_status_t EFIAPI efi_allocate_pool_ext(int pool_type, return EFI_EXIT(r); } -static efi_status_t EFIAPI efi_free_pool(void *buffer) +static efi_status_t EFIAPI efi_free_pool_ext(void *buffer) { efi_status_t r; EFI_ENTRY("%p", buffer); - r = efi_free_pages((ulong)buffer, 0); + r = efi_free_pool(buffer); return EFI_EXIT(r); } @@ -736,7 +736,7 @@ static const struct efi_boot_services efi_boot_services = { .free_pages = efi_free_pages_ext, .get_memory_map = efi_get_memory_map_ext, .allocate_pool = efi_allocate_pool_ext, - .free_pool = efi_free_pool, + .free_pool = efi_free_pool_ext, .create_event = efi_create_event, .set_timer = efi_set_timer, .wait_for_event = efi_wait_for_event, diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 045558d..fa5c639 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -34,6 +34,18 @@ void *efi_bounce_buffer; #endif /* + * U-Boot services each EFI AllocatePool request as a separate + * (multiple) page allocation. We have to track the number of pages + * to be able to free the correct amount later. + * EFI requires 8 byte alignement for pool allocations, so it is + * possible to reserve some headroom and serve the remainder. + */ +struct efi_pool_allocation { + u64 num_pages; + char data[]; +}; + +/* * Sorts the memory list from highest address to lowest address * * When allocating memory we should always start from the highest @@ -332,9 +344,35 @@ efi_status_t efi_allocate_pool(int pool_type, unsigned long size, { efi_status_t r; efi_physical_addr_t t; - u64 num_pages = (size + EFI_PAGE_MASK) >> EFI_PAGE_SHIFT; + u64 num_pages = (size + sizeof(u64) + EFI_PAGE_MASK) >> EFI_PAGE_SHIFT; + + if (size == 0) { + *buffer = NULL; + return EFI_EXIT(EFI_SUCCESS); + } r = efi_allocate_pages(0, pool_type, num_pages, &t); + + if (r == EFI_SUCCESS) { + struct efi_pool_allocation *alloc = (void *)(uintptr_t)t; + alloc->num_pages = num_pages; + *buffer = &(alloc->data); + assert(((uintptr_t)(*buffer) & 0x7) == 0); + } + + return EFI_EXIT(r); +} + +efi_status_t efi_free_pool(void *buffer) +{ + efi_status_t r; + struct efi_pool_allocation *alloc; + + alloc = container_of(buffer, struct efi_pool_allocation, data); + assert(((uintptr_t)alloc & EFI_PAGE_MASK) == 0); + + r = efi_free_pages((uintptr_t)alloc, alloc->num_pages); + return EFI_EXIT(r); } -- 2.10.0

2 1

[U-Boot] [PATCH v3 3/7] efi_loader: Move efi_allocate_pool implementation to efi_memory.c
by Stefan Brüns 02 Oct '16

02 Oct '16

Implementation essentially unchanged, but use EFI_PAGE_MASK/SHIFT instead of numeric constants. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- include/efi_loader.h | 3 +++ lib/efi_loader/efi_boottime.c | 11 +++++------ lib/efi_loader/efi_memory.c | 11 +++++++++++ 3 files changed, 19 insertions(+), 6 deletions(-) diff --git a/include/efi_loader.h b/include/efi_loader.h index 9738835..40e7beb 100644 --- a/include/efi_loader.h +++ b/include/efi_loader.h @@ -119,6 +119,9 @@ efi_status_t efi_allocate_pages(int type, int memory_type, unsigned long pages, uint64_t *memory); /* EFI memory free function. Not implemented today */ efi_status_t efi_free_pages(uint64_t memory, unsigned long pages); +/* EFI memory allocator for small allocations, called by EFI payloads */ +efi_status_t efi_allocate_pool(int pool_type, unsigned long size, + void **buffer); /* Returns the EFI memory map */ efi_status_t efi_get_memory_map(unsigned long *memory_map_size, struct efi_mem_desc *memory_map, diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 784891b..eb74cb0 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -130,15 +130,14 @@ efi_status_t EFIAPI efi_get_memory_map_ext(unsigned long *memory_map_size, return EFI_EXIT(r); } -static efi_status_t EFIAPI efi_allocate_pool(int pool_type, unsigned long size, - void **buffer) +static efi_status_t EFIAPI efi_allocate_pool_ext(int pool_type, + unsigned long size, + void **buffer) { efi_status_t r; - efi_physical_addr_t t; EFI_ENTRY("%d, %ld, %p", pool_type, size, buffer); - r = efi_allocate_pages(0, pool_type, (size + 0xfff) >> 12, &t); - *buffer = (void *)(uintptr_t)t; + r = efi_allocate_pool(pool_type, size, buffer); return EFI_EXIT(r); } @@ -736,7 +735,7 @@ static const struct efi_boot_services efi_boot_services = { .allocate_pages = efi_allocate_pages_ext, .free_pages = efi_free_pages_ext, .get_memory_map = efi_get_memory_map_ext, - .allocate_pool = efi_allocate_pool, + .allocate_pool = efi_allocate_pool_ext, .free_pool = efi_free_pool, .create_event = efi_create_event, .set_timer = efi_set_timer, diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 5d71fdf..045558d 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -327,6 +327,17 @@ efi_status_t efi_free_pages(uint64_t memory, unsigned long pages) return EFI_SUCCESS; } +efi_status_t efi_allocate_pool(int pool_type, unsigned long size, + void **buffer) +{ + efi_status_t r; + efi_physical_addr_t t; + u64 num_pages = (size + EFI_PAGE_MASK) >> EFI_PAGE_SHIFT; + + r = efi_allocate_pages(0, pool_type, num_pages, &t); + return EFI_EXIT(r); +} + efi_status_t efi_get_memory_map(unsigned long *memory_map_size, struct efi_mem_desc *memory_map, unsigned long *map_key, -- 2.10.0

2 1

[U-Boot] [PATCH v3 2/7] efi_loader: Fix memory map size check to avoid out-of-bounds access
by Stefan Brüns 02 Oct '16

02 Oct '16

Do not overwrite the specified size of the provided buffer without having checked it is sufficient. If the buffer is to small, memory_map_size is updated to indicate the required size, and an error code is returned. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- lib/efi_loader/efi_memory.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index ebe8e94..5d71fdf 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -342,16 +342,18 @@ efi_status_t efi_get_memory_map(unsigned long *memory_map_size, map_size = map_entries * sizeof(struct efi_mem_desc); - *memory_map_size = map_size; - if (descriptor_size) *descriptor_size = sizeof(struct efi_mem_desc); if (descriptor_version) *descriptor_version = EFI_MEMORY_DESCRIPTOR_VERSION; - if (*memory_map_size < map_size) + if (*memory_map_size < map_size) { + *memory_map_size = map_size; return EFI_BUFFER_TOO_SMALL; + } + + *memory_map_size = map_size; /* Copy list into array */ if (memory_map) { -- 2.10.0

2 1

[U-Boot] [PATCH 0/4] boot-mode support in rockchip platform
by Jacob Chen 02 Oct '16

02 Oct '16

This patch add boot-mode support for rk3036,rk3288 (fastboot, ums) The corresponding commit in the kernel: https://git.kernel.org/cgit/linux/kernel/git/mmind/linux-rockchip.git/commi… This patch also make some work to let rk3036 and rk3288 more same , so easy to maintain Jacob Chen (4): rockchip: move partitons define from 3036-kylin to 3036-commn rockchip: rename board.c to rk3288-board.c rockchip: move common function from board-file to rk3036-board.c rockchip: add boot-mode support for rk3288,rk3036 arch/arm/include/asm/arch-rockchip/boot_mode.h | 19 ++++ arch/arm/mach-rockchip/Makefile | 3 +- arch/arm/mach-rockchip/rk3036-board.c | 122 +++++++++++++++++++++ arch/arm/mach-rockchip/{board.c => rk3288-board.c} | 50 ++++++++- board/rockchip/evb_rk3036/evb_rk3036.c | 66 ----------- board/rockchip/kylin_rk3036/kylin_rk3036.c | 80 +------------- include/configs/kylin_rk3036.h | 27 ----- include/configs/rk3036_common.h | 13 +++ include/configs/rk3288_common.h | 3 + 9 files changed, 206 insertions(+), 177 deletions(-) create mode 100644 arch/arm/include/asm/arch-rockchip/boot_mode.h create mode 100644 arch/arm/mach-rockchip/rk3036-board.c rename arch/arm/mach-rockchip/{board.c => rk3288-board.c} (80%) -- 1.9.1

2 12

[U-Boot] [PATCH v2] cros_ec: Fix issue with cros_ec_flash_write command
by Moritz Fischer 02 Oct '16

02 Oct '16

This commit fixes an issue where data is written to an invalid memory location. The issue has been introduced in commit (88364387 cros: add cros_ec_driver) Cc: Simon Glass <sjg(a)chromium.org> Cc: u-boot(a)lists.denx.de Signed-off-by: Moritz Fischer <moritz.fischer(a)ettus.com> --- Changes from v1: - Fixed accidential change of command version - Removed added whitespace --- drivers/misc/cros_ec.c | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c index 44b4f59..06a7dcc 100644 --- a/drivers/misc/cros_ec.c +++ b/drivers/misc/cros_ec.c @@ -760,15 +760,24 @@ int cros_ec_flash_erase(struct cros_ec_dev *dev, uint32_t offset, uint32_t size) static int cros_ec_flash_write_block(struct cros_ec_dev *dev, const uint8_t *data, uint32_t offset, uint32_t size) { - struct ec_params_flash_write p; + struct ec_params_flash_write *p; + int ret; - p.offset = offset; - p.size = size; - assert(data && p.size <= EC_FLASH_WRITE_VER0_SIZE); - memcpy(&p + 1, data, p.size); + p = malloc(sizeof(*p) + size); + if (!p) + return -ENOMEM; + + p->offset = offset; + p->size = size; + assert(data && p->size <= EC_FLASH_WRITE_VER0_SIZE); + memcpy(p + 1, data, p->size); - return ec_command_inptr(dev, EC_CMD_FLASH_WRITE, 0, - &p, sizeof(p), NULL, 0) >= 0 ? 0 : -1; + ret = ec_command_inptr(dev, EC_CMD_FLASH_WRITE, 0, + p, sizeof(*p) + size, NULL, 0) >= 0 ? 0 : -1; + + free(p); + + return ret; } /** -- 2.7.4

2 2

[U-Boot] [PATCH 1/2] cros_ec: Add function to read back flash parameters
by Moritz Fischer 02 Oct '16

02 Oct '16

Add support for reading back flash parameters as reported by the ec. Signed-off-by: Moritz Fischer <moritz.fischer(a)ettus.com> Cc: Simon Glass <sjg(a)chromium.org> Cc: u-boot(a)lists.denx.de --- drivers/misc/cros_ec.c | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/drivers/misc/cros_ec.c b/drivers/misc/cros_ec.c index 06a7dcc..931fdf5 100644 --- a/drivers/misc/cros_ec.c +++ b/drivers/misc/cros_ec.c @@ -809,6 +809,27 @@ static int cros_ec_data_is_erased(const uint32_t *data, int size) return 1; } +/** + * Read back flash parameters + * + * This function reads back parameters of the flash as reported by the EC + * + * @param dev Pointer to device + * @param info Pointer to output flash info struct + */ +int cros_ec_read_flashinfo(struct cros_ec_dev *dev, + struct ec_response_flash_info *info) +{ + int ret; + + ret = ec_command(dev, EC_CMD_FLASH_INFO, 0, + NULL, 0, info, sizeof(*info)); + if (ret < 0) + return ret; + + return ret < sizeof(*info) ? -1 : 0; +} + int cros_ec_flash_write(struct cros_ec_dev *dev, const uint8_t *data, uint32_t offset, uint32_t size) { -- 2.7.4

2 5

[U-Boot] [PATCH 00/13] buildman: Threading and output improvements
by Simon Glass 02 Oct '16

02 Oct '16

This series includes a few minor improvements to buildman: - Cleaner output and updates on what buildman is doing at the start - a way to generate only the CONFIG options in a build, for speed (-D) - a fix for pressing Ctrl-C during a build (so that it exits cleanly). Simon Glass (13): Makefile: Add a target to create the .cfg files buildman: Add an option to just create the config buildman: Add documentation for CONFIG checking buildman: Squash useless output from -K patman: Flush output when there is no newline buildman: Tidy up the 'cloning' message buildman: Print a message when removing old directories buildman: Print a message indicating the build is starting buildman: Put our local libraries first in the path buildman: Allow builds to terminate cleanly buildman: Drop the 'active' flag in the builder buildman: Don't show a stacktrace on Ctrl-C buildman: Drop the 'alive' flag in BuilderThread Makefile | 9 ++++++ scripts/Makefile.spl | 2 ++ tools/buildman/README | 49 +++++++++++++++++++++++++++++ tools/buildman/builder.py | 70 ++++++++++++++++++++++++++++------------- tools/buildman/builderthread.py | 29 +++++++---------- tools/buildman/buildman.py | 2 +- tools/buildman/cmdline.py | 4 +++ tools/buildman/control.py | 4 ++- tools/buildman/test.py | 4 +-- tools/patman/terminal.py | 2 ++ 10 files changed, 132 insertions(+), 43 deletions(-) -- 2.8.0.rc3.226.g39d4020

2 28

[U-Boot] [PATCH v2 0/6] efi_loader: implement BS.FreePages()/BS.FreePool, some cleanup
by Stefan Brüns 01 Oct '16

01 Oct '16

Linux 4.8 no longer boots, as it runs out of descriptor space. Readding the mapping allows reuse, and the next AllocatePool will likely not add a new mapping. Also fix some small issues found while debugging. v2, updated: efi_loader: Fix memory map size check to avoid out-of-bounds access - (Hopefully) clarified commit message efi_loader: Track size of pool allocations to allow freeing - rebased on top of 'efi_loader: Fix crash on 32-bit systems' - assert correct address in efi_free_pool - use EFI_PAGE_MASK instead of 0xfff, EFI_PAGE_SHIFT likewise v3, added: efi_loader: Move efi_allocate_pool implementation to efi_memory.c v3, updated: efi_loader: Fix memory map size check to avoid out-of-bounds access - set descriptor_size/_version even if EFI_BUFFER_TOO_SMALL efi_loader: Track size of pool allocations to allow freeing - use a struct instead of pointer arithmetic, add some comments Stefan Brüns (7): efi_loader: Update description of internal efi_mem_carve_out efi_loader: Fix memory map size check to avoid out-of-bounds access efi_loader: Move efi_allocate_pool implementation to efi_memory.c efi_loader: Track size of pool allocations to allow freeing efi_loader: Readd freed pages to memory pool efi_loader: Keep memory mapping sorted when splitting an entry efi_loader: Do not leak memory when unlinking a mapping include/efi_loader.h | 7 +++- lib/efi_loader/efi_boottime.c | 17 ++++---- lib/efi_loader/efi_memory.c | 92 +++++++++++++++++++++++++++++++++++++------ 3 files changed, 95 insertions(+), 21 deletions(-) -- 2.10.0

1 0

[U-Boot] [PATCH 0/5] Fix some trivial issues in sandbox/fs
by Stefan Brüns 01 Oct '16

01 Oct '16

Stefan Brüns (5): sandbox/fs: Free memory allocated by os_dirent_ls sandbox/fs: Make linking of nodes in os_dirent_ls more obvious sandbox/fs: Use correct size path name buffer sandbox/fs: Set correct filetype for unknown filetype sandbox/fs: Use readdir instead of deprecated readdir_r arch/sandbox/cpu/os.c | 34 +++++++++++++++++++++++----------- fs/sandbox/sandboxfs.c | 1 + include/os.h | 11 ++++++++++- 3 files changed, 34 insertions(+), 12 deletions(-) -- 2.10.0

1 0