October 2016 - U-Boot

[U-Boot] Please pull u-boot-fdt
by Simon Glass 24 Oct '16

24 Oct '16

Hi Tom, Here's another patch syncing up with libfdt upstream. Maxime suggest that this should go in now. The following changes since commit 3431b392ad50ff37fa3d6e7715c6a99c74d692dc: Merge tag 'signed-efi-next' of git://github.com/agraf/u-boot (2016-10-19 07:48:16 -0400) are available in the git repository at: git://git.denx.de/u-boot-fdt.git for you to fetch changes up to 610db7058f1d9ed668aef7692f8f90f05e0923f8: libfdt: Sync overlay with upstream (2016-10-23 12:08:48 -0700) ---------------------------------------------------------------- Maxime Ripard (1): libfdt: Sync overlay with upstream include/libfdt.h | 24 ++++++--- lib/libfdt/fdt_overlay.c | 199 +++++++++++++++++++++++++++++++++++++++++++------------------------- lib/libfdt/fdt_strerror.c | 3 ++ 3 files changed, 147 insertions(+), 79 deletions(-) Regards, Simon

2 1

[U-Boot] [PATCH] api: storage: Avoid enumeration for non-configured subsystem
by Emmanuel Vadot 24 Oct '16

24 Oct '16

If a subsystem wasn't configured, avoid enumeration. Signed-off-by: Emmanuel Vadot <manu(a)bidouilliste.com> --- api/api_storage.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/api/api_storage.c b/api/api_storage.c index d425a9a..b5aaba1 100644 --- a/api/api_storage.c +++ b/api/api_storage.c @@ -41,7 +41,7 @@ struct stor_spec { char *name; }; -static struct stor_spec specs[ENUM_MAX] = { { 0, 0, 0, 0, "" }, }; +static struct stor_spec specs[ENUM_MAX] = { { 0, 0, 0, 0, NULL }, }; void dev_stor_init(void) @@ -105,6 +105,10 @@ static int dev_stor_get(int type, int first, int *more, struct device_info *di) struct blk_desc *dd; + /* Wasn't configured for this type, return 0 directly */ + if (specs[type].name == NULL) + return 0; + if (first) { di->cookie = (void *)blk_get_dev(specs[type].name, 0); if (di->cookie == NULL) -- 2.9.2

2 1

[U-Boot] [PATCH v2] tools: moveconfig: support wildcards in --defconfigs file
by Masahiro Yamada 24 Oct '16

24 Oct '16

Supporting shell-style wildcards for the --defconfigs option will be useful to run the moveconfig tool against a specific platform. For example, "uniphier*" in the file passed by --defconfigs option will be expanded to defconfig files that start with "uniphier". This is easier than listing out all defconfig files you are interested in. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- Changes in v2: - Warn when a pattern does not match any defconfig. (suggested by Joe) tools/moveconfig.py | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/tools/moveconfig.py b/tools/moveconfig.py index 87e2bb2..228d098 100755 --- a/tools/moveconfig.py +++ b/tools/moveconfig.py @@ -127,7 +127,8 @@ Available options standard commit message is used which may need to be edited. -d, --defconfigs - Specify a file containing a list of defconfigs to move + Specify a file containing a list of defconfigs to move. The defconfig + files can be given with shell-style wildcards. -n, --dry-run Perform a trial run that does not make any changes. It is useful to @@ -180,6 +181,7 @@ import copy import difflib import filecmp import fnmatch +import glob import multiprocessing import optparse import os @@ -284,6 +286,24 @@ def get_make_cmd(): sys.exit('GNU Make not found') return ret[0].rstrip() +def get_matched_defconfigs(defconfigs_file): + """Get all the defconfig files that match the patterns in a file.""" + defconfigs = [] + for i, line in enumerate(open(defconfigs_file)): + line = line.strip() + if not line: + continue # skip blank lines silently + pattern = os.path.join('configs', line) + matched = glob.glob(pattern) + glob.glob(pattern + '_defconfig') + if not matched: + print >> sys.stderr, "warning: %s:%d: no defconfig matched '%s'" % \ + (defconfigs_file, i + 1, line) + + defconfigs += matched + + # use set() to drop multiple matching + return [ defconfig[len('configs') + 1:] for defconfig in set(defconfigs) ] + def get_all_defconfigs(): """Get all the defconfig files under the configs/ directory.""" defconfigs = [] @@ -1204,13 +1224,7 @@ def move_config(configs, options): reference_src_dir = None if options.defconfigs: - defconfigs = [line.strip() for line in open(options.defconfigs)] - for i, defconfig in enumerate(defconfigs): - if not defconfig.endswith('_defconfig'): - defconfigs[i] = defconfig + '_defconfig' - if not os.path.exists(os.path.join('configs', defconfigs[i])): - sys.exit('%s - defconfig does not exist. Stopping.' % - defconfigs[i]) + defconfigs = get_matched_defconfigs(options.defconfigs) else: defconfigs = get_all_defconfigs() -- 1.9.1

3 2

[U-Boot] [PATCH] Fix codying style broken by recent libfdt sync
by Masahiro Yamada 24 Oct '16

24 Oct '16

Commit b02e4044ff8e ("libfdt: Bring in upstream stringlist functions") broke codying style in some places especially by inserting an extra whitespace before fdt_stringlist_count(). Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- arch/arm/mach-tegra/xusb-padctl-common.c | 2 +- drivers/core/device.c | 4 ++-- drivers/net/sun8i_emac.c | 2 +- drivers/pinctrl/exynos/pinctrl-exynos.c | 2 +- drivers/pinctrl/pinctrl-generic.c | 6 +++--- drivers/video/sunxi_display.c | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/arch/arm/mach-tegra/xusb-padctl-common.c b/arch/arm/mach-tegra/xusb-padctl-common.c index dfbc8ef..43f5bb7 100644 --- a/arch/arm/mach-tegra/xusb-padctl-common.c +++ b/arch/arm/mach-tegra/xusb-padctl-common.c @@ -82,7 +82,7 @@ tegra_xusb_padctl_group_parse_dt(struct tegra_xusb_padctl *padctl, group->name = fdt_get_name(fdt, node, &len); - len = fdt_stringlist_count(fdt, node, "nvidia,lanes"); + len = fdt_stringlist_count(fdt, node, "nvidia,lanes"); if (len < 0) { error("failed to parse \"nvidia,lanes\" property"); return -EINVAL; diff --git a/drivers/core/device.c b/drivers/core/device.c index 1935b8d..dcf5d9d 100644 --- a/drivers/core/device.c +++ b/drivers/core/device.c @@ -698,8 +698,8 @@ fdt_addr_t dev_get_addr_name(struct udevice *dev, const char *name) #if CONFIG_IS_ENABLED(OF_CONTROL) int index; - index = fdt_stringlist_search(gd->fdt_blob, dev->of_offset, "reg-names", - name); + index = fdt_stringlist_search(gd->fdt_blob, dev->of_offset, + "reg-names", name); if (index < 0) return index; diff --git a/drivers/net/sun8i_emac.c b/drivers/net/sun8i_emac.c index 91570a2..6ac8ba3 100644 --- a/drivers/net/sun8i_emac.c +++ b/drivers/net/sun8i_emac.c @@ -457,7 +457,7 @@ static int parse_phy_pins(struct udevice *dev) int pin; pin_name = fdt_stringlist_get(gd->fdt_blob, offset, - "allwinner,pins", i, NULL); + "allwinner,pins", i, NULL); if (!pin_name) break; if (pin_name[0] != 'P') diff --git a/drivers/pinctrl/exynos/pinctrl-exynos.c b/drivers/pinctrl/exynos/pinctrl-exynos.c index c9c13e6..dd0a16e 100644 --- a/drivers/pinctrl/exynos/pinctrl-exynos.c +++ b/drivers/pinctrl/exynos/pinctrl-exynos.c @@ -80,7 +80,7 @@ int exynos_pinctrl_set_state(struct udevice *dev, struct udevice *config) * refer to the following document for the pinctrl bindings * linux/Documentation/devicetree/bindings/pinctrl/samsung-pinctrl.txt */ - count = fdt_stringlist_count(fdt, node, "samsung,pins"); + count = fdt_stringlist_count(fdt, node, "samsung,pins"); if (count <= 0) return -EINVAL; diff --git a/drivers/pinctrl/pinctrl-generic.c b/drivers/pinctrl/pinctrl-generic.c index 482db29..3629322 100644 --- a/drivers/pinctrl/pinctrl-generic.c +++ b/drivers/pinctrl/pinctrl-generic.c @@ -306,12 +306,12 @@ static int pinctrl_generic_set_state_subnode(struct udevice *dev, const char *name; int strings_count, selector, i, ret; - strings_count = fdt_stringlist_count(fdt, node, subnode_target_type); + strings_count = fdt_stringlist_count(fdt, node, subnode_target_type); if (strings_count < 0) { subnode_target_type = "groups"; is_group = true; - strings_count = fdt_stringlist_count(fdt, node, - subnode_target_type); + strings_count = fdt_stringlist_count(fdt, node, + subnode_target_type); if (strings_count < 0) { /* skip this node; may contain config child nodes */ return 0; diff --git a/drivers/video/sunxi_display.c b/drivers/video/sunxi_display.c index 6cba1b9..6f8ee01 100644 --- a/drivers/video/sunxi_display.c +++ b/drivers/video/sunxi_display.c @@ -1563,7 +1563,7 @@ int sunxi_simplefb_setup(void *blob) "allwinner,simple-framebuffer"); while (offset >= 0) { ret = fdt_stringlist_search(blob, offset, "allwinner,pipeline", - pipeline); + pipeline); if (ret == 0) break; offset = fdt_node_offset_by_compatible(blob, offset, -- 1.9.1

3 2

[U-Boot] [PATCH v2 0/2] libfdt: fix "Bring in upstream stringlist functions"
by Masahiro Yamada 24 Oct '16

24 Oct '16

I found my boards are broken since commit b02e4044ff8ee1f6ac83917a39514172a9b449fb Author: Simon Glass <sjg(a)chromium.org> Date: Sun Oct 2 17:59:28 2016 -0600 libfdt: Bring in upstream stringlist functions I figured out that the root cause is in the upstream libfdt. The upstream libfdt has been fixed, so I am backporting commits. Changes in v2: - Add sob of David Gibson Masahiro Yamada (2): libfdt: fix fdt_stringlist_count() libfdt: fix fdt_stringlist_search() lib/libfdt/fdt_ro.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 1.9.1

2 4

[U-Boot] [PATCH] power: twl6030: fix code refactoring
by Nicolae Rosia 24 Oct '16

24 Oct '16

From: Nicolae Rosia <nicolae.rosia(a)gmail.com> Commit a85362fb3e1fc7833723accddbbae431091d06b8 refactored the code but the register read ended up in the wrong if branch. Currently, the else branch checks a variable which is always 0. Signed-off-by: Nicolae Rosia <nicolae_rosia(a)mentor.com> --- drivers/power/twl6030.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/power/twl6030.c b/drivers/power/twl6030.c index 05c79be..cd53200 100644 --- a/drivers/power/twl6030.c +++ b/drivers/power/twl6030.c @@ -231,9 +231,9 @@ void twl6030_power_mmc_init(int dev_index) /* Enable P1 output for VMMC */ twl6030_i2c_write_u8(TWL6030_CHIP_PM, TWL6030_VMMC_CFG_STATE, TWL6030_CFG_STATE_P1 | TWL6030_CFG_STATE_ON); - - twl6030_i2c_read_u8(TWL6030_CHIP_PM, TWL6030_PH_STS_BOOT, &value); } else if (dev_index == 1) { + twl6030_i2c_read_u8(TWL6030_CHIP_PM, TWL6030_PH_STS_BOOT, + &value); /* BOOT2 indicates 1.8V/2.8V VAUX1 for eMMC */ if (value & TWL6030_PH_STS_BOOT2) { /* 1.8V voltage output for VAUX1 */ -- 2.5.5

3 8

[U-Boot] [PATCH 0/5] Update LS2080A SoC code to support LS2088A SoC
by Priyanka Jain 24 Oct '16

24 Oct '16

From: Priyanka Jain <Priyanka.Jain(a)freescale.com> LS2088A is similar to LS2080A SoC with some differences like 1)Timer controller offset is different 2)It has A72 cores 3)Process to release secondary cores is different 4)LS2088A SoC has TZASC controller In preparation of using same binary for LS2088A and LS2080A as both are using same development boards. code is update to detect difference based on SVR at runtime Priyanka Jain (5): armv8: lsch3: Use SVR based timer base address detection armv8: fsl-layerscape: Update TZASC registers type armv8: fsl-layerscape : Check SVR for initializing TZASC armv8: fsl-layerscape: Add NXP LS2088A SoC support armv8/fsl-lsch3: Update code to release secondary cores arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 16 +++++- arch/arm/cpu/armv8/fsl-layerscape/cpu.h | 1 + arch/arm/cpu/armv8/fsl-layerscape/doc/README.soc | 58 +++++++++++++++++++ arch/arm/cpu/armv8/fsl-layerscape/lowlevel.S | 47 +++++++++++----- arch/arm/cpu/armv8/fsl-layerscape/mp.c | 59 ++++++++++++++++++- arch/arm/cpu/armv8/fsl-layerscape/soc.c | 6 +- arch/arm/include/asm/arch-fsl-layerscape/config.h | 1 + arch/arm/include/asm/arch-fsl-layerscape/cpu.h | 4 + .../include/asm/arch-fsl-layerscape/immap_lsch3.h | 7 ++- arch/arm/include/asm/arch-fsl-layerscape/soc.h | 10 +++ board/freescale/ls2080a/MAINTAINERS | 2 +- board/freescale/ls2080aqds/MAINTAINERS | 2 +- board/freescale/ls2080aqds/README | 12 ++-- board/freescale/ls2080ardb/MAINTAINERS | 2 +- board/freescale/ls2080ardb/README | 8 +- 15 files changed, 198 insertions(+), 37 deletions(-) -- 1.7.4.1

