April 2020 - U-Boot

[PATCH] rtc: ds1374: typo Watchdog
by Heinrich Schuchardt 26 Apr '20

26 Apr '20

%s/Watchdoc/Watchdog/ Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- drivers/rtc/ds1374.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/rtc/ds1374.c b/drivers/rtc/ds1374.c index 5a2060fe75..9f2647d707 100644 --- a/drivers/rtc/ds1374.c +++ b/drivers/rtc/ds1374.c @@ -58,7 +58,7 @@ #define RTC_CTL_BIT_RS2 (1<<2) /* Bit 2/2 - Rate Select square wave output */ #define RTC_CTL_BIT_WDSTR (1<<3) /* Bit 3 - Watchdog Reset Steering */ #define RTC_CTL_BIT_BBSQW (1<<4) /* Bit 4 - Battery-Backed Square-Wave */ -#define RTC_CTL_BIT_WD_ALM (1<<5) /* Bit 5 - Watchdoc/Alarm Counter Select */ +#define RTC_CTL_BIT_WD_ALM (1<<5) /* Bit 5 - Watchdog/Alarm Counter Select */ #define RTC_CTL_BIT_WACE (1<<6) /* Bit 6 - Watchdog/Alarm Counter Enable WACE*/ #define RTC_CTL_BIT_EN_OSC (1<<7) /* Bit 7 - Enable Oscilator */ -- 2.25.1

2 1

[PATCH] spi: mpc8xxx_spi: fix missing dev_err definition
by Rasmus Villemoes 26 Apr '20

26 Apr '20

The build currently fails with drivers/spi/mpc8xxx_spi.c:64:3: warning: implicit declaration of function ‘dev_err’ [-Wimplicit-function-declaration] ... drivers/spi/built-in.o: In function `mpc8xxx_spi_set_speed': drivers/spi/mpc8xxx_spi.c:227: undefined reference to `dev_err' Fixes: 4856cc7a97 (mpc8xxx_spi: implement real ->set_speed) Fixes: 1a7b462dee (mpc8xxx_spi: put max_cs to use) Signed-off-by: Rasmus Villemoes <rasmus.villemoes(a)prevas.dk> --- Those patches got into -rc5, but I hadn't noticed commit 336d4615f8fa (dm: core: Create a new header file for 'compat' features) from -rc2. Sorry about this. Probably no buildbot caught it before release because no in-tree defconfig sets CONFIG_MPC8XXX_SPI=y. drivers/spi/mpc8xxx_spi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/spi/mpc8xxx_spi.c b/drivers/spi/mpc8xxx_spi.c index 1bde31ad34..e48debb045 100644 --- a/drivers/spi/mpc8xxx_spi.c +++ b/drivers/spi/mpc8xxx_spi.c @@ -12,6 +12,7 @@ #include <spi.h> #include <asm/mpc8xxx_spi.h> #include <asm-generic/gpio.h> +#include <dm/device_compat.h> enum { SPI_EV_NE = BIT(31 - 22), /* Receiver Not Empty */ -- 2.23.0

2 1

[PATCH 1/1] spl: fit: do not check argument of free()
by Heinrich Schuchardt 26 Apr '20

26 Apr '20

The free() function checks if its argument is NULL. It is superfluous to do the same check on the calling side. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- common/spl/spl_fit.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/common/spl/spl_fit.c b/common/spl/spl_fit.c index 69dabd27f6..c51e4beb1c 100644 --- a/common/spl/spl_fit.c +++ b/common/spl/spl_fit.c @@ -425,8 +425,7 @@ static int spl_fit_append_fdt(struct spl_image_info *spl_image, debug("%s: DT overlay %s applied\n", __func__, fit_get_name(fit, node, NULL)); } - if (tmpbuffer) - free(tmpbuffer); + free(tmpbuffer); if (ret) return ret; } -- 2.25.1

2 1

