October 2016 - U-Boot

[U-Boot] [PATCH v2 3/6] efi_loader: Track size of pool allocations to allow freeing
by Stefan Brüns 01 Oct '16

01 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> --- lib/efi_loader/efi_boottime.c | 24 +++++++++++++++++++++--- 1 file changed, 21 insertions(+), 3 deletions(-) diff --git a/lib/efi_loader/efi_boottime.c b/lib/efi_loader/efi_boottime.c index 784891b..c413ecb 100644 --- a/lib/efi_loader/efi_boottime.c +++ b/lib/efi_loader/efi_boottime.c @@ -135,19 +135,37 @@ static efi_status_t EFIAPI efi_allocate_pool(int pool_type, unsigned long size, { efi_status_t r; efi_physical_addr_t t; + u64 num_pages = (size + 8 + EFI_PAGE_MASK) >> EFI_PAGE_SHIFT; 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; + + if (size == 0) { + *buffer = NULL; + return EFI_EXIT(EFI_SUCCESS); + } + + r = efi_allocate_pages(0, pool_type, num_pages, &t); + + if (r == EFI_SUCCESS) { + *(u64 *)(uintptr_t)t = num_pages; + *buffer = (void *)(uintptr_t)(t + 8); + } + return EFI_EXIT(r); } static efi_status_t EFIAPI efi_free_pool(void *buffer) { efi_status_t r; + u64 num_pages; EFI_ENTRY("%p", buffer); - r = efi_free_pages((ulong)buffer, 0); + + buffer = (char *)(buffer) - 8; + assert(((ulong)buffer & EFI_PAGE_MASK) == 0); + num_pages = *(u64 *)buffer; + + r = efi_free_pages((ulong)buffer, num_pages); return EFI_EXIT(r); } -- 2.10.0

2 1

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

01 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..72a5870 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -342,6 +342,11 @@ efi_status_t efi_get_memory_map(unsigned long *memory_map_size, map_size = map_entries * sizeof(struct efi_mem_desc); + if (*memory_map_size < map_size) { + *memory_map_size = map_size; + return EFI_BUFFER_TOO_SMALL; + } + *memory_map_size = map_size; if (descriptor_size) @@ -350,9 +355,6 @@ efi_status_t efi_get_memory_map(unsigned long *memory_map_size, if (descriptor_version) *descriptor_version = EFI_MEMORY_DESCRIPTOR_VERSION; - if (*memory_map_size < map_size) - return EFI_BUFFER_TOO_SMALL; - /* Copy list into array */ if (memory_map) { /* Return the list in ascending order */ -- 2.10.0

2 1

[U-Boot] [PATCH v2 6/6] efi_loader: Do not leak memory when unlinking a mapping
by Stefan Brüns 01 Oct '16

01 Oct '16

As soon as a mapping is unlinked from the list, there are no further references to it, so it should be freed. If it not unlinked, update the start address and length. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Reviewed-by: Alexander Graf <agraf(a)suse.de> --- lib/efi_loader/efi_memory.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 26a5d50..000e776 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -103,10 +103,13 @@ static int efi_mem_carve_out(struct efi_mem_list *map, if (map_end == carve_end) { /* Full overlap, just remove map */ list_del(&map->link); + free(map); + } else { + map->desc.physical_start = carve_end; + map->desc.num_pages = (map_end - carve_end) + >> EFI_PAGE_SHIFT; } - map_desc->physical_start = carve_end; - map_desc->num_pages = (map_end - carve_end) >> EFI_PAGE_SHIFT; return (carve_end - carve_start) >> EFI_PAGE_SHIFT; } -- 2.10.0

1 0

[U-Boot] [PATCH v2 5/6] efi_loader: Keep memory mapping sorted when splitting an entry
by Stefan Brüns 01 Oct '16

01 Oct '16

The code assumes sorted mappings in descending address order. When splitting a mapping, insert the new part next to the current mapping. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Reviewed-by: Alexander Graf <agraf(a)suse.de> --- lib/efi_loader/efi_memory.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 9c785dd..26a5d50 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -122,7 +122,8 @@ static int efi_mem_carve_out(struct efi_mem_list *map, newmap->desc = map->desc; newmap->desc.physical_start = carve_start; newmap->desc.num_pages = (map_end - carve_start) >> EFI_PAGE_SHIFT; - list_add_tail(&newmap->link, &efi_mem); + /* Insert before current entry (descending address order) */ + list_add_tail(&newmap->link, &map->link); /* Shrink the map to [ map_start ... carve_start ] */ map_desc->num_pages = (carve_start - map_start) >> EFI_PAGE_SHIFT; -- 2.10.0

1 0

[U-Boot] [PATCH v2 4/6] efi_loader: Readd freed pages to memory pool
by Stefan Brüns 01 Oct '16

01 Oct '16

Currently each allocation creates a new mapping. Readding the mapping as free memory (EFI_CONVENTIONAL_MEMORY) potentially allows to hand out an existing mapping, thus limiting the number of mapping descriptors in the memory map. Mitigates a problem with current (4.8rc7) linux kernels when doing an efi_get_memory map, resulting in an infinite loop. Space for the memory map is reserved with allocate_pool (implicitly creating a new mapping) and filled. If there is insufficient slack space (8 entries) in the map, the space is freed and a new round is started, with space for one more entry. As each round increases requirement and allocation by exactly one, there is never enough slack space. (At least 32 entries are allocated, so as long as there are less than 24 entries, there is enough slack). Earlier kernels reserved no slack, and did less allocations, so this problem was not visible. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> Reviewed-by: Alexander Graf <agraf(a)suse.de> --- lib/efi_loader/efi_memory.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 72a5870..9c785dd 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -323,8 +323,15 @@ void *efi_alloc(uint64_t len, int memory_type) efi_status_t efi_free_pages(uint64_t memory, unsigned long pages) { - /* We don't free, let's cross our fingers we have plenty RAM */ - return EFI_SUCCESS; + uint64_t r = 0; + + r = efi_add_memory_map(memory, pages, EFI_CONVENTIONAL_MEMORY, false); + /* Merging of adjacent free regions is missing */ + + if (r == memory) + return EFI_SUCCESS; + + return EFI_NOT_FOUND; } efi_status_t efi_get_memory_map(unsigned long *memory_map_size, -- 2.10.0

1 0

[U-Boot] [PATCH v2 1/6] efi_loader: Update description of internal efi_mem_carve_out
by Stefan Brüns 01 Oct '16

01 Oct '16

In 74c16acce30bb882ad5951829d8dafef8eea564c the return values where changed, but the description was kept. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- lib/efi_loader/efi_memory.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c index 80e4e26..ebe8e94 100644 --- a/lib/efi_loader/efi_memory.c +++ b/lib/efi_loader/efi_memory.c @@ -62,9 +62,17 @@ static void efi_mem_sort(void) * Unmaps all memory occupied by the carve_desc region from the * list entry pointed to by map. * - * Returns 1 if carving was performed or 0 if the regions don't overlap. - * Returns -1 if it would affect non-RAM regions but overlap_only_ram is set. - * Carving is only guaranteed to complete when all regions return 0. + * Returns EFI_CARVE_NO_OVERLAP if the regions don't overlap. + * Returns EFI_CARVE_OVERLAPS_NONRAM if the carve and map overlap, + * and the map contains anything but free ram. + * (only when overlap_only_ram is true) + * Returns EFI_CARVE_LOOP_AGAIN if the mapping list should be traversed + * again, as it has been altered + * Returns the number of overlapping pages. The pages are removed from + * the mapping list. + * + * In case of EFI_CARVE_OVERLAPS_NONRAM it is the callers responsibility + * to readd the already carved out pages to the mapping. */ static int efi_mem_carve_out(struct efi_mem_list *map, struct efi_mem_desc *carve_desc, -- 2.10.0

1 0

[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 Stefan Brüns (6): 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: 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 lib/efi_loader/efi_boottime.c | 24 +++++++++++++++++++++--- lib/efi_loader/efi_memory.c | 43 ++++++++++++++++++++++++++++++++----------- 2 files changed, 53 insertions(+), 14 deletions(-) -- 2.10.0

1 0

Re: [U-Boot] [PATCH v3 03/29] Convert CONSOLE_PRE_CONSOLE_BUFFER options to Kconfig
by Soeren Moch 01 Oct '16

01 Oct '16

>> > Hello Simon, >> > >> > On Thu, 29 Sep 2016 14:23:02 -0600 >> > Simon Glass <sjg(a)chromium.org> wrote: >> > >>> > > Move these option to Kconfig and tidy up existing uses. >>> > > >>> > > Signed-off-by: Simon Glass <sjg(a)chromium.org> >>> > > --- >>> > > >>> > > Changes in v3: None >>> > > Changes in v2: >>> > > - Change CONFIG_PRE_CON_BUF_SZ default to 4096 >>> > > - Change CONFIG_PRE_CON_BUF_SZ to 'int' type >>> > > - Drop the depend clause on the CONFIG_PRE_CON_BUF_SZ default >>> > > - Move CONFIG_PRE_CON_BUF_ADDR default to common/Kconfig >> > >> > What is the point moving these defines to Kconfig? They are neither >> > user configurable, nor board specific. The location of the buffer is >> > defined per platform or per SoC type and is a part of the global memory >> > map. Similar to such things as the malloc heap and the stack. > This is a good point to bring up. As we're discussing in another thread > about moving FSL things out of CONFIG_SYS_... and into Kconfig or a > different namespace, we have other examples today where there's > addresses in Kconfig. Looking harder still at this code, perhaps as a > follow-up CONFIG_PRE_CON_BUF_SZ should just be 'PRE_CON_BUF_SIZE' in the > code and 4096, and not in Kconfig at all. And for this series, make the > default tbs2910 uses the default for ARCH_MX6. I don't think that my arbitrarily chosen PRE_CON_BUF_ADDR for tbs2910 (0x7C000000) is a good default for ARCH_MX6. On tbs2910 we have 2GB of DDR memory, there are lots of other imx6 boards with less memory available. So a lower PRE_CON_BUF_ADDR (as for sunxi) might be a better choice. The only constraint for this buffer (besides being located in DDR) is, that it must not overlap with u-boot text and data. As I understand it, this buffer is only used very early in the boot process and not needed anymore, when the vga console is set up. So this buffer can not interfere with user commands (even pre-boot commands). > > Allowing the users to redefine the buffer location is a dangerous thing > > because everything may go out of control very easily (it may overlap > > with some other memory buffer). IMHO it only makes sense to have a > > single user configurable boolean flag in Kconfig (the one which > > enables/disables the pre-console functionality). > > > > Regarding the buffer size. It was originally picked rather arbitrarily > > as 1MB at least for the sunxi platform: > > > > https://patchwork.ozlabs.org/patch/426526/ > > > > Just because making it several orders of magnitude larger than > > necessary makes it extremely unlikely that anyone ever gets into > > a buffer wraparound situation. Picking smallish sizes does not gain > > us anything, but just adds an extra hassle because now one needs to > > make some estimations whether the size is large enough or not. > > Especially considering that this functionality may be sometimes > > used for debugging prints when troubleshooting something. And one > > can't easily predict how much debugging output would be actually > > necessary. > So maybe we should hide the size option under EXPERT? Just curious, can this address be generated automatically, e.g. just below the malloc area? Or is this too complicated, e.g. because the buffer is used already before relocation? However, if this address is configurable in Kconfig at all, for me it makes sense to hide it somehow. I can test other PRE_CON_BUF_ADDR settings on tbs2910 if this would help to find more general default values. Regards, Soeren

1 0

[U-Boot] Uboot send pull request
by uboot＠andestech.com 01 Oct '16

01 Oct '16

Hi Tom, Please pull the following patch from u-boot-nds32 into your tree. Thanks! The following changes since commit 06572f0301c18e63b887efc91803bb9467e55dbe: Merge git://www.denx.de/git/u-boot-ppc4xx (2016-09-27 12:48:18 -0400) are available in the git repository at: git://git.denx.de/u-boot-nds32.git master for you to fetch changes up to d607f6fa99a67dd1b40c08ba21ca6f3aaff933ce: nds32: Support relocation. (2016-09-29 15:38:10 +0800) ---------------------------------------------------------------- rick (1): nds32: Support relocation. arch/nds32/config.mk | 2 +- arch/nds32/cpu/n1213/ag101/lowlevel_init.S | 13 ++- arch/nds32/cpu/n1213/start.S | 120 +++++++++++++++------------- arch/nds32/cpu/n1213/u-boot.lds | 13 +-- arch/nds32/include/asm/config.h | 2 - include/configs/adp-ag101p.h | 1 - 6 files changed, 77 insertions(+), 74 deletions(-)

2 1

[U-Boot] [PULL] u-boot-usb/master
by Marek Vasut 01 Oct '16

01 Oct '16

The following changes since commit cbe7706ab8aab06c18edaa9b120371f9c8012728: Merge git://git.denx.de/u-boot-fsl-qoriq (2016-09-26 17:10:56 -0400) are available in the git repository at: git://git.denx.de/u-boot-usb.git master for you to fetch changes up to 4c043712e9910ef1d612aedbd8304a1f7348ef5f: drivers: usb: xhci-fsl: Implement Erratum A-010151 for FSL USB3 controller (2016-09-27 23:30:49 +0200) ---------------------------------------------------------------- Alban Bedel (1): net: asix: Fix ASIX 88772B with driver model B, Ravi (5): spl: dfu: add dfu support in SPL common: dfu: saperate the dfu common functionality spl: dfu: adding dfu support functions for SPL-DFU dra7x: boot: add dfu bootmode support dra7x: configs: enable SPL-DFU support Marcel Ziswiler (2): colibri_t30: fix usb ethernet functionality apalis_t30: colibri_imx7: colibri_t30: fix ethernet functionality Sanchayan Maity (5): cmd: dfu: Add error handling for failed registration usb: host: ehci-vf: Migrate Vybrid USB to driver model ARM: dts: vf: Add device tree node for USB on Vybrid ARM: dts: vf-colibri: Enable USB device tree node for Colibri Vybrid configs: colibri_vf_defconfig: Enable USB driver model for Colibri Vybrid Sriram Dash (4): drivers: usb: xhci-fsl: Change burst beat and outstanding pipelined transfers requests usb: fsl: Rename fdt_fixup_dr_usb usb: fsl: Renaming fdt_fixup_erratum and fdt_fixup_usb_erratum drivers: usb: xhci-fsl: Implement Erratum A-010151 for FSL USB3 controller Kconfig | 27 ++++++++++++ arch/arm/cpu/armv7/omap-common/boot-common.c | 5 +++ arch/arm/dts/vf-colibri.dtsi | 11 +++++ arch/arm/dts/vf.dtsi | 14 +++++++ arch/arm/include/asm/arch-omap5/spl.h | 2 +- board/Arcturus/ucp1020/ucp1020.c | 2 +- board/freescale/b4860qds/b4860qds.c | 2 +- board/freescale/bsc9131rdb/bsc9131rdb.c | 2 +- board/freescale/bsc9132qds/bsc9132qds.c | 2 +- board/freescale/corenet_ds/corenet_ds.c | 2 +- board/freescale/ls2080aqds/ls2080aqds.c | 2 +- board/freescale/ls2080ardb/ls2080ardb.c | 2 +- board/freescale/mpc8308rdb/mpc8308rdb.c | 2 +- board/freescale/mpc8315erdb/mpc8315erdb.c | 2 +- board/freescale/mpc837xemds/mpc837xemds.c | 2 +- board/freescale/mpc837xerdb/mpc837xerdb.c | 2 +- board/freescale/mpc8536ds/mpc8536ds.c | 2 +- board/freescale/p1010rdb/p1010rdb.c | 2 +- board/freescale/p1022ds/p1022ds.c | 2 +- board/freescale/p1023rdb/p1023rdb.c | 2 +- board/freescale/p1_p2_rdb_pc/p1_p2_rdb_pc.c | 2 +- board/freescale/p1_twr/p1_twr.c | 2 +- board/freescale/p2041rdb/p2041rdb.c | 2 +- board/freescale/t102xqds/t102xqds.c | 2 +- board/freescale/t102xrdb/t102xrdb.c | 2 +- board/freescale/t1040qds/t1040qds.c | 2 +- board/freescale/t104xrdb/t104xrdb.c | 2 +- board/freescale/t208xqds/t208xqds.c | 2 +- board/freescale/t208xrdb/t208xrdb.c | 2 +- board/freescale/t4qds/t4240emu.c | 2 +- board/freescale/t4qds/t4240qds.c | 2 +- board/freescale/t4rdb/t4240rdb.c | 2 +- board/gdsys/mpc8308/hrcon.c | 2 +- board/gdsys/mpc8308/strider.c | 2 +- board/gdsys/p1022/controlcenterd.c | 2 +- board/keymile/kmp204x/kmp204x.c | 2 +- board/mpc8308_p1m/mpc8308_p1m.c | 2 +- board/varisys/cyrus/cyrus.c | 2 +- cmd/dfu.c | 61 +-------------------------- common/Makefile | 3 ++ common/dfu.c | 92 +++++++++++++++++++++++++++++++++++++++++ common/spl/Makefile | 1 + common/spl/spl.c | 10 ++++- common/spl/spl_dfu.c | 57 +++++++++++++++++++++++++ configs/colibri_vf_defconfig | 1 + drivers/usb/common/fsl-dt-fixup.c | 47 ++++++++++----------- drivers/usb/common/fsl-errata.c | 26 ++++++++++++ drivers/usb/eth/asix.c | 27 ++---------- drivers/usb/host/ehci-vf.c | 208 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- drivers/usb/host/xhci-fsl.c | 23 +++++++++++ include/configs/apalis_t30.h | 2 +- include/configs/colibri_imx7.h | 4 +- include/configs/colibri_t30.h | 2 +- include/configs/dra7xx_evm.h | 20 ++++++++- include/configs/ti_omap5_common.h | 2 - include/fdt_support.h | 4 +- include/fsl_usb.h | 1 + include/g_dnl.h | 1 + include/linux/usb/dwc3.h | 1 + include/linux/usb/xhci-fsl.h | 3 ++ include/spl.h | 8 ++++ scripts/Makefile.spl | 4 ++ 62 files changed, 576 insertions(+), 157 deletions(-) create mode 100644 common/dfu.c create mode 100644 common/spl/spl_dfu.c

2 1