April 2020 - U-Boot

[PATCH v6 0/8] Cortina Access Drivers Package 2
by Alex Nemirovsky 21 Apr '20

21 Apr '20

This release adds the following drivers and integrates support into the Cortina Access Presidio Engineering Board: CAxxxx SoC eMMC/SD controller CAxxxx SoC I2C controller CAxxxx Soc LED controller CAxxxx SPI NAND and NOR controller Changes in v6: - Add I2C DT binding document Changes in v5: - Rebase code basis on v2020.04-rc5 which has already incorporated CAxxxx eMMC initial baseline - Rebase on codebase basis v2020.04-rc5 which already incorporated initial baseline of eMMC DT information - NAND support removed from presidio-asic board DT. Changes in v4: - Rename DT compatible name - Remove uneccessary if-statement to support 8-bit buswidth - Remove redundant error msg - Use symbolic constants in switch statement - Change DT compatiblity name to match change in driver's name - Remove unused io_ds and fifo_mode fields from DT - Utilize standard I2C macros from <i2c.h> - Return ETIMEDOUT in funcs that can timeout - Return i2c_xfer_init() result to caller of i2c_read() if it fails within i2c_read() execution - Fix misc. style guide conformance issues - Use printf() to report i2c_xfer() runtime errors instead of debug() - remove unused macros - remove cortina prefix from macros - remove use BSS variable - further cleanup to meet code style guidelines - add additinal struct comments - rename DT blink rate symbol - rename DT blink rate symbol Changes in v3: - Fixup syntax issues related to checkpatch.pl cleanup Changes in v2: - Add I2C controller - Add LED controller - Add SPI NAND and NOR controller Alex Nemirovsky (3): board: presidio-asic: update eMMC DT informatino board: presidio-asic: Add I2C support board: presidio-asic: Add SPI NOR support Arthur Li (2): mmc: ca_dw_mmc: Misc cleanup of driver i2c: i2c-cortina: added CAxxxx I2C support Jway Lin (2): led: led_cortina: Add CAxxx LED support board: presidio: add LED support Pengpeng Chen (1): spi: ca_sflash: Add CAxxxx SPI Flash Controller MAINTAINERS | 8 + arch/arm/dts/ca-presidio-engboard.dts | 41 +- board/cortina/presidio-asic/presidio.c | 16 +- configs/cortina_presidio-asic-emmc_defconfig | 5 + configs/cortina_presidio-asic-spi-nand_defconfig | 48 ++ configs/cortina_presidio-asic-spi-nor_defconfig | 59 +++ doc/device-tree-bindings/i2c/i2c-cortina.txt | 18 + drivers/i2c/Kconfig | 7 + drivers/i2c/Makefile | 1 + drivers/i2c/i2c-cortina.c | 346 ++++++++++++++ drivers/i2c/i2c-cortina.h | 84 ++++ drivers/led/Kconfig | 8 + drivers/led/Makefile | 1 + drivers/led/led_cortina.c | 268 +++++++++++ drivers/mmc/ca_dw_mmc.c | 34 +- drivers/spi/Kconfig | 8 + drivers/spi/Makefile | 1 + drivers/spi/ca_sflash.c | 576 +++++++++++++++++++++++ 18 files changed, 1499 insertions(+), 30 deletions(-) create mode 100644 configs/cortina_presidio-asic-spi-nand_defconfig create mode 100644 configs/cortina_presidio-asic-spi-nor_defconfig create mode 100644 doc/device-tree-bindings/i2c/i2c-cortina.txt create mode 100644 drivers/i2c/i2c-cortina.c create mode 100644 drivers/i2c/i2c-cortina.h create mode 100644 drivers/led/led_cortina.c create mode 100644 drivers/spi/ca_sflash.c -- 2.7.4

3 12

[PATCH] test: use correct path in file system tests
by Heinrich Schuchardt 21 Apr '20

21 Apr '20

