September 2018 - U-Boot

[U-Boot] [PATCH 1/3] Remove CONFIG_USE_STDINT
by Masahiro Yamada 11 Sep '18

11 Sep '18

You do not need to use the typedefs provided by compiler. Our compilers are either IPL32 or LP64. Hence, U-Boot can/should always use int-ll64.h typedefs like Linux kernel, whatever the typedefs the compiler internally uses. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- README | 5 ----- arch/sandbox/include/asm/types.h | 5 ----- arch/x86/include/asm/types.h | 5 ----- config.mk | 5 ----- include/compiler.h | 5 ----- include/inttypes.h | 10 ---------- include/linux/types.h | 9 +-------- scripts/config_whitelist.txt | 1 - test/stdint/test-includes.sh | 2 -- tools/buildman/func_test.py | 2 +- 10 files changed, 2 insertions(+), 47 deletions(-) diff --git a/README b/README index aee0f73..58594f3 100644 --- a/README +++ b/README @@ -3018,11 +3018,6 @@ Configuration Settings: If defined, don't allow the -f switch to env set override variable access flags. -- CONFIG_USE_STDINT - If stdint.h is available with your toolchain you can define this - option to enable it. You can provide option 'USE_STDINT=1' when - building U-Boot to enable this. - The following definitions that deal with the placement and management of environment data (variable area); in general, we support the following configurations: diff --git a/arch/sandbox/include/asm/types.h b/arch/sandbox/include/asm/types.h index a10b455..79c85aa 100644 --- a/arch/sandbox/include/asm/types.h +++ b/arch/sandbox/include/asm/types.h @@ -41,13 +41,8 @@ typedef unsigned short u16; typedef signed int s32; typedef unsigned int u32; -#if !defined(CONFIG_USE_STDINT) || !defined(__INT64_TYPE__) typedef signed long long s64; typedef unsigned long long u64; -#else -typedef __INT64_TYPE__ s64; -typedef __UINT64_TYPE__ u64; -#endif /* * Number of bits in a C 'long' on this architecture. diff --git a/arch/x86/include/asm/types.h b/arch/x86/include/asm/types.h index a47e581..7649c2b 100644 --- a/arch/x86/include/asm/types.h +++ b/arch/x86/include/asm/types.h @@ -36,13 +36,8 @@ typedef unsigned short u16; typedef signed int s32; typedef unsigned int u32; -#if !defined(CONFIG_USE_STDINT) || !defined(__INT64_TYPE__) typedef signed long long s64; typedef unsigned long long u64; -#else -typedef __INT64_TYPE__ s64; -typedef __UINT64_TYPE__ u64; -#endif #if CONFIG_IS_ENABLED(X86_64) #define BITS_PER_LONG 64 diff --git a/config.mk b/config.mk index 78748cc..b4e4618 100644 --- a/config.mk +++ b/config.mk @@ -62,11 +62,6 @@ ifdef FTRACE PLATFORM_CPPFLAGS += -finstrument-functions -DFTRACE endif -# Allow use of stdint.h if available -ifneq ($(USE_STDINT),) -PLATFORM_CPPFLAGS += -DCONFIG_USE_STDINT -endif - ######################################################################### RELFLAGS := $(PLATFORM_RELFLAGS) diff --git a/include/compiler.h b/include/compiler.h index 957f4b5..29507f9 100644 --- a/include/compiler.h +++ b/include/compiler.h @@ -120,13 +120,8 @@ typedef unsigned int uint; #else /* !USE_HOSTCC */ -#ifdef CONFIG_USE_STDINT -/* Provided by gcc. */ -#include <stdint.h> -#else /* Type for `void *' pointers. */ typedef unsigned long int uintptr_t; -#endif #include <linux/string.h> #include <linux/types.h> diff --git a/include/inttypes.h b/include/inttypes.h index ea731ec..b86ad04 100644 --- a/include/inttypes.h +++ b/include/inttypes.h @@ -34,19 +34,9 @@ typedef wchar_t __gwchar_t; defined if explicitly requested. */ #if !defined __cplusplus || defined __STDC_FORMAT_MACROS -#ifdef CONFIG_USE_STDINT -# if __WORDSIZE == 64 -# define __PRI64_PREFIX "l" -# define __PRIPTR_PREFIX "l" -# else -# define __PRI64_PREFIX "ll" -# define __PRIPTR_PREFIX -# endif -#else /* linux/types.h always uses long long for 64-bit and long for uintptr_t */ # define __PRI64_PREFIX "ll" # define __PRIPTR_PREFIX "l" -#endif /* Macros for printing format specifiers. */ diff --git a/include/linux/types.h b/include/linux/types.h index 7c33e7a..1f3cd63 100644 --- a/include/linux/types.h +++ b/include/linux/types.h @@ -106,8 +106,7 @@ typedef __u8 uint8_t; typedef __u16 uint16_t; typedef __u32 uint32_t; -#if defined(__GNUC__) && !defined(__STRICT_ANSI__) && \ - (!defined(CONFIG_USE_STDINT) || !defined(__INT64_TYPE__)) +#if defined(__GNUC__) && !defined(__STRICT_ANSI__) typedef __u64 uint64_t; typedef __u64 u_int64_t; typedef __s64 int64_t; @@ -120,12 +119,6 @@ typedef __s64 int64_t; #define aligned_be64 __be64 __aligned(8) #define aligned_le64 __le64 __aligned(8) -#if defined(CONFIG_USE_STDINT) && defined(__INT64_TYPE__) -typedef __UINT64_TYPE__ uint64_t; -typedef __UINT64_TYPE__ u_int64_t; -typedef __INT64_TYPE__ int64_t; -#endif - #ifdef __KERNEL__ typedef phys_addr_t resource_size_t; #endif diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 0d60da3..fe3a772 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -4674,7 +4674,6 @@ CONFIG_USE_INTERRUPT CONFIG_USE_NOR CONFIG_USE_ONENAND_BOARD_INIT CONFIG_USE_SPIFLASH -CONFIG_USE_STDINT CONFIG_UTBIPAR_INIT_TBIPA CONFIG_U_BOOT_HDR_ADDR CONFIG_U_BOOT_HDR_SIZE diff --git a/test/stdint/test-includes.sh b/test/stdint/test-includes.sh index 077bdc7..1db8515 100755 --- a/test/stdint/test-includes.sh +++ b/test/stdint/test-includes.sh @@ -46,10 +46,8 @@ try_test() { $cmd } -# Run a test with and without CONFIG_USE_STDINT try_both() { try_test $@ - try_test $@ -DCONFIG_USE_STDINT } # board arch soc path-to-gcc diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py index 363db9d..119d02c 100644 --- a/tools/buildman/func_test.py +++ b/tools/buildman/func_test.py @@ -27,7 +27,7 @@ settings_data = ''' [make-flags] src=/home/sjg/c/src chroot=/home/sjg/c/chroot -vboot=USE_STDINT=1 VBOOT_DEBUG=1 MAKEFLAGS_VBOOT=DEBUG=1 CFLAGS_EXTRA_VBOOT=-DUNROLL_LOOPS VBOOT_SOURCE=${src}/platform/vboot_reference +vboot=VBOOT_DEBUG=1 MAKEFLAGS_VBOOT=DEBUG=1 CFLAGS_EXTRA_VBOOT=-DUNROLL_LOOPS VBOOT_SOURCE=${src}/platform/vboot_reference chromeos_coreboot=VBOOT=${chroot}/build/link/usr ${vboot} chromeos_daisy=VBOOT=${chroot}/build/daisy/usr ${vboot} chromeos_peach=VBOOT=${chroot}/build/peach_pit/usr ${vboot} -- 2.7.4