[PATCH v11 00/13] Actions S700 SoC support
by Amit Singh Tomar 26 Apr '20

26 Apr '20

This adds Cubieboard7[1] support based on Action Semi's S700 SoC[2], It's Quad-core ARMv8 SoC with Cortex-A53 cores. Peripheral like UART seems to be compatible with S900 SoC(basic support for it is alreay present in u-boot). This series(v11) takes care of the issues(breaks few boards unfortunately) pointed out by Tom. Changes has been made to patches 10/13 and 11/13 and some of config options is moved from arch/arm/mach-owl/Kconfig to appropriate config files. Apart from it, new patch 13/13 is added that updates MAINTAINER file with cubieboard7_defconfig entry. Previous series(v10) takes care the commments provided by Mani and patches 04/12, 07/12 and 12/12 has been changed to address those comments. Series(v9) fixes a Bug that breaks bubblegum96 board boot(reported by Mani). It was due to fact that driver data read is not proper in the clock driver. There are changes in patch 06/12 to fix it. Series(v8) removes the SoC specific include instead just uses owl-common. For this patch 01/12 and 09/12 changes a bit. Series(v7) fixes a serious Bug that breaks S900, it was there since v5.Thanks to Andre for pointing it out. Series(v6)[3] does following changes: * [PATCH v5 06/11] becomes [PATCH v6 03/11] * [PATCH v5 03/11] becomes [PATCH v6 04/11] * Introduce a new patch to move defconfig options to Kconfig which is [PATCH v6 10/12] Series(v5)[4] just re-orders the patches so that U-BOOT(with bubblegum96_defconfig) builds after every patch of the series(suggested by Andre). S700 support is tested[5] on Cubieboard7-lite board and S900 support is just compiled tested. This patch series can be tested using below tree: https://github.com/Atomar25/u-boot/commits/s700_v10 [1]: http://www.cubietech.com/product-detail/cubieboard7/ [2]: http://www.actions-semi.com/en/productview.aspx?id=225 [3]: http://u-boot.10912.n7.nabble.com/PATCH-v6-00-12-Actions-S700-SoC-support-t… [4]: http://u-boot.10912.n7.nabble.com/PATCH-v5-00-11-Actions-S700-SoC-support-t… [5]: https://paste.ubuntu.com/p/4nhCWryRNR/ Amit Singh Tomar (13): arm: actions: Add common framework for Actions Owl Semi SoCs arm: actions: rename sysmap-s900 to sysmap-owl serial: actions: add compatible string arm: dts: sync dts for Action Semi S900 arm: dts: actions: s900: add u-boot specific dtsi file clk: actions: Add common clock driver arm: actions: add S700 SoC device tree arm: dts: actions: s700: add u-boot specific dtsi file arm: add support Actions Semi S700 actions: Move defconfig options to Kconfig arm: add Cubieboard7 board support doc: boards: add Cubieboard7 documentation MAINTAINERS: add entry for cubieboard7 config Kconfig | 2 +- MAINTAINERS | 4 +- arch/arm/Kconfig | 6 +- arch/arm/dts/Makefile | 4 +- arch/arm/dts/s700-cubieboard7.dts | 92 +++++++ arch/arm/dts/s700-u-boot.dtsi | 18 ++ arch/arm/dts/s700.dtsi | 248 +++++++++++++++++++ arch/arm/dts/s900-u-boot.dtsi | 17 ++ arch/arm/dts/s900.dtsi | 322 +++++++++++++++++++++++-- arch/arm/include/asm/arch-owl/clk_s900.h | 57 ----- arch/arm/include/asm/arch-owl/regs_s700.h | 56 +++++ arch/arm/mach-owl/Kconfig | 34 +-- arch/arm/mach-owl/Makefile | 3 +- arch/arm/mach-owl/soc.c | 57 +++++ arch/arm/mach-owl/sysmap-owl.c | 32 +++ arch/arm/mach-owl/sysmap-s900.c | 32 --- board/ucRobotics/bubblegum_96/Kconfig | 15 -- board/ucRobotics/bubblegum_96/MAINTAINERS | 6 - board/ucRobotics/bubblegum_96/Makefile | 3 - board/ucRobotics/bubblegum_96/bubblegum_96.c | 57 ----- configs/bubblegum_96_defconfig | 9 +- configs/cubieboard7_defconfig | 12 + doc/board/actions/cubieboard7.rst | 114 +++++++++ doc/board/actions/index.rst | 10 + doc/board/index.rst | 1 + drivers/clk/owl/Kconfig | 8 +- drivers/clk/owl/Makefile | 2 +- drivers/clk/owl/clk_owl.c | 155 ++++++++++++ drivers/clk/owl/clk_owl.h | 64 +++++ drivers/clk/owl/clk_s900.c | 137 ----------- drivers/serial/serial_owl.c | 2 +- include/configs/bubblegum_96.h | 40 --- include/configs/owl-common.h | 40 +++ include/dt-bindings/clock/actions,s700-cmu.h | 118 +++++++++ include/dt-bindings/clock/actions,s900-cmu.h | 129 ++++++++++ include/dt-bindings/clock/s900_cmu.h | 77 ------ include/dt-bindings/reset/actions,s700-reset.h | 34 +++ include/dt-bindings/reset/actions,s900-reset.h | 65 +++++ 38 files changed, 1598 insertions(+), 484 deletions(-) create mode 100644 arch/arm/dts/s700-cubieboard7.dts create mode 100644 arch/arm/dts/s700-u-boot.dtsi create mode 100644 arch/arm/dts/s700.dtsi create mode 100644 arch/arm/dts/s900-u-boot.dtsi delete mode 100644 arch/arm/include/asm/arch-owl/clk_s900.h create mode 100644 arch/arm/include/asm/arch-owl/regs_s700.h create mode 100644 arch/arm/mach-owl/soc.c create mode 100644 arch/arm/mach-owl/sysmap-owl.c delete mode 100644 arch/arm/mach-owl/sysmap-s900.c delete mode 100644 board/ucRobotics/bubblegum_96/Kconfig delete mode 100644 board/ucRobotics/bubblegum_96/MAINTAINERS delete mode 100644 board/ucRobotics/bubblegum_96/Makefile delete mode 100644 board/ucRobotics/bubblegum_96/bubblegum_96.c create mode 100644 configs/cubieboard7_defconfig create mode 100644 doc/board/actions/cubieboard7.rst create mode 100644 doc/board/actions/index.rst create mode 100644 drivers/clk/owl/clk_owl.c create mode 100644 drivers/clk/owl/clk_owl.h delete mode 100644 drivers/clk/owl/clk_s900.c delete mode 100644 include/configs/bubblegum_96.h create mode 100644 include/configs/owl-common.h create mode 100644 include/dt-bindings/clock/actions,s700-cmu.h create mode 100644 include/dt-bindings/clock/actions,s900-cmu.h delete mode 100644 include/dt-bindings/clock/s900_cmu.h create mode 100644 include/dt-bindings/reset/actions,s700-reset.h create mode 100644 include/dt-bindings/reset/actions,s900-reset.h -- 2.7.4

