January 2021 - U-Boot

[PATCH 00/11] More minor clean-ups and improvements
by Simon Glass 30 Jan '21

30 Jan '21

This series includes a collection of small things noticed while bringing up verified boot on Coral. Simon Glass (11): spl: Tidy up SPL/TPL malloc sizes x86: coral: Support TPM and RTC in SPL i2c: desigware: Add an alias for Intel Apollo Lake sandbox: Disable I2C emulators in SPL dm: core: Don't inline dev_read...() calls with of-platdata clk: Add debugging for return values clk: x86: Correct the driver name dm: core: Add a comment about pinctrl_select_state() dm: core: Update ofnode_read_fmap_entry() to read hashes Add a symlink for ctype.h binman: Print a debug message when binman selects a node Kconfig | 13 ++++--- arch/sandbox/dts/sandbox.dtsi | 10 ++++-- arch/sandbox/dts/test.dts | 10 ++++++ arch/x86/dts/chromebook_coral.dts | 20 ++++++++++- arch/x86/include/asm/arch-apollolake/iomap.h | 3 ++ configs/sandbox_spl_defconfig | 1 - drivers/clk/clk-uclass.c | 16 ++++++--- drivers/clk/intel/clk_intel.c | 4 +-- drivers/core/device.c | 9 +++++ drivers/core/of_extra.c | 21 ++++++----- drivers/i2c/Makefile | 2 ++ drivers/i2c/designware_i2c_pci.c | 2 ++ include/ctype.h | 1 + include/dm/read.h | 3 +- lib/binman.c | 2 ++ test/dm/Makefile | 1 + test/dm/of_extra.c | 38 ++++++++++++++++++++ test/dm/of_platdata.c | 8 ++--- 18 files changed, 132 insertions(+), 32 deletions(-) create mode 120000 include/ctype.h create mode 100644 test/dm/of_extra.c -- 2.30.0.280.ga3ce27912f-goog

2 23

[PATCH] dm: replace auto_alloc_size with auto
by Dario Binacchi 30 Jan '21

30 Jan '21