3 7

[U-Boot] [PATCH] arm: armv7-a: Compile and tune for armv7-a instead of armv5
by Adam Ford 11 Sep '18

11 Sep '18

arch/arm/Makefile references armv5 for backwards compatibility with older compilers. This patch removes those references to armv5, since by now newer compilers are required which should have armv7 support enabled. The Makefile also also has a list of options for mtune, but the entry for CONFIG_CPU_V7A is empty, so this patch tunes the CPU_V7A architecture to generic-armv7-a. The following size changed apply to omap3_logic using GCC. Stock text data bss dec hex filename 50910 429 67580 118919 1d087 spl/u-boot-spl 540713 22700 327072 890485 d9675 u-boot Without Armv5 text data bss dec hex filename 50916 429 67580 118925 1d08d spl/u-boot-spl 540719 22700 327064 890483 d9673 u-boot mtune=generic-armv7-a text data bss dec hex filename 50932 429 67580 118941 1d09d spl/u-boot-spl 540519 22700 327080 890299 d95bb u-boot Signed-off-by: Adam Ford <aford173(a)gmail.com> diff --git a/arch/arm/Makefile b/arch/arm/Makefile index cac58bdc4d..4e1b8cfa35 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -15,7 +15,7 @@ arch-$(CONFIG_CPU_PXA) = arch-$(CONFIG_CPU_ARM1136) =-march=armv5 arch-$(CONFIG_CPU_ARM1176) =-march=armv5t arch-$(CONFIG_CPU_V7A) =$(call cc-option, -march=armv7-a, \ - $(call cc-option, -march=armv7, -march=armv5)) + $(call cc-option, -march=armv7)) arch-$(CONFIG_CPU_V7M) =-march=armv7-m arch-$(CONFIG_CPU_V7R) =-march=armv7-r arch-$(CONFIG_ARM64) =-march=armv8-a @@ -40,7 +40,7 @@ tune-$(CONFIG_CPU_SA1100) =-mtune=strongarm1100 tune-$(CONFIG_CPU_PXA) =-mcpu=xscale tune-$(CONFIG_CPU_ARM1136) = tune-$(CONFIG_CPU_ARM1176) = -tune-$(CONFIG_CPU_V7A) = +tune-$(CONFIG_CPU_V7A) =-mtune=generic-armv7-a tune-$(CONFIG_CPU_V7R) = tune-$(CONFIG_ARM64) = diff --git a/arch/arm/mach-omap2/omap3/lowlevel_init.S b/arch/arm/mach-omap2/omap3/lowlevel_init.S index e6e907d11f..2a05b5e521 100644 --- a/arch/arm/mach-omap2/omap3/lowlevel_init.S +++ b/arch/arm/mach-omap2/omap3/lowlevel_init.S @@ -21,6 +21,7 @@ * R0 - Service ID * R1 - paramer list */ +/* TODO: Re-evaluate the comment at the end regarding armv5 vs armv7 */ ENTRY(do_omap3_emu_romcode_call) PUSH {r4-r12, lr} @ Save all registers from ROM code! MOV r12, r0 @ Copy the Secure Service ID in R12 diff --git a/doc/README.omap3 b/doc/README.omap3 index e09ac032c0..00bcbdba9a 100644 --- a/doc/README.omap3 +++ b/doc/README.omap3 @@ -23,13 +23,6 @@ Currently the following boards are supported: * CompuLab Ltd. CM-T35 [8] -Toolchain -========= - -While ARM Cortex-A8 support ARM v7 instruction set (-march=armv7a) we compile -with -march=armv5 to allow more compilers to work. For U-Boot code this has -no performance impact. - Build ===== -- 2.17.1

