February 2020 - U-Boot

[PATCH] net: convert NET_MAXDEFRAG to Kconfig
by Rasmus Villemoes 13 Feb '20

13 Feb '20

Signed-off-by: Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> --- net/Kconfig | 10 ++++++++++ net/net.c | 3 --- scripts/config_whitelist.txt | 1 - 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/net/Kconfig b/net/Kconfig index a07f6746c5..96bbce1778 100644 --- a/net/Kconfig +++ b/net/Kconfig @@ -29,6 +29,16 @@ config IP_DEFRAG Selecting this will enable IP datagram reassembly according to the algorithm in RFC815. +config NET_MAXDEFRAG + int "Size of buffer used for IP datagram reassembly" + depends on IP_DEFRAG + default 16384 + range 1024 65536 + help + This defines the size of the statically allocated buffer + used for reassembly, and thus an upper bound for the size of + IP datagrams that can be received. + config TFTP_BLOCKSIZE int "TFTP block size" default 1468 diff --git a/net/net.c b/net/net.c index 5199d679a1..322b1f81bf 100644 --- a/net/net.c +++ b/net/net.c @@ -882,9 +882,6 @@ int net_send_ip_packet(uchar *ether, struct in_addr dest, int dport, int sport, * to the algorithm in RFC815. It returns NULL or the pointer to * a complete packet, in static storage */ -#ifndef CONFIG_NET_MAXDEFRAG -#define CONFIG_NET_MAXDEFRAG 16384 -#endif #define IP_PKTSIZE (CONFIG_NET_MAXDEFRAG) #define IP_MAXUDP (IP_PKTSIZE - IP_HDR_SIZE) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index cf1808e051..669d0bf65d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1226,7 +1226,6 @@ CONFIG_NETSPACE_LITE_V2 CONFIG_NETSPACE_MAX_V2 CONFIG_NETSPACE_MINI_V2 CONFIG_NETSPACE_V2 -CONFIG_NET_MAXDEFRAG CONFIG_NET_MULTI CONFIG_NET_RETRY_COUNT CONFIG_NEVER_ASSERT_ODT_TO_CPU -- 2.23.0

3 2

[PATCH] test: aes: fix memleak
by Philippe Reynes 13 Feb '20

13 Feb '20

In the first version, the result of malloc is checked with ut_assertnonnull. But on a fail, this macro exit the function, so previously malloc are not freed. So to avoid a memleak, we don't use ut_assertnonnull, but simply check the return of malloc. If one has failed, we freed all the allocated memory and quit the function. Reported-by: Coverity (CID: 284403) Reported-by: Coverity (CID: 284404) Reported-by: Coverity (CID: 284405) Reported-by: Coverity (CID: 284406) Reported-by: Coverity (CID: 284407) Signed-off-by: Philippe Reynes <philippe.reynes(a)softathome.com> --- test/lib/test_aes.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/test/lib/test_aes.c b/test/lib/test_aes.c index b7b4b77..fb8a0b1 100644 --- a/test/lib/test_aes.c +++ b/test/lib/test_aes.c @@ -88,17 +88,17 @@ static int _lib_test_aes_run(struct unit_test_state *uts, int key_len, /* Allocate all the buffer */ key = malloc(key_len); - ut_assertnonnull(key); key_exp = malloc(key_exp_len); - ut_assertnonnull(key_exp); iv = malloc(AES_BLOCK_LENGTH); - ut_assertnonnull(iv); nocipher = malloc(num_block * AES_BLOCK_LENGTH); - ut_assertnonnull(nocipher); ciphered = malloc((num_block + 1) * AES_BLOCK_LENGTH); - ut_assertnonnull(ciphered); uncipher = malloc((num_block + 1) * AES_BLOCK_LENGTH); - ut_assertnonnull(uncipher); + + if (!key || !key_exp || !iv || !nocipher || !ciphered || !uncipher) { + printf("%s: can't allocate memory\n", __func__); + ret = -1; + goto out; + } /* Initialize all buffer */ rand_buf(key, key_len); @@ -127,6 +127,7 @@ static int _lib_test_aes_run(struct unit_test_state *uts, int key_len, ret = -1; }; + out: /* Free all the data */ free(key); free(key_exp); -- 2.7.4

2 1

[PATCH v2 1/1] pci: definition of pci_addr_t and pci_size_t
by Heinrich Schuchardt 13 Feb '20

13 Feb '20

Currently the size of pci_addr_t and pci_size_t depends on CONFIG_SYS_PCI_64BIT. For qemu_arm64_defconfig with 4 GiB RAM this leads to an error pci_hose_phys_to_bus: invalid physical address which is due to the truncation of the bus address in _dm_pci_phys_to_bus. Defining CONFIG_SYS_PCI_64BIT is not a solution as this results in an error PCI: Failed autoconfig bar 10 So let's use unsigned long for pci_addr_t and pci_size_t if CONFIG_SYS_PCI_64BIT is not defined. Considering that 32bit U-Boot is used to launch some 64bit x86 systems we cannot do without CONFIG_SYS_PCI_64BIT requiring u64 as type. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- v2 Do not change CONFIG_SYS_PCI_64BIT=y case. --- include/pci.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/pci.h b/include/pci.h index 8c761d8da3..06a09f8987 100644 --- a/include/pci.h +++ b/include/pci.h @@ -488,8 +488,8 @@ typedef u64 pci_addr_t; typedef u64 pci_size_t; #else -typedef u32 pci_addr_t; -typedef u32 pci_size_t; +typedef unsigned long pci_addr_t; +typedef unsigned long pci_size_t; #endif struct pci_region { -- 2.24.1

3 2

[PATCH] board_f: Make clear_bss generic
by Ovidiu Panait 13 Feb '20

13 Feb '20

clear_bss is already used by 3 arches (x86, arc, xtensa), so make it generic and provide a weak nop stub for it. This also removes arch-specific ifdef duplications around clear_bss. Signed-off-by: Ovidiu Panait <ovpanait(a)gmail.com> --- common/board_f.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/common/board_f.c b/common/board_f.c index 8fa26e3ca5..82a164752a 100644 --- a/common/board_f.c +++ b/common/board_f.c @@ -867,6 +867,11 @@ __weak int checkcpu(void) return 0; } +__weak int clear_bss(void) +{ + return 0; +} + static const init_fnc_t init_sequence_f[] = { setup_mon_len, #ifdef CONFIG_OF_CONTROL @@ -1002,11 +1007,8 @@ static const init_fnc_t init_sequence_f[] = { #if defined(CONFIG_X86) || defined(CONFIG_ARC) copy_uboot_to_ram, do_elf_reloc_fixups, - clear_bss, #endif -#if defined(CONFIG_XTENSA) clear_bss, -#endif #if !defined(CONFIG_ARM) && !defined(CONFIG_SANDBOX) && \ !CONFIG_IS_ENABLED(X86_64) jump_to_copy, -- 2.17.1

2 1

[PATCH] dm: core: Move "/chosen" and "/firmware" node scan
by Patrick Delaunay 13 Feb '20

13 Feb '20

Use the new function dm_scan_fdt_ofnode_path() to scan all the nodes which aren't devices themselves but may contain some: - "/chosen" - "/clocks" - "/firmware" The patch avoid to call strcmp in recursive function dm_scan_fdt_live() and also corrects a conflict with the 2 applied patches in the commit 1712ca21924b ("dm: core: Scan /firmware node by default") and in the commit 747558d01457 ("dm: fdt: scan for devices under /firmware too"): the subnodes of "/firmware" (optee for example) are bound 2 times. For example the dm tree command result on STM32MP1 is: STM32MP> dm tree Class Index Probed Driver Name ----------------------------------------------------------- root 0 [ + ] root_driver root_driver firmware 0 [ ] psci |-- psci sysreset 0 [ ] psci-sysreset | `-- psci-sysreset simple_bus 0 [ + ] generic_simple_bus |-- soc ... tee 0 [ + ] optee |-- optee ... tee 1 [ ] optee `-- optee Serie-cc: Jens Wiklander <jens.wiklander(a)linaro.org> Serie-cc: Rajan Vaja <rajan.vaja(a)xilinx.com> Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> --- drivers/core/root.c | 52 +++++++++++++++------------------------------ 1 file changed, 17 insertions(+), 35 deletions(-) diff --git a/drivers/core/root.c b/drivers/core/root.c index e85643819e..14df16c280 100644 --- a/drivers/core/root.c +++ b/drivers/core/root.c @@ -203,15 +203,6 @@ static int dm_scan_fdt_live(struct udevice *parent, int ret = 0, err; for (np = node_parent->child; np; np = np->sibling) { - /* "chosen" node isn't a device itself but may contain some: */ - if (!strcmp(np->name, "chosen")) { - pr_debug("parsing subnodes of \"chosen\"\n"); - - err = dm_scan_fdt_live(parent, np, pre_reloc_only); - if (err && !ret) - ret = err; - continue; - } if (!of_device_is_available(np)) { pr_debug(" - ignoring disabled device\n"); @@ -256,21 +247,6 @@ static int dm_scan_fdt_node(struct udevice *parent, const void *blob, offset = fdt_next_subnode(blob, offset)) { const char *node_name = fdt_get_name(blob, offset, NULL); - /* - * The "chosen" and "firmware" nodes aren't devices - * themselves but may contain some: - */ - if (!strcmp(node_name, "chosen") || - !strcmp(node_name, "firmware")) { - pr_debug("parsing subnodes of \"%s\"\n", node_name); - - err = dm_scan_fdt_node(parent, blob, offset, - pre_reloc_only); - if (err && !ret) - ret = err; - continue; - } - if (!fdtdec_get_is_enabled(blob, offset)) { pr_debug(" - ignoring disabled device\n"); continue; @@ -315,7 +291,8 @@ int dm_scan_fdt(const void *blob, bool pre_reloc_only) return dm_scan_fdt_node(gd->dm_root, blob, 0, pre_reloc_only); } -static int dm_scan_fdt_ofnode_path(const char *path, bool pre_reloc_only) +static int dm_scan_fdt_ofnode_path(const void *blob, const char *path, + bool pre_reloc_only) { ofnode node; @@ -327,13 +304,18 @@ static int dm_scan_fdt_ofnode_path(const char *path, bool pre_reloc_only) if (of_live_active()) return dm_scan_fdt_live(gd->dm_root, node.np, pre_reloc_only); #endif - return dm_scan_fdt_node(gd->dm_root, gd->fdt_blob, node.of_offset, + return dm_scan_fdt_node(gd->dm_root, blob, node.of_offset, pre_reloc_only); } int dm_extended_scan_fdt(const void *blob, bool pre_reloc_only) { - int ret; + int ret, i; + const char * const nodes[] = { + "/chosen", + "/clocks", + "/firmware" + }; ret = dm_scan_fdt(blob, pre_reloc_only); if (ret) { @@ -341,16 +323,16 @@ int dm_extended_scan_fdt(const void *blob, bool pre_reloc_only) return ret; } - ret = dm_scan_fdt_ofnode_path("/clocks", pre_reloc_only); - if (ret) { - debug("scan for /clocks failed: %d\n", ret); - return ret; + /* Some nodes aren't devices themselves but may contain some */ + for (i = 0; i < ARRAY_SIZE(nodes); i++) { + ret = dm_scan_fdt_ofnode_path(blob, nodes[i], pre_reloc_only); + if (ret) { + debug("dm_scan_fdt() scan for %s failed: %d\n", + nodes[i], ret); + return ret; + } } - ret = dm_scan_fdt_ofnode_path("/firmware", pre_reloc_only); - if (ret) - debug("scan for /firmware failed: %d\n", ret); - return ret; } #endif -- 2.17.1

1 0

[PATCHv6 0/5] Odroid n2 using eMMC would fail to boot up
by Anand Moon 13 Feb '20

13 Feb '20

Here are some small changes to fix booting of Odroid N2 using eMMC. Fixed the clk tunnig during mmc initialization. Added two new patches to fix warning Build and tested on top of below patches [0] https://patchwork.ozlabs.org/patch/1213648/ [1] https://patchwork.ozlabs.org/patch/1213650/ Tested on below eMMC module on Odroid N2 and C2 new orange - eMMC AJNB4R 14.6 GiB MMC 5.1 old back - eMMC CGND3R 58.2 GiB MMC 5.0 Prevoius changes: Fixed the clk tuning as per mainline kernel [3]v1 https://patchwork.ozlabs.org/cover/1201206/ [4]v2 https://patchwork.ozlabs.org/cover/1215217/ [5]v3 https://www.mail-archive.com/u-boot@lists.denx.de/msg351859.html [6]v4 https://patchwork.ozlabs.org/cover/1227205/ [7]v5 https://patchwork.ozlabs.org/cover/1232879/ -Anand Anand Moon (5): mmc: meson-gx: Fix clk phase tuning for MMC mmc: meson-gx: Use proper compatible string as per the dts arm: dts: gx: Move common nodes to the -u-boot.dtsi arm: dts: g12: Move common nodes to the -u-boot.dtsi arm: dts: s400: Move common nodes to the -u-boot.dtsi arch/arm/dts/meson-axg-s400-u-boot.dtsi | 16 +++++ arch/arm/dts/meson-axg-s400.dts | 9 --- arch/arm/dts/meson-g12-common-u-boot.dtsi | 12 ++++ arch/arm/dts/meson-g12a-sei510.dts | 9 --- arch/arm/dts/meson-g12a-u200.dts | 9 --- arch/arm/dts/meson-g12b-odroid-n2.dts | 9 --- arch/arm/dts/meson-gx-u-boot.dtsi | 15 +++++ arch/arm/dts/meson-gxbb-nanopi-k2.dts | 9 --- arch/arm/dts/meson-gxbb-odroidc2.dts | 9 --- arch/arm/dts/meson-gxbb-p20x.dtsi | 9 --- arch/arm/dts/meson-gxl-s805x-libretech-ac.dts | 10 ---- arch/arm/dts/meson-gxl-s905x-khadas-vim.dts | 5 -- arch/arm/dts/meson-gxl-s905x-libretech-cc.dts | 9 --- arch/arm/dts/meson-gxl-s905x-p212.dtsi | 10 ---- arch/arm/dts/meson-gxm-khadas-vim2.dts | 10 ---- arch/arm/dts/meson-khadas-vim3.dtsi | 9 --- arch/arm/dts/meson-sm1-sei610.dts | 9 --- arch/arm/include/asm/arch-meson/sd_emmc.h | 31 +++++++--- drivers/mmc/meson_gx_mmc.c | 58 ++++++++++++++++--- 19 files changed, 114 insertions(+), 143 deletions(-) -- 2.25.0

3 23

[U-Boot] Please pull ARC changes for v2020.04-rc2
by Alexey Brodkin 13 Feb '20

13 Feb '20

Hi Tom, The following changes since commit 26d4d77035d20364afc08c3098581a638b4edda8: Revert "gitlab: Disable SDL when building sandbox" (2020-02-12 08:05:54 -0500) are available in the Git repository at: git@gitlab.denx.de:u-boot/custodians/u-boot-arc.git tags/arc-fixes-for-2020.04-rc2 for you to fetch changes up to 07906b3dad157bd58411664bcc6a2a7976d5e0a9: ARC: Switch to generic accessors (2020-02-12 21:11:13 +0300) ---------------------------------------------------------------- As usual a bit late a couple of tiny fixes and improvements for ARC. 1. Switch from ARC UART to a convenient DW UART on ARC simulation platforms. This became avaialble when nSIM got support of that much more standard UART (starting from nSIM v2019.06). FWIW also available now in Free nSIM [1]. This among other things allows us finally to use the same one binary on all our simulators & FPGA-based emulators. 2. Disable networking support on simulated platforms as there's no network interface in them. 3. Add Virtio net & block devices for the configuration supported by QEMU so that we may leverage those virtual peripherals and in fact it's possible to load uImage from TFTP server and bootm it. 4. Minor fixes for HSDK clocks. 5. Rework of how we chose and use compiler options for ARC-based boards. In real world ARC-based designs are customized more or less but very rarely match any of our "templates" thus it makes not much sense to pretend we have some fixed configs, instead we now will fully reply on a SoC or even board on getting precise set of compiler options preferably even extracted from real HW via "tcfgen" utility. 6. Well and finally yet another simplification - switch to generic written in C accessors which are much more universal and just work for any target supported by the complier as compared to GAS implementation which is much more target-dependent. This one was heavily "inspired" by similar implementation for RISCV and ARM. [1] https://www.synopsys.com/cgi-bin/dwarcnsim/req1.cgi ---------------------------------------------------------------- Alexey Brodkin (4): ARC: nSIM: switch from ARC UART to DW UART ARC: nsim_{700|700be|hs38be}_defconfigs: Disable networking ARC: nsim_hs38: Add support of Virtio NET & BLK ARC: Switch to generic accessors Eugeniy Paltsev (3): CLK: HSDK: Check for PLL bypass firstly CLK: HSDK: fix HDMI clock calculation ARC: rework setting of ARC CPU specific compiler options arch/arc/Kconfig | 4 +-- arch/arc/config.mk | 20 ----------- arch/arc/dts/nsim.dts | 36 +++++++++++++++++--- arch/arc/include/asm/io.h | 204 ++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------- board/abilis/tb100/config.mk | 5 +++ board/synopsys/Kconfig | 9 ----- board/synopsys/axs10x/config.mk | 6 ++++ board/synopsys/emsdp/config.mk | 2 +- board/synopsys/hsdk/config.mk | 4 +++ board/synopsys/iot_devkit/config.mk | 3 +- board/synopsys/nsim/Kconfig | 21 ++++++++++++ board/synopsys/nsim/MAINTAINERS | 6 ++++ board/synopsys/nsim/Makefile | 7 ++++ board/synopsys/nsim/config.mk | 8 +++++ board/synopsys/nsim/nsim.c | 26 +++++++++++++++ configs/nsim_700_defconfig | 10 +++--- configs/nsim_700be_defconfig | 10 +++--- configs/nsim_hs38_defconfig | 18 +++++++--- configs/nsim_hs38be_defconfig | 10 +++--- drivers/clk/clk-hsdk-cgu.c | 37 +++++++++++++-------- 20 files changed, 250 insertions(+), 196 deletions(-) create mode 100644 board/abilis/tb100/config.mk delete mode 100644 board/synopsys/Kconfig create mode 100644 board/synopsys/nsim/Kconfig create mode 100644 board/synopsys/nsim/MAINTAINERS create mode 100644 board/synopsys/nsim/Makefile create mode 100644 board/synopsys/nsim/config.mk create mode 100644 board/synopsys/nsim/nsim.c Regards, Alexey

2 1

[ANN] U-Boot v2020.04-rc2 released
by Tom Rini 13 Feb '20

13 Feb '20

Hey all, First, I drafted this email and tagged and pushed everything out yesterday and then promptly forgot to send this. Sorry! Second, I know I'm slightly late but the DM PR slipped my mind at first and then slipped in a regression. That's fixed and overnight all of the different CI systems went green so here we are. There's a number of little fixes out there I believe and I'm appreciative of everyone taking the time to drop fdt_high=0xff... and I hope those patches can come all the way in. Once again, for a changelog, git log --merges v2020.04-rc1..v2020.04-rc2 and as always, I ask for more details in the PRs people send me so I can put them in the merge commit. I'm planning to follow the every-other-week RC schedule and release on April 6th. I'm also thinking about opening -next again on March 9th as that will give us a bit more time to focus on stability and regression fixing. Thanks all! -- Tom

1 0

[PATCH] arm: dts: sort armada alphabetically
by Josip Kelecic 13 Feb '20

13 Feb '20

Signed-off-by: Josip Kelečić <josip.kelecic(a)sartura.hr> Cc: Luka Perkov <luka.perkov(a)sartura.hr> --- arch/arm/dts/Makefile | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile index 4fee5cc489..634197bf35 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -188,25 +188,25 @@ dtb-$(CONFIG_ARCH_MVEBU) += \ armada-3720-turris-mox.dtb \ armada-3720-uDPU.dtb \ armada-375-db.dtb \ + armada-385-atl-x530.dtb \ + armada-385-atl-x530DP.dtb \ + armada-385-db-88f6820-amc.dtb \ + armada-385-turris-omnia.dtb \ armada-388-clearfog.dtb \ armada-388-gp.dtb \ armada-388-helios4.dtb \ - armada-385-db-88f6820-amc.dtb \ - armada-385-turris-omnia.dtb \ - armada-7040-db.dtb \ + armada-38x-controlcenterdc.dtb \ armada-7040-db-nand.dtb \ + armada-7040-db.dtb \ + armada-8040-clearfog-gt-8k.dtb \ armada-8040-db.dtb \ armada-8040-mcbin.dtb \ - armada-8040-clearfog-gt-8k.dtb \ + armada-xp-crs305-1g-4s.dtb \ + armada-xp-db-xc3-24g4xg.dtb \ armada-xp-gp.dtb \ armada-xp-maxbcm.dtb \ armada-xp-synology-ds414.dtb \ - armada-xp-theadorable.dtb \ - armada-38x-controlcenterdc.dtb \ - armada-385-atl-x530.dtb \ - armada-385-atl-x530DP.dtb \ - armada-xp-db-xc3-24g4xg.dtb \ - armada-xp-crs305-1g-4s.dtb + armada-xp-theadorable.dtb dtb-$(CONFIG_ARCH_UNIPHIER_LD11) += \ uniphier-ld11-global.dtb \ -- 2.24.1

1 0

[PATCH 0/7] ESM support for TI K3 SoCs
by Tero Kristo 13 Feb '20

13 Feb '20

Hi, This series introduces ESM (Error Signaling Module) drivers for TI K3 generation of SoCs. These are used to handle SoC internal HW error events from various sources, and they can either trigger an error interrupt for SW to handle, or trigger a HW event which can be routed to e.g. PMIC to trigger full device reset. In this series, the watchdog expire events are routed to an error event pin, which is handled by PMIC resetting the J721e board. AM65x boards are not handled, as they currently don't support HW routing of the signals. -Tero -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

2 11