October 2018 - U-Boot

[U-Boot] [PATCH] arm: socfpga: check total size of SPL
by Simon Goldschmidt 02 Nov '18

02 Nov '18

Correctly define CONFIG_SPL_MAX_FOOTPRINT to make the default arm linker script for SPL check the total SRAM size available for SPL (code, data, bss, heap, global data). The previously existing define CONFIG_SPL_MAX_SIZE seems to only check the binary size (which is without bss, heap and gd). Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt(a)gmail.com> --- include/configs/socfpga_common.h | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 2330143cf1..9103d0a966 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -242,6 +242,13 @@ unsigned int cm_get_qspi_controller_clk_hz(void); #define CONFIG_SPL_TEXT_BASE CONFIG_SYS_INIT_RAM_ADDR #define CONFIG_SPL_MAX_SIZE CONFIG_SYS_INIT_RAM_SIZE +/* Check total size of SPL including BSS, malloc area and gd */ +#include <generated/generic-asm-offsets.h> +#define CONFIG_SPL_MAX_FOOTPRINT (CONFIG_SYS_INIT_SP_ADDR - \ + CONFIG_SYS_INIT_RAM_ADDR - \ + CONFIG_SYS_MALLOC_F_LEN - \ + GENERATED_GBL_DATA_SIZE) + #if defined(CONFIG_TARGET_SOCFPGA_ARRIA10) /* SPL memory allocation configuration, this is for FAT implementation */ #ifndef CONFIG_SYS_SPL_MALLOC_START -- 2.17.1

3 12

[U-Boot] [PATCH] arm: ti: boot: Don't read environment partition
by Sam Protsenko 02 Nov '18

02 Nov '18

This part should've been remove in commit 88d60db01168 ("arm: ti: boot: Remove environment partition"), but I missed it somehow. Remove reading dtb file from environment partition on eMMC, as we don't have it anymore. Signed-off-by: Sam Protsenko <semen.protsenko(a)linaro.org> --- include/environment/ti/boot.h | 1 - 1 file changed, 1 deletion(-) diff --git a/include/environment/ti/boot.h b/include/environment/ti/boot.h index 560753ae4c..3c9c87f21b 100644 --- a/include/environment/ti/boot.h +++ b/include/environment/ti/boot.h @@ -93,7 +93,6 @@ AVB_VERIFY_CHECK \ "part start mmc ${mmcdev} boot boot_start; " \ "part size mmc ${mmcdev} boot boot_size; " \ - "mmc read ${fdtaddr} ${fdt_start} ${fdt_size}; " \ "mmc read ${loadaddr} ${boot_start} ${boot_size}; " \ "bootm ${loadaddr}#${fdtfile};\0 " -- 2.19.1

2 1

[U-Boot] [PATCH] test: tee: fix resource leak in dm_test_tee()
by Jens Wiklander 02 Nov '18

02 Nov '18

