December 2020 - U-Boot

Please pull u-boot-x86
by Bin Meng 23 Dec '20

23 Dec '20

Hi Tom, This PR includes the following changes for v2021.01 release: - Update Intel Edison doc information about xFSTK - Move and rename fsp_types.h file to signatures.h Azure results: PASS https://dev.azure.com/bmeng/GitHub/_build/results?buildId=304&view=results The following changes since commit c15f44acf9d473f4682bfdc63b8aebd313492b15: Prepare v2021.01-rc4 (2020-12-21 15:03:24 -0500) are available in the git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-x86 for you to fetch changes up to 6ef1b7508740dfce9b30f172839b385361e8bd50: fsp: Move and rename fsp_types.h file (2020-12-22 10:19:40 +0800) ---------------------------------------------------------------- Andy Shevchenko (1): doc: edison: Update information about xFSTK Sughosh Ganu (1): fsp: Move and rename fsp_types.h file arch/x86/include/asm/fsp/fsp_support.h | 3 ++- doc/board/intel/edison.rst | 49 +++++++++++++++++++++++++++++-------------------- arch/x86/include/asm/fsp/fsp_types.h => include/signatures.h | 6 +++--- 3 files changed, 34 insertions(+), 24 deletions(-) rename arch/x86/include/asm/fsp/fsp_types.h => include/signatures.h (95%) Regards, Bin

2 1

[u-boot,v2019.04-aspeed, v1 0/1] Common:fdt: Check for error return
by Hongwei Zhang 23 Dec '20

23 Dec '20

Hello Reviewer, Check for negative return value of fdt_noffset from calling boot_get_fdt_fit(). Otherwise, when fdt subimage is corrupted, the u-boot report bad hash value but continue loading kernel image and get hanged later. Hongwei Zhang (1): Common:fdt: Check for error return value common/image-fdt.c | 3 +++ 1 file changed, 3 insertions(+) -- 2.17.1

3 6

[PATCH v2 0/6] spi: spi-uclass: Fix spi_claim_bus() speed/mode setup logic
by Ovidiu Panait 23 Dec '20

23 Dec '20

This patchset fixes spi_claim_bus() handling of the speed/mode settings when multiple spi slaves claim the bus consecutively, as reported here: https://lists.denx.de/pipermail/u-boot/2019-December/393854.html https://lists.denx.de/pipermail/u-boot/2020-November/431554.html It also does some minor cleanups and adds a sandbox testcase for spi_claim_bus(). Changes in v2: - add reviewed-by tag - add reviewed-by tag - none - add reviewed-by tag - add reviewed-by tag - add reviewed-by tag - properly restore slave_a->mode from platdata: <snip> - slave_a->mode = slave_plat->max_hz; + slave_a->mode = slave_plat->mode; Ovidiu Panait (6): sandbox: spi: Drop unused sandbox_spi_parse_spec function sandbox: test: Add a second SPI slave on sandbox_spi bus spi: sandbox_spi: Implement speed/mode setup test: spi: Add sandbox_spi_get_{speed, mode} interface spi: spi-uclass: Fix spi_claim_bus() speed/mode setup logic test: dm: spi: Add testcase for spi_claim_bus() arch/sandbox/dts/test.dts | 10 +++- arch/sandbox/include/asm/spi.h | 10 ---- arch/sandbox/include/asm/test.h | 16 +++++++ drivers/mmc/mmc_spi.c | 1 - drivers/spi/sandbox_spi.c | 58 ++++++++++++++++------- drivers/spi/spi-uclass.c | 17 +++++-- include/spi.h | 18 +++++-- test/dm/spi.c | 84 ++++++++++++++++++++++++++++++++- 8 files changed, 175 insertions(+), 39 deletions(-) -- 2.17.1

2 12

[PATCH 1/3] patman: Add --no-signoff to suppress adding signoffs
by Philipp Tomsich 23 Dec '20

23 Dec '20

