December 2019 - U-Boot

[U-Boot] [PATCH] x86: use data32 directive instead of macro for operand-size prefix
by Masahiro Yamada 03 Dec '19

03 Dec '19

This file defines 'a32' and 'o32' macros to avoid magic numbers of operand/address-size prefixing. GAS supports 'data32' and 'addr32' for that purpose. Signed-off-by: Masahiro Yamada <masahiroy(a)kernel.org> --- arch/x86/cpu/start16.S | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/arch/x86/cpu/start16.S b/arch/x86/cpu/start16.S index 474efe4df5f4..bcabd76741ef 100644 --- a/arch/x86/cpu/start16.S +++ b/arch/x86/cpu/start16.S @@ -13,8 +13,6 @@ #include <asm/processor-flags.h> #define BOOT_SEG 0xffff0000 /* linear segment of boot code */ -#define a32 .byte 0x67; -#define o32 .byte 0x66; .section .start16, "ax" .code16 @@ -33,8 +31,8 @@ start16: wbinvd /* load the temporary Global Descriptor Table */ -o32 cs lidt idt_ptr -o32 cs lgdt gdt_ptr +data32 cs lidt idt_ptr +data32 cs lgdt gdt_ptr /* Now, we enter protected mode */ movl %cr0, %eax @@ -49,7 +47,7 @@ ff: movw $code32start, %ax movw %ax, %bp movl %ecx, %eax -o32 cs ljmp *(%bp) +data32 cs ljmp *(%bp) /* 48-bit far pointer */ code32start: -- 2.17.1

1 0

[U-Boot] pull request u-boot-fsl-qoriq
by Priyanka Jain 03 Dec '19

03 Dec '19

Dear Tom, Please find my pull-request for u-boot-fsl-qoriq/master https://travis-ci.org/p-priyanka-jain/u-boot/builds/618451045 Summary fsl-qoriq : Minor bug fixes and updates on lx2160a, ls1028a, ls1012a, ls1043aqds platforms priyankajain --------------------------------------- The following changes since commit 4b19b89ca4a866b7baa642533e6dbd67cd832d27: Merge tag 'rpi-next-2020.01' of https://github.com/mbgg/u-boot (2019-11-25 12:56:27 -0500) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq.git HEAD for you to fetch changes up to 873d00a3fb066933f40341220fa65414cf2a1416: configs: ls1028a: enable CMD_DM (2019-11-29 10:38:12 +0530) ---------------------------------------------------------------- Alex Marginean (2): configs: ls1028a: enable OF_LIBFDT_OVERLAY configs: ls1028a: enable CMD_DM Biwen Li (1): include/configs: ls1012a: add pfe stop command Pankaj Bansal (1): board: fsl: lx2160a: Fix the typo in board_fix_fdt Priyanka Jain (1): configs/lx2160a: Add CONFIG_ENV_SECT_SIZE in defconfig Wen He (1): armv8: ls1043aqds: modify the qspi_bootcmd definition Yuantian Tang (1): armv8: ls1028a: Add environment variables to facilitate the boot board/freescale/lx2160a/lx2160a.c | 2 +- configs/ls1028aqds_tfa_SECURE_BOOT_defconfig | 2 ++ configs/ls1028aqds_tfa_defconfig | 2 ++ configs/ls1028ardb_tfa_SECURE_BOOT_defconfig | 2 ++ configs/ls1028ardb_tfa_defconfig | 2 ++ configs/lx2160aqds_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2160aqds_tfa_defconfig | 1 + configs/lx2160ardb_tfa_SECURE_BOOT_defconfig | 1 + configs/lx2160ardb_tfa_defconfig | 1 + include/configs/ls1012a2g5rdb.h | 2 +- include/configs/ls1012afrdm.h | 2 +- include/configs/ls1012afrwy.h | 4 ++-- include/configs/ls1012ardb.h | 2 +- include/configs/ls1028a_common.h | 28 +++++++++++++++++++++++++--- include/configs/ls1043a_common.h | 4 ++--

2 2

[U-Boot] [PATCH v4 00/42] common: Further reduce common.h
by Simon Glass 03 Dec '19

03 Dec '19