The auto_alloc_size members of struct driver has been renamed auto. Signed-off-by: Dario Binacchi <dariobin(a)libero.it> --- include/dm/device.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/dm/device.h b/include/dm/device.h index f5b4cd6876..e665558444 100644 --- a/include/dm/device.h +++ b/include/dm/device.h @@ -111,7 +111,7 @@ enum { * probe method if the device has a device tree node. * * All three of plat, priv and uclass_priv can be allocated by the - * driver, or you can use the auto_alloc_size members of struct driver and + * driver, or you can use the auto members of struct driver and * struct uclass_driver to have driver model do this automatically. * * @driver: The driver used by this device -- 2.17.1

2 2

[PATCH 0/2] disk: part: sandbox support in dev_print()
by Heinrich Schuchardt 30 Jan '21

30 Jan '21

Without the series the fatinfo command shows an error for host file backed block devices: => host bind 0 ../sandbox.img => fatinfo host 0:1 Interface: Unknown Device 0: Unhandled device type: 9 Filesystem: FAT16 "NO NAME " => With the series reasonable information is shown: => host bind 0 ../sandbox.img => fatinfo host 0:1 Interface: Unknown Device 0: Vendor: U-Boot Rev: 1.0 Prod: hostfile Type: Removable Hard Disk Capacity: 128.9 MB = 0.1 GB (264190 x 512) Filesystem: FAT16 "NO NAME " => The "Interface:" line is created in file_fat_detectfs() and still needs to be fixed. Heinrich Schuchardt (2): sandbox: fill block device meta information disk: part: sandbox support in dev_print() disk/part.c | 1 + drivers/block/sandbox.c | 11 +++++++++++ 2 files changed, 12 insertions(+) -- 2.29.2

2 4

[PATCH] test: Update test_fs to not use deprecated pytest.yield_fixture()
by Tom Rini 30 Jan '21

30 Jan '21

As noted in comments, yield_fixture has been deprecated for longer than our minimum required version of pytest. Newer versions of pytest cause this to be a louder warning, and as the migration is trivial, perform it now. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- test/py/tests/test_fs/conftest.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/test/py/tests/test_fs/conftest.py b/test/py/tests/test_fs/conftest.py index 58e8cd46ee2c..ec70e8c4ef3f 100644 --- a/test/py/tests/test_fs/conftest.py +++ b/test/py/tests/test_fs/conftest.py @@ -243,8 +243,7 @@ def umount_fs(mount_point): # Fixture for basic fs test # derived from test/fs/fs-test.sh # -# NOTE: yield_fixture was deprecated since pytest-3.0 -(a)pytest.yield_fixture() +(a)pytest.fixture() def fs_obj_basic(request, u_boot_config): """Set up a file system to be used in basic fs test. @@ -352,8 +351,7 @@ def fs_obj_basic(request, u_boot_config): # # Fixture for extended fs test # -# NOTE: yield_fixture was deprecated since pytest-3.0 -(a)pytest.yield_fixture() +(a)pytest.fixture() def fs_obj_ext(request, u_boot_config): """Set up a file system to be used in extended fs test. @@ -439,8 +437,7 @@ def fs_obj_ext(request, u_boot_config): # # Fixture for mkdir test # -# NOTE: yield_fixture was deprecated since pytest-3.0 -(a)pytest.yield_fixture() +(a)pytest.fixture() def fs_obj_mkdir(request, u_boot_config): """Set up a file system to be used in mkdir test. @@ -472,8 +469,7 @@ def fs_obj_mkdir(request, u_boot_config): # # Fixture for unlink test # -# NOTE: yield_fixture was deprecated since pytest-3.0 -(a)pytest.yield_fixture() +(a)pytest.fixture() def fs_obj_unlink(request, u_boot_config): """Set up a file system to be used in unlink test. @@ -538,8 +534,7 @@ def fs_obj_unlink(request, u_boot_config): # # Fixture for symlink fs test # -# NOTE: yield_fixture was deprecated since pytest-3.0 -(a)pytest.yield_fixture() +(a)pytest.fixture() def fs_obj_symlink(request, u_boot_config): """Set up a file system to be used in symlink fs test. -- 2.17.1

1 1

[PATCH] test: correct entry point to pytest
by Heinrich Schuchardt 30 Jan '21

30 Jan '21

With Pytest 6.0.2 'make tests' fails: sandbox: Traceback (most recent call last): File "./test/py/test.py", line 20, in <module> sys.exit(load_entry_point('pytest', 'console_scripts', 'pytest')(args)) TypeError: console_main() takes 0 positional arguments but 1 was given The definition of console_scripts has changed as follows: Pytest 4.6.1: [options.entry_points] console_scripts = pytest=pytest:main py.test=pytest:main Pytest 6.0.2: [options.entry_points] console_scripts = pytest=pytest:console_main py.test=pytest:console_main The new function console_main() has a comment: "This function is not meant for programmable use; use `main()`" Hence let's call pytest.main() directly. Move args processing into the __main__ paragraph. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- test/py/test.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/test/py/test.py b/test/py/test.py index bee88d96bc..285fda5425 100755 --- a/test/py/test.py +++ b/test/py/test.py @@ -10,11 +10,11 @@ import os import os.path import sys +import pytest from pkg_resources import load_entry_point -# argv; py.test test_directory_name user-supplied-arguments -args = [os.path.dirname(__file__) + '/tests'] -args.extend(sys.argv) - if __name__ == '__main__': - sys.exit(load_entry_point('pytest', 'console_scripts', 'pytest')(args)) + # argv; py.test test_directory_name user-supplied-arguments + args = [os.path.dirname(__file__) + '/tests'] + args.extend(sys.argv) + sys.exit(pytest.main(args)) -- 2.29.2

3 9

[PATCH 1/1] test: pr_cont_test.o depends on CONFIG_LOG=y
by Heinrich Schuchardt 30 Jan '21

30 Jan '21

Compiling wandboard_defconfig with CONFIG_UT_LOG=y leads to a build error: test/log/pr_cont_test.c: In function ‘log_test_pr_cont’: test/log/pr_cont_test.c:28:14: error: ‘gd_t’ {aka ‘volatile struct global_data’} has no member named ‘log_fmt’ log_fmt = gd->log_fmt; We do not want to let CONFIG_UT_LOG depend on CONFIG_LOG=y because we have tests for logging functions called with CONFIG_LOG=n. Fix the build dependency. Reported-by: Kever Yang <kever.yang(a)rock-chips.com> Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- test/log/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/log/Makefile b/test/log/Makefile index afdafa502a..3f09deb644 100644 --- a/test/log/Makefile +++ b/test/log/Makefile @@ -8,7 +8,6 @@ obj-$(CONFIG_CMD_LOG) += log_filter.o ifdef CONFIG_UT_LOG obj-y += test-main.o -obj-y += pr_cont_test.o ifdef CONFIG_SANDBOX obj-$(CONFIG_LOG_SYSLOG) += syslog_test.o @@ -16,6 +15,7 @@ obj-$(CONFIG_LOG_SYSLOG) += syslog_test_ndebug.o endif ifdef CONFIG_LOG +obj-y += pr_cont_test.o obj-$(CONFIG_CONSOLE_RECORD) += cont_test.o else obj-$(CONFIG_CONSOLE_RECORD) += nolog_test.o -- 2.29.2

2 1

[PATCH] fs: btrfs: Select SHA256 in Kconfig
by matthias.bgg＠kernel.org 30 Jan '21

30 Jan '21

From: Matthias Brugger <mbrugger(a)suse.com> Since commit 565a4147d17a ("fs: btrfs: Add more checksum algorithms") btrfs uses the sha256 checksum algorithm. But Kconfig lacks to select it. This leads to compilation errors: fs/built-in.o: In function `hash_sha256': fs/btrfs/crypto/hash.c:25: undefined reference to `sha256_starts' fs/btrfs/crypto/hash.c:26: undefined reference to `sha256_update' fs/btrfs/crypto/hash.c:27: undefined reference to `sha256_finish' Signed-off-by: Matthias Brugger <mbrugger(a)suse.com> --- fs/btrfs/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/fs/btrfs/Kconfig b/fs/btrfs/Kconfig index f302b1fbef..2a32f42ad1 100644 --- a/fs/btrfs/Kconfig +++ b/fs/btrfs/Kconfig @@ -4,6 +4,7 @@ config FS_BTRFS select LZO select ZSTD select RBTREE + select SHA256 help This provides a single-device read-only BTRFS support. BTRFS is a next-generation Linux file system based on the copy-on-write -- 2.30.0

6 6

[PATCH 1/1] fs: fat: remove superfluous assignments
by Heinrich Schuchardt 30 Jan '21

30 Jan '21

Do not assign a value to a variable if it is not used. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- fs/fat/fat.c | 3 ++- fs/fat/fat_write.c | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/fs/fat/fat.c b/fs/fat/fat.c index fb6ce094ac..ccba268f61 100644 --- a/fs/fat/fat.c +++ b/fs/fat/fat.c @@ -248,7 +248,6 @@ static __u32 get_fatent(fsdata *mydata, __u32 entry) static int get_cluster(fsdata *mydata, __u32 clustnum, __u8 *buffer, unsigned long size) { - __u32 idx = 0; __u32 startsect; int ret; @@ -277,6 +276,8 @@ get_cluster(fsdata *mydata, __u32 clustnum, __u8 *buffer, unsigned long size) size -= mydata->sect_size; } } else { + __u32 idx; + idx = size / mydata->sect_size; if (idx == 0) ret = 0; diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c index aae3a6a3d1..b43a27b205 100644 --- a/fs/fat/fat_write.c +++ b/fs/fat/fat_write.c @@ -573,7 +573,6 @@ static __u32 determine_fatent(fsdata *mydata, __u32 entry) static int set_sectors(fsdata *mydata, u32 startsect, u8 *buffer, u32 size) { - u32 nsects = 0; int ret; debug("startsect: %d\n", startsect); @@ -595,6 +594,8 @@ set_sectors(fsdata *mydata, u32 startsect, u8 *buffer, u32 size) size -= mydata->sect_size; } } else if (size >= mydata->sect_size) { + u32 nsects; + nsects = size / mydata->sect_size; ret = disk_write(startsect, nsects, buffer); if (ret != nsects) { @@ -785,7 +786,6 @@ get_set_cluster(fsdata *mydata, __u32 clustnum, loff_t pos, __u8 *buffer, } size -= wsize; - buffer += wsize; *gotsize += wsize; } @@ -1482,10 +1482,10 @@ static int delete_single_dentry(fat_itr *itr) */ static int delete_long_name(fat_itr *itr) { - struct dir_entry *dent = itr->dent; int seqn = itr->dent->nameext.name[0] & ~LAST_LONG_ENTRY_MASK; while (seqn--) { + struct dir_entry *dent; int ret; ret = delete_single_dentry(itr); -- 2.29.2

3 3

[PATCH 1/1] fs: fat: avoid out of bounds access warning
by Heinrich Schuchardt 30 Jan '21

30 Jan '21

When copying short name plus extension refer to the encapsulating structure and not to the short name element. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- fs/fat/fat_write.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/fs/fat/fat_write.c b/fs/fat/fat_write.c index 0132ef9b42..aae3a6a3d1 100644 --- a/fs/fat/fat_write.c +++ b/fs/fat/fat_write.c @@ -108,10 +108,7 @@ static int set_name(fat_itr *itr, const char *filename, char *shortname) char buf[13]; int i; int ret; - struct { - char name[8]; - char ext[3]; - } dirent; + struct nameext dirent; if (!filename) return -EIO; @@ -185,7 +182,7 @@ static int set_name(fat_itr *itr, const char *filename, char *shortname) } return -EIO; out: - memcpy(shortname, dirent.name, SHORT_NAME_SIZE); + memcpy(shortname, &dirent, SHORT_NAME_SIZE); return ret; } -- 2.29.2

2 1

[PATCH 1/1] avb: AVB_VERIFY depends on MMC
by Heinrich Schuchardt 30 Jan '21

30 Jan '21

AVB Verified Boot uses functions related to MMC. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- common/Kconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/common/Kconfig b/common/Kconfig index d8982ba377..be4dd815c0 100644 --- a/common/Kconfig +++ b/common/Kconfig @@ -561,6 +561,7 @@ config HASH config AVB_VERIFY bool "Build Android Verified Boot operations" depends on LIBAVB + depends on MMC depends on PARTITION_UUIDS help This option enables compilation of bootloader-dependent operations, -- 2.29.2

3 2