Fixes possible resource leak in dm_test_tee() reported by Coverity. Reported-by: Coverity (CID: 184175) Signed-off-by: Jens Wiklander <jens.wiklander(a)linaro.org> --- test/dm/tee.c | 35 ++++++++++++++++++++++++++--------- 1 file changed, 26 insertions(+), 9 deletions(-) diff --git a/test/dm/tee.c b/test/dm/tee.c index 13e3f4003a7d..22f05a421978 100644 --- a/test/dm/tee.c +++ b/test/dm/tee.c @@ -49,7 +49,12 @@ static int match(struct tee_version_data *vers, const void *data) return vers->gen_caps & TEE_GEN_CAP_GP; } -static int dm_test_tee(struct unit_test_state *uts) +struct test_tee_vars { + struct tee_shm *reg_shm; + struct tee_shm *alloc_shm; +}; + +static int test_tee(struct unit_test_state *uts, struct test_tee_vars *vars) { struct tee_version_data vers; struct udevice *dev; @@ -57,8 +62,6 @@ static int dm_test_tee(struct unit_test_state *uts) u32 session = 0; int rc; u8 data[128]; - struct tee_shm *reg_shm; - struct tee_shm *alloc_shm; dev = tee_find_device(NULL, match, NULL, &vers); ut_assert(dev); @@ -77,22 +80,36 @@ static int dm_test_tee(struct unit_test_state *uts) ut_assert(!state->session); ut_assert(!state->num_shms); - rc = tee_shm_register(dev, data, sizeof(data), 0, &reg_shm); + rc = tee_shm_register(dev, data, sizeof(data), 0, &vars->reg_shm); ut_assert(!rc); ut_assert(state->num_shms == 1); - rc = tee_shm_alloc(dev, 256, 0, &alloc_shm); + rc = tee_shm_alloc(dev, 256, 0, &vars->alloc_shm); ut_assert(!rc); ut_assert(state->num_shms == 2); - ut_assert(tee_shm_is_registered(reg_shm, dev)); - ut_assert(tee_shm_is_registered(alloc_shm, dev)); + ut_assert(tee_shm_is_registered(vars->reg_shm, dev)); + ut_assert(tee_shm_is_registered(vars->alloc_shm, dev)); - tee_shm_free(reg_shm); - tee_shm_free(alloc_shm); + tee_shm_free(vars->reg_shm); + vars->reg_shm = NULL; + tee_shm_free(vars->alloc_shm); + vars->alloc_shm = NULL; ut_assert(!state->num_shms); return 0; } +static int dm_test_tee(struct unit_test_state *uts) +{ + struct test_tee_vars vars = { NULL, NULL }; + int rc = test_tee(uts, &vars); + + /* In case test_tee() asserts these may still remain allocated */ + tee_shm_free(vars.reg_shm); + tee_shm_free(vars.alloc_shm); + + return rc; +} + DM_TEST(dm_test_tee, DM_TESTF_SCAN_FDT); -- 2.17.1

2 1

[U-Boot] [PATCH] cmd: remove CONFIG_SOURCE support in Makefile
by Patrick Delaunay 02 Nov '18

02 Nov '18

This line is no more needed and can be removed. Only CONFIG_CMD_SOURCE is defined in Kconfig and used in defconfig files. CONFIG_SOURCE if not defined in source code and "config SOURCE" is not present in any Kconfig. Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> --- cmd/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/cmd/Makefile b/cmd/Makefile index d9cdaf6..ac4830a 100644 --- a/cmd/Makefile +++ b/cmd/Makefile @@ -15,7 +15,6 @@ obj-$(CONFIG_CMD_AES) += aes.o obj-$(CONFIG_CMD_ADC) += adc.o obj-$(CONFIG_CMD_ARMFLASH) += armflash.o obj-y += blk_common.o -obj-$(CONFIG_SOURCE) += source.o obj-$(CONFIG_CMD_SOURCE) += source.o obj-$(CONFIG_CMD_BDI) += bdinfo.o obj-$(CONFIG_CMD_BEDBUG) += bedbug.o -- 2.7.4

2 1

[U-Boot] [PATCH] power: spl: add SPL_DM_REGULATOR_GPIO in Kconfig
by Lokesh Vutla 02 Nov '18

02 Nov '18

The Makefile already tests for SPL_DM_REGULATOR_GPIO, but Kconfig does not provide it. This adds SPL_DM_REGULATOR_GPIO to Kconfig. Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- drivers/power/regulator/Kconfig | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/power/regulator/Kconfig b/drivers/power/regulator/Kconfig index 414f4a53f7..2561a8a856 100644 --- a/drivers/power/regulator/Kconfig +++ b/drivers/power/regulator/Kconfig @@ -86,12 +86,19 @@ config SPL_DM_REGULATOR_FIXED config DM_REGULATOR_GPIO bool "Enable Driver Model for GPIO REGULATOR" - depends on DM_REGULATOR + depends on DM_REGULATOR && DM_GPIO ---help--- This config enables implementation of driver-model regulator uclass features for gpio regulators. The driver implements get/set for voltage value. +config SPL_DM_REGULATOR_GPIO + bool "Enable Driver Model for GPIO REGULATOR in SPL" + depends on DM_REGULATOR_GPIO && SPL_GPIO_SUPPORT + ---help--- + This config enables implementation of driver-model regulator uclass + features for gpio regulators in SPL. + config REGULATOR_RK8XX bool "Enable driver for RK8XX regulators" depends on DM_REGULATOR && PMIC_RK8XX -- 2.19.1