4 59

[U-Boot] [PULL] u-boot-mips
by Daniel Schwierzeck 03 Dec '19

03 Dec '19

Hi Tom, please pull the removal of the MIPS Micronas VCT boards for 2020.01. Gitlab: https://gitlab.denx.de/u-boot/custodians/u-boot-mips/pipelines/1454 Travis CI: https://travis-ci.org/danielschwierzeck/u-boot/builds/618647984 The following changes since commit 4b19b89ca4a866b7baa642533e6dbd67cd832d27: Merge tag 'rpi-next-2020.01' of https://github.com/mbgg/u-boot (2019-11-25 12:56:27 -0500) are available in the Git repository at: git://git.denx.de/u-boot-mips.git master for you to fetch changes up to 2a250ae9b6f1437f13dba272b690b24341b8e1d7: MIPS: remove Micronas VCT boards (2019-11-29 16:18:35 +0100) ---------------------------------------------------------------- Daniel Schwierzeck (1): MIPS: remove Micronas VCT boards arch/mips/Kconfig | 1 - board/micronas/vct/Kconfig | 52 -- board/micronas/vct/MAINTAINERS | 17 - board/micronas/vct/Makefile | 12 - board/micronas/vct/bcu.h | 156 ------ board/micronas/vct/dcgu.c | 244 --------- board/micronas/vct/dcgu.h | 165 ------ board/micronas/vct/ebi.c | 34 -- board/micronas/vct/ebi.h | 81 --- board/micronas/vct/ebi_nor_flash.c | 117 ----- board/micronas/vct/ebi_onenand.c | 185 ------- board/micronas/vct/ebi_smc911x.c | 94 ---- board/micronas/vct/ehci.c | 96 ---- board/micronas/vct/gpio.c | 74 --- board/micronas/vct/scc.c | 657 ------------------------ board/micronas/vct/scc.h | 191 ------- board/micronas/vct/smc_eeprom.c | 394 -------------- board/micronas/vct/top.c | 275 ---------- board/micronas/vct/vct.c | 119 ----- board/micronas/vct/vct.h | 92 ---- board/micronas/vct/vcth/reg_dcgu.h | 22 - board/micronas/vct/vcth/reg_ebi.h | 228 -------- board/micronas/vct/vcth/reg_fwsram.h | 59 --- board/micronas/vct/vcth/reg_gpio.h | 18 - board/micronas/vct/vcth/reg_scc.h | 88 ---- board/micronas/vct/vcth/reg_usbh.h | 19 - board/micronas/vct/vcth/reg_wdt.h | 10 - board/micronas/vct/vcth2/reg_ebi.h | 276 ---------- board/micronas/vct/vctv/reg_dcgu.h | 11 - board/micronas/vct/vctv/reg_ebi.h | 276 ---------- board/micronas/vct/vctv/reg_gpio.h | 18 - board/micronas/vct/vctv/reg_wdt.h | 10 - configs/vct_platinum_defconfig | 32 -- configs/vct_platinum_onenand_defconfig | 35 -- configs/vct_platinum_onenand_small_defconfig | 35 -- configs/vct_platinum_small_defconfig | 32 -- configs/vct_platinumavc_defconfig | 24 - configs/vct_platinumavc_onenand_defconfig | 27 - configs/vct_platinumavc_onenand_small_defconfig | 35 -- configs/vct_platinumavc_small_defconfig | 32 -- configs/vct_premium_defconfig | 32 -- configs/vct_premium_onenand_defconfig | 35 -- configs/vct_premium_onenand_small_defconfig | 35 -- configs/vct_premium_small_defconfig | 32 -- include/configs/vct.h | 194 ------- 45 files changed, 4671 deletions(-) delete mode 100644 board/micronas/vct/Kconfig delete mode 100644 board/micronas/vct/MAINTAINERS delete mode 100644 board/micronas/vct/Makefile delete mode 100644 board/micronas/vct/bcu.h delete mode 100644 board/micronas/vct/dcgu.c delete mode 100644 board/micronas/vct/dcgu.h delete mode 100644 board/micronas/vct/ebi.c delete mode 100644 board/micronas/vct/ebi.h delete mode 100644 board/micronas/vct/ebi_nor_flash.c delete mode 100644 board/micronas/vct/ebi_onenand.c delete mode 100644 board/micronas/vct/ebi_smc911x.c delete mode 100644 board/micronas/vct/ehci.c delete mode 100644 board/micronas/vct/gpio.c delete mode 100644 board/micronas/vct/scc.c delete mode 100644 board/micronas/vct/scc.h delete mode 100644 board/micronas/vct/smc_eeprom.c delete mode 100644 board/micronas/vct/top.c delete mode 100644 board/micronas/vct/vct.c delete mode 100644 board/micronas/vct/vct.h delete mode 100644 board/micronas/vct/vcth/reg_dcgu.h delete mode 100644 board/micronas/vct/vcth/reg_ebi.h delete mode 100644 board/micronas/vct/vcth/reg_fwsram.h delete mode 100644 board/micronas/vct/vcth/reg_gpio.h delete mode 100644 board/micronas/vct/vcth/reg_scc.h delete mode 100644 board/micronas/vct/vcth/reg_usbh.h delete mode 100644 board/micronas/vct/vcth/reg_wdt.h delete mode 100644 board/micronas/vct/vcth2/reg_ebi.h delete mode 100644 board/micronas/vct/vctv/reg_dcgu.h delete mode 100644 board/micronas/vct/vctv/reg_ebi.h delete mode 100644 board/micronas/vct/vctv/reg_gpio.h delete mode 100644 board/micronas/vct/vctv/reg_wdt.h delete mode 100644 configs/vct_platinum_defconfig delete mode 100644 configs/vct_platinum_onenand_defconfig delete mode 100644 configs/vct_platinum_onenand_small_defconfig delete mode 100644 configs/vct_platinum_small_defconfig delete mode 100644 configs/vct_platinumavc_defconfig delete mode 100644 configs/vct_platinumavc_onenand_defconfig delete mode 100644 configs/vct_platinumavc_onenand_small_defconfig delete mode 100644 configs/vct_platinumavc_small_defconfig delete mode 100644 configs/vct_premium_defconfig delete mode 100644 configs/vct_premium_onenand_defconfig delete mode 100644 configs/vct_premium_onenand_small_defconfig delete mode 100644 configs/vct_premium_small_defconfig delete mode 100644 include/configs/vct.h