2 1

[U-Boot] [PATCH v3 0/4] Replace serial setparity by setconfig
by Patrice Chotard 11 Sep '18

11 Sep '18

This series : - Replace setparity ops by more complete setconfig in serial uclass - Replace setparity by setconfig in STM32 serial driver _ Adds test for serial setconfig Changes in v3: - Update SERIAL_PAR_MASK definition - Don't remove setparity ops declaration in patch 1 to not break bissectability - Replace u8 by uint for parity/bits/stop in stm32_serial_setconfig() - Add patch to remove obsolete setparity ops - Update serial test when wrong serial options are specified - Add SERIAL_CONFIG(par, bits, stop) macro to create serial mask Changes in v2: - Update SERIAL_BITS_MASK and SERIAL_STOP_MASK - Update serial_setconfig prototype - Update stm32_serial_setconfig prototype - Add sandbox serial test Patrice Chotard (4): dm: serial: Replace setparity by setconfig serial: stm32: Replace setparity by setconfig dm: serial: Remove setparity ops sandbox: Add serial test drivers/serial/sandbox.c | 14 +++++++++++ drivers/serial/serial-uclass.c | 16 +++++++++++++ drivers/serial/serial_stm32.c | 21 +++++++++++----- include/common.h | 1 + include/serial.h | 48 ++++++++++++++++++++++++++++++++++--- test/dm/Makefile | 1 + test/dm/serial.c | 54 ++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 146 insertions(+), 9 deletions(-) create mode 100644 test/dm/serial.c -- 1.9.1