2 27

[PATCH] coccinelle: adjust NULL check before free()
by Heinrich Schuchardt 26 Apr '20

26 Apr '20

The free() function checks if its argument is NULL. We should avoid checking for NULL before calling free like in if (result->tds) free(result->tds); The list of relevant functions differs between Linux and U-Boot, e.g. we use free(). Adjust the list of relevant functions. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- scripts/coccinelle/free/ifnullfree.cocci | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/scripts/coccinelle/free/ifnullfree.cocci b/scripts/coccinelle/free/ifnullfree.cocci index 14a4cd98e8..2d59545d7d 100644 --- a/scripts/coccinelle/free/ifnullfree.cocci +++ b/scripts/coccinelle/free/ifnullfree.cocci @@ -1,10 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0-only /// NULL check before some freeing functions is not needed. /// /// Based on checkpatch warning /// "kfree(NULL) is safe this check is probably not required" /// and kfreeaddr.cocci by Julia Lawall. /// -// Copyright: (C) 2014 Fabian Frederick. GPLv2. +// Copyright: (C) 2014 Fabian Frederick. // Comments: - // Options: --no-includes --include-headers @@ -18,21 +19,19 @@ expression E; @@ - if (E != NULL) ( - kfree(E); + free(E); | - kzfree(E); + kfree(E); | - debugfs_remove(E); + vfree(E); | - debugfs_remove_recursive(E); + vfree_recursive(E); | - usb_free_urb(E); + kmem_cache_free(E); | kmem_cache_destroy(E); | - mempool_destroy(E); -| - dma_pool_destroy(E); + gzfree(E); ) @r depends on context || report || org @ @@ -41,9 +40,8 @@ position p; @@ * if (E != NULL) -* \(kfree@p\|kzfree@p\|debugfs_remove@p\|debugfs_remove_recursive@p\| -* usb_free_urb@p\|kmem_cache_destroy@p\|mempool_destroy@p\| -* dma_pool_destroy@p\)(E); +* \(free@p\|kfree@p\|vfree@p\|debugfs_remove_recursive@p\| +* kmem_cache_free@p\|kmem_cache_destroy@p\|gzfree@p\)(E); @script:python depends on org@ p << r.p; @@ -55,5 +53,5 @@ cocci.print_main("NULL check before that freeing function is not needed", p) p << r.p; @@ -msg = "WARNING: NULL check before freeing functions like kfree, debugfs_remove, debugfs_remove_recursive or usb_free_urb is not needed. Maybe consider reorganizing relevant code to avoid passing NULL values." +msg = "WARNING: NULL check before some freeing functions is not needed." coccilib.report.print_report(p[0], msg) -- 2.25.1