For non-root users mkfs.ext4 and fsck.ext4 are not in the search path at least on Debian. Use /sbin/mkfs.ext4 and /sbin/fsck.ext4 instead. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- test/py/tests/test_fs/conftest.py | 2 +- test/py/tests/test_fs/fstest_helpers.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/test/py/tests/test_fs/conftest.py b/test/py/tests/test_fs/conftest.py index 1949f91619..b03fe75f5c 100644 --- a/test/py/tests/test_fs/conftest.py +++ b/test/py/tests/test_fs/conftest.py @@ -165,7 +165,7 @@ def mk_fs(config, fs_type, size, id): check_call('rm -f %s' % fs_img, shell=True) check_call('dd if=/dev/zero of=%s bs=1M count=%d' % (fs_img, count), shell=True) - check_call('mkfs.%s %s %s' + check_call('/sbin/mkfs.%s %s %s' % (fs_lnxtype, mkfs_opt, fs_img), shell=True) return fs_img except CalledProcessError: diff --git a/test/py/tests/test_fs/fstest_helpers.py b/test/py/tests/test_fs/fstest_helpers.py index faec298248..f1326434a6 100644 --- a/test/py/tests/test_fs/fstest_helpers.py +++ b/test/py/tests/test_fs/fstest_helpers.py @@ -8,6 +8,6 @@ from subprocess import check_call, CalledProcessError def assert_fs_integrity(fs_type, fs_img): try: if fs_type == 'ext4': - check_call('fsck.ext4 -n -f %s' % fs_img, shell=True) + check_call('/sbin/fsck.ext4 -n -f %s' % fs_img, shell=True) except CalledProcessError: raise -- 2.26.1

3 2

[PATCH] imx8mq_evk: Update the required ATF branch
by Fabio Estevam 21 Apr '20

21 Apr '20

Following the README instructions leads to a non-booting U-Boot: U-Boot SPL 2020.01-rc3-00070-g9a0cbae22a (Nov 25 2019 - 13:08:24 -0300) PMIC: PFUZE100 ID=0x10 DDRINFO: start DRAM init DDRINFO:ddrphy calibration done DDRINFO: ddrmix config done Normal Boot Trying to boot from MMC2 (It hangs here) Use the "imx_4.19.35_1.0.0" ATF branch instead, which fixes such problem and allow the boot to complete again. Suggested-by: Adam Ford <aford173(a)gmail.com> Signed-off-by: Fabio Estevam <festevam(a)gmail.com> --- board/freescale/imx8mq_evk/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/freescale/imx8mq_evk/README b/board/freescale/imx8mq_evk/README index c1d400bcf9..4f671b069c 100644 --- a/board/freescale/imx8mq_evk/README +++ b/board/freescale/imx8mq_evk/README @@ -11,7 +11,7 @@ Get and Build the ARM Trusted firmware ====================================== Note: srctree is U-Boot source directory Get ATF from: https://source.codeaurora.org/external/imx/imx-atf -branch: imx_4.14.62_1.0.0_beta +branch: imx_4.19.35_1.0.0 $ make PLAT=imx8mq bl31 $ cp build/imx8mq/release/bl31.bin $(srctree) -- 2.17.1

7 16

[U-Boot] Please pull from u-boot-i2c
by Heiko Schocher 21 Apr '20

21 Apr '20

Hello Tom, please pull from u-boot-i2c master The following changes since commit 8d5d3bcf3c53d798bd7f3fe7092e994593bcc41c: Merge branch '2020-04-16-master-imports' (2020-04-17 11:17:29 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-i2c.git tags/for-v2020.07 for you to fetch changes up to 956d57a8ddf17dbd69f9120b399f621f15ea3f95: drivers: i2c: add brcm iproc I2C driver support (2020-04-20 06:52:28 +0200) ---------------------------------------------------------------- i2c changes for 2020.07 - add new i2c driver for Broadcom iproc-based socs - fix cmd: eeprom: Staticize eeprom_i2c_bus - i2c: muxes: pca954x: add PCA9546 variant ---------------------------------------------------------------- Chris Packham (1): i2c: muxes: pca954x: add PCA9546 variant Marek Vasut (1): cmd: eeprom: Staticize eeprom_i2c_bus Rayagonda Kokatanur (1): drivers: i2c: add brcm iproc I2C driver support cmd/eeprom.c | 2 +- drivers/i2c/Kconfig | 8 ++ drivers/i2c/Makefile | 1 + drivers/i2c/iproc_i2c.c | 713 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/i2c/iproc_i2c.h | 335 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/i2c/muxes/Kconfig | 4 +- drivers/i2c/muxes/pca954x.c | 6 ++ 7 files changed, 1066 insertions(+), 3 deletions(-) create mode 100644 drivers/i2c/iproc_i2c.c create mode 100644 drivers/i2c/iproc_i2c.h Travis build: https://travis-ci.org/github/hsdenx/u-boot-i2c/builds/677107235 bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs(a)denx.de

2 1

[U-Boot] Pull request: u-boot-ubi/master
by Heiko Schocher 21 Apr '20

21 Apr '20

Hello Tom, please pull from u-boot-ubi master The following changes since commit 8d5d3bcf3c53d798bd7f3fe7092e994593bcc41c: Merge branch '2020-04-16-master-imports' (2020-04-17 11:17:29 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-ubi.git tags/for-v2020.07 for you to fetch changes up to 83f7078b688528f1f5c117e404c056e048970012: cmd: ubi: add a command to rename volume (2020-04-20 06:34:56 +0200) ---------------------------------------------------------------- new ubi command for renaming an UBI volume ---------------------------------------------------------------- Philippe Reynes (1): cmd: ubi: add a command to rename volume cmd/Kconfig | 8 ++++++++ cmd/ubi.c | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 47 insertions(+) Travis build: https://travis-ci.org/github/hsdenx/u-boot-ubi/builds/677107775 bye, Heiko -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-52 Fax: +49-8142-66989-80 Email: hs(a)denx.de

2 1

[RFT PATCH v5 0/3] Add compressed Image booting support
by Atish Patra 21 Apr '20

21 Apr '20

This patch series extends booti to support compressed images as well. Following compressed images are supported for now. lzma, lzo, bzip2, gz. Other compression methods can easily be supported if required. The above compression methods are common ones that Linux kernel (ARM64/RISC-V) and U-Boot supports. Changes from v4->v5 1. Moved back to explicit kernel_comp_size enviornemnt variable from filesize. 2. Rebased on top latest master. Changes from v3->v4 1. Removed CONFIG_SYS_BOOTM_LEN usage. Atish Patra (3): lib: kconfig: Add option to set BZIP2 compression method image: Add a common compression type detection function. image: Add compressed Image parsing support in booti. cmd/booti.c | 40 ++++++++++++++++++++++++++- common/image.c | 23 ++++++++++++++++ doc/README.distro | 12 +++++++++ doc/board/sifive/fu540.rst | 55 ++++++++++++++++++++++++++++++++++++++ include/image.h | 21 +++++++++++++++ lib/Kconfig | 5 ++++ 6 files changed, 155 insertions(+), 1 deletion(-) -- 2.24.0

3 11

[PATCH] tee: optee: use dev_info in print_os_revision
by Patrick Delaunay 21 Apr '20

21 Apr '20

Display TEE version at information level; this patch replaces debug() call to dev_info() in print_os_revision() function. Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> --- drivers/tee/optee/core.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index 9fb5e658f9..5260dab3ac 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -512,7 +512,7 @@ static bool is_optee_api(optee_invoke_fn *invoke_fn) res.a2 == OPTEE_MSG_UID_2 && res.a3 == OPTEE_MSG_UID_3; } -static void print_os_revision(optee_invoke_fn *invoke_fn) +static void print_os_revision(struct udevice *dev, optee_invoke_fn *invoke_fn) { union { struct arm_smccc_res smccc; @@ -527,11 +527,12 @@ static void print_os_revision(optee_invoke_fn *invoke_fn) &res.smccc); if (res.result.build_id) - debug("OP-TEE revision %lu.%lu (%08lx)\n", res.result.major, - res.result.minor, res.result.build_id); + dev_info(dev, "OP-TEE: revision %lu.%lu (%08lx)\n", + res.result.major, res.result.minor, + res.result.build_id); else - debug("OP-TEE revision %lu.%lu\n", res.result.major, - res.result.minor); + dev_info(dev, "OP-TEE: revision %lu.%lu\n", + res.result.major, res.result.minor); } static bool api_revision_is_compatible(optee_invoke_fn *invoke_fn) @@ -626,7 +627,7 @@ static int optee_probe(struct udevice *dev) return -ENOENT; } - print_os_revision(pdata->invoke_fn); + print_os_revision(dev, pdata->invoke_fn); if (!api_revision_is_compatible(pdata->invoke_fn)) { debug("%s: OP-TEE api revision mismatch\n", __func__); -- 2.17.1

3 2

[PATCH] doc: spl: update reference to driver-model/README.txt
by Patrick Delaunay 21 Apr '20

21 Apr '20

Update the reference in doc/README.SPL to a no more existing file: "driver-model/README.txt", it is changed to "doc/driver-model/design.rst". Adding the directory path /doc/ allows to check this reference with 'make refcheckdocs'. Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> --- doc/README.SPL | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/README.SPL b/doc/README.SPL index 929b9672b0..2beb6d8f11 100644 --- a/doc/README.SPL +++ b/doc/README.SPL @@ -81,7 +81,7 @@ fdtgrep is also used to remove: ('u-boot,dm-pre-reloc', 'u-boot,dm-spl' and 'u-boot,dm-tpl') All the nodes remaining in the SPL devicetree are bound -(see driver-model/README.txt). +(see doc/driver-model/design.rst). Debugging --------- -- 2.17.1

3 2

[PATCH] mkimage: fit: don't create image with 0700 permissions
by Thomas Hebb 21 Apr '20

21 Apr '20

commit 7298e422504e ("mkimage: fit: add support to encrypt image with aes") added a new copyfile() function as part of the FIT image creation flow. This function as currently written creates the final image with a mode of 0700 (before umask), differing from the old behavior of 0666. Since there doesn't seem to be any reason to make the image executable or non-group, non-other readable, change the mask to 0666 to preserve the old behavior. Fixes: 7298e422504e ("mkimage: fit: add support to encrypt image with aes") Signed-off-by: Thomas Hebb <tommyhebb(a)gmail.com> --- tools/fit_image.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/fit_image.c b/tools/fit_image.c index dd61a816c9..4301b5decb 100644 --- a/tools/fit_image.c +++ b/tools/fit_image.c @@ -642,7 +642,7 @@ static int copyfile(const char *src, const char *dst) goto out; } - fd_dst = open(dst, O_WRONLY | O_CREAT, 0700); + fd_dst = open(dst, O_WRONLY | O_CREAT, 0666); if (fd_dst < 0) { printf("Can't open file %s (%s)\n", dst, strerror(errno)); goto out; -- 2.25.0

2 1

[PATCH v2 1/1] scripts: add documentation-file-ref-check
by Heinrich Schuchardt 21 Apr '20

21 Apr '20

'make refcheckdocs' requires scripts/documentation-file-ref-check. Adopt script from Linux v5.6-rc3. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- v2: our device-tree documentation is at doc/device-tree-bindings/ --- scripts/documentation-file-ref-check | 226 +++++++++++++++++++++++++++ 1 file changed, 226 insertions(+) create mode 100755 scripts/documentation-file-ref-check diff --git a/scripts/documentation-file-ref-check b/scripts/documentation-file-ref-check new file mode 100755 index 0000000000..0bfc5feefb --- /dev/null +++ b/scripts/documentation-file-ref-check @@ -0,0 +1,226 @@ +#!/usr/bin/env perl +# SPDX-License-Identifier: GPL-2.0 +# +# Treewide grep for references to files under doc, and report +# non-existing files in stderr. + +use warnings; +use strict; +use Getopt::Long qw(:config no_auto_abbrev); + +# NOTE: only add things here when the file was gone, but the text wants +# to mention a past documentation file, for example, to give credits for +# the original work. +my %false_positives = ( +); + +my $scriptname = $0; +$scriptname =~ s,.*/([^/]+/),$1,; + +# Parse arguments +my $help = 0; +my $fix = 0; +my $warn = 0; + +if (! -d ".git") { + printf "Warning: can't check if file exists, as this is not a git tree"; + exit 0; +} + +GetOptions( + 'fix' => \$fix, + 'warn' => \$warn, + 'h|help|usage' => \$help, +); + +if ($help != 0) { + print "$scriptname [--help] [--fix]\n"; + exit -1; +} + +# Step 1: find broken references +print "Finding broken references. This may take a while... " if ($fix); + +my %broken_ref; + +my $doc_fix = 0; + +open IN, "git grep ':doc:\`' doc/|" + or die "Failed to run git grep"; +while (<IN>) { + next if (!m,^([^:]+):.*\:doc\:\`([^\`]+)\`,); + + my $d = $1; + my $doc_ref = $2; + + my $f = $doc_ref; + + $d =~ s,(.*/).*,$1,; + $f =~ s,.*\<([^\>]+)\>,$1,; + + $f ="$d$f.rst"; + + next if (grep -e, glob("$f")); + + if ($fix && !$doc_fix) { + print STDERR "\nWARNING: Currently, can't fix broken :doc:`` fields\n"; + } + $doc_fix++; + + print STDERR "$f: :doc:`$doc_ref`\n"; +} +close IN; + +open IN, "git grep 'doc/'|" + or die "Failed to run git grep"; +while (<IN>) { + next if (!m/^([^:]+):(.*)/); + + my $f = $1; + my $ln = $2; + + # On linux-next, discard the Next/ directory + next if ($f =~ m,^Next/,); + + # Makefiles and scripts contain nasty expressions to parse docs + next if ($f =~ m/Makefile/ || $f =~ m/\.sh$/); + + # Skip this script + next if ($f eq $scriptname); + + # Ignore the dir where documentation will be built + next if ($ln =~ m,\b(\S*)doc/output,); + + if ($ln =~ m,\b(\S*)(doc/[A-Za-z0-9\_\.\,\~/\*\[\]\?+-]*)(.*),) { + my $prefix = $1; + my $ref = $2; + my $base = $2; + my $extra = $3; + + # some file references are like: + # /usr/src/linux/doc/DMA-{API,mapping}.txt + # For now, ignore them + next if ($extra =~ m/^{/); + + # Remove footnotes at the end like: + # doc/devicetree/dt-object-internal.txt[1] + $ref =~ s/(txt|rst)\[\d+]$/$1/; + + # Remove ending ']' without any '[' + $ref =~ s/\].*// if (!($ref =~ m/\[/)); + + # Remove puntuation marks at the end + $ref =~ s/[\,\.]+$//; + + my $fulref = "$prefix$ref"; + + $fulref =~ s/^(\<file|ref)://; + $fulref =~ s/^[\'\`]+//; + $fulref =~ s,^\$$.*$/,,; + $base =~ s,.*/,,; + + # Remove URL false-positives + next if ($fulref =~ m/^http/); + + # Check if exists, evaluating wildcards + next if (grep -e, glob("$ref $fulref")); + + # Accept relative doc patches for tools/ + if ($f =~ m/tools/) { + my $path = $f; + $path =~ s,(.*)/.*,$1,; + next if (grep -e, glob("$path/$ref $path/../$ref $path/$fulref")); + } + + # Discard known false-positives + if (defined($false_positives{$f})) { + next if ($false_positives{$f} eq $fulref); + } + + if ($fix) { + if (!($ref =~ m/(scripts|Kconfig|Kbuild)/)) { + $broken_ref{$ref}++; + } + } elsif ($warn) { + print STDERR "Warning: $f references a file that doesn't exist: $fulref\n"; + } else { + print STDERR "$f: $fulref\n"; + } + } +} +close IN; + +exit 0 if (!$fix); + +# Step 2: Seek for file name alternatives +print "Auto-fixing broken references. Please double-check the results\n"; + +foreach my $ref (keys %broken_ref) { + my $new =$ref; + + my $basedir = "."; + # On translations, only seek inside the translations directory + $basedir = $1 if ($ref =~ m,(doc/translations/[^/]+),); + + # get just the basename + $new =~ s,.*/,,; + + my $f=""; + + # usual reason for breakage: DT file moved around + if ($ref =~ /devicetree/) { + # usual reason for breakage: DT file renamed to .yaml + if (!$f) { + my $new_ref = $ref; + $new_ref =~ s/\.txt$/.yaml/; + $f=$new_ref if (-f $new_ref); + } + + if (!$f) { + my $search = $new; + $search =~ s,^.*/,,; + $f = qx(find doc/device-tree-bindings/ -iname "*$search*") if ($search); + if (!$f) { + # Manufacturer name may have changed + $search =~ s/^.*,//; + $f = qx(find doc/device-tree-bindings/ -iname "*$search*") if ($search); + } + } + } + + # usual reason for breakage: file renamed to .rst + if (!$f) { + $new =~ s/\.txt$/.rst/; + $f=qx(find $basedir -iname $new) if ($new); + } + + # usual reason for breakage: use dash or underline + if (!$f) { + $new =~ s/[-_]/[-_]/g; + $f=qx(find $basedir -iname $new) if ($new); + } + + # Wild guess: seek for the same name on another place + if (!$f) { + $f = qx(find $basedir -iname $new) if ($new); + } + + my @find = split /\s+/, $f; + + if (!$f) { + print STDERR "ERROR: Didn't find a replacement for $ref\n"; + } elsif (scalar(@find) > 1) { + print STDERR "WARNING: Won't auto-replace, as found multiple files close to $ref:\n"; + foreach my $j (@find) { + $j =~ s,^./,,; + print STDERR " $j\n"; + } + } else { + $f = $find[0]; + $f =~ s,^./,,; + print "INFO: Replacing $ref to $f\n"; + foreach my $j (qx(git grep -l $ref)) { + qx(sed "s\@$ref\@$f\@g" -i $j); + } + } +} -- 2.25.0

2 1