3 12

[U-Boot] [PATCH 0/4] Solve issue with serial rx buffer when MUX is deactivated
by Patrick Delaunay 11 Sep '18

11 Sep '18

When I activate CONFIG_SERIAL_RX_BUFFER on my board without CONSOLE_MUX, I have a strange behavior in console: a new prompt is displayed continuously I check the call stack cread_line (common/cli_readline.c) => getcmd_getch (common/cli_readline.c) ==> fgetc (common/console.c) ===> console_tstc (common/console.c) ====> stdio_devices[file]->get() =====> _serial_getc() (drivers/serial/serial-uclass.c) and the data reads from rx buffer but it is garbage as tstc is not called PS: I have no issue when CONSOLE_MUX is activated because in this case the tstc() is always called in fgetc loop. My first solution to update the rx buffer management, to avoid the issue: static int _serial_getc(struct udevice *dev) { struct serial_dev_priv *upriv = dev_get_uclass_priv(dev); char val; if (upriv->rd_ptr == upriv->wr_ptr) __serial_tstc(dev); if (upriv->rd_ptr == upriv->wr_ptr) return 0; /* error : no data to read */ val = upriv->buf[upriv->rd_ptr++]; upriv->rd_ptr %= CONFIG_SERIAL_RX_BUFFER_SIZE; return val; } With this first patch, I see that that WATCHDOG is not reloaded and the getc() error value 0x0 wasn't correctly handle in cli; the issue is alway present and the behavior change (getc function is no more blocking): the caller needs to handle the error and reload the watchdog. To summarize, I see several issues in the current U-Boot code: - No protection on the rx buffer in _serial_getc(): the current code assumed that tstc() is alway called but it is dangerous - error for getc() (read value = 0x0) is not handled in cread_line() - in console.c, tstc() is not called when CONSOLE_MUX is not activated In this patchset I try to solve all these issues by separate patch but perhaps only the first correction on the rx buffer is really mandatory. On my board stm32mp1 ev1 the issue is solved. Patrick Delaunay (4): stm32mp1: activate serial rx buffer serial: protect access to serial rx buffer console: unify fgetc function when console MUX is deactivated cli: handle getch error common/cli_readline.c | 4 ++++ common/console.c | 9 +++++---- configs/stm32mp15_basic_defconfig | 1 + drivers/serial/serial-uclass.c | 3 +++ 4 files changed, 13 insertions(+), 4 deletions(-) -- 2.7.4

5 16

[U-Boot] [PATCH] include/version.h: workaround sysroot inc order
by Matt Weber 11 Sep '18

11 Sep '18