2 1

[PATCH] coccinelle: check for casting malloc output
by Heinrich Schuchardt 26 Apr '20

26 Apr '20

Casting the (void *) output of memory allocation functions before assignment like in sata->cmd_hdr_tbl_offset = (void *)malloc(length + align); is useless. Adopt the Linux kernel script scripts/coccinelle/api/alloc/alloc_cast.cocci. Now 'make coccicheck' generates warnings like: ./drivers/ata/fsl_sata.c:143:29-33: WARNING: casting value returned by memory allocation function to (void *) is useless. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- scripts/coccinelle/api/alloc/alloc_cast.cocci | 102 ++++++++++++++++++ 1 file changed, 102 insertions(+) create mode 100644 scripts/coccinelle/api/alloc/alloc_cast.cocci diff --git a/scripts/coccinelle/api/alloc/alloc_cast.cocci b/scripts/coccinelle/api/alloc/alloc_cast.cocci new file mode 100644 index 0000000000..e336784a9f --- /dev/null +++ b/scripts/coccinelle/api/alloc/alloc_cast.cocci @@ -0,0 +1,102 @@ +// SPDX-License-Identifier: GPL-2.0-only +/// Remove casting the values returned by memory allocation functions +/// like kmalloc, kzalloc, kmem_cache_alloc, kmem_cache_zalloc etc. +/// +//# This makes an effort to find cases of casting of values returned by +//# malloc, calloc, kmalloc, kmalloc_array, kmalloc_node and removes +//# the casting as it is not required. The result in the patch case may +//# need some reformatting. +// +// Confidence: High +// Copyright: (C) 2014 Himangi Saraogi +// Copyright: (C) 2017 Himanshu Jha +// Comments: +// Options: --no-includes --include-headers +// + +virtual context +virtual patch +virtual org +virtual report + +@initialize:python@ +@@ +import re +pattern = '__' +m = re.compile(pattern) + +@r1 depends on context || patch@ +type T; +@@ + + (T *) + \(malloc\|calloc\|kmalloc\|kmalloc_array\|kmalloc_node\)(...) + +//---------------------------------------------------------- +// For context mode +//---------------------------------------------------------- + +@script:python depends on context@ +t << r1.T; +@@ + +if m.search(t) != None: + cocci.include_match(False) + +@depends on context && r1@ +type r1.T; +@@ + +* (T *) + \(malloc\|calloc\|kmalloc\|kmalloc_array\|kmalloc_node\)(...) + +//---------------------------------------------------------- +// For patch mode +//---------------------------------------------------------- + +@script:python depends on patch@ +t << r1.T; +@@ + +if m.search(t) != None: + cocci.include_match(False) + +@depends on patch && r1@ +type r1.T; +@@ + +- (T *) + \(malloc\|calloc\|kmalloc\|kmalloc_array\|kmalloc_node\)(...) + +//---------------------------------------------------------- +// For org and report mode +//---------------------------------------------------------- + +@r2 depends on org || report@ +type T; +position p; +@@ + + (T@p *) + \(malloc\|calloc\|kmalloc\|kmalloc_array\|kmalloc_node\)(...) + +@script:python depends on org@ +p << r2.p; +t << r2.T; +@@ + +if m.search(t) != None: + cocci.include_match(False) +else: + coccilib.org.print_safe_todo(p[0], t) + +@script:python depends on report@ +p << r2.p; +t << r2.T; +@@ + +if m.search(t) != None: + cocci.include_match(False) +else: + msg="WARNING: casting value returned by memory allocation function to (%s *) is useless." % (t) + coccilib.report.print_report(p[0], msg) -- 2.25.1