2 1

[U-Boot] [PATCH v2] warp7: Fix U-Boot corruption after saving the environment
by Fabio Estevam 03 Dec '19

03 Dec '19

U-Boot binary has grown in such a way that it goes beyond the reserved area for the environment variables. Running "saveenv" followed by a "reset" causes U-Boot to hang because of this overlap. Fix this problem by increasing the CONFIG_ENV_OFFSET size. Also, in order to prevent this same problem in the future, use CONFIG_BOARD_SIZE_LIMIT, which will detect the overlap in build-time. CONFIG_BOARD_SIZE_LIMIT does not accept math expressions, so declare CONFIG_ENV_OFFSET with its direct value instead. Signed-off-by: Fabio Estevam <festevam(a)gmail.com> Acked-by: Pierre-Jean Texier <pjtexier(a)koncepto.io> Tested-by: Pierre-Jean Texier <pjtexier(a)koncepto.io> Acked-by: Joris Offouga <offougajoris(a)gmail.com> Tested-by: Joris Offouga <offougajoris(a)gmail.com> --- Changes since v1: - Rebased against master as CONFIG_ENV_OFFSET has moved to Kconfig configs/warp7_defconfig | 2 +- include/configs/warp7.h | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 72cdb684a7..04a639da6d 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -3,7 +3,7 @@ CONFIG_ARCH_MX7=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_TARGET_WARP7=y CONFIG_ENV_SIZE=0x2000 -CONFIG_ENV_OFFSET=0x80000 +CONFIG_ENV_OFFSET=0xC0000 CONFIG_NR_DRAM_BANKS=1 CONFIG_ARMV7_BOOT_SEC_DEFAULT=y # CONFIG_ARMV7_VIRT is not set diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 9a82581c5f..4b55376f7a 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -125,6 +125,19 @@ #define CONFIG_SYS_INIT_SP_ADDR \ (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) +/* + * Environment starts at CONFIG_ENV_OFFSET= 0xC0000 = 768k = 768*1024 = 786432 + * + * Detect overlap between U-Boot image and environment area in build-time + * + * CONFIG_BOARD_SIZE_LIMIT = CONFIG_ENV_OFFSET - u-boot.imx offset + * CONFIG_BOARD_SIZE_LIMIT = 768k - 1k = 767k = 785408 + * + * Currently CONFIG_BOARD_SIZE_LIMIT does not handle expressions, so + * write the direct value here + */ +#define CONFIG_BOARD_SIZE_LIMIT 785408 + /* I2C configs */ #define CONFIG_SYS_I2C_MXC #define CONFIG_SYS_I2C_SPEED 100000 -- 2.17.1