On some systems the host system or even the cross sysroot can contain a version.h. This leads to the wrong file being picked up and a PLAIN_VERSION undefined error. This workaround symlinks the version.h into the tool folder to allow reordering of search folders. Fixes http://autobuild.buildroot.net/results/770/7702d5df36a6532aafdbe6e9e62709bb… http://autobuild.buildroot.net/results/e34/e3401027d2fb3ce565ca9e2456a427af… ... additional can be found with these queries ... http://autobuild.buildroot.net/?reason=uboot-tools-2018.03 http://autobuild.buildroot.net/?reason=uboot-tools-2018.05 Upstream: pending Signed-off-by: Matthew Weber <matthew.weber(a)rockwellcollins.com> --- tools/env/Makefile | 3 ++- tools/version.h | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) create mode 120000 tools/version.h diff --git a/tools/env/Makefile b/tools/env/Makefile index 95a03c9..865fbc3 100644 --- a/tools/env/Makefile +++ b/tools/env/Makefile @@ -11,7 +11,8 @@ override HOSTCC = $(CC) # Compile for a hosted environment on the target -HOST_EXTRACFLAGS = $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \ +HOST_EXTRACFLAGS = -I$(srctree)/tools \ + $(patsubst -I%,-idirafter%, $(filter -I%, $(UBOOTINCLUDE))) \ -idirafter $(srctree)/tools/env \ -DUSE_HOSTCC \ -DTEXT_BASE=$(TEXT_BASE) diff --git a/tools/version.h b/tools/version.h new file mode 120000 index 0000000..bb57607 --- /dev/null +++ b/tools/version.h @@ -0,0 +1 @@ +../include/version.h \ No newline at end of file -- 2.17.0

3 3

[U-Boot] [PATCH] ARM: socfpga: Enable DCache on Arria10
by Marek Vasut 11 Sep '18

11 Sep '18

Enable DCache, there is no reason for it to be disabled anymore. Signed-off-by: Marek Vasut <marex(a)denx.de> --- include/configs/socfpga_arria10_socdk.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/include/configs/socfpga_arria10_socdk.h b/include/configs/socfpga_arria10_socdk.h index 58e446b60a..f9a54424a3 100644 --- a/include/configs/socfpga_arria10_socdk.h +++ b/include/configs/socfpga_arria10_socdk.h @@ -15,9 +15,6 @@ /* * U-Boot general configurations */ -/* Cache options */ -#define CONFIG_SYS_DCACHE_OFF - /* Memory configurations */ #define PHYS_SDRAM_1_SIZE 0x40000000 -- 2.18.0

1 0

[U-Boot] [PATCH 0/3] socfpga: clean up sfp generation
by Dalon Westergreen 11 Sep '18

11 Sep '18

Move gen5 and arria10 to use CONFIG_SPL_TARGET to specify the required SPL output. Dalon Westergreen (3): spl: socfpga: remove sfp generation socfpga: Add sfp generation targets socfpga: common: add CONFIG_SPL_TARGET to gen5 and arria10 socfpga header Makefile | 11 +++++++---- include/configs/socfpga_common.h | 1 + scripts/Makefile.spl | 12 ------------ 3 files changed, 8 insertions(+), 16 deletions(-) -- 2.17.1

2 4

[U-Boot] [PATCH v2 0/13] efi_loader: EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL
by Heinrich Schuchardt 11 Sep '18

11 Sep '18

Support Unicode letters received as UTF-8 from the serial console. Correct handling of the WaitForKey event. Update unit test for the EFI_SIMPLE_TEXT_INPUT__PROTOCOL. Fix bugs for the EFI_SIMPLE_TEXT_INPUT__PROTOCOL. Implement the EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL. Provide a unit test. Fix a U-Boot binary size problem. v2: merge two patch series move reading of Unicode to charset.c drop support for German keyboard layout Heinrich Schuchardt (13): efi_loader: support Unicode text input test/py: Unicode w/ EFI_SIMPLE_TEXT_INPUT_PROTOCOL efi_selftest: refactor text input test efi_loader: rework event handling for console efi_selftest: use WaitForKey to test text input test/py: rework test_efi_selftest_text_input() efi_loader: console input ESC a - ESC z efi_loader: EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL efi_selftest: test EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL test/py: test EFI_SIMPLE_TEXT_INPUT_EX_PROTOCOL efi_loader: implement key notify functions efi_selftest: test key notification functions efi_loader: unset CONFIG_EFI_UNICODE_CAPITALIZATION configs/vf610twr_defconfig | 1 + configs/vf610twr_nand_defconfig | 1 + include/charset.h | 10 + include/efi_api.h | 56 +++ include/efi_selftest.h | 16 + lib/charset.c | 137 ++++-- lib/efi_loader/efi_console.c | 517 +++++++++++++++++--- lib/efi_selftest/Makefile | 1 + lib/efi_selftest/efi_selftest_textinput.c | 136 +---- lib/efi_selftest/efi_selftest_textinputex.c | 198 ++++++++ lib/efi_selftest/efi_selftest_util.c | 93 ++++ test/py/tests/test_efi_selftest.py | 101 +++- test/unicode_ut.c | 8 +- 13 files changed, 1053 insertions(+), 222 deletions(-) create mode 100644 lib/efi_selftest/efi_selftest_textinputex.c -- 2.18.0