2 1

[PATCH] cache: l2x0: Fix write to incorrect shared-override bit
by Ley Foon Tan 26 Apr '20

26 Apr '20

The existing code write bit-0 for shared attribute override enable bit. It should be bit-22 based on cache controller specification [1]. [1] http://infocenter.arm.com/help/topic/com.arm.doc.ddi0246f/DDI0246F_l2c310_r… Signed-off-by: Ley Foon Tan <ley.foon.tan(a)intel.com> --- drivers/cache/cache-l2x0.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/cache/cache-l2x0.c b/drivers/cache/cache-l2x0.c index 67c752d076f2..226824c2832e 100644 --- a/drivers/cache/cache-l2x0.c +++ b/drivers/cache/cache-l2x0.c @@ -33,8 +33,8 @@ static void l2c310_of_parse_and_init(struct udevice *dev) saved_reg &= ~L310_AUX_CTRL_INST_PREFETCH_MASK; } - saved_reg |= dev_read_bool(dev, "arm,shared-override"); - writel(saved_reg, &regs->pl310_aux_ctrl); + if (dev_read_bool(dev, "arm,shared-override")) + saved_reg |= L310_SHARED_ATT_OVERRIDE_ENABLE; saved_reg = readl(&regs->pl310_tag_latency_ctrl); if (!dev_read_u32_array(dev, "arm,tag-latency", tag, 3)) -- 2.19.0

2 1

[PATCH 1/3] cosmetic: README: Fix one CONFIG name
by Patrick Delaunay 26 Apr '20

26 Apr '20

Only replace CONFIF_ by CONFIG_ Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 8cfa92fac9..6cb7656fa0 100644 --- a/README +++ b/README @@ -1640,7 +1640,7 @@ The following options need to be configured: - CONFIG_SYS_RCAR_I2C2_SPEED for for the speed channel 2 - CONFIG_SYS_RCAR_I2C3_BASE for setting the register channel 3 - CONFIG_SYS_RCAR_I2C3_SPEED for for the speed channel 3 - - CONFIF_SYS_RCAR_I2C_NUM_CONTROLLERS for number of i2c buses + - CONFIG_SYS_RCAR_I2C_NUM_CONTROLLERS for number of i2c buses - drivers/i2c/sh_i2c.c: - activate this driver with CONFIG_SYS_I2C_SH -- 2.17.1