2 2

[U-Boot] [PATCH v4 1/2] disk: update to use SPL_PARTITIONS for SPL
by Kever Yang 03 Dec '19

03 Dec '19

The SPL disk driver can not depends on SPL_FRAMEWORK & PARTITIONS, which will enable the disk driver when we actually not need it. Use a separate Kconfig to control the partition driver in SPL and fix the issue caused by: Fixes: 91ff686562 ("blk: Rework guard around part_init call") Signed-off-by: Kever Yang <kever.yang(a)rock-chips.com> Reviewed-by: Simon Glass <sjg(a)chromium.org> --- Changes in v4: - format the commit message to ~75 columns. Changes in v3: - update code in blk-uclass.c Changes in v2: - add this patch common/spl/Kconfig | 2 +- disk/Kconfig | 20 ++++++++++++-------- disk/Makefile | 2 +- drivers/block/blk-uclass.c | 2 +- scripts/Makefile.spl | 2 +- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index 5978fb2934..094680e54d 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -544,7 +544,7 @@ config SPL_LIBCOMMON_SUPPORT config SPL_LIBDISK_SUPPORT bool "Support disk partitions" - select PARTITIONS + select SPL_PARTITIONS help Enable support for disk partitions within SPL. 'Disk' is something of a misnomer as it includes non-spinning media such as flash (as diff --git a/disk/Kconfig b/disk/Kconfig index 28fb81c2ee..43e76cb49d 100644 --- a/disk/Kconfig +++ b/disk/Kconfig @@ -4,9 +4,7 @@ menu "Partition Types" config PARTITIONS bool "Enable Partition Labels (disklabels) support" default y - select SPL_SPRINTF if SPL select TPL_SPRINTF if TPL - select SPL_STRTO if SPL select TPL_STRTO if TPL help Partition Labels (disklabels) Supported: @@ -23,6 +21,12 @@ config PARTITIONS you must configure support for at least one non-MTD partition type as well. +config SPL_PARTITIONS + select SPL_SPRINTF + select SPL_STRTO + bool "Enable Partition Labels (disklabels) support for SPL" + depends on SPL + config MAC_PARTITION bool "Enable Apple's MacOS partition table" depends on PARTITIONS @@ -32,7 +36,7 @@ config MAC_PARTITION config SPL_MAC_PARTITION bool "Enable Apple's MacOS partition table for SPL" - depends on SPL && PARTITIONS + depends on SPL_PARTITIONS default y if MAC_PARTITION config DOS_PARTITION @@ -45,7 +49,7 @@ config DOS_PARTITION config SPL_DOS_PARTITION bool "Enable MS Dos partition table for SPL" - depends on SPL && PARTITIONS + depends on SPL_PARTITIONS default y if DOS_PARTITION config ISO_PARTITION @@ -56,7 +60,7 @@ config ISO_PARTITION config SPL_ISO_PARTITION bool "Enable ISO partition table for SPL" - depends on SPL && PARTITIONS + depends on SPL_PARTITIONS config AMIGA_PARTITION bool "Enable AMIGA partition table" @@ -67,7 +71,7 @@ config AMIGA_PARTITION config SPL_AMIGA_PARTITION bool "Enable AMIGA partition table for SPL" - depends on SPL && PARTITIONS + depends on SPL_PARTITIONS default y if AMIGA_PARTITION config EFI_PARTITION @@ -111,7 +115,7 @@ config EFI_PARTITION_ENTRIES_OFF config SPL_EFI_PARTITION bool "Enable EFI GPT partition table for SPL" - depends on SPL && PARTITIONS + depends on SPL_PARTITIONS default y if EFI_PARTITION config PARTITION_UUIDS @@ -125,7 +129,7 @@ config PARTITION_UUIDS config SPL_PARTITION_UUIDS bool "Enable support of UUID for partition in SPL" - depends on SPL && PARTITIONS + depends on SPL_PARTITIONS default y if SPL_EFI_PARTITION config PARTITION_TYPE_GUID diff --git a/disk/Makefile b/disk/Makefile index ccd0335959..92fcc2b4ac 100644 --- a/disk/Makefile +++ b/disk/Makefile @@ -5,7 +5,7 @@ #ccflags-y += -DET_DEBUG -DDEBUG -obj-$(CONFIG_PARTITIONS) += part.o +obj-$(CONFIG_$(SPL_)PARTITIONS) += part.o obj-$(CONFIG_$(SPL_)MAC_PARTITION) += part_mac.o obj-$(CONFIG_$(SPL_)DOS_PARTITION) += part_dos.o obj-$(CONFIG_$(SPL_)ISO_PARTITION) += part_iso.o diff --git a/drivers/block/blk-uclass.c b/drivers/block/blk-uclass.c index c23b6682a6..425ec3259f 100644 --- a/drivers/block/blk-uclass.c +++ b/drivers/block/blk-uclass.c @@ -649,7 +649,7 @@ int blk_unbind_all(int if_type) static int blk_post_probe(struct udevice *dev) { -#if defined(CONFIG_PARTITIONS) && defined(CONFIG_HAVE_BLOCK_DEVICE) +#if CONFIG_IS_ENABLED(PARTITIONS) && defined(CONFIG_HAVE_BLOCK_DEVICE) struct blk_desc *desc = dev_get_uclass_platdata(dev); part_init(desc); diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 7af6b120b6..3535978634 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -82,7 +82,7 @@ else libs-$(CONFIG_SPL_LIBCOMMON_SUPPORT) += common/ cmd/ env/ libs-$(CONFIG_SPL_LIBGENERIC_SUPPORT) += lib/ ifdef CONFIG_SPL_FRAMEWORK -libs-$(CONFIG_PARTITIONS) += disk/ +libs-$(CONFIG_SPL_PARTITIONS) += disk/ endif endif -- 2.17.1

2 5

[U-Boot] [RESEND PATCH v2] dm: serial: Handle "stdout-path" with ":options" correctly
by Bin Meng 03 Dec '19

03 Dec '19

With commit f0921f5098d8 ("fdt: Sync up to the latest libfdt"), SiFive Unleashed board does not boot any more. This was due to the U-Boot local changes commit 77d7fff8cec2 ("fdt: Fix handling of paths with options in them") to libfdt/fdt_ro.c was dropped during the libfdt upgrade. >From the history [1] it was mentioned that the U-Boot changes commit 77d7fff8cec2 ("fdt: Fix handling of paths with options in them") was rejected by libfdt upstream, hence we need find another way to fix the things. This commit uses another method, by updating serial_check_stdout() directly to handle the situation of "stdout-path" with ":options". A simpler way is to change the logic in fdtdec_get_chosen_node() to do similar thing, but I feel that not every property in chosen node may have the option in them, hence it would make more sense to do the special handling in serial_check_stdout() directly. [1]: http://patchwork.ozlabs.org/patch/462756/ Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> Reviewed-by: Simon Glass <sjg(a)chromium.org> --- Changes in v2: - initialize node with -1 at the beginning of serial_check_stdout() for better readability drivers/serial/serial-uclass.c | 36 +++++++++++++++++++----------------- 1 file changed, 19 insertions(+), 17 deletions(-) diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index dcdaede..0f5f1fa 100644 --- a/drivers/serial/serial-uclass.c +++ b/drivers/serial/serial-uclass.c @@ -29,29 +29,31 @@ static const unsigned long baudrate_table[] = CONFIG_SYS_BAUDRATE_TABLE; #if CONFIG_IS_ENABLED(SERIAL_PRESENT) static int serial_check_stdout(const void *blob, struct udevice **devp) { - int node; + int node = -1; + const char *str, *p, *name; + int namelen; /* Check for a chosen console */ - node = fdtdec_get_chosen_node(blob, "stdout-path"); - if (node < 0) { - const char *str, *p, *name; - - /* - * Deal with things like - * stdout-path = "serial0:115200n8"; - * - * We need to look up the alias and then follow it to the - * correct node. - */ - str = fdtdec_get_chosen_prop(blob, "stdout-path"); - if (str) { - p = strchr(str, ':'); - name = fdt_get_alias_namelen(blob, str, - p ? p - str : strlen(str)); + str = fdtdec_get_chosen_prop(blob, "stdout-path"); + if (str) { + p = strchr(str, ':'); + namelen = p ? p - str : strlen(str); + node = fdt_path_offset_namelen(blob, str, namelen); + + if (node < 0) { + /* + * Deal with things like + * stdout-path = "serial0:115200n8"; + * + * We need to look up the alias and then follow it to + * the correct node. + */ + name = fdt_get_alias_namelen(blob, str, namelen); if (name) node = fdt_path_offset(blob, name); } } + if (node < 0) node = fdt_path_offset(blob, "console"); if (!uclass_get_device_by_of_offset(UCLASS_SERIAL, node, devp)) -- 2.7.4

2 3

[U-Boot] [PATCH] spi: cadence_qspi_apb: fix QSPI write issues
by Ooi, Joyce 02 Dec '19

02 Dec '19

From: Chee Hong Ang <chee.hong.ang(a)intel.com> QSPI driver perform chip select on every flash read/write access. The driver need to disable/enable the QSPI controller while performing chip select. This may cause some data lost especially the QSPI controller is configured to run at slower speed as it may take longer time to access the flash device. This patch prevent the driver from disable/enable the QSPI controller too soon and inadvertently halting any ongoing flash read/write access by ensuring the QSPI controller is always in idle mode after each read/write access. Signed-off-by: Chee Hong Ang <chee.hong.ang(a)intel.com> Signed-off-by: Ooi, Joyce <joyce.ooi(a)intel.com> --- drivers/spi/cadence_qspi_apb.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/spi/cadence_qspi_apb.c b/drivers/spi/cadence_qspi_apb.c index 55a7501..ab14a5f 100644 --- a/drivers/spi/cadence_qspi_apb.c +++ b/drivers/spi/cadence_qspi_apb.c @@ -676,6 +676,10 @@ int cadence_qspi_apb_indirect_read_execute(struct cadence_spi_platdata *plat, writel(CQSPI_REG_INDIRECTRD_DONE, plat->regbase + CQSPI_REG_INDIRECTRD); + /* Wait til QSPI is idle */ + if (!cadence_qspi_wait_idle(plat->regbase)) + return -EIO; + return 0; failrd: @@ -782,6 +786,11 @@ int cadence_qspi_apb_indirect_write_execute(struct cadence_spi_platdata *plat, plat->regbase + CQSPI_REG_INDIRECTWR); if (bounce_buf) free(bounce_buf); + + /* Wait til QSPI is idle */ + if (!cadence_qspi_wait_idle(plat->regbase)) + return -EIO; + return 0; failwr: -- 1.9.1

3 2

[U-Boot] [RESEND PATCH] net: tftp: Fix tftp store address check in store_block()
by Bin Meng 02 Dec '19

02 Dec '19

During testing of qemu-riscv32 with a 2GiB memory configuration, tftp always fails with a error message: Load address: 0x84000000 Loading: # TFTP error: trying to overwrite reserved memory... It turns out the result of 'tftp_load_addr + tftp_load_size' just overflows (0x100000000) and the test logic in store_block() fails. Fix this by adjusting the end address to ULONG_MAX when overflow is detected. Fixes: a156c47e39ad ("tftp: prevent overwriting reserved memory") Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- net/tftp.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/net/tftp.c b/net/tftp.c index 5a69bca..1e3c18a 100644 --- a/net/tftp.c +++ b/net/tftp.c @@ -171,8 +171,13 @@ static inline int store_block(int block, uchar *src, unsigned int len) void *ptr; #ifdef CONFIG_LMB + ulong end_addr = tftp_load_addr + tftp_load_size; + + if (!end_addr) + end_addr = ULONG_MAX; + if (store_addr < tftp_load_addr || - store_addr + len > tftp_load_addr + tftp_load_size) { + store_addr + len > end_addr) { puts("\nTFTP error: "); puts("trying to overwrite reserved memory...\n"); return -1; -- 2.7.4

2 3

[U-Boot] [PATCH v4 1/2] common: Add support for Android DT image
by Sam Protsenko 02 Dec '19

02 Dec '19

Android documentation recommends new image format for storing DTB/DTBO files: [1]. To support that format, this patch adds helper functions for Android DTB/DTBO format. In image-android-dt.* files you can find helper functions to work with Android DT image format, such us routines for: - printing the dump of image structure - getting the address and size of desired dtb/dtbo file This patch uses dt_table.h file, that was added in commit 643cefa4d848 ("Import Android's dt_table.h for DT image format") by Alex Deymo. [1] https://source.android.com/devices/architecture/dto/partitions Signed-off-by: Sam Protsenko <semen.protsenko(a)linaro.org> --- Changes in v4: - fix SPDX tags - renamed .reserved[] to .version (just reflect changes in dt_image.h) Changes in v3: - dropped include/dt_image.h (was sent in another patch by Alex Deymo) - rebased on top of last master common/image-android-dt.c | 156 +++++++++++++++++++++++++++++++++++++ include/image-android-dt.h | 20 +++++ 2 files changed, 176 insertions(+) create mode 100644 common/image-android-dt.c create mode 100644 include/image-android-dt.h diff --git a/common/image-android-dt.c b/common/image-android-dt.c new file mode 100644 index 0000000000..c0683ee70f --- /dev/null +++ b/common/image-android-dt.c @@ -0,0 +1,156 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * (C) Copyright 2018 Linaro Ltd. + * Sam Protsenko <semen.protsenko(a)linaro.org> + */ + +#include <image-android-dt.h> +#include <dt_table.h> +#include <common.h> +#include <linux/libfdt.h> +#include <mapmem.h> + +/** + * Check if image header is correct. + * + * @param hdr_addr Start address of DT image + * @return true if header is correct or false if header is incorrect + */ +bool android_dt_check_header(ulong hdr_addr) +{ + const struct dt_table_header *hdr; + u32 magic; + + hdr = map_sysmem(hdr_addr, sizeof(*hdr)); + magic = fdt32_to_cpu(hdr->magic); + unmap_sysmem(hdr); + + return magic == DT_TABLE_MAGIC; +} + +/** + * Get the address of FDT (dtb or dtbo) in memory by its index in image. + * + * @param hdr_addr Start address of DT image + * @param index Index of desired FDT in image (starting from 0) + * @param[out] addr If not NULL, will contain address to specified FDT + * @param[out] size If not NULL, will contain size of specified FDT + * + * @return true on success or false on error + */ +bool android_dt_get_fdt_by_index(ulong hdr_addr, u32 index, ulong *addr, + u32 *size) +{ + const struct dt_table_header *hdr; + const struct dt_table_entry *e; + u32 entry_count, entries_offset, entry_size; + ulong e_addr; + u32 dt_offset, dt_size; + + hdr = map_sysmem(hdr_addr, sizeof(*hdr)); + entry_count = fdt32_to_cpu(hdr->dt_entry_count); + entries_offset = fdt32_to_cpu(hdr->dt_entries_offset); + entry_size = fdt32_to_cpu(hdr->dt_entry_size); + unmap_sysmem(hdr); + + if (index > entry_count) { + printf("Error: index > dt_entry_count (%u > %u)\n", index, + entry_count); + return false; + } + + e_addr = hdr_addr + entries_offset + index * entry_size; + e = map_sysmem(e_addr, sizeof(*e)); + dt_offset = fdt32_to_cpu(e->dt_offset); + dt_size = fdt32_to_cpu(e->dt_size); + unmap_sysmem(e); + + if (addr) + *addr = hdr_addr + dt_offset; + if (size) + *size = dt_size; + + return true; +} + +#if !defined(CONFIG_SPL_BUILD) +static void android_dt_print_fdt_info(const struct fdt_header *fdt) +{ + u32 fdt_size; + int root_node_off; + const char *compatible = NULL; + + fdt_size = fdt_totalsize(fdt); + root_node_off = fdt_path_offset(fdt, "/"); + if (root_node_off < 0) { + printf("Error: Root node not found\n"); + } else { + compatible = fdt_getprop(fdt, root_node_off, "compatible", + NULL); + } + + printf(" (FDT)size = %d\n", fdt_size); + printf(" (FDT)compatible = %s\n", + compatible ? compatible : "(unknown)"); +} + +/** + * Print information about DT image structure. + * + * @param hdr_addr Start address of DT image + */ +void android_dt_print_contents(ulong hdr_addr) +{ + const struct dt_table_header *hdr; + u32 entry_count, entries_offset, entry_size; + u32 i; + + hdr = map_sysmem(hdr_addr, sizeof(*hdr)); + entry_count = fdt32_to_cpu(hdr->dt_entry_count); + entries_offset = fdt32_to_cpu(hdr->dt_entries_offset); + entry_size = fdt32_to_cpu(hdr->dt_entry_size); + + /* Print image header info */ + printf("dt_table_header:\n"); + printf(" magic = %08x\n", fdt32_to_cpu(hdr->magic)); + printf(" total_size = %d\n", fdt32_to_cpu(hdr->total_size)); + printf(" header_size = %d\n", fdt32_to_cpu(hdr->header_size)); + printf(" dt_entry_size = %d\n", entry_size); + printf(" dt_entry_count = %d\n", entry_count); + printf(" dt_entries_offset = %d\n", entries_offset); + printf(" page_size = %d\n", fdt32_to_cpu(hdr->page_size)); + printf(" version = %d\n", fdt32_to_cpu(hdr->version)); + + unmap_sysmem(hdr); + + /* Print image entries info */ + for (i = 0; i < entry_count; ++i) { + const ulong e_addr = hdr_addr + entries_offset + i * entry_size; + const struct dt_table_entry *e; + const struct fdt_header *fdt; + u32 dt_offset, dt_size; + u32 j; + + e = map_sysmem(e_addr, sizeof(*e)); + dt_offset = fdt32_to_cpu(e->dt_offset); + dt_size = fdt32_to_cpu(e->dt_size); + + printf("dt_table_entry[%d]:\n", i); + printf(" dt_size = %d\n", dt_size); + printf(" dt_offset = %d\n", dt_offset); + printf(" id = %08x\n", fdt32_to_cpu(e->id)); + printf(" rev = %08x\n", fdt32_to_cpu(e->rev)); + for (j = 0; j < 4; ++j) { + printf(" custom[%d] = %08x\n", j, + fdt32_to_cpu(e->custom[j])); + } + + unmap_sysmem(e); + + /* Print FDT info for this entry */ + fdt = map_sysmem(hdr_addr + dt_offset, sizeof(*fdt)); + android_dt_print_fdt_info(fdt); + unmap_sysmem(fdt); + } +} +#endif diff --git a/include/image-android-dt.h b/include/image-android-dt.h new file mode 100644 index 0000000000..9a3aa8fa30 --- /dev/null +++ b/include/image-android-dt.h @@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: GPL-2.0+ */ +/* + * (C) Copyright 2018 Linaro Ltd. + * Sam Protsenko <semen.protsenko(a)linaro.org> + */ + +#ifndef IMAGE_ANDROID_DT_H +#define IMAGE_ANDROID_DT_H + +#include <linux/types.h> + +bool android_dt_check_header(ulong hdr_addr); +bool android_dt_get_fdt_by_index(ulong hdr_addr, u32 index, ulong *addr, + u32 *size); + +#if !defined(CONFIG_SPL_BUILD) +void android_dt_print_contents(ulong hdr_addr); +#endif + +#endif /* IMAGE_ANDROID_DT_H */ -- 2.18.0

5 11