3 11

[U-Boot] [PATCH 3/3] ext4: Only write journal entries for modified blocks in unlink_filename
by Stefan Brüns 24 Oct '16

24 Oct '16

Instead of creating a journal entry for each directory block, even if the block is unmodified, only log the modified block. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- fs/ext4/ext4_common.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index 11be0b7..ec02eec 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -874,8 +874,6 @@ static int unlink_filename(char *filename, unsigned int blknr) if (status == 0) goto fail; - if (ext4fs_log_journal(block_buffer, blknr)) - goto fail; offset = 0; do { previous_dir = dir; @@ -889,14 +887,6 @@ static int unlink_filename(char *filename, unsigned int blknr) if (dir->inode && (strlen(filename) == dir->namelen) && (strncmp(direntname, filename, dir->namelen) == 0)) { inodeno = le32_to_cpu(dir->inode); - if (previous_dir) { - uint16_t new_len; - new_len = le16_to_cpu(previous_dir->direntlen); - new_len += le16_to_cpu(dir->direntlen); - previous_dir->direntlen = cpu_to_le16(new_len); - } else { - dir->inode = 0; - } break; } @@ -905,7 +895,20 @@ static int unlink_filename(char *filename, unsigned int blknr) } while (offset < fs->blksz); if (inodeno > 0) { + printf("file found, deleting\n"); + if (ext4fs_log_journal(block_buffer, blknr)) + goto fail; + if (previous_dir) { + /* merge dir entry with predecessor */ + uint16_t new_len; + new_len = le16_to_cpu(previous_dir->direntlen); + new_len += le16_to_cpu(dir->direntlen); + previous_dir->direntlen = cpu_to_le16(new_len); + } else { + /* invalidate dir entry */ + dir->inode = 0; + } if (ext4fs_put_metadata(block_buffer, blknr)) goto fail; ret = inodeno; -- 2.10.0

3 3

[U-Boot] [PATCH 2/3] ext4: Fix handling of direntlen in unlink_filename
by Stefan Brüns 24 Oct '16

24 Oct '16

The direntlen checks were quite bogus, i.e. the loop termination used "len + offset == blocksize" (exact match only), and checked for a direntlen less than 0. The latter can never happen as the len is unsigned, this has been reported by Coverity, CID 153384. Use the same code as in search_dir for directory traversal. This code has the correct checks for direntlen >= sizeof(struct dirent), and offset < blocksize. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- fs/ext4/ext4_common.c | 45 +++++++++++++++++---------------------------- 1 file changed, 17 insertions(+), 28 deletions(-) diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index 699a640..11be0b7 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -854,16 +854,15 @@ fail: static int unlink_filename(char *filename, unsigned int blknr) { - int templength = 0; - int status, inodeno; - int found = 0; + int status; + int inodeno = 0; int offset; char *block_buffer = NULL; struct ext2_dirent *dir = NULL; - struct ext2_dirent *previous_dir = NULL; - char *ptr = NULL; + struct ext2_dirent *previous_dir; struct ext_filesystem *fs = get_fs(); int ret = -1; + char *direntname; block_buffer = zalloc(fs->blksz); if (!block_buffer) @@ -877,20 +876,18 @@ static int unlink_filename(char *filename, unsigned int blknr) if (ext4fs_log_journal(block_buffer, blknr)) goto fail; - dir = (struct ext2_dirent *)block_buffer; - ptr = (char *)dir; offset = 0; - while (le16_to_cpu(dir->direntlen) >= 0) { - /* - * blocksize-offset because last - * directory length i.e., *dir->direntlen - * is free availble space in the block that - * means it is a last entry of directory entry - */ + do { + previous_dir = dir; + dir = (struct ext2_dirent *)(block_buffer + offset); + direntname = (char *)(dir) + sizeof(struct ext2_dirent); + + int direntlen = le16_to_cpu(dir->direntlen); + if (direntlen < sizeof(struct ext2_dirent)) + break; + if (dir->inode && (strlen(filename) == dir->namelen) && - (strncmp(ptr + sizeof(struct ext2_dirent), - filename, dir->namelen) == 0)) { - printf("file found, deleting\n"); + (strncmp(direntname, filename, dir->namelen) == 0)) { inodeno = le32_to_cpu(dir->inode); if (previous_dir) { uint16_t new_len; @@ -900,23 +897,15 @@ static int unlink_filename(char *filename, unsigned int blknr) } else { dir->inode = 0; } - found = 1; break; } - if (fs->blksz - offset == le16_to_cpu(dir->direntlen)) - break; + offset += direntlen; - /* traversing the each directory entry */ - templength = le16_to_cpu(dir->direntlen); - offset = offset + templength; - previous_dir = dir; - dir = (struct ext2_dirent *)((char *)dir + templength); - ptr = (char *)dir; - } + } while (offset < fs->blksz); + if (inodeno > 0) { - if (found == 1) { if (ext4fs_put_metadata(block_buffer, blknr)) goto fail; ret = inodeno; -- 2.10.0

3 3

[U-Boot] [PATCH 1/3] ext4: cleanup unlink_filename function
by Stefan Brüns 24 Oct '16

24 Oct '16

Use the same variable names as in search_dir, to make purpose of variables more obvious. Signed-off-by: Stefan Brüns <stefan.bruens(a)rwth-aachen.de> --- fs/ext4/ext4_common.c | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/fs/ext4/ext4_common.c b/fs/ext4/ext4_common.c index e78185b..699a640 100644 --- a/fs/ext4/ext4_common.c +++ b/fs/ext4/ext4_common.c @@ -854,34 +854,35 @@ fail: static int unlink_filename(char *filename, unsigned int blknr) { - int totalbytes = 0; int templength = 0; int status, inodeno; int found = 0; - char *root_first_block_buffer = NULL; + int offset; + char *block_buffer = NULL; struct ext2_dirent *dir = NULL; struct ext2_dirent *previous_dir = NULL; char *ptr = NULL; struct ext_filesystem *fs = get_fs(); int ret = -1; - /* get the first block of root */ - root_first_block_buffer = zalloc(fs->blksz); - if (!root_first_block_buffer) + block_buffer = zalloc(fs->blksz); + if (!block_buffer) return -ENOMEM; + + /* read the directory block */ status = ext4fs_devread((lbaint_t)blknr * fs->sect_perblk, 0, - fs->blksz, root_first_block_buffer); + fs->blksz, block_buffer); if (status == 0) goto fail; - if (ext4fs_log_journal(root_first_block_buffer, blknr)) + if (ext4fs_log_journal(block_buffer, blknr)) goto fail; - dir = (struct ext2_dirent *)root_first_block_buffer; + dir = (struct ext2_dirent *)block_buffer; ptr = (char *)dir; - totalbytes = 0; + offset = 0; while (le16_to_cpu(dir->direntlen) >= 0) { /* - * blocksize-totalbytes because last + * blocksize-offset because last * directory length i.e., *dir->direntlen * is free availble space in the block that * means it is a last entry of directory entry @@ -903,12 +904,12 @@ static int unlink_filename(char *filename, unsigned int blknr) break; } - if (fs->blksz - totalbytes == le16_to_cpu(dir->direntlen)) + if (fs->blksz - offset == le16_to_cpu(dir->direntlen)) break; /* traversing the each directory entry */ templength = le16_to_cpu(dir->direntlen); - totalbytes = totalbytes + templength; + offset = offset + templength; previous_dir = dir; dir = (struct ext2_dirent *)((char *)dir + templength); ptr = (char *)dir; @@ -916,12 +917,12 @@ static int unlink_filename(char *filename, unsigned int blknr) if (found == 1) { - if (ext4fs_put_metadata(root_first_block_buffer, blknr)) + if (ext4fs_put_metadata(block_buffer, blknr)) goto fail; ret = inodeno; } fail: - free(root_first_block_buffer); + free(block_buffer); return ret; } -- 2.10.0

2 2