2 1

[U-Boot] [PATCH] cmd: remoteproc: Fix the base of strtoul for ID conversion from 3 to 10
by Keerthy 02 Nov '18

02 Nov '18

Currently the base is 3 fix it 10 so that IDs follow decimal system. Signed-off-by: Keerthy <j-keerthy(a)ti.com> --- cmd/remoteproc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmd/remoteproc.c b/cmd/remoteproc.c index 9aebfc2..81463f3 100644 --- a/cmd/remoteproc.c +++ b/cmd/remoteproc.c @@ -120,7 +120,7 @@ static int do_remoteproc_load(cmd_tbl_t *cmdtp, int flag, int argc, if (argc != 4) return CMD_RET_USAGE; - id = (int)simple_strtoul(argv[1], NULL, 3); + id = (int)simple_strtoul(argv[1], NULL, 10); addr = simple_strtoul(argv[2], NULL, 16); size = simple_strtoul(argv[3], NULL, 16); @@ -163,7 +163,7 @@ static int do_remoteproc_wrapper(cmd_tbl_t *cmdtp, int flag, int argc, if (argc != 2) return CMD_RET_USAGE; - id = (int)simple_strtoul(argv[1], NULL, 3); + id = (int)simple_strtoul(argv[1], NULL, 10); if (!rproc_is_initialized()) { printf("\tRemote Processors are not initialized\n"); -- 1.9.1

3 2

[U-Boot] [PATCH] configs: sama5d2_ptc_ek: read environment from FAT
by Andrei.Stefanescu＠microchip.com 02 Nov '18

02 Nov '18

On our demo setup for SD card boot, the u-boot environment is in a FAT partition. This patch changes the default configuration, specifing that the u-boot environment is in a FAT partition instead of raw MMC. Signed-off-by: Andrei Stefanescu <andrei.stefanescu(a)microchip.com> --- configs/sama5d2_ptc_ek_mmc_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/sama5d2_ptc_ek_mmc_defconfig b/configs/sama5d2_ptc_ek_mmc_defconfig index c378465..83d3fb6 100644 --- a/configs/sama5d2_ptc_ek_mmc_defconfig +++ b/configs/sama5d2_ptc_ek_mmc_defconfig @@ -30,7 +30,7 @@ CONFIG_CMD_PING=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_OF_CONTROL=y -CONFIG_ENV_IS_IN_MMC=y +CONFIG_ENV_IS_IN_FAT=y CONFIG_DM=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_CLK=y -- 2.7.4

3 2

[U-Boot] [PATCH] configs: at91: at91sam9x5ek: fix bootcmd for NAND flash
by Eugen.Hristev＠microchip.com 02 Nov '18

02 Nov '18

The default bootcommand needs to be accurate w.r.t the nand memory map at http://www.at91.com/linux4sam/bin/view/Linux4SAM/AT91sam9x5ekMainPage#NAND_… Updated to load kernel + dtb at right offsets and boot the zImage. Signed-off-by: Eugen Hristev <eugen.hristev(a)microchip.com> --- include/configs/at91sam9x5ek.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index d48b7d0..63305a7 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -85,8 +85,9 @@ #define CONFIG_ENV_OFFSET_REDUND 0x100000 #define CONFIG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */ #define CONFIG_BOOTCOMMAND "nand read " \ - "0x22000000 0x200000 0x300000; " \ - "bootm 0x22000000" + "0x22000000 0x200000 0x600000; " \ + "nand read 0x21000000 0x180000 0x20000; " \ + "bootz 0x22000000 - 0x21000000" #elif defined(CONFIG_SPI_BOOT) /* bootstrap + u-boot + env + linux in spi flash */ #define CONFIG_ENV_OFFSET 0x5000 -- 2.7.4

2 1

[U-Boot] [PATCH] w1-eeprom: ds24xxx: fix data abort in ds24xxx_probe()
by Martin Fuzzey 02 Nov '18

02 Nov '18

Data abort was occurring when using "w1 bus" with a DS24B33 present. The abort occurred in the ds24xxx_probe() because the struct w1_device pointer was NULL. This is because that structure is allocated by the parent device uclass (by .per_child_platdata_auto_alloc_size) and thus the correct accessor is dev_get_parent_platdata() not dev_get_platdata() Signed-off-by: Martin Fuzzey <martin.fuzzey(a)flowbird.group> --- drivers/w1-eeprom/ds24xxx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/w1-eeprom/ds24xxx.c b/drivers/w1-eeprom/ds24xxx.c index 56186e5..0967acc 100644 --- a/drivers/w1-eeprom/ds24xxx.c +++ b/drivers/w1-eeprom/ds24xxx.c @@ -31,7 +31,7 @@ static int ds24xxx_probe(struct udevice *dev) { struct w1_device *w1; - w1 = dev_get_platdata(dev); + w1 = dev_get_parent_platdata(dev); w1->id = 0; return 0; } -- 1.9.1

3 7

[U-Boot] [PATCH v6 0/5] dma: add channels support
by Grygorii Strashko 02 Nov '18

02 Nov '18

Hi All, This series is the next try to add DMA channels support for DMA controllers which last version was posted by Álvaro Fernández Rojas [1]. i've kept version numbering. Comparing to the original post I've added few changes: - added possibility to pass DMA driver/channel's specific data per each transfer using additional parameter "metadata" in dma_send/dma_receive() API. For example, port number for network packets to be directed to the specific port on multi port ethernet controllers. - added new dma_prepare_rcv_buf() API which allows to implement zero-copy DEV_TO_MEM transfer using DMA streaming channels which is usual case for Networking. - added dma-uclass test - removed unused function dma_get_by_index_platdata() - updated comments Hence, originally DMA channels support was introduced to add support for "bmips: add bcm6348-enet support" - that series can be easily updated following DMA channels API changes (if still actual). Patches 5-6 - Here I'm providing DMA and networking drivers for the new TI AM65x SoC [2] as an illustration of DMA channels API usage only. Unfortunately, those drivers are still under development so NOT-FOR-MERGE (!will not build!) - we'd like code/bindings to be accepted in LKML first. Full sources can be found at [3]. [1] https://patchwork.ozlabs.org/cover/881642/ [2] http://www.ti.com/lit/ug/spruid7b/spruid7b.pdf [3] git@git.ti.com:~gragst/ti-u-boot/gragsts-ti-u-boot.git branch: master-am6-dma-wip === A DMA is a feature of computer systems that allows certain hardware subsystems to access main system memory, independent of the CPU. DMA channels are typically generated externally to the HW module consuming them, by an entity this API calls a DMA provider. This API provides a standard means for drivers to enable and disable DMAs, and to copy, send and receive data using DMA. DMA channel API: dma_get_by_index() dma_get_by_name() dma_request() dma_free() dma_enable() dma_disable() dma_prepare_rcv_buf() dma_receive() dma_send() A driver that implements UCLASS_DMA is a DMA provider. A provider will often implement multiple separate DMAs channels, since the hardware it manages often has this capability. dma_uclass.h describes the interface which DMA providers must implement. DMA consumers/clients are the HW modules driven by the DMA channels. DMA consumer DMA_MEM_TO_DEV (transmit) usage example (based on networking). Note. In u-boot dma_send() is sync operation always - it'll start transfer and will poll for it to complete: - get/request dma channel struct dma dma_tx; ret = dma_get_by_name(common->dev, "tx0", &dma_tx); if (ret) ... - enable dma channel ret = dma_enable(&dma_tx); if (ret) ... - dma transmit DMA_MEM_TO_DEV. struct ti_drv_packet_data packet_data; packet_data.opt1 = val1; packet_data.opt2 = val2; ret = dma_send(&dma_tx, packet, length, &packet_data); if (ret) .. DMA consumer DMA_DEV_TO_MEM (receive) usage example (based on networking). Note. dma_receive() is sync operation always - it'll start transfer (if required) and will poll for it to complete (or for any previously configured dev2mem transfer to complete): - get/request dma channel struct dma dma_rx; ret = dma_get_by_name(common->dev, "rx0", &dma_rx); if (ret) ... - enable dma channel ret = dma_enable(&dma_rx); if (ret) ... - dma receive DMA_DEV_TO_MEM. struct ti_drv_packet_data packet_data; len = dma_receive(&dma_rx, (void **)packet, &packet_data); if (ret < 0) ... DMA consumer DMA_DEV_TO_MEM (receive) zero-copy usage example (based on networking). Networking subsystem allows to configure and use few receive buffers (dev2mem), as Networking RX DMA channels usually implemented as streaming interface - get/request dma channel struct dma dma_rx; ret = dma_get_by_name(common->dev, "rx0", &dma_rx); if (ret) ... for (i = 0; i < RX_DESC_NUM; i++) { ret = dma_prepare_rcv_buf(&dma_rx, net_rx_packets[i], RX_BUF_SIZE); if (ret) ... } - enable dma channel ret = dma_enable(&dma_rx); if (ret) ... - dma receive DMA_DEV_TO_MEM. struct ti_drv_packet_data packet_data; void *packet; len = dma_receive(&dma_rx, &packet, &packet_data); if (ret < 0) .. /* packet - points on buffer prepared by dma_prepare_rcv_buf(). process packet*/ - return buffer back to DAM channel ret = dma_prepare_rcv_buf(&dma_rx, net_rx_packets[rx_next], RX_BUF_SIZE); Grygorii Strashko (2): test: dma: add dma-uclass test net: ethernet: ti: introduce am654 gigabit eth switch subsystem driver Vignesh R (1): dma: ti: add driver to K3 UDMA Álvaro Fernández Rojas (2): dma: move dma_ops to dma-uclass.h dma: add channels support arch/sandbox/dts/test.dts | 8 + configs/sandbox_defconfig | 3 + drivers/dma/Kconfig | 16 + drivers/dma/Makefile | 3 + drivers/dma/dma-uclass.c | 183 +++- drivers/dma/sandbox-dma-test.c | 284 +++++++ drivers/dma/ti-edma3.c | 2 +- drivers/dma/ti/Kconfig | 14 + drivers/dma/ti/Makefile | 3 + drivers/dma/ti/k3-udma-hwdef.h | 184 ++++ drivers/dma/ti/k3-udma.c | 1661 +++++++++++++++++++++++++++++++++++++ drivers/net/Kconfig | 8 + drivers/net/Makefile | 1 + drivers/net/am65-cpsw-nuss.c | 962 +++++++++++++++++++++ include/dma-uclass.h | 128 +++ include/dma.h | 282 ++++++- include/dt-bindings/dma/k3-udma.h | 26 + include/linux/soc/ti/ti-udma.h | 24 + test/dm/Makefile | 1 + test/dm/dma.c | 121 +++ 20 files changed, 3884 insertions(+), 30 deletions(-) create mode 100644 drivers/dma/sandbox-dma-test.c create mode 100644 drivers/dma/ti/Kconfig create mode 100644 drivers/dma/ti/Makefile create mode 100644 drivers/dma/ti/k3-udma-hwdef.h create mode 100644 drivers/dma/ti/k3-udma.c create mode 100644 drivers/net/am65-cpsw-nuss.c create mode 100644 include/dma-uclass.h create mode 100644 include/dt-bindings/dma/k3-udma.h create mode 100644 include/linux/soc/ti/ti-udma.h create mode 100644 test/dm/dma.c -- 2.10.5

2 8