To enable use of patman with FSF/GNU projects, such as GCC or Binutils, no Signed-off-by may be added. This adds a command line flag '--no-signoff' to suppress adding signoffs in patman when processing commits. Signed-off-by: Philipp Tomsich <philipp.tomsich(a)vrull.eu> --- tools/patman/control.py | 6 +++--- tools/patman/gitutil.py | 6 ++++-- tools/patman/main.py | 2 ++ 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/tools/patman/control.py b/tools/patman/control.py index 2330682..ee9717c 100644 --- a/tools/patman/control.py +++ b/tools/patman/control.py @@ -20,7 +20,7 @@ def setup(): """Do required setup before doing anything""" gitutil.Setup() -def prepare_patches(col, branch, count, start, end, ignore_binary): +def prepare_patches(col, branch, count, start, end, ignore_binary, signoff): """Figure out what patches to generate, then generate them The patch files are written to the current directory, e.g. 0001_xxx.patch @@ -56,7 +56,7 @@ def prepare_patches(col, branch, count, start, end, ignore_binary): to_do = count - end series = patchstream.get_metadata(branch, start, to_do) cover_fname, patch_files = gitutil.CreatePatches( - branch, start, to_do, ignore_binary, series) + branch, start, to_do, ignore_binary, series, signoff) # Fix up the patch files to our liking, and insert the cover letter patchstream.fix_patches(series, patch_files) @@ -163,7 +163,7 @@ def send(args): col = terminal.Color() series, cover_fname, patch_files = prepare_patches( col, args.branch, args.count, args.start, args.end, - args.ignore_binary) + args.ignore_binary, args.add_signoff) ok = check_patches(series, patch_files, args.check_patch, args.verbose) diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py index 31fb3b2..5736d37 100644 --- a/tools/patman/gitutil.py +++ b/tools/patman/gitutil.py @@ -305,7 +305,7 @@ def PruneWorktrees(git_dir): if result.return_code != 0: raise OSError('git worktree prune: %s' % result.stderr) -def CreatePatches(branch, start, count, ignore_binary, series): +def CreatePatches(branch, start, count, ignore_binary, series, signoff = True): """Create a series of patches from the top of the current branch. The patch files are written to the current directory using @@ -323,7 +323,9 @@ def CreatePatches(branch, start, count, ignore_binary, series): """ if series.get('version'): version = '%s ' % series['version'] - cmd = ['git', 'format-patch', '-M', '--signoff'] + cmd = ['git', 'format-patch', '-M' ] + if signoff: + cmd.append('--signoff') if ignore_binary: cmd.append('--no-binary') if series.get('cover'): diff --git a/tools/patman/main.py b/tools/patman/main.py index 342fd44..c4e4d80 100755 --- a/tools/patman/main.py +++ b/tools/patman/main.py @@ -81,6 +81,8 @@ send.add_argument('--no-check', action='store_false', dest='check_patch', help="Don't check for patch compliance") send.add_argument('--no-tags', action='store_false', dest='process_tags', default=True, help="Don't process subject tags as aliases") +send.add_argument('--no-signoff', action='store_false', dest='add_signoff', + default=True, help="Don't add Signed-off-by to patches") send.add_argument('--smtp-server', type=str, help="Specify the SMTP server to 'git send-email'") -- 1.8.3.1

2 12

[PATCH 1/2] configs: sandbox: activate DEBUG_UART
by Patrick Delaunay 23 Dec '20

23 Dec '20

Add CONFIG_DEBUG_UART=y for all sandbox defconfig as it is already done in sandbox_defconfig. Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> --- configs/sandbox64_defconfig | 1 + configs/sandbox_flattree_defconfig | 1 + configs/sandbox_spl_defconfig | 1 + 3 files changed, 3 insertions(+) diff --git a/configs/sandbox64_defconfig b/configs/sandbox64_defconfig index dc993cd13a..3bcf472a47 100644 --- a/configs/sandbox64_defconfig +++ b/configs/sandbox64_defconfig @@ -5,6 +5,7 @@ CONFIG_PRE_CON_BUF_ADDR=0x100000 CONFIG_BOOTSTAGE_STASH_ADDR=0x0 CONFIG_DEFAULT_DEVICE_TREE="sandbox64" CONFIG_SANDBOX64=y +CONFIG_DEBUG_UART=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y diff --git a/configs/sandbox_flattree_defconfig b/configs/sandbox_flattree_defconfig index 1f593eba8f..4ac72aa5ce 100644 --- a/configs/sandbox_flattree_defconfig +++ b/configs/sandbox_flattree_defconfig @@ -3,6 +3,7 @@ CONFIG_NR_DRAM_BANKS=1 CONFIG_ENV_SIZE=0x2000 CONFIG_BOOTSTAGE_STASH_ADDR=0x0 CONFIG_DEFAULT_DEVICE_TREE="sandbox" +CONFIG_DEBUG_UART=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y diff --git a/configs/sandbox_spl_defconfig b/configs/sandbox_spl_defconfig index 1ac843e1bc..e3b435837b 100644 --- a/configs/sandbox_spl_defconfig +++ b/configs/sandbox_spl_defconfig @@ -9,6 +9,7 @@ CONFIG_SPL=y CONFIG_BOOTSTAGE_STASH_ADDR=0x0 CONFIG_DEFAULT_DEVICE_TREE="sandbox" CONFIG_SANDBOX_SPL=y +CONFIG_DEBUG_UART=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y -- 2.17.1

4 8

[PATCH 1/1] sandbox: implement runtime system reset
by Heinrich Schuchardt 23 Dec '20

23 Dec '20

Implement a reset function that we can call after ExitBootServices(), when all driver model devices are gone. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- arch/sandbox/cpu/start.c | 10 ++++++++++ lib/efi_loader/Kconfig | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/arch/sandbox/cpu/start.c b/arch/sandbox/cpu/start.c index a03e5aa0b3..cd324767d0 100644 --- a/arch/sandbox/cpu/start.c +++ b/arch/sandbox/cpu/start.c @@ -6,6 +6,7 @@ #include <common.h> #include <command.h> #include <dm/root.h> +#include <efi_loader.h> #include <errno.h> #include <init.h> #include <os.h> @@ -406,6 +407,15 @@ void state_show(struct sandbox_state *state) printf("\n"); } +void __efi_runtime EFIAPI efi_reset_system( + enum efi_reset_type reset_type, + efi_status_t reset_status, + unsigned long data_size, void *reset_data) +{ + os_fd_restore(); + os_relaunch(os_argv); +} + void sandbox_reset(void) { /* Do this here while it still has an effect */ diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index 7fd3a3c90c..31da8800e0 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -165,7 +165,8 @@ config EFI_HAVE_RUNTIME_RESET # bool "Reset runtime service is available" bool default y - depends on ARCH_BCM283X || FSL_LAYERSCAPE || PSCI_RESET || SYSRESET_X86 + depends on ARCH_BCM283X || FSL_LAYERSCAPE || PSCI_RESET || \ + SANDBOX || SYSRESET_X86 config EFI_GRUB_ARM32_WORKAROUND bool "Workaround for GRUB on 32bit ARM" -- 2.29.2

2 2

[PATCH v3] fdt: Use phandle to distinguish DT nodes with same name
by Aswath Govindraju 23 Dec '20

23 Dec '20

While assigning the sequence number to subsystem instances by reading the aliases property, only DT nodes names are compared and not the complete path. This causes a problem when there are two DT nodes with same name but have different paths. In arch/arm/dts/k3-am65-main.dtsi there are two USB controllers with the same device tree node name but different path. When aliases are defined for these USB controllers then fdtdec_get_alias_seq() fails to pick the correct instance for a given index. fdt_path_offset() function is slow and this would effect the U-Boot startup. To avert the time penalty on all boards, apply this extra check only when required by using a config option. Fix it by comparing the phandles of DT nodes after the node names match, under a config option. Signed-off-by: Aswath Govindraju <a-govindraju(a)ti.com> --- Changes since v2: - changed #ifdef to if(IS_ENABLED()) - corrected errors in commit description Changes since v1: - Added a config option as fdt_path_offset() slows down the u-boot start up and would be better to be enabled only when required - Added an example case in commit message where the following fix is required. lib/Kconfig | 8 ++++++++ lib/fdtdec.c | 11 +++++++++++ 2 files changed, 19 insertions(+) diff --git a/lib/Kconfig b/lib/Kconfig index 8efb154f7344..9813a3a5e0ba 100644 --- a/lib/Kconfig +++ b/lib/Kconfig @@ -685,3 +685,11 @@ config LIB_ELF This supports fir 32 bit and 64 bit versions. endmenu + +config PHANDLE_CHECK_SEQ + bool "Enable phandle check while getting sequence number" + default n + help + When there are multiple device tree nodes with same name, + enable this config option to distinguish them using + phandles in fdtdec_get_alias_seq() function. diff --git a/lib/fdtdec.c b/lib/fdtdec.c index ee1bd41b0818..0ab7105fef0d 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -500,6 +500,17 @@ int fdtdec_get_alias_seq(const void *blob, const char *base, int offset, slash = strrchr(prop, '/'); if (strcmp(slash + 1, find_name)) continue; + + /* + * Adding an extra check to distinguish DT nodes with + * same name + */ + if (IS_ENABLED(CONFIG_PHANDLE_CHECK_SEQ)) { + if (fdt_get_phandle(blob, offset) != + fdt_get_phandle(blob, fdt_path_offset(blob, prop))) + continue; + } + val = trailing_strtol(name); if (val != -1) { *seqp = val; -- 2.17.1

2 2

[PATCH] dm: spi: Fix spi_free_slave() freed memory write
by Niel Fourie 23 Dec '20

23 Dec '20

Remove setting slave->dev to NULL after the device_remove() call. The slave pointer points to dev->parent_priv, which has already been freed by device_free(), called from device_remove() in the preceding line. Writing to slave->dev may cause corruption of the dlmalloc free chunk forward pointer of the previously freed chunk. Signed-off-by: Niel Fourie <lusus(a)denx.de> Cc: Simon Glass <sjg(a)chromium.org> --- drivers/spi/spi-uclass.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/spi/spi-uclass.c b/drivers/spi/spi-uclass.c index 55a8eed8901..a16ac9280fd 100644 --- a/drivers/spi/spi-uclass.c +++ b/drivers/spi/spi-uclass.c @@ -428,7 +428,6 @@ struct spi_slave *spi_setup_slave(unsigned int busnum, unsigned int cs, void spi_free_slave(struct spi_slave *slave) { device_remove(slave->dev, DM_REMOVE_NORMAL); - slave->dev = NULL; } int spi_slave_ofdata_to_platdata(struct udevice *dev, -- 2.28.0

2 2

[PATCH] buildman: Remove output binaries before building
by Simon Glass 23 Dec '20

23 Dec '20

Buildman reuses build directories from previous builds to avoid the cost of 'make mrproper' for every build. If the previous build produced an SPL image but the current one does not, the SPL image will remain and buildman will think it is a result of building the current board. Remove these files before building, to avoid this problem. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- tools/buildman/builderthread.py | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index c5bf31e9e11..d6648685823 100644 --- a/tools/buildman/builderthread.py +++ b/tools/buildman/builderthread.py @@ -13,6 +13,7 @@ from patman import command from patman import gitutil RETURN_CODE_RETRY = -1 +BASE_ELF_FILENAMES = ['u-boot', 'spl/u-boot-spl', 'tpl/u-boot-tpl'] def Mkdir(dirname, parents = False): """Make a directory if it doesn't already exist. @@ -240,6 +241,17 @@ class BuilderThread(threading.Thread): args.extend(self.builder.toolchains.GetMakeArguments(brd)) args.extend(self.toolchain.MakeArgs()) + # Remove any output targets. Since we use a build directory that + # was previously used by another board, it may have produced an + # SPL image. If we don't remove it (i.e. see do_config and + # self.mrproper below) then it will appear to be the output of + # this build, even if it does not produce SPL images. + build_dir = self.builder.GetBuildDir(commit_upto, brd.target) + for elf in BASE_ELF_FILENAMES: + fname = os.path.join(out_dir, elf) + if os.path.exists(fname): + os.remove(fname) + # If we need to reconfigure, do that now if do_config: config_out = '' @@ -335,7 +347,7 @@ class BuilderThread(threading.Thread): for var in sorted(env.keys()): print('%s="%s"' % (var, env[var]), file=fd) lines = [] - for fname in ['u-boot', 'spl/u-boot-spl', 'tpl/u-boot-tpl']: + for fname in BASE_ELF_FILENAMES: cmd = ['%snm' % self.toolchain.cross, '--size-sort', fname] nm_result = command.RunPipe([cmd], capture=True, capture_stderr=True, cwd=result.out_dir, -- 2.29.2.684.gfbc64c5ab5-goog

1 1

[PATCH] dm: core: Inline a few ofnode functions in SPL
by Simon Glass 23 Dec '20

23 Dec '20

A recent change to unify the flattree/livetree code introduced a small size increase in SPL on some boards. For example SPL code size for px30-core-ctouch2-px30 increased by 40 bytes. To address this we can take advantage of the fact that some of the ofnode functions are only called a few times in SPL, so it is worth inlining them. Add new Kconfig options to control this. These functions are not inlined for U-Boot proper, since this increases code size. Fixes: 2ebea5eaebf ("dm: core: Combine the flattree and livetree binding code") Signed-off-by: Simon Glass <sjg(a)chromium.org> --- This series mostly improves code size: 04: dm: core: Inline a few ofnode functions in SPL arm: brppt1_spi brsmarc1 aarch64: (for 267/267 boards) spl/u-boot-spl:all -8.9 spl/u-boot-spl:text -8.9 arm: (for 693/693 boards) all +65.1 bss +0.2 data +64.9 rodata +0.0 spl/u-boot-spl:all -6.6 spl/u-boot-spl:text -6.6 text -0.0 microblaze: (for 1/1 boards) spl/u-boot-spl:all -132.0 spl/u-boot-spl:text -132.0 mips: (for 44/44 boards) spl/u-boot-spl:all -9.0 spl/u-boot-spl:text -9.0 riscv: (for 18/18 boards) spl/u-boot-spl:all +17.3 spl/u-boot-spl:text +17.3 x86: (for 28/28 boards) spl/u-boot-spl:all -6.1 spl/u-boot-spl:text -6.1 tpl/u-boot-tpl:all -1.5 tpl/u-boot-tpl:text -1.5 For the particular board mentioned with the problem (px30-core-ctouch2-px30) it erases the size 40-byte increase: 04: dm: core: Inline a few ofnode functions in SPL aarch64: (for 1/1 boards) spl/u-boot-spl:all -84.0 spl/u-boot-spl:text -84.0 drivers/core/Kconfig | 16 +++++++++++++ drivers/core/ofnode.c | 2 ++ include/dm/ofnode.h | 56 ++++++++++++++++++++++++++++++++++--------- 3 files changed, 63 insertions(+), 11 deletions(-) diff --git a/drivers/core/Kconfig b/drivers/core/Kconfig index ffae6f9795f..65a503e76d1 100644 --- a/drivers/core/Kconfig +++ b/drivers/core/Kconfig @@ -113,6 +113,22 @@ config SPL_DM_SEQ_ALIAS numbered devices (e.g. serial0 = &serial0). This feature can be disabled if it is not required, to save code space in SPL. +config SPL_DM_INLINE_OFNODE + bool "Inline some ofnode functions which are seldom used in SPL" + depends on SPL_DM + default y + help + This applies to several ofnode functions (see ofnode.h) which are + seldom used. Inlining them can help reduce code size. + +config TPL_DM_INLINE_OFNODE + bool "Inline some ofnode functions which are seldom used in TPL" + depends on TPL_DM + default y + help + This applies to several ofnode functions (see ofnode.h) which are + seldom used. Inlining them can help reduce code size. + config REGMAP bool "Support register maps" depends on DM diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c index 87072094f32..2a6e43ddc6b 100644 --- a/drivers/core/ofnode.c +++ b/drivers/core/ofnode.c @@ -226,6 +226,7 @@ int ofnode_read_u32_array(ofnode node, const char *propname, } } +#if !CONFIG_IS_ENABLED(DM_INLINE_OFNODE) bool ofnode_is_enabled(ofnode node) { if (ofnode_is_np(node)) { @@ -255,6 +256,7 @@ ofnode ofnode_next_subnode(ofnode node) return offset_to_ofnode( fdt_next_subnode(gd->fdt_blob, ofnode_to_offset(node))); } +#endif /* !DM_INLINE_OFNODE */ ofnode ofnode_get_parent(ofnode node) { diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h index 53f04ac91d0..5b088650d3b 100644 --- a/include/dm/ofnode.h +++ b/include/dm/ofnode.h @@ -10,6 +10,7 @@ /* TODO(sjg(a)chromium.org): Drop fdtdec.h include */ #include <fdtdec.h> #include <dm/of.h> +#include <dm/of_access.h> #include <log.h> /* Enable checks to protect against invalid calls */ @@ -357,17 +358,6 @@ const char *ofnode_read_string(ofnode node, const char *propname); */ int ofnode_read_u32_array(ofnode node, const char *propname, u32 *out_values, size_t sz); -/** - * ofnode_is_enabled() - Checks whether a node is enabled. - * This looks for a 'status' property. If this exists, then returns true if - * the status is 'okay' and false otherwise. If there is no status property, - * it returns true on the assumption that anything mentioned should be enabled - * by default. - * - * @node: node to examine - * @return false (not enabled) or true (enabled) - */ -bool ofnode_is_enabled(ofnode node); /** * ofnode_read_bool() - read a boolean value from a property @@ -388,6 +378,49 @@ bool ofnode_read_bool(ofnode node, const char *propname); */ ofnode ofnode_find_subnode(ofnode node, const char *subnode_name); +#if CONFIG_IS_ENABLED(DM_INLINE_OFNODE) +static inline bool ofnode_is_enabled(ofnode node) +{ + if (ofnode_is_np(node)) { + return of_device_is_available(ofnode_to_np(node)); + } else { + return fdtdec_get_is_enabled(gd->fdt_blob, + ofnode_to_offset(node)); + } +} + +static inline ofnode ofnode_first_subnode(ofnode node) +{ + assert(ofnode_valid(node)); + if (ofnode_is_np(node)) + return np_to_ofnode(node.np->child); + + return offset_to_ofnode( + fdt_first_subnode(gd->fdt_blob, ofnode_to_offset(node))); +} + +static inline ofnode ofnode_next_subnode(ofnode node) +{ + assert(ofnode_valid(node)); + if (ofnode_is_np(node)) + return np_to_ofnode(node.np->sibling); + + return offset_to_ofnode( + fdt_next_subnode(gd->fdt_blob, ofnode_to_offset(node))); +} +#else +/** + * ofnode_is_enabled() - Checks whether a node is enabled. + * This looks for a 'status' property. If this exists, then returns true if + * the status is 'okay' and false otherwise. If there is no status property, + * it returns true on the assumption that anything mentioned should be enabled + * by default. + * + * @node: node to examine + * @return false (not enabled) or true (enabled) + */ +bool ofnode_is_enabled(ofnode node); + /** * ofnode_first_subnode() - find the first subnode of a parent node * @@ -405,6 +438,7 @@ ofnode ofnode_first_subnode(ofnode node); * has no more siblings) */ ofnode ofnode_next_subnode(ofnode node); +#endif /* DM_INLINE_OFNODE */ /** * ofnode_get_parent() - get the ofnode's parent (enclosing ofnode) -- 2.29.2.684.gfbc64c5ab5-goog

1 1