5 8

[PATCH v5 0/6] A few little patches
by Simon Glass 26 Apr '20

26 Apr '20

This series collects together a few patches I have been carrying for a while. The first two pathces are split out of the acpi series since they don't really relate to ACPI. Changes in v5: - Drop change to FAT - Add new tests for copying an empty string - Use size_t instead of int, require caller to use SIZE_MAX - Update the algorithm to avoid dealing with -1 Changes in v4: - Add a new patch with some string tests - Add a new patch to convert a string to upper case Simon Glass (6): test: Add the beginnings of some string tests lib: Add a function to convert a string to upper case usb: Update struct usb_device to indicate speed enum uuid: Use const char * where possible pci: Add a macro to convert BDF from linux to U-Boot dm: mmc: Update mmc_get_mmc_dev() to use const * drivers/mmc/mmc-uclass.c | 2 +- include/mmc.h | 2 +- include/pci.h | 3 + include/test/suites.h | 1 + include/usb.h | 2 +- include/uuid.h | 8 ++- include/vsprintf.h | 12 ++++ lib/strto.c | 8 +++ lib/uuid.c | 6 +- test/Makefile | 1 + test/cmd_ut.c | 5 ++ test/str_ut.c | 115 +++++++++++++++++++++++++++++++++++++++ 12 files changed, 157 insertions(+), 8 deletions(-) create mode 100644 test/str_ut.c -- 2.26.0.292.g33ef6b2f38-goog

5 15

[PATCH] lib: strto: Stop detection when invalid char is used
by Michal Simek 26 Apr '20

26 Apr '20

This issue has been found when mtd partition are specified. Autodetection code should stop when the first invalid char is found. Here is the example of commands: setenv mtdids nand0=memory-controller@e000e000 setenv mtdparts "mtdparts=nand0:4m(boot),4m(env),64m(kernel),96m(rootfs)" mtd list Before: Zynq> mtd list List of MTD devices: * nand0 - type: NAND flash - block size: 0x20000 bytes - min I/O: 0x800 bytes - OOB size: 64 bytes - OOB available: 16 bytes - ECC strength: 1 bits - ECC step size: 2048 bytes - bitflip threshold: 1 bits - 0x000000000000-0x000010000000 : "nand0" - 0x000000000000-0x000000400000 : "boot" - 0x000000400000-0x000000800000 : "env" - 0x000000800000-0x000006c00000 : "kernel" - 0x000006c00000-0x000010000000 : "rootfs" Where it is visible that kernel partition has 100m instead of 64m After: Zynq> mtd list * nand0 - type: NAND flash - block size: 0x20000 bytes - min I/O: 0x800 bytes - OOB size: 64 bytes - OOB available: 16 bytes - ECC strength: 1 bits - ECC step size: 2048 bytes - bitflip threshold: 1 bits - 0x000000000000-0x000010000000 : "nand0" - 0x000000000000-0x000000400000 : "boot" - 0x000000400000-0x000000800000 : "env" - 0x000000800000-0x000004800000 : "kernel" - 0x000004800000-0x00000a800000 : "rootfs" Signed-off-by: Michal Simek <michal.simek(a)xilinx.com> --- lib/strto.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/strto.c b/lib/strto.c index 1ac2b09c725c..606701566f32 100644 --- a/lib/strto.c +++ b/lib/strto.c @@ -34,6 +34,9 @@ static const char *_parse_integer_fixup_radix(const char *s, unsigned int *base) *base = 16; break; } + + if (!(var >= '0' && var <= '9')) + break; } while (var); } } -- 2.26.0

3 2