February 2016 - U-Boot

[U-Boot] [PATCH] test/py: handle exceptions in console creation
by Stephen Warren 15 Feb '16

15 Feb '16

From: Stephen Warren <swarren(a)nvidia.com> u_boot_console.exec_attach.get_spawn() performs two steps: 1) Spawn a process to communicate with the serial console. 2) Reset the board so that U-Boot starts running from scratch. Currently, if an exception happens in step (2), no cleanup is performed on the process created in step (1). That process stays running and may e.g. hold serial port locks, or simply continue to read data from the serial port, thus preventing it from reaching any other process that attempts to read from the same serial port later. While there is error cleanup code in u_boot_console_base.ensure_spawned(), this is not triggered since the exception prevents assignment to self.p there, and hence the exception handler has no object to operate upon in cleanup_spawn(). Solve this by enhancing u_boot_console.exec_attach.get_spawn() to clean up any objects it has created. In theory, u_boot_spawn.Spawn's constructor has a similar issue, so fix this too. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- test/py/u_boot_console_exec_attach.py | 14 +++++++++----- test/py/u_boot_spawn.py | 8 ++++++-- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/test/py/u_boot_console_exec_attach.py b/test/py/u_boot_console_exec_attach.py index 1be27c193079..445b58dda612 100644 --- a/test/py/u_boot_console_exec_attach.py +++ b/test/py/u_boot_console_exec_attach.py @@ -58,10 +58,14 @@ class ConsoleExecAttach(ConsoleBase): args = [self.config.board_type, self.config.board_identity] s = Spawn(['u-boot-test-console'] + args) - self.log.action('Resetting board') - cmd = ['u-boot-test-reset'] + args - runner = self.log.get_runner(cmd[0], sys.stdout) - runner.run(cmd) - runner.close() + try: + self.log.action('Resetting board') + cmd = ['u-boot-test-reset'] + args + runner = self.log.get_runner(cmd[0], sys.stdout) + runner.run(cmd) + runner.close() + except: + s.close() + raise return s diff --git a/test/py/u_boot_spawn.py b/test/py/u_boot_spawn.py index 3d9cde5ee0d0..a5f4a8e91bae 100644 --- a/test/py/u_boot_spawn.py +++ b/test/py/u_boot_spawn.py @@ -56,8 +56,12 @@ class Spawn(object): finally: os._exit(255) - self.poll = select.poll() - self.poll.register(self.fd, select.POLLIN | select.POLLPRI | select.POLLERR | select.POLLHUP | select.POLLNVAL) + try: + self.poll = select.poll() + self.poll.register(self.fd, select.POLLIN | select.POLLPRI | select.POLLERR | select.POLLHUP | select.POLLNVAL) + except: + self.close() + raise def kill(self, sig): """Send unix signal "sig" to the child process. -- 2.7.0

3 3

[U-Boot] [PATCH] test/py: print summary in test order
by Stephen Warren 15 Feb '16

15 Feb '16

