September 2022 - U-Boot

[PATCH v3 30/45] dm: core: Expand integer-reading tests
by Simon Glass 30 Sep '22

30 Sep '22

The current tests do not cover all the behaviour. Add some more. Tidy up a few inconsistencies between livetree and flattree which come to light with these tests. Also drop the -ENODATA error since it is never actually returned. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- Changes in v3: - Avoid code-size increase in SPL where error codes matter less drivers/core/of_access.c | 5 +- drivers/core/ofnode.c | 17 +++++-- include/dm/of_access.h | 10 ++-- include/dm/ofnode.h | 8 +-- test/dm/ofnode.c | 102 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 125 insertions(+), 17 deletions(-) diff --git a/drivers/core/of_access.c b/drivers/core/of_access.c index 8631e1c286b..85f7da5a499 100644 --- a/drivers/core/of_access.c +++ b/drivers/core/of_access.c @@ -471,8 +471,7 @@ struct device_node *of_find_node_by_phandle(struct device_node *root, * @len: requested length of property value * * Return: the property value on success, -EINVAL if the property does not - * exist, -ENODATA if property does not have a value, and -EOVERFLOW if the - * property data isn't large enough. + * exist and -EOVERFLOW if the property data isn't large enough. */ static void *of_find_property_value_of_size(const struct device_node *np, const char *propname, u32 len) @@ -481,8 +480,6 @@ static void *of_find_property_value_of_size(const struct device_node *np, if (!prop) return ERR_PTR(-EINVAL); - if (!prop->value) - return ERR_PTR(-ENODATA); if (len > prop->length) return ERR_PTR(-EOVERFLOW); diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c index 4dd2aee11ce..e4b4b352e46 100644 --- a/drivers/core/ofnode.c +++ b/drivers/core/ofnode.c @@ -296,9 +296,20 @@ int ofnode_read_u32_array(ofnode node, const char *propname, return of_read_u32_array(ofnode_to_np(node), propname, out_values, sz); } else { - return fdtdec_get_int_array(gd->fdt_blob, - ofnode_to_offset(node), propname, - out_values, sz); + int ret; + + ret = fdtdec_get_int_array(gd->fdt_blob, + ofnode_to_offset(node), propname, + out_values, sz); + + /* get the error right, but space is more important in SPL */ + if (!IS_ENABLED(CONFIG_SPL_BUILD)) { + if (ret == -FDT_ERR_NOTFOUND) + return -EINVAL; + else if (ret == -FDT_ERR_BADLAYOUT) + return -EOVERFLOW; + } + return ret; } } diff --git a/include/dm/of_access.h b/include/dm/of_access.h index dd70b44344d..c556a18f7d9 100644 --- a/include/dm/of_access.h +++ b/include/dm/of_access.h @@ -327,8 +327,7 @@ int of_read_u32(const struct device_node *np, const char *propname, u32 *outp); * @outp: pointer to return value, modified only if return value is 0. * * Return: - * 0 on success, -EINVAL if the property does not exist, - * -ENODATA if property does not have a value, and -EOVERFLOW if the + * 0 on success, -EINVAL if the property does not exist, or -EOVERFLOW if the * property data isn't large enough. */ int of_read_u32_index(const struct device_node *np, const char *propname, @@ -345,8 +344,7 @@ int of_read_u32_index(const struct device_node *np, const char *propname, * @outp: pointer to return value, modified only if return value is 0. * * Return: - * 0 on success, -EINVAL if the property does not exist, - * -ENODATA if property does not have a value, and -EOVERFLOW if the + * 0 on success, -EINVAL if the property does not exist, or -EOVERFLOW if the * property data isn't large enough. */ int of_read_u64(const struct device_node *np, const char *propname, u64 *outp); @@ -362,8 +360,8 @@ int of_read_u64(const struct device_node *np, const char *propname, u64 *outp); * @out_values: pointer to return value, modified only if return value is 0. * @sz: number of array elements to read * Return: - * 0 on success, -EINVAL if the property does not exist, -ENODATA - * if property does not have a value, and -EOVERFLOW is longer than sz. + * 0 on success, -EINVAL if the property does not exist, or -EOVERFLOW if + * longer than sz. */ int of_read_u32_array(const struct device_node *np, const char *propname, u32 *out_values, size_t sz); diff --git a/include/dm/ofnode.h b/include/dm/ofnode.h index a674d7d8fd6..8b0a1087062 100644 --- a/include/dm/ofnode.h +++ b/include/dm/ofnode.h @@ -373,12 +373,12 @@ const char *ofnode_read_string(ofnode node, const char *propname); * @propname: name of the property to read * @out_values: pointer to return value, modified only if return value is 0 * @sz: number of array elements to read - * Return: 0 if OK, -ve on error + * Return: 0 on success, -EINVAL if the property does not exist, + * -ENODATA if property does not have a value, and -EOVERFLOW if the + * property data isn't large enough * * Search for a property in a device node and read 32-bit value(s) from - * it. Returns 0 on success, -EINVAL if the property does not exist, - * -ENODATA if property does not have a value, and -EOVERFLOW if the - * property data isn't large enough. + * it. * * The out_values is modified only if a valid u32 value can be decoded. */ diff --git a/test/dm/ofnode.c b/test/dm/ofnode.c index 5ddfd0298a6..eac0c50364a 100644 --- a/test/dm/ofnode.c +++ b/test/dm/ofnode.c @@ -320,6 +320,9 @@ static int dm_test_ofnode_get_path(struct unit_test_state *uts) res = ofnode_get_path(node, buf, 32); ut_asserteq(-ENOSPC, res); + res = ofnode_get_path(ofnode_root(), buf, 32); + ut_asserteq_str("/", buf); + return 0; } DM_TEST(dm_test_ofnode_get_path, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT); @@ -589,6 +592,7 @@ DM_TEST(dm_test_ofnode_livetree_writing, static int dm_test_ofnode_u32(struct unit_test_state *uts) { ofnode node; + u32 val; node = ofnode_path("/lcd"); ut_assert(ofnode_valid(node)); @@ -597,10 +601,62 @@ static int dm_test_ofnode_u32(struct unit_test_state *uts) ut_asserteq(1367, ofnode_read_u32_default(node, "xres", 123)); ut_assertok(ofnode_write_u32(node, "xres", 1366)); + node = ofnode_path("/backlight"); + ut_assertok(ofnode_read_u32_index(node, "brightness-levels", 0, &val)); + ut_asserteq(0, val); + ut_assertok(ofnode_read_u32_index(node, "brightness-levels", 1, &val)); + ut_asserteq(16, val); + ut_assertok(ofnode_read_u32_index(node, "brightness-levels", 8, &val)); + ut_asserteq(255, val); + ut_asserteq(-EOVERFLOW, + ofnode_read_u32_index(node, "brightness-levels", 9, &val)); + ut_asserteq(-EINVAL, ofnode_read_u32_index(node, "missing", 0, &val)); + return 0; } DM_TEST(dm_test_ofnode_u32, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT); +static int dm_test_ofnode_u32_array(struct unit_test_state *uts) +{ + ofnode node; + u32 val[10]; + + node = ofnode_path("/a-test"); + ut_assert(ofnode_valid(node)); + ut_assertok(ofnode_read_u32_array(node, "int-value", val, 1)); + ut_asserteq(-EINVAL, ofnode_read_u32_array(node, "missing", val, 1)); + ut_asserteq(-EOVERFLOW, ofnode_read_u32_array(node, "bool-value", val, + 1)); + + memset(val, '\0', sizeof(val)); + ut_assertok(ofnode_read_u32_array(node, "int-array", val + 1, 3)); + ut_asserteq(0, val[0]); + ut_asserteq(5678, val[1]); + ut_asserteq(9123, val[2]); + ut_asserteq(4567, val[3]); + ut_asserteq(0, val[4]); + ut_asserteq(-EOVERFLOW, ofnode_read_u32_array(node, "int-array", val, + 4)); + + return 0; +} +DM_TEST(dm_test_ofnode_u32_array, UT_TESTF_SCAN_PDATA | UT_TESTF_SCAN_FDT); + +static int dm_test_ofnode_u64(struct unit_test_state *uts) +{ + ofnode node; + u64 val; + + node = ofnode_path("/a-test"); + ut_assert(ofnode_valid(node)); + ut_assertok(ofnode_read_u64(node, "int64-value", &val)); + ut_asserteq_64(0x1111222233334444, val); + ut_asserteq(-EINVAL, ofnode_read_u64(node, "missing", &val)); + + return 0; +} +DM_TEST(dm_test_ofnode_u64, UT_TESTF_SCAN_FDT); + static int dm_test_ofnode_add_subnode(struct unit_test_state *uts) { ofnode node, check, subnode; @@ -693,3 +749,49 @@ static int dm_test_ofnode_for_each_prop(struct unit_test_state *uts) return 0; } DM_TEST(dm_test_ofnode_for_each_prop, UT_TESTF_SCAN_FDT); + +static int dm_test_ofnode_by_compatible(struct unit_test_state *uts) +{ + const char *compat = "denx,u-boot-fdt-test"; + ofnode node; + int count; + + count = 0; + for (node = ofnode_null(); + node = ofnode_by_compatible(node, compat), ofnode_valid(node);) + count++; + ut_asserteq(11, count); + + return 0; +} +DM_TEST(dm_test_ofnode_by_compatible, UT_TESTF_SCAN_FDT); + +static int dm_test_ofnode_find_subnode(struct unit_test_state *uts) +{ + ofnode node, subnode; + + node = ofnode_path("/buttons"); + + subnode = ofnode_find_subnode(node, "btn1"); + ut_assert(ofnode_valid(subnode)); + ut_asserteq_str("btn1", ofnode_get_name(subnode)); + + subnode = ofnode_find_subnode(node, "btn"); + ut_assert(!ofnode_valid(subnode)); + + return 0; +} +DM_TEST(dm_test_ofnode_find_subnode, UT_TESTF_SCAN_FDT); + +static int dm_test_ofnode_get_name(struct unit_test_state *uts) +{ + ofnode node; + + node = ofnode_path("/buttons"); + ut_assert(ofnode_valid(node)); + ut_asserteq_str("buttons", ofnode_get_name(node)); + ut_asserteq_str("", ofnode_get_name(ofnode_root())); + + return 0; +} +DM_TEST(dm_test_ofnode_get_name, UT_TESTF_SCAN_FDT); -- 2.38.0.rc1.362.ged0d419d3c-goog

2 1

[PATCH v2 00/45] dm: core: Support multiple device trees in ofnode
by Simon Glass 30 Sep '22

30 Sep '22

At present the ofnode interface is somewhat limited, in that it cannot access the device tree provided by the OS, only the one used by U-Boot itself (assuming these are separate). This prevents using ofnode functions to handle device tree fixups, i.e. ft_board_setup() and the like. The ofnode interface was introduced to allow a consistent API to access the device tree, whether a flat tree or a live tree (OF_LIVE) is in use. With the flat tree, adding nodes and properties at the start of the tree (as often happens when writing to the /chosen node) requires copying a lot of data for each operation. With live tree, such operations are quite a bit faster, since there is no memory copying required. This has to be weighed against the required memory allocation with OF_LIVE, as well as the cost of unflattening and flattening the device tree which U-Boot is running. This series enables support for access to multiple device trees with the ofnode interface. This is already available to some extent with OF_LIVE, but some of the ofnode functions need changes to allow the tree to be specified. The mechanism works by using the top 1-4 bits of the device tree offset. The sign bit is not affected, since negative values must be supported. With this implemented, it becomes possible to use the ofnode interface to do device tree fixups. The only current user is the EVT_FT_FIXUP event. This has two main benefits: - ofnode can now be used everywhere, in preference to the libfdt calls - live tree can eventually be used everywhere, with potential speed improvements when larger number of fixups are used This series is only a step along the way. Firstly, while it is possible to access the 'fix-up' tree using OF_LIVE, most of the fixup functions use flat tree directly, rather than the ofnode interface. These need to be updated. Also the tree must be flattened again before it is passed to the OS. This is not currently implemented. With OFNODE_MULTI_TREE disabled this has almost no effect on code size: around 4 bytes if EVENT is enabled, 0 if not. With the feature enabled, the increase is around 700 bytes, e.g. on venice2: $ buildman -b ofn2a venice2 -sS --step 0 Summary of 2 commits for 1 boards (1 thread, 64 jobs per thread) 01: image: Drop some other #ifdefs in image-board.c arm: w+ venice2 48: wip arm: (for 1/1 boards) all +668.0 text +668.0 This size increase is not too bad, considering the extra functionality, but is too large to enable everywhere. So for now this features needs to be opt-in only, based on EVENT. Changes in v2: - Return the existing node with -EEXIST - Allow len to be passed in as -1 - Add a comment as to why strncmp() is not enough - Add a comment why the len parameter is needed - Add a comment why the new_name variable is used - Add tests for the memory checks in of_add_subnode() - Fix memory checks - Fix 'property' comment - Add lots more tests and a few other fixes - Gosh that code was a mess - Add new patch to rename ofnode_get_property_by_prop() - Substantially expanded to improve the ofnode implementation/interface - Added more ofnode tests - Minor reworks of the ofnode internals, using oftree - Added testing of memory-allocation failures Simon Glass (45): image: Fix BOOTM_STATE values treewide: Drop bootm_headers_t typedef treewide: Drop image_info_t typedef treewide: Drop image_header_t typedef log: update the comment for log_msg_ret() sandbox: power: Update PMIC driver to use log event: Fix a typo in the EVENT help event: Allow multiple spy declarations for each event dm: core: Pass a root node to of_find_node_by_phandle() event: Pass the images to EVT_FT_FIXUP test: Fix missing livetree test runs test: Support testing malloc() failures dm: core: Document the livetree structures properly dm: core: Allow adding ofnode subnodes dm: core: Support writing a property to an empty node dm: core: Drop the const from ofnode test: Make a copy of the device tree before running a test test: Detect a change in the device tree test: Drop the UT_TESTF_LIVE_OR_FLAT flag sandbox: Add a function to load a relative file path sandbox: Support loading the other FDT sandbox: Support setting up the other FDT for testing sandbox: test: Provide an easy way to use the other FDT dm: core: Reduce code size with dev_of_offset() dm: core: Rename ofnode_get_first/next_property() dm: core: Rename ofnode_get_property_by_prop() dm: core: Avoid creating a name property when unflattening dm: core: Add a macro to iterate through properties dm: core: Drop ofnode_is_available() dm: core: Expand integer-reading tests dm: core: Provide a way to reset the device tree dm: core: Add an ofnode function to obtain the flat tree dm: core: Add ofnode functions to obtain an oftree dm: core: Add a way to look up a phandle in an oftree dm: core: Allow obtaining a node offset in the same tree dm: core: Split ofnode_path_root() into two functions dm: core: Add definitions for multiple ofnode trees dm: core: Add the ofnode multi-tree implementation dm: core: Complete phandle implementation using the other FDT dm: core: Update comments for default-FDT ofnode functions dm: core: Create a function to get a live tree in a test dm: core: Expand ofnode tests vbe: Allow test to run with live/flat tree dm: core: Allow copying ofnode property data when writing dm: core: Support copying properties with ofnode arch/arc/lib/bootm.c | 8 +- arch/arm/lib/bootm.c | 13 +- arch/arm/mach-aspeed/ast2600/spl.c | 4 +- arch/arm/mach-imx/hab.c | 2 +- arch/arm/mach-imx/spl_imx_romapi.c | 6 +- arch/arm/mach-k3/common.c | 2 +- arch/arm/mach-k3/sysfw-loader.c | 6 +- arch/arm/mach-keystone/cmd_mon.c | 6 +- arch/arm/mach-socfpga/board.c | 2 +- arch/arm/mach-sunxi/spl_spi_sunxi.c | 4 +- arch/arm/mach-tegra/xusb-padctl-common.c | 2 +- arch/m68k/lib/bootm.c | 2 +- arch/microblaze/lib/bootm.c | 6 +- arch/mips/lib/bootm.c | 16 +- arch/mips/mach-jz47xx/jz4780/jz4780.c | 6 +- arch/mips/mach-mtmips/mt7621/spl/spl.c | 4 +- arch/mips/mach-mtmips/mt7621/tpl/tpl.c | 4 +- arch/nios2/lib/bootm.c | 2 +- arch/powerpc/lib/bootm.c | 16 +- arch/riscv/lib/andes_plic.c | 2 +- arch/riscv/lib/bootm.c | 8 +- arch/riscv/lib/smp.c | 2 +- arch/sandbox/cpu/cpu.c | 34 +- arch/sandbox/cpu/start.c | 16 +- arch/sandbox/cpu/state.c | 48 ++ arch/sandbox/dts/Makefile | 2 +- arch/sandbox/dts/other.dts | 35 ++ arch/sandbox/include/asm/malloc.h | 1 + arch/sandbox/include/asm/state.h | 30 + arch/sandbox/include/asm/test.h | 19 + arch/sandbox/lib/bootm.c | 2 +- arch/sh/lib/bootm.c | 2 +- arch/x86/lib/bootm.c | 8 +- arch/xtensa/lib/bootm.c | 2 +- board/synopsys/hsdk/hsdk.c | 2 +- board/ti/ks2_evm/board.c | 4 +- boot/boot_fit.c | 4 +- boot/bootm.c | 26 +- boot/bootm_os.c | 35 +- boot/image-android.c | 6 +- boot/image-board.c | 26 +- boot/image-fdt.c | 13 +- boot/image-fit.c | 16 +- boot/image.c | 14 +- boot/vbe_simple.c | 2 +- cmd/bootefi.c | 2 +- cmd/booti.c | 2 +- cmd/bootm.c | 4 +- cmd/bootz.c | 2 +- cmd/disk.c | 4 +- cmd/fpga.c | 2 +- cmd/nand.c | 4 +- cmd/source.c | 2 +- cmd/ximg.c | 4 +- common/Kconfig | 2 +- common/board_r.c | 2 + common/dlmalloc.c | 19 + common/spl/spl.c | 10 +- common/spl/spl_ext.c | 4 +- common/spl/spl_fat.c | 6 +- common/spl/spl_legacy.c | 8 +- common/spl/spl_mmc.c | 4 +- common/spl/spl_nand.c | 4 +- common/spl/spl_net.c | 2 +- common/spl/spl_nor.c | 8 +- common/spl/spl_onenand.c | 2 +- common/spl/spl_ram.c | 8 +- common/spl/spl_sata.c | 2 +- common/spl/spl_semihosting.c | 4 +- common/spl/spl_spi.c | 6 +- common/spl/spl_ubi.c | 4 +- common/spl/spl_xip.c | 2 +- common/spl/spl_ymodem.c | 14 +- common/splash_source.c | 6 +- doc/develop/driver-model/livetree.rst | 37 +- doc/uImage.FIT/source_file_format.txt | 2 +- drivers/core/Kconfig | 24 + drivers/core/fdtaddr.c | 18 +- drivers/core/of_access.c | 83 ++- drivers/core/ofnode.c | 442 +++++++++++--- drivers/core/read.c | 6 +- drivers/cpu/imx8_cpu.c | 2 +- drivers/cpu/riscv_cpu.c | 2 +- drivers/crypto/fsl/jr.c | 2 +- drivers/firmware/scmi/scmi_agent-uclass.c | 2 +- drivers/fpga/socfpga_arria10.c | 4 +- drivers/mtd/mtdpart.c | 4 +- drivers/mtd/nand/raw/zynq_nand.c | 2 +- drivers/net/fec_mxc.c | 2 +- drivers/net/fsl_enetc.c | 2 +- drivers/net/mscc_eswitch/felix_switch.c | 2 +- drivers/net/sja1105.c | 2 +- drivers/net/ti/am65-cpsw-nuss.c | 2 +- drivers/pci/pci-uclass.c | 2 +- drivers/pci/pci_mvebu.c | 2 +- drivers/pci/pci_tegra.c | 2 +- drivers/pci/pcie_mediatek.c | 4 +- drivers/power/pmic/sandbox.c | 10 +- drivers/usb/gadget/f_sdp.c | 2 +- env/common.c | 6 +- include/asm-generic/global_data.h | 4 + include/bootm.h | 6 +- include/configs/uniphier.h | 2 +- include/dm/device.h | 6 +- include/dm/of.h | 15 +- include/dm/of_access.h | 29 +- include/dm/ofnode.h | 345 +++++++++-- include/dm/ofnode_decl.h | 37 +- include/dm/read.h | 8 +- include/event.h | 6 +- include/image.h | 118 ++-- include/log.h | 5 +- include/malloc.h | 12 + include/spl.h | 8 +- include/tee/optee.h | 4 +- include/test/test.h | 30 +- include/test/ut.h | 5 + lib/efi_loader/efi_dt_fixup.c | 2 +- lib/fdtdec.c | 7 +- lib/of_live.c | 7 +- net/dsa-uclass.c | 2 +- scripts/event_dump.py | 4 +- test/boot/vbe_simple.c | 25 +- test/dm/ofnode.c | 696 +++++++++++++++++++++- test/dm/ofread.c | 11 +- test/image/spl_load.c | 4 +- test/test-main.c | 136 ++++- tools/binman/ftest.py | 4 +- tools/default_image.c | 31 +- tools/fit_image.c | 4 +- tools/imx8mimage.c | 8 +- tools/mkimage.c | 2 +- tools/mtk_image.c | 10 +- 133 files changed, 2253 insertions(+), 621 deletions(-) create mode 100644 arch/sandbox/dts/other.dts -- 2.37.2.789.g6183377224-goog

4 55

Pull request for efi-2022-10-rc6
by Heinrich Schuchardt 30 Sep '22

30 Sep '22

The following changes since commit 435596d57f8beedf36b5dc858fe7ba9d6c03334b: Merge tag 'u-boot-imx-20220922' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx (2022-09-22 10:29:29 -0400) are available in the Git repository at: https://source.denx.de/u-boot/custodians/u-boot-efi.git tags/efi-2022-10-rc6 for you to fetch changes up to 8d805929b1541a071048b55b22d110f166809939: efi_loader: fix efi_initrd_deregister() (2022-09-30 02:03:23 +0200) Gitlab CI showed no issued: https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/13637 ---------------------------------------------------------------- Pull request for efi-2022-10-rc6 Documentation: * doc: improve description of autostart UEFI: * prefix test functions with efi_st_ in the LoadImage unit test * avoid a warning message in efi_initrd_deregister() ---------------------------------------------------------------- Heinrich Schuchardt (3): doc: improve description of autostart efi_selftest: prefix test functions with efi_st_ efi_loader: fix efi_initrd_deregister() doc/usage/environment.rst | 34 +++++++----- lib/efi_loader/efi_load_initrd.c | 3 ++ lib/efi_selftest/efi_selftest_loadimage.c | 87 ++++++++++++++++--------------- 3 files changed, 68 insertions(+), 56 deletions(-)

2 1

[PATCH 1/2] smbios: Simplify reporting of unknown values
by Ilias Apalodimas 30 Sep '22

30 Sep '22

If a value is not valid during the DT or SYSINFO parsing, we explicitly set that to "Unknown Product" and "Unknown" for the product and manufacturer respectively. It's cleaner if we move the checks insisde smbios_add_string() and always report "Unknown" regardless of the missing field. pre-patch dmidecode <snip> Handle 0x0001, DMI type 1, 27 bytes System Information Manufacturer: Unknown Product Name: Unknown Product Version: Not Specified Serial Number: Not Specified UUID: Not Settable Wake-up Type: Reserved SKU Number: Not Specified Family: Not Specified Handle 0x0002, DMI type 2, 14 bytes Base Board Information Manufacturer: Unknown Product Name: Unknown Product Version: Not Specified Serial Number: Not Specified Asset Tag: Not Specified Features: Board is a hosting board Location In Chassis: Not Specified Chassis Handle: 0x0000 Type: Motherboard <snip> post-patch dmidecode: Handle 0x0001, DMI type 1, 27 bytes System Information Manufacturer: Unknown Product Name: Unknown Version: Unknown Serial Number: Unknown UUID: Not Settable Wake-up Type: Reserved SKU Number: Unknown Family: Unknown Handle 0x0002, DMI type 2, 14 bytes Base Board Information Manufacturer: Unknown Product Name: Unknown Version: Unknown Serial Number: Not Specified Asset Tag: Unknown Features: Board is a hosting board Location In Chassis: Not Specified Chassis Handle: 0x0000 Type: Motherboard Signed-off-by: Ilias Apalodimas <ilias.apalodimas(a)linaro.org> --- lib/smbios.c | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/lib/smbios.c b/lib/smbios.c index d7f4999e8b2a..fcc8686993ef 100644 --- a/lib/smbios.c +++ b/lib/smbios.c @@ -102,7 +102,7 @@ static int smbios_add_string(struct smbios_ctx *ctx, const char *str) int i = 1; char *p = ctx->eos; - if (!*str) + if (!str || !*str) str = "Unknown"; for (;;) { @@ -151,8 +151,7 @@ static int smbios_add_prop_si(struct smbios_ctx *ctx, const char *prop, const char *str; str = ofnode_read_string(ctx->node, prop); - if (str) - return smbios_add_string(ctx, str); + return smbios_add_string(ctx, str); } return 0; @@ -231,7 +230,7 @@ static int smbios_write_type0(ulong *current, int handle, t->vendor = smbios_add_string(ctx, "U-Boot"); t->bios_ver = smbios_add_prop(ctx, "version"); - if (!t->bios_ver) + if (!strcmp(ctx->last_str, "Unknown")) t->bios_ver = smbios_add_string(ctx, PLAIN_VERSION); if (t->bios_ver) gd->smbios_version = ctx->last_str; @@ -281,11 +280,7 @@ static int smbios_write_type1(ulong *current, int handle, fill_smbios_header(t, SMBIOS_SYSTEM_INFORMATION, len, handle); smbios_set_eos(ctx, t->eos); t->manufacturer = smbios_add_prop(ctx, "manufacturer"); - if (!t->manufacturer) - t->manufacturer = smbios_add_string(ctx, "Unknown"); t->product_name = smbios_add_prop(ctx, "product"); - if (!t->product_name) - t->product_name = smbios_add_string(ctx, "Unknown Product"); t->version = smbios_add_prop_si(ctx, "version", SYSINFO_ID_SMBIOS_SYSTEM_VERSION); if (serial_str) { @@ -315,11 +310,7 @@ static int smbios_write_type2(ulong *current, int handle, fill_smbios_header(t, SMBIOS_BOARD_INFORMATION, len, handle); smbios_set_eos(ctx, t->eos); t->manufacturer = smbios_add_prop(ctx, "manufacturer"); - if (!t->manufacturer) - t->manufacturer = smbios_add_string(ctx, "Unknown"); t->product_name = smbios_add_prop(ctx, "product"); - if (!t->product_name) - t->product_name = smbios_add_string(ctx, "Unknown Product"); t->version = smbios_add_prop_si(ctx, "version", SYSINFO_ID_SMBIOS_BASEBOARD_VERSION); t->asset_tag_number = smbios_add_prop(ctx, "asset-tag"); @@ -344,8 +335,6 @@ static int smbios_write_type3(ulong *current, int handle, fill_smbios_header(t, SMBIOS_SYSTEM_ENCLOSURE, len, handle); smbios_set_eos(ctx, t->eos); t->manufacturer = smbios_add_prop(ctx, "manufacturer"); - if (!t->manufacturer) - t->manufacturer = smbios_add_string(ctx, "Unknown"); t->chassis_type = SMBIOS_ENCLOSURE_DESKTOP; t->bootup_state = SMBIOS_STATE_SAFE; t->power_supply_state = SMBIOS_STATE_SAFE; -- 2.37.2

6 18

[PATCH v2 0/9] Add DM support for atmel NAND driver
by Balamanikandan Gunasundar 30 Sep '22

30 Sep '22

Change include: - Adapt GPIO descriptor apis for U-Boot. Use gpio_request_by_name_nodev, dm_gpio_get_value etc. - Use U_BOOT_DRIVER instead of platform_driver. - Replace struct platform_device with struct udevice - Check the status of nfc exec operation by polling the status register instead of interrupt based handling - DMA operations not supported. Remove it - Adapt DT parsing to U-Boot APIs v2: - Add linux reference version in the commit message from which the driver is ported from - Reword the commit message to describe the changes clearly Balamanikandan Gunasundar (9): nand: atmel: Add DM based NAND driver nand: atmel: Add pmecc driver mfd: syscon: Add atmel-matrix registers definition memory: atmel-ebi: add Atmel EBI (External Bus Interface) driver mfd: syscon: atmel-smc: Add driver for atmel SMC configs: at91: sam9x60ek: Enable DM based nand driver ARM: dts: at91: sam9x60: Add nodes for EBI and NAND ARM: dts: at91: sam9x60ek: Enable NAND support board: sam9x60ek: remove nand init from board file MAINTAINERS | 1 + arch/arm/dts/sam9x60.dtsi | 42 + arch/arm/dts/sam9x60ek.dts | 103 + board/atmel/sam9x60ek/sam9x60ek.c | 59 - configs/sam9x60ek_mmc_defconfig | 9 +- configs/sam9x60ek_nandflash_defconfig | 9 +- configs/sam9x60ek_qspiflash_defconfig | 8 +- drivers/Kconfig | 2 + drivers/Makefile | 1 + drivers/memory/Kconfig | 7 + drivers/memory/Makefile | 1 + drivers/memory/atmel_ebi.c | 37 + drivers/mfd/Kconfig | 4 + drivers/mfd/Makefile | 1 + drivers/mfd/atmel-smc.c | 364 +++ drivers/mtd/nand/raw/Kconfig | 8 + drivers/mtd/nand/raw/Makefile | 1 + drivers/mtd/nand/raw/atmel/Makefile | 5 + drivers/mtd/nand/raw/atmel/nand-controller.c | 2293 ++++++++++++++++++ drivers/mtd/nand/raw/atmel/pmecc.c | 965 ++++++++ drivers/mtd/nand/raw/atmel/pmecc.h | 94 + include/configs/sam9x60ek.h | 5 - include/linux/mfd/syscon/atmel-matrix.h | 112 + include/linux/mfd/syscon/atmel-smc.h | 119 + 24 files changed, 4177 insertions(+), 73 deletions(-) create mode 100644 drivers/memory/atmel_ebi.c create mode 100644 drivers/mfd/Kconfig create mode 100644 drivers/mfd/Makefile create mode 100644 drivers/mfd/atmel-smc.c create mode 100644 drivers/mtd/nand/raw/atmel/Makefile create mode 100644 drivers/mtd/nand/raw/atmel/nand-controller.c create mode 100644 drivers/mtd/nand/raw/atmel/pmecc.c create mode 100644 drivers/mtd/nand/raw/atmel/pmecc.h create mode 100644 include/linux/mfd/syscon/atmel-matrix.h create mode 100644 include/linux/mfd/syscon/atmel-smc.h -- 2.34.1

6 23

[RFC PATCH] dm: fpga: Introduce new uclass
by Alexander Dahl 30 Sep '22

30 Sep '22

For future DM based FPGA drivers and for now to have a meaningful logging class for old FPGA drivers. Suggested-by: Michal Simek <michal.simek(a)amd.com> Suggested-by: Simon Glass <sjg(a)chromium.org> Signed-off-by: Alexander Dahl <post(a)lespocky.de> --- arch/sandbox/dts/test.dts | 4 ++++ drivers/fpga/Kconfig | 14 ++++++++++++++ drivers/fpga/Makefile | 3 +++ drivers/fpga/fpga-uclass.c | 11 +++++++++++ drivers/fpga/sandbox.c | 11 +++++++++++ include/dm/uclass-id.h | 1 + test/dm/Makefile | 1 + test/dm/fpga.c | 20 ++++++++++++++++++++ 8 files changed, 65 insertions(+) create mode 100644 drivers/fpga/fpga-uclass.c create mode 100644 drivers/fpga/sandbox.c create mode 100644 test/dm/fpga.c diff --git a/arch/sandbox/dts/test.dts b/arch/sandbox/dts/test.dts index 2761588f0d..3b9cc8cd7c 100644 --- a/arch/sandbox/dts/test.dts +++ b/arch/sandbox/dts/test.dts @@ -650,6 +650,10 @@ }; }; + fpga { + compatible = "sandbox,fpga"; + }; + pinctrl-gpio { compatible = "sandbox,pinctrl-gpio"; diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig index e07a9cf80e..2ad1ff60b6 100644 --- a/drivers/fpga/Kconfig +++ b/drivers/fpga/Kconfig @@ -118,4 +118,18 @@ config SPL_FPGA_LOAD_SECURE Enables the fpga loads() functions that are used to load secure (authenticated or encrypted or both) bitstreams on to FPGA. +config DM_FPGA + bool "Enable Driver Model for FPGA drivers" + depends on DM + select FPGA + help + Enable driver model for FPGA. + For now this is uclass only without a real driver using it. + +config SANDBOX_FPGA + bool "Enable sandbox FPGA driver" + depends on SANDBOX && DM_FPGA + help + tbd + endmenu diff --git a/drivers/fpga/Makefile b/drivers/fpga/Makefile index 83243fb107..610c168fc3 100644 --- a/drivers/fpga/Makefile +++ b/drivers/fpga/Makefile @@ -4,6 +4,9 @@ # Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. obj-y += fpga.o +obj-$(CONFIG_DM_FPGA) += fpga-uclass.o +obj-$(CONFIG_SANDBOX_FPGA) += sandbox.o + obj-$(CONFIG_FPGA_SPARTAN2) += spartan2.o obj-$(CONFIG_FPGA_SPARTAN3) += spartan3.o obj-$(CONFIG_FPGA_VERSALPL) += versalpl.o diff --git a/drivers/fpga/fpga-uclass.c b/drivers/fpga/fpga-uclass.c new file mode 100644 index 0000000000..4278ec28e5 --- /dev/null +++ b/drivers/fpga/fpga-uclass.c @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2022 Alexander Dahl <post(a)lespocky.de> + */ + +#include <dm.h> + +UCLASS_DRIVER(fpga) = { + .name = "fpga", + .id = UCLASS_FPGA, +}; diff --git a/drivers/fpga/sandbox.c b/drivers/fpga/sandbox.c new file mode 100644 index 0000000000..5687efccb1 --- /dev/null +++ b/drivers/fpga/sandbox.c @@ -0,0 +1,11 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2022 Alexander Dahl <post(a)lespocky.de> + */ + +#include <dm.h> + +U_BOOT_DRIVER(sandbox_fpga) = { + .name = "sandbox_fpga", + .id = UCLASS_FPGA, +}; diff --git a/include/dm/uclass-id.h b/include/dm/uclass-id.h index a432e43871..c2b15881ba 100644 --- a/include/dm/uclass-id.h +++ b/include/dm/uclass-id.h @@ -56,6 +56,7 @@ enum uclass_id { UCLASS_ETH, /* Ethernet device */ UCLASS_ETH_PHY, /* Ethernet PHY device */ UCLASS_FIRMWARE, /* Firmware */ + UCLASS_FPGA, /* FPGA device */ UCLASS_FUZZING_ENGINE, /* Fuzzing engine */ UCLASS_FS_FIRMWARE_LOADER, /* Generic loader */ UCLASS_GPIO, /* Bank of general-purpose I/O pins */ diff --git a/test/dm/Makefile b/test/dm/Makefile index 7543df8823..666c85f10a 100644 --- a/test/dm/Makefile +++ b/test/dm/Makefile @@ -47,6 +47,7 @@ ifneq ($(CONFIG_EFI_PARTITION),) obj-$(CONFIG_FASTBOOT_FLASH_MMC) += fastboot.o endif obj-$(CONFIG_FIRMWARE) += firmware.o +obj-$(CONFIG_DM_FPGA) += fpga.o obj-$(CONFIG_DM_HWSPINLOCK) += hwspinlock.o obj-$(CONFIG_DM_I2C) += i2c.o obj-$(CONFIG_SOUND) += i2s.o diff --git a/test/dm/fpga.c b/test/dm/fpga.c new file mode 100644 index 0000000000..8d29c8f159 --- /dev/null +++ b/test/dm/fpga.c @@ -0,0 +1,20 @@ +// SPDX-License-Identifier: GPL-2.0+ +/* + * Copyright 2022 Alexander Dahl <post(a)lespocky.de> + */ + +#include <dm.h> +#include <dm/test.h> +#include <test/test.h> +#include <test/ut.h> + +static int dm_test_fpga(struct unit_test_state *uts) +{ + struct udevice *dev; + + ut_assertok(uclass_get_device(UCLASS_FPGA, 0, &dev)); + + return 0; +} + +DM_TEST(dm_test_fpga, UT_TESTF_SCAN_FDT); base-commit: f117c54cc83e3c519883edb5a48062644d38c443 -- 2.30.2

2 2

[PATCH 1/1] efi_loader: fix efi_initrd_deregister()
by Heinrich Schuchardt 30 Sep '22

30 Sep '22

Don't try to delete a non-existent handle. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt(a)canonical.com> --- lib/efi_loader/efi_load_initrd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/efi_loader/efi_load_initrd.c b/lib/efi_loader/efi_load_initrd.c index c5e6652e66..3d6044f760 100644 --- a/lib/efi_loader/efi_load_initrd.c +++ b/lib/efi_loader/efi_load_initrd.c @@ -230,6 +230,9 @@ efi_status_t efi_initrd_register(void) */ void efi_initrd_deregister(void) { + if (!efi_initrd_handle) + return; + efi_delete_handle(efi_initrd_handle); efi_initrd_handle = NULL; } -- 2.37.2

3 9

CONFIG_DEFAULT_ENV_FILE Question
by Jonathan DeNoon 30 Sep '22

30 Sep '22

Hello, I want to define my own default environment, so I have enabled CONFIG_USE_DEFAULT_ENV_FILE. The next step appears to be setting the path to the default environment file via CONFIG_DEFAULT_ENV_FILE. My questions are as follows: * Am I expected to provide an absolute path to the file, or is it a relative path with respect to the cloned U-Boot repo? * Is there a specific directory that you advise to store a default environment file in? * Are there any example default environment files and corresponding default environment file paths that I could reference? Thank you, Jonathan DeNoon

3 2

[PATCH] schemas: Add schema for U-Boot driver model 'phase tags'
by Simon Glass 30 Sep '22

30 Sep '22

Until recently it has not been possible to add any U-Boot-specific properties to the device tree schema. Now that it is somewhat separated from Linux and people are feeling the enormous pain of the bifurcated schema, it seems like a good time to add this and other U-Boot-specific bindings. U-Boot has some particular challenges with device tree and devices which are not faced with Linux: - U-Boot has multiple build phases, such as a Secondary Program Loader (SPL) phase which typically runs in a pre-SDRAM environment where code and data space are limited. In particular, there may not be enough space for the full device tree blob. U-Boot uses various automated techniques to reduce the size from perhaps 40KB to 3KB. - Some U-Boot phases needs to run before the clocks are properly set up, where the CPU may be running very slowly. Therefore it is important to bind only those devices which are actually needed in that phase - Unlike Linux or UEFI, U-Boot uses lazy initialisation for its devices, with 'bind' and 'probe' being separate steps. Even if a device is bound, it is not actually probed until it is used. This is necessary to keep the boot time reasonable, e.g. to under a second The phases of U-Boot in order are: TPL, VPL, SPL, U-Boot (first pre-relocation, then post-relocation). ALl but the last two are optional. For the above reasons, U-Boot only includes the full device tree in the final 'U-Boot proper' build. Even then, before relocation U-Boot only processes nodes which are marked as being needed. For this to work, U-Boot's driver model[1] provides a way to mark device tree nodes as applicable for a particular phase. This works by adding a tag to the node, e.g.: cru: clock-controller@ff760000 { u-boot,dm-all; compatible = "rockchip,rk3399-cru"; reg = <0x0 0xff760000 0x0 0x1000>; rockchip,grf = <&grf>; #clock-cells = <1>; #reset-cells = <1>; ... }; Here the "u-boot,dm-all" tag indicates that the node must be present in all phases, since the clock driver is required There has been discussion over the years about whether this could be done in a property instead, e.g. options { u-boot,dm-all = <&cru> <&gpio_a> ...; ... }; Some problems with this: - we need to be able to merge several such tags from different .dtsi files since many boards have their own specific requirements - it is hard to find and cross-reference the affected nodes - it is more error-prone - it requires significant tool rework in U-Boot, including fdtgrep and the build system - is harder (slower, more code) to process since it involves scanning another node/property to find out what to do with a particular node - we don't want to add phandle arguments to the above since we are referring, e.g., to the clock device as a whole, not a paricular clock - the of-platdata feature[2], which converts device tree to C for even more constrained environments, would need to become aware of the /options node There is also the question about whether this needs to be U-Boot-specific, or whether the tags could be generic. From what I can tell, U-Boot is the only bootloader which seriously attempts to use a runtime device tree in all cases. We could perhaps adopt U-Boot's naming for the phases and drop the "u-boot," prefix, but that might cause confusion. It should also be noted that the approach provided here has stood the test of time, used in U-Boot for 8 years so far. So add the schema for this. This will allow a major class of schema exceptions to be dropped from the U-Boot source tree. This being sent to the mailing list since it might attract more review. A PR will be sent when this has had some review. That is why the file path is set up for https://github.com/devicetree-org/dt-schema rather than the Linux kernel. [1] https://u-boot.readthedocs.io/en/latest/develop/driver-model/index.html [2] https://u-boot.readthedocs.io/en/latest/develop/driver-model/of-plat.html Signed-off-by: Simon Glass <sjg(a)chromium.org> --- dtschema/schemas/u-boot.yaml | 48 ++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 dtschema/schemas/u-boot.yaml diff --git a/dtschema/schemas/u-boot.yaml b/dtschema/schemas/u-boot.yaml new file mode 100644 index 0000000..6c5c820 --- /dev/null +++ b/dtschema/schemas/u-boot.yaml @@ -0,0 +1,48 @@ +# SPDX-License-Identifier: BSD-2-Clause +# Copyright 2022 Google LLC +%YAML 1.2 +--- +$id: http://devicetree.org/schemas/serial.yaml# +$schema: http://devicetree.org/meta-schemas/core.yaml# + +title: Bindings required by U-Boot driver model + +maintainers: + - Simon Glass <sjg(a)chromium.org> + +patternProperties: + "^u-boot,dm-(tpl|vpl|spl|all|pre-reloc)$": + type: boolean + description: | + The device tree is often quite large (e.g. 40KB) and cannot fit into xPL + phases like SPL, TPL. Even with U-Boot proper, we normally only want to + init a small subset of devices before relocation. + + U-Boot supports adding tags to device tree nodes to allow them to be + marked according to the U-Boot phases where they should be included. + + Without any tags, nodes are included only in U-Boot proper after + relocation. Any untagged nodes are dropped from xPL and are ignored before + relocation in U-Boot proper. + + The xPL builds use fdtgrep drop any nodes which are not needed for that + build. For example, TPL will drop any nodes which are not marked with + u-boot,dm-tpl or u-boot,dm-all tags. + + Note that xPL builds also drop the tags, since they have server their + purpose by that point. So when looking at xPL device tree files you will + not see these tags. The means, for example, that ofnode_pre_reloc() + returns true always in xPL builds. This is done to save space. + + Multiple tags can be used in the same node. + + One complication is that tags apply only to the node they are added to, + not to any parents. This means that you often need to add the same tag to + parent nodes so that any properties needed by the parent driver are + included. Without that, the parent node may have no properties, or may not + be bound before relocation (meaning that its child will not be either). + + The phases of U-Boot in order are: TPL, VPL, SPL, U-Boot (first + pre-relocation, then post-relocation). ALl but the last two are optional. + +additionalProperties: true -- 2.38.0.rc1.362.ged0d419d3c-goog

2 3

[PATCH 1/1] usb: request only 8 bytes for USB_SPEED_FULL bMaxPacketSize0 discovery
by Janne Grunau 30 Sep '22

30 Sep '22

Fixes probing of various keyboards with DWC3 as integrated into Apple silicon SoCs. The problem appears to be requesting more data than the devices's bMaxPacketSize0 of 8. Older Logitech unifying receivers (bcdDevice 12.03 or 12.10) are for eaxample affected. Signed-off-by: Janne Grunau <j(a)jannau.net> Tested-by: Thomas Glanzmann <thomas(a)glanzmann.de> --- common/usb.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/common/usb.c b/common/usb.c index 6fcf1e8428e9..48a310e8599d 100644 --- a/common/usb.c +++ b/common/usb.c @@ -993,10 +993,12 @@ static int usb_setup_descriptor(struct usb_device *dev, bool do_read) * * At least the DWC2 controller needs to be programmed with * the number of packets in addition to the number of bytes. - * A request for 64 bytes of data with the maxpacket guessed - * as 64 (above) yields a request for 1 packet. + * Requesting more than 8 bytes causes probing errors on the + * DWC3 controller integrated into Apple silicon SoCs with + * devices with bMaxPacketSize0 of 8. So limit the read request + * to the used size of 8 bytes. */ - err = get_descriptor_len(dev, 64, 8); + err = get_descriptor_len(dev, 8, 8); if (err) return err; } -- 2.35.1

4 5