2 14

[U-Boot] [RFC PATCH v1 0/2] Fix to keystone2 uinitrd fixup logic
by Nicholas Faustini 11 Sep '18

11 Sep '18

For ks2 devices with PAE enabled, the function ft_board_setup() (board/ti/ks2_evm/board.c) is supposed to update at runtime the /chosen fdt node by shifting the initrd start/end addresses into the 36b it address space. Unfortunately, this mechanism doesn't work since the /chosen node has not been populated at the time of the ft_board_setup() call. The root of the issue is that, at some point in u-boot history, the call sequence of fdt_initrd() and ft_board_setup() (common/image-fdt.c) has been inverted: ft_board_setup() is called before fdt_initrd(). Error shown by Linux during startup is: [ 0.000000] INITRD: 0x8fcec000+0x00313dc8 is not a memory region - disabling initrd I would propose to move the fdt initrd fixup logic from ft_board_setup() to ft_board_setup_ex() since the latter is called esclusively for keystone devices. Moreover, cmd/fdt.c command should include the call of ft_board_setup_ex() since keystone2 devices will require it. Nicholas Faustini (2): fdt: add call to ft_board_setup_ex() for ks2 boards board: ks2: move uinitrd fixup logic inside ft_board_setup_ex board/ti/ks2_evm/board.c | 44 ++++++++++++++++++++-------------------- cmd/fdt.c | 3 +++ 2 files changed, 25 insertions(+), 22 deletions(-) -- 2.17.1 -- Disclaimer: This email and any files transmitted along with it may contain Azcom confidential and proprietary information. If you are not the intended recipient, you are notified that disclosing, copying, distributing or taking any action based on the contents of the information contained herein is strictly prohibited. If you are not an intended recipient of this transmission and you received it in error, please inform the sender by reply e-mail and destroy this and all other copies of this transmission to which you have access. The sender of this email or Azcom does not accept liability for any errors or omissions in the contents of this message that may occur as a result.

1 2

[U-Boot] [PATCH v3 26/26] test/py: fs: add fstest/unlink test
by Akashi, Takahiro 11 Sep '18

11 Sep '18

In this commit, test cases for unlink interfaces are added as part of "test_fs" test suite. Signed-off-by: AKASHI Takahiro <takahiro.akashi(a)linaro.org> --- test/py/tests/test_fs/conftest.py | 62 +++++++++++++++ test/py/tests/test_fs/test_unlink.py | 109 +++++++++++++++++++++++++++ 2 files changed, 171 insertions(+) create mode 100644 test/py/tests/test_fs/test_unlink.py diff --git a/test/py/tests/test_fs/conftest.py b/test/py/tests/test_fs/conftest.py index 71abf8fa4222..6404b311bc30 100644 --- a/test/py/tests/test_fs/conftest.py +++ b/test/py/tests/test_fs/conftest.py @@ -12,6 +12,7 @@ from fstest_defs import * supported_fs_basic = ['fat16', 'fat32', 'ext4'] supported_fs_ext = ['fat16', 'fat32'] supported_fs_mkdir = ['fat16', 'fat32'] +supported_fs_unlink = ['fat16', 'fat32'] # # Filesystem test specific setup @@ -24,6 +25,7 @@ def pytest_configure(config): global supported_fs_basic global supported_fs_ext global supported_fs_mkdir + global supported_fs_unlink def intersect(listA, listB): return [x for x in listA if x in listB] @@ -34,6 +36,7 @@ def pytest_configure(config): supported_fs_basic = intersect(supported_fs, supported_fs_basic) supported_fs_ext = intersect(supported_fs, supported_fs_ext) supported_fs_mkdir = intersect(supported_fs, supported_fs_mkdir) + supported_fs_unlink = intersect(supported_fs, supported_fs_unlink) def pytest_generate_tests(metafunc): if 'fs_obj_basic' in metafunc.fixturenames: @@ -45,6 +48,9 @@ def pytest_generate_tests(metafunc): if 'fs_obj_mkdir' in metafunc.fixturenames: metafunc.parametrize('fs_obj_mkdir', supported_fs_mkdir, indirect=True, scope='module') + if 'fs_obj_unlink' in metafunc.fixturenames: + metafunc.parametrize('fs_obj_unlink', supported_fs_unlink, + indirect=True, scope='module') # # Helper functions @@ -328,3 +334,59 @@ def fs_obj_mkdir(request, u_boot_config): finally: if fs_img: call('rm -f %s' % fs_img, shell=True) + +# +# Fixture for unlink test +# +# NOTE: yield_fixture was deprecated since pytest-3.0 +(a)pytest.yield_fixture() +def fs_obj_unlink(request, u_boot_config): + fs_type = request.param + fs_img = '' + + fs_ubtype = fstype_to_ubname(fs_type) + check_ubconfig(u_boot_config, fs_ubtype) + + mount_dir = u_boot_config.persistent_data_dir + '/mnt' + + try: + + # 128MiB volume + fs_img = mk_fs(u_boot_config, fs_type, 0x8000000, '128MB') + + # Mount the image so we can populate it. + check_call('mkdir -p %s' % mount_dir, shell=True) + mount_fs(fs_type, fs_img, mount_dir) + + # Test Case 1 & 3 + check_call('mkdir %s/dir1' % mount_dir, shell=True) + check_call('dd if=/dev/urandom of=%s/dir1/file1 bs=1K count=1' + % mount_dir, shell=True) + check_call('dd if=/dev/urandom of=%s/dir1/file2 bs=1K count=1' + % mount_dir, shell=True) + + # Test Case 2 + check_call('mkdir %s/dir2' % mount_dir, shell=True) + for i in range(0, 20): + check_call('mkdir %s/dir2/0123456789abcdef%02x' + % (mount_dir, i), shell=True) + + # Test Case 4 + check_call('mkdir %s/dir4' % mount_dir, shell=True) + + # Test Case 5, 6 & 7 + check_call('mkdir %s/dir5' % mount_dir, shell=True) + check_call('dd if=/dev/urandom of=%s/dir5/file1 bs=1K count=1' + % mount_dir, shell=True) + + umount_fs(fs_type, mount_dir) + except CalledProcessError: + pytest.skip('Setup failed for filesystem: ' + fs_type) + return + else: + yield [fs_ubtype, fs_img] + finally: + umount_fs(fs_type, mount_dir) + call('rmdir %s' % mount_dir, shell=True) + if fs_img: + call('rm -f %s' % fs_img, shell=True) diff --git a/test/py/tests/test_fs/test_unlink.py b/test/py/tests/test_fs/test_unlink.py new file mode 100644 index 000000000000..69c1a6e078c3 --- /dev/null +++ b/test/py/tests/test_fs/test_unlink.py @@ -0,0 +1,109 @@ +# SPDX-License-Identifier: GPL-2.0+ +# Copyright (c) 2018, Linaro Limited +# Author: Takahiro Akashi <takahiro.akashi(a)linaro.org> +# +# U-Boot File System:unlink Test + +""" +This test verifies unlink operation (deleting a file or a directory) +on file system. +""" + +import pytest + +(a)pytest.mark.boardspec('sandbox') +class TestUnlink(object): + def test_unlink1(self, u_boot_console, fs_obj_unlink): + """ + Test Case 1 - delete a file + """ + fs_type,fs_img = fs_obj_unlink + with u_boot_console.log.section('Test Case 1 - unlink (file)'): + output = u_boot_console.run_command_list([ + 'host bind 0 %s' % fs_img, + '%srm host 0:0 dir1/file1' % fs_type, + '%sls host 0:0 dir1/file1' % fs_type]) + assert('' == ''.join(output)) + + output = u_boot_console.run_command( + '%sls host 0:0 dir1/' % fs_type) + assert(not 'file1' in output) + assert('file2' in output) + + def test_unlink2(self, u_boot_console, fs_obj_unlink): + """ + Test Case 2 - delete many files + """ + fs_type,fs_img = fs_obj_unlink + with u_boot_console.log.section('Test Case 2 - unlink (many)'): + output = u_boot_console.run_command('host bind 0 %s' % fs_img) + + for i in range(0, 20): + output = u_boot_console.run_command_list([ + '%srm host 0:0 dir2/0123456789abcdef%02x' % (fs_type, i), + '%sls host 0:0 dir2/0123456789abcdef%02x' % (fs_type, i)]) + assert('' == ''.join(output)) + + output = u_boot_console.run_command( + '%sls host 0:0 dir2' % fs_type) + assert('0 file(s), 2 dir(s)' in output) + + def test_unlink3(self, u_boot_console, fs_obj_unlink): + """ + Test Case 3 - trying to delete a non-existing file should fail + """ + fs_type,fs_img = fs_obj_unlink + with u_boot_console.log.section('Test Case 3 - unlink (non-existing)'): + output = u_boot_console.run_command_list([ + 'host bind 0 %s' % fs_img, + '%srm host 0:0 dir1/nofile' % fs_type]) + assert('nofile: doesn\'t exist' in ''.join(output)) + + def test_unlink4(self, u_boot_console, fs_obj_unlink): + """ + Test Case 4 - delete an empty directory + """ + fs_type,fs_img = fs_obj_unlink + with u_boot_console.log.section('Test Case 4 - unlink (directory)'): + output = u_boot_console.run_command_list([ + 'host bind 0 %s' % fs_img, + '%srm host 0:0 dir4' % fs_type]) + assert('' == ''.join(output)) + + output = u_boot_console.run_command( + '%sls host 0:0 /' % fs_type) + assert(not 'dir4' in output) + + def test_unlink5(self, u_boot_console, fs_obj_unlink): + """ + Test Case 5 - trying to deleting a non-empty directory ".." + should fail + """ + fs_type,fs_img = fs_obj_unlink + with u_boot_console.log.section('Test Case 5 - unlink ("non-empty directory")'): + output = u_boot_console.run_command_list([ + 'host bind 0 %s' % fs_img, + '%srm host 0:0 dir5' % fs_type]) + assert('directory is not empty' in ''.join(output)) + + def test_unlink6(self, u_boot_console, fs_obj_unlink): + """ + Test Case 6 - trying to deleting a "." should fail + """ + fs_type,fs_img = fs_obj_unlink + with u_boot_console.log.section('Test Case 6 - unlink (".")'): + output = u_boot_console.run_command_list([ + 'host bind 0 %s' % fs_img, + '%srm host 0:0 dir5/.' % fs_type]) + assert('directory is not empty' in ''.join(output)) + + def test_unlink7(self, u_boot_console, fs_obj_unlink): + """ + Test Case 7 - trying to deleting a ".." should fail + """ + fs_type,fs_img = fs_obj_unlink + with u_boot_console.log.section('Test Case 7 - unlink ("..")'): + output = u_boot_console.run_command_list([ + 'host bind 0 %s' % fs_img, + '%srm host 0:0 dir5/..' % fs_type]) + assert('directory is not empty' in ''.join(output)) -- 2.18.0

1 0