From: Stephen Warren <swarren(a)nvidia.com> Use lists rather than sets to record the status of tests. This causes the test summary in the HTML file to be generated in the same order as the tests are (or would have been) run. This makes it easier to locate the first failed test. The log for this test might have interesting first clues re: interaction with the environment (e.g. hardware flashing, serial console, ...) and may help tracking down external issues. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- test/py/conftest.py | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/test/py/conftest.py b/test/py/conftest.py index 1ec096e24182..449f98bee39c 100644 --- a/test/py/conftest.py +++ b/test/py/conftest.py @@ -312,12 +312,12 @@ def u_boot_console(request): return console anchors = {} -tests_not_run = set() -tests_failed = set() -tests_xpassed = set() -tests_xfailed = set() -tests_skipped = set() -tests_passed = set() +tests_not_run = [] +tests_failed = [] +tests_xpassed = [] +tests_xfailed = [] +tests_skipped = [] +tests_passed = [] def pytest_itemcollected(item): """pytest hook: Called once for each test found during collection. @@ -332,7 +332,7 @@ def pytest_itemcollected(item): Nothing. """ - tests_not_run.add(item.name) + tests_not_run.append(item.name) def cleanup(): """Clean up all global state. @@ -493,7 +493,7 @@ def pytest_runtest_protocol(item, nextitem): if failure_cleanup: console.drain_console() - test_list.add(item.name) + test_list.append(item.name) tests_not_run.remove(item.name) try: -- 2.7.0

3 2

[U-Boot] [PATCH] test/py: fix CONFIG_SPL test
by Stephen Warren 15 Feb '16

15 Feb '16

From: Stephen Warren <swarren(a)nvidia.com> The Python ini file parser that's used to parse .config converts all keys to lower-case. Hence, all queries against the results must use lower-case. Fix u_boot_console.ensure_spawned() to test CONFIG_SPL correctly, or the connection will fail for boards that have SPL. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- test/py/u_boot_console_base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/py/u_boot_console_base.py b/test/py/u_boot_console_base.py index 7e1e9d430ffa..58575704adf5 100644 --- a/test/py/u_boot_console_base.py +++ b/test/py/u_boot_console_base.py @@ -303,7 +303,7 @@ class ConsoleBase(object): if not self.config.gdbserver: self.p.timeout = 30000 self.p.logfile_read = self.logstream - if self.config.buildconfig.get('CONFIG_SPL', False) == 'y': + if self.config.buildconfig.get('config_spl', False) == 'y': m = self.p.expect([pattern_u_boot_spl_signon] + self.bad_patterns) if m != 0: raise Exception('Bad pattern found on console: ' + -- 2.7.0

3 2

[U-Boot] [PATCH 1/2] test/py: don't import pexpect
by Stephen Warren 15 Feb '16

15 Feb '16

From: Stephen Warren <swarren(a)nvidia.com> The code replaced pexpect with custom code long ago. Don't import the unused module so it doesn't need to be installed. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- test/py/conftest.py | 1 - 1 file changed, 1 deletion(-) diff --git a/test/py/conftest.py b/test/py/conftest.py index 7b97cbaa0eed..1ec096e24182 100644 --- a/test/py/conftest.py +++ b/test/py/conftest.py @@ -17,7 +17,6 @@ import atexit import errno import os import os.path -import pexpect import pytest from _pytest.runner import runtestprotocol import ConfigParser -- 2.7.0

5 7

[U-Boot] [PATCH] test/py: add docs for gdbserver and pytest options
by Stephen Warren 15 Feb '16

15 Feb '16

From: Stephen Warren <swarren(a)nvidia.com> Add documentation describing the new --gdbserver feature, and some common pytest options. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- test/py/README.md | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 56 insertions(+), 4 deletions(-) diff --git a/test/py/README.md b/test/py/README.md index 8036299d0735..ba1674cb1de6 100644 --- a/test/py/README.md +++ b/test/py/README.md @@ -76,6 +76,43 @@ will be written to `${build_dir}/test-log.html`. This is best viewed in a web browser, but may be read directly as plain text, perhaps with the aid of the `html2text` utility. +### Testing under a debugger + +If you need to run sandbox under a debugger, you may pass the command-line +option `--gdbserver COMM`. This causes two things to happens: + +- Instead of running U-Boot directly, it will be run under gdbserver, with + debug communication via the channel `COMM`. You can attach a debugger to the + sandbox process in order to debug it. See `man gdbserver` and the example + below for details of valid values for `COMM`. +- All timeouts in tests are disabled, allowing U-Boot an arbitrary amount of + time to execute commands. This is useful if U-Boot is stopped at a breakpoint + during debugging. + +A usage example is: + +Window 1: +```shell +./test/py/test.py --bd sandbox --gdbserver localhost:1234 +``` + +Window 2: +```shell +gdb ./build-sandbox/u-boot -ex 'target remote localhost:1234' +``` + +Alternatively, you could leave off the `-ex` option and type the command +manually into gdb once it starts. + +You can use any debugger you wish, so long as it speaks the gdb remote +protocol, or any graphical wrapper around gdb. + +Some tests deliberately cause the sandbox process to exit, e.g. to test the +reset command, or sandbox's CTRL-C handling. When this happens, you will need +to attach the debugger to the new sandbox instance. If these tests are not +relevant to your debugging session, you can skip them using pytest's -k +command-line option; see the next section. + ## Command-line options - `--board-type`, `--bd`, `-B` set the type of the board to be tested. For @@ -98,10 +135,25 @@ browser, but may be read directly as plain text, perhaps with the aid of the data. This is test data that may be re-used across test runs, such as file- system images. -`pytest` also implements a number of its own command-line options. Please see -`pytest` documentation for complete details. Execute `py.test --version` for -a brief summary. Note that U-Boot's test.py script passes all command-line -arguments directly to `pytest` for processing. +`pytest` also implements a number of its own command-line options. Commonly used +options are mentioned below. Please see `pytest` documentation for complete +details. Execute `py.test --version` for a brief summary. Note that U-Boot's +test.py script passes all command-line arguments directly to `pytest` for +processing. + +- `-k` selects which tests to run. The default is to run all known tests. This + option takes a single argument which is used to filter test names. Simple + logical operators are supported. For example: + - `'ums'` runs only tests with "ums" in their name. + - ``ut_dm'` runs only tests with "ut_dm" in their name. Note that in this + case, "ut_dm" is a parameter to a test rather than the test name. The full + test name is e.g. "test_ut[ut_dm_leak]". + - `'not reset'` runs everything except tests with "reset" in their name. + - `'ut or hush'` runs only tests with "ut" or "hush" in their name. + - `'not (ut or hush)'` runs everything except tests with "ut" or "hush" in + their name. +- `-s` prevents pytest from hiding a test's stdout. This allows you to see + U-Boot's console log in real time on pytest's stdout. ## Testing real hardware -- 2.7.0

3 2

[U-Boot] [PATCH V3 1/2] Makefile: generate symbol list from u-boot
by Stephen Warren 15 Feb '16

15 Feb '16

From: Stephen Warren <swarren(a)nvidia.com> This information may be useful for both debugging, and processes that want to perform simple forms of introspection on the U-Boot binary, such as determining the set of "ut" subtests that are compiled in. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> Acked-by: Simon Glass <sjg(a)chromium.org> --- v3: s/syms/sym/ in symbol file name. v2: New patch. --- Makefile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 430dd4f83e8c..42fad45afee1 100644 --- a/Makefile +++ b/Makefile @@ -732,7 +732,7 @@ DO_STATIC_RELA = endif # Always append ALL so that arch config.mk's can add custom ones -ALL-y += u-boot.srec u-boot.bin System.map u-boot.cfg binary_size_check +ALL-y += u-boot.srec u-boot.bin u-boot.sym System.map u-boot.cfg binary_size_check ALL-$(CONFIG_ONENAND_U_BOOT) += u-boot-onenand.bin ifeq ($(CONFIG_SPL_FSL_PBL),y) @@ -1178,6 +1178,11 @@ ifeq ($(CONFIG_KALLSYMS),y) $(call cmd,u-boot__) common/system_map.o endif +quiet_cmd_sym ?= SYM $@ + cmd_sym ?= $(OBJDUMP) -t $< > $@ +u-boot.sym: u-boot FORCE + $(call if_changed,sym) + # The actual objects are generated when descending, # make sure no implicit rule kicks in $(sort $(u-boot-init) $(u-boot-main)): $(u-boot-dirs) ; -- 2.7.0

2 3

[U-Boot] [PATCH] gpio: Correct handling of 'gpio status'
by Simon Glass 15 Feb '16

15 Feb '16

This is broken - we need to look at the first two characters to distinguish 'gpio status' from 'gpio set'. Fixes: 0ffe6ab5 (gpio: Allow 's' as an abbreviation for 'status') Reported-by: Soeren Moch <smoch(a)web.de> Signed-off-by: Simon Glass <sjg(a)chromium.org> --- cmd/gpio.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/gpio.c b/cmd/gpio.c index 2b78b16..693998e 100644 --- a/cmd/gpio.c +++ b/cmd/gpio.c @@ -141,7 +141,7 @@ static int do_gpio(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #endif if (argc > 0) str_gpio = *argv; - if (!strncmp(str_cmd, "status", 1)) { + if (!strncmp(str_cmd, "status", 2)) { /* Support deprecated gpio_status() */ #ifdef gpio_status gpio_status(); -- 2.7.0.rc3.207.g0ac5344

5 4

[U-Boot] [PATCH v2] tools: fix env_flags build
by Lubomir Rintel 15 Feb '16

15 Feb '16

$ make tools-all ... In file included from tools/env/env_flags.c:1:0: tools/env/../../common/env_flags.c: In function ‘env_flags_parse_varaccess_from_binflags’: tools/env/../../common/env_flags.c:156:18: warning: implicit declaration of function ‘ARRAY_SIZE’ [-Wimplicit-function-declaration] for (i = 0; i < ARRAY_SIZE(env_flags_varaccess_mask); i++) ^ Seems like the other utilities just add a copy of ARRAY_SIZE since there's nowhere to include it from (tools/imagetool.h, tools/mxsimage.h). Let's do the same here. Signed-off-by: Lubomir Rintel <lkundrak(a)v3.sk> --- Changes since v1: - Moved from tools/env/env_flags.c to common/env_flags.c as per suggestion from Tom Rini common/env_flags.c | 1 + 1 file changed, 1 insertion(+) diff --git a/common/env_flags.c b/common/env_flags.c index 735bba5..921d377 100644 --- a/common/env_flags.c +++ b/common/env_flags.c @@ -15,6 +15,7 @@ #include <env_attr.h> #include <env_flags.h> #define getenv fw_getenv +#define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0])) #else #include <common.h> #include <environment.h> -- 2.5.0

2 1

[U-Boot] [PATCH] ARM: rpi: set initrd_high
by Lubomir Rintel 15 Feb '16

15 Feb '16

The kernel gets much too sad when the ramdisk is loaded too high into the 1GiB of memory on Raspberry Pi 2: ## Flattened Device Tree blob at 00000100 Booting using the fdt blob at 0x000100 Loading Ramdisk to 39c14000, end 3ab45067 ... OK Using Device Tree in place at 00000100, end 000045ea ... [ 0.599346] Unpacking initramfs... [ 0.602924] Unable to handle kernel paging request at virtual address f9c14000 Placement of the device tree was fixed in 89ca1000 (ARM: rpi: set fdt_high in the default environment). Signed-off-by: Lubomir Rintel <lkundrak(a)v3.sk> --- include/configs/rpi-common.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/rpi-common.h b/include/configs/rpi-common.h index 48f5fc2..97e5d2c 100644 --- a/include/configs/rpi-common.h +++ b/include/configs/rpi-common.h @@ -173,6 +173,7 @@ */ #define ENV_MEM_LAYOUT_SETTINGS \ "fdt_high=ffffffff\0" \ + "initrd_high=ffffffff\0" \ "fdt_addr_r=0x00000100\0" \ "pxefile_addr_r=0x00100000\0" \ "kernel_addr_r=0x01000000\0" \ -- 2.5.0

3 2

[U-Boot] [PATCH V3] Makefile: remove BUILD_TAG from KBUILD_CFLAGS
by Stephen Warren 15 Feb '16

15 Feb '16

From: Stephen Warren <swarren(a)nvidia.com> If BUILD_TAG is part of KBUILD_CFLAGS, then any time the value changes, all files get rebuilt. In a continuous integration environment, the value will change every build. This wastes time, assuming that incremental builds would otherwise occur. To solve this, remove BUILD_TAG from KBUILD_CFLAGS and add it to CFLAGS for just the one file that uses it. This does have the disadvantage that if any other files want to use the flag, we'll need to duplicate this custom CFLAGS setup logic. However, it seems unlikely we'll need this. An alternative would be to add BUILD_TAG to the "local version" and remove the special case code from display_options.c. However, that would affect the format of the U-Boot signon message, which may negatively affect people looking for specific data there. The approach of using file-specific CFLAGS was suggested by Masahiro Yamada. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- v3: Undo accidental removal of bch.o. v2: Set CFLAGS on display_options.c rather than modifying scripts/setlocalversion to add BUILD_TAG to the local version. --- Makefile | 4 ---- lib/Makefile | 1 + 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 42fad45afee1..2265b8995a7b 100644 --- a/Makefile +++ b/Makefile @@ -562,10 +562,6 @@ else KBUILD_CFLAGS += -O2 endif -ifdef BUILD_TAG -KBUILD_CFLAGS += -DBUILD_TAG='"$(BUILD_TAG)"' -endif - KBUILD_CFLAGS += $(call cc-option,-fno-stack-protector) KBUILD_CFLAGS += $(call cc-option,-fno-delete-null-pointer-checks) diff --git a/lib/Makefile b/lib/Makefile index dd36f25b2a32..1e21bcc4c75a 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -67,6 +67,7 @@ obj-$(CONFIG_ADDR_MAP) += addr_map.o obj-y += hashtable.o obj-y += errno.o obj-y += display_options.o +CFLAGS_display_options.o := $(if $(BUILD_TAG),-DBUILD_TAG='"$(BUILD_TAG)"') obj-$(CONFIG_BCH) += bch.o obj-y += crc32.o obj-y += ctype.o -- 2.7.0

4 4