misc: fs_loader: reorg and split to FS and FW loader + FIP loader
v9 cover misc: fs_loader: reorg and split to FS and FW loader + FIP loader
This series mainly rework the FS loader to permit reading firmware from container that are not exactly a readable filesystem.
Also splitting out the generic firmware loader infra from the filesystem-specific code will make adding new loader types easier.
One scenario is when a firmware is shipped in a FIP container as a generic blob with an UUID.
FIP are mostly used on ARM in the context of ATF.
In such context U-Boot is loaded as BL31 and the PHY firmware can't be stored in the FIT image for the kernel as U-Boot should not depend on the presence of the kernel to correctly enable PHY for Ethernet port.
To handle such case the PHY firmware is stored in FIP with a predictable UUID.
One example is with Airoha 8811H firmware where the FIP can have a blob with UUID "d39d2cf2-9bd0-3ca7-93e9-e71b4f9250b2". (generated from command "uuidgen -n @dns --md5 --name en8811h.bin")
With these example DTS entry:
fw_loader0: fip-loader {
bootph-all;
compatible = "u-boot,fip-loader";
phandlepart = <&mmc0 0>;
partoffset = <0x100>;
};mdio {
en8811: ethernet-phy@f {
reg = <0xf>;
firmware-name = "d39d2cf2-9bd0-3ca7-93e9-e71b4f9250b2";
firmware-loader = <&fw_loader0>; };
};
And PHY driver using the get_fw_loader_from_node() and the common request_firmware_into_buf() it's possible to load the PHY firmware transparently by just declaring the required entry in the DTS.
get_fw_loader_from_node() is implemented to actual get the loader from DT. This was something that was already in mind from when the FS loader was implemented but then it was never implemented in favor of a single loader per device.
The first patch is a minor fixup for something that probably won't ever happen.
The second one is a good reworking of the FS and FW loader moving the internal struct to a dedicated header. (this is really to enforce what drivers should use and what driver should not mess with)
Then there is the request_firmware_size() new OP to get only the size of the firmware. Useful for case where the firmware size is not always the same and change across different version. (the patter might be get size -> alloc buffer -> get firmware).
Then the FIP loader as a basic parser of FIP. This only read the FIP header, loop all the entry and search for a matching UUID. If nothing is found then no firmware blob. Very simple implementation.
This is being CI tested on [0]
[0] https://github.com/u-boot/u-boot/pull/884
Changes v9:
- Drop FIP blob in favor of dynamic generation
- Rename fs_loader to fw_loader
- Add additional patch for offset validation
- More use of lbaint_t
- Handle reading 0 for UBI
- Update MTD/UBI documentation and YAML conditions
- Make generic_fw_loader_get_phandle_desc handling explicit Changes v8:
- Address all the comments from Simon
- Massively improve test coverage for both FS and FIP
- Enable mmc node when needed for the tests
- Change FIP implementation to follow FS one
(read up to buf size or end of entry size) (complain when offset is bigger than size of entry)
- Update related documentation for fw loader
- Rebase on top of next
Changes v7:
- Add tests
- Rebase on top of next
- Fix compilation for vpl
Changes v6:
- Rework to generic FW loader UCLASS
- Account for firmware offset in FIP loader
- Add UBI example in documentation
- Improve variables order
Changes v5:
- Fix unment dependency for config flag
- Move request_firmware_size before FIP loader
- Add documentation patch
- Improve get_fw_loader_from_node() implementation
- use min() instead of custom MIN()
- Fix handling of some return value
Changes v4:
- Rebase on top of next
Changes v3:
- Add review tag where possible
- Check blk_dread ret
- Generalize mount_ubifs with generic_fw_loader_ubi_select
- Fix some typo
- Drop useless ubifs umount (nothing is mounted in FIP) Changes v2:
- Better handle header include to fix compilation error on some devices
- Fix typo for ubifs fix commit
Christian Marangi (8):
misc: fs_loader: fix ubifs not unmounted on dev_get_priv error
misc: fs_loader: reorganize and split to FS loader and FW UCLASS
misc: fw_loader: implement generic get_fw_loader_from_node()
misc: fs_loader: validate requested offset on reading file
misc: fw_loader: implement request_firmware_size() OP
doc: dtbinding: Update documentation for Generic Firmware loader
misc: fw_loader: introduce FIP loader driver
test: dm: Add test for FW Loader feature
arch/sandbox/dts/test.dts | 38 ++
configs/sandbox64_defconfig | 2 +
configs/sandbox_defconfig | 2 +
configs/sandbox_flattree_defconfig | 2 +
configs/sandbox_noinst_defconfig | 1 +
configs/sandbox_spl_defconfig | 2 +
configs/sandbox_vpl_defconfig | 2 +
...irmware_loader.rst => firmware_loader.rst} | 6 +-
doc/develop/driver-model/index.rst | 2 +-
doc/device-tree-bindings/misc/fs_loader.txt | 48 --
doc/device-tree-bindings/misc/fw_loader.yaml | 112 ++++
drivers/misc/Kconfig | 31 +
drivers/misc/Makefile | 2 +-
drivers/misc/fs_loader.c | 326 ----------
drivers/misc/fw_loader/Makefile | 5 +
drivers/misc/fw_loader/fip_loader.c | 558 ++++++++++++++++++
drivers/misc/fw_loader/fs_loader.c | 234 ++++++++
drivers/misc/fw_loader/fw_loader-uclass.c | 231 ++++++++
drivers/misc/fw_loader/internal.h | 100 ++++
include/dm/uclass-id.h | 2 +-
include/fs_loader.h | 47 +-
include/fw_loader.h | 42 ++
test/dm/Makefile | 1 +
test/dm/fw_loader.c | 218 +++++++
test/py/tests/test_ut.py | 58 ++
25 files changed, 1647 insertions(+), 425 deletions(-)
rename doc/develop/driver-model/{fs_firmware_loader.rst => firmware_loader.rst} (95%)
delete mode 100644 doc/device-tree-bindings/misc/fs_loader.txt
create mode 100644 doc/device-tree-bindings/misc/fw_loader.yaml
delete mode 100644 drivers/misc/fs_loader.c
create mode 100644 drivers/misc/fw_loader/Makefile
create mode 100644 drivers/misc/fw_loader/fip_loader.c
create mode 100644 drivers/misc/fw_loader/fs_loader.c
create mode 100644 drivers/misc/fw_loader/fw_loader-uclass.c
create mode 100644 drivers/misc/fw_loader/internal.h
create mode 100644 test/dm/fw_loader.cSignature · 1 line
2.55.0
PATCH v9 1/8 misc: fs_loader: fix ubifs not unmounted on dev_get_priv error
When dev_get_priv errors out, the ubifs is not umounted (if used).
Correctly handle this handle condition and while at it also return -EINVAL instead of -ENOMEM as a better error since no memory is allocated but is actually an invalid scenario for fw_get_filesystem_firmware().
--- drivers/misc/fs_loader.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/misc/fs_loader.c +4 -2
@@ -175,8 +175,10 @@ static int fw_get_filesystem_firmware(struct udevice *dev)struct firmware *firmwarep =dev_get_priv (dev); -if (!firmwarep) -return -ENOMEM ; +if (!firmwarep) { + ret = -EINVAL ; + goto out; + } ret =fs_read (firmwarep->name, (ulong )map_to_sysmem (firmwarep->data), firmwarep->offset, firmwarep->size, &actread);
Signature · 1 line
2.55.0
PATCH v9 2/8 misc: fs_loader: reorganize and split to FS loader and FW UCLASS
In reply to Christian MarangiIn preparation to the introduction of variant of the FS loader, reorganize and split the driver to generic fw_loader UCLASS and specific fs_loader function. Create a dedicated directory for the loader and move the internal structs and functions to a dedicated header file. While at it also drop some redundant check and rename some variables as we are updating the code for the UCLASS rework.
Doc are renamed and updated to a more generic name and for the new UCLASS.
This will permit to reuse all the property and logic of FS loader with container that are not exactly a readable filesystem.
---
...irmware_loader.rst => firmware_loader.rst} | 6 +-
doc/develop/driver-model/index.rst | 2 +-
drivers/misc/Kconfig | 8 +
drivers/misc/Makefile | 2 +-
drivers/misc/fs_loader.c | 328 ------------------
drivers/misc/fw_loader/Makefile | 4 +
drivers/misc/fw_loader/fs_loader.c | 175 ++++++++++
drivers/misc/fw_loader/fw_loader-uclass.c | 188 ++++++++++
drivers/misc/fw_loader/internal.h | 91 +++++
include/dm/uclass-id.h | 2 +-
include/fs_loader.h | 47 +--
include/fw_loader.h | 19 +
12 files changed, 493 insertions(+), 379 deletions(-)
rename doc/develop/driver-model/{fs_firmware_loader.rst => firmware_loader.rst} (95%)
delete mode 100644 drivers/misc/fs_loader.c
create mode 100644 drivers/misc/fw_loader/Makefile
create mode 100644 drivers/misc/fw_loader/fs_loader.c
create mode 100644 drivers/misc/fw_loader/fw_loader-uclass.c
create mode 100644 drivers/misc/fw_loader/internal.hdoc/develop/driver-model/firmware_loader.rst renamed from doc/develop/driver-model/fs_firmware_loader.rst +3 -3
@@ -4,7 +4,7 @@ File System Firmware Loader =========================== -This is file system firmware loader for U-Boot framework, which has very close +This is firmware loader for U-Boot framework, which has very close to some Linux Firmware API. For the details of Linux Firmware API, you can refer to https://docs.kernel.org/driver-api/firmware/index.html.
@@ -87,7 +87,7 @@ For example of getting DT phandle from /chosen and creating instance: } phandle = fdt32_to_cpu(*phandle_p); - ret = uclass_get_device_by_phandle_id(UCLASS_FS_FIRMWARE_LOADER, + ret = uclass_get_device_by_phandle_id(UCLASS_FIRMWARE_LOADER, phandle, &dev); if (ret) return ret;
@@ -145,7 +145,7 @@ instance: .. code-block:: c - ret = uclass_get_device_by_phandle_id(UCLASS_FS_FIRMWARE_LOADER, + ret = uclass_get_device_by_phandle_id(UCLASS_FIRMWARE_LOADER, phandle, &dev); if (ret) return ret;
doc/develop/driver-model/index.rst +1 -1
@@ -15,7 +15,7 @@ subsystems design ethernet fdt-fixup - fs_firmware_loader + firmware_loader i2c-howto livetree migration
drivers/misc/Kconfig +8 -0
@@ -621,8 +621,12 @@ config MPC83XX_SERDES help Support for serdes found on MPC83xx SoCs. +config FW_LOADER_UCLASS + bool + config FS_LOADER bool "Enable loader driver for file system" + select FW_LOADER_UCLASS help This is file system generic loader which can be used to load the file image from the storage into target such as memory.
@@ -630,8 +634,12 @@ config FS_LOADER The consumer driver would then use this loader to program whatever, ie. the FPGA device. +config SPL_FW_LOADER_UCLASS + bool + config SPL_FS_LOADER bool "Enable loader driver for file system in SPL" + select SPL_FW_LOADER_UCLASS depends on SPL help This is file system generic loader which can be used to load
drivers/misc/Makefile +1 -1
@@ -36,7 +36,7 @@ obj-$(CONFIG_FSL_DEVICE_DISABLE) += fsl_devdis.o obj-$(CONFIG_FSL_IFC) += fsl_ifc.o obj-$(CONFIG_FSL_IIM) += fsl_iim.o obj-$(CONFIG_FSL_SEC_MON) += fsl_sec_mon.o -obj-$(CONFIG_$(PHASE_)FS_LOADER) += fs_loader.o +obj-$(CONFIG_$(PHASE_)FW_LOADER_UCLASS) += fw_loader/ obj-$(CONFIG_GATEWORKS_SC) += gsc.o obj-$(CONFIG_GXP_EEPROM) += gxp_eeprom.o obj-$(CONFIG_GDSYS_IOEP) += gdsys_ioep.o
drivers/misc/fs_loader.c deleted +0 -328
328 lines not on this page · raw message
drivers/misc/fw_loader/Makefile new file +4 -0
@@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0+ + +obj-$(CONFIG_$(PHASE_)FW_LOADER_UCLASS) += fw_loader-uclass.o +obj-$(CONFIG_$(PHASE_)FS_LOADER) += fs_loader.o
drivers/misc/fw_loader/fs_loader.c new file +175 -0
175 lines not on this page · raw message
drivers/misc/fw_loader/fw_loader-uclass.c new file +188 -0
188 lines not on this page · raw message
drivers/misc/fw_loader/internal.h new file +91 -0
91 lines not on this page · raw message
include/dm/uclass-id.h +1 -1
@@ -69,7 +69,7 @@ enum uclass_id {UCLASS_FIRMWARE ,/* Firmware */ UCLASS_FPGA ,/* FPGA device */ UCLASS_FUZZING_ENGINE ,/* Fuzzing engine */ -UCLASS_FS_FIRMWARE_LOADER ,/* Generic loader */ +UCLASS_FIRMWARE_LOADER ,/* Firmware loader */ UCLASS_FWU_MDATA ,/* FWU Metadata Access */ UCLASS_GPIO ,/* Bank of general-purpose I/O pins */ UCLASS_HASH, /* Hash device */
include/fs_loader.h +2 -45
54 lines not on this page · raw message
include/fw_loader.h +19 -0
@@ -1,10 +1,29 @@/* SPDX-License-Identifier: GPL-2.0 */ /* +* Copyright (C) 2018-2019 Intel Corporation <www.intel.com> * Copyright (C) 2025 Lucien Jheng <[email protected]> */ #ifndef _FW_LOADER_H_#define _FW_LOADER_H_ +struct udevice ; + +/** +* request_firmware_into_buf - Load firmware into a previously allocated buffer. +* @dev: An instance of a driver. +* @name: Name of firmware file. +* @buf: Address of buffer to load firmware into. +* @size: Size of buffer. +* @offset: Offset of a file for start reading into buffer. +* +* The firmware is loaded directly into the buffer pointed to by @buf. +* +* Return: Size of total read, negative value when error. +*/ +int request_firmware_into_buf (struct udevice *dev, +const char *name, +void *buf,size_t size,u32 offset); +/** * request_firmware_into_buf_via_script() - * Load firmware using a U-Boot script and copy to buffer
Signature · 1 line
2.55.0
Re: [PATCH v9 2/8] misc: fs_loader: reorganize and split to FS loader and FW UCLASS
Quoted 15 lines · Christian Marangi
misc:
fs_loader: reorganize and split to FS loader and FW UCLASSIn preparation to the introduction of variant of the FS loader, reorganize and split the driver to generic
fw_loaderUCLASS and specificfs_loaderfunction. Create a dedicated directory for the loader and move the internal structs and functions to a dedicated header file. While at it also drop some redundant check and rename some variables as we are updating the code for the UCLASS rework.
Doc are renamed and updated to a more generic name and for the new UCLASS.This will permit to reuse all the property and logic of FS loader with container that are not exactly a readable filesystem.
Signed-off-by Christian Marangi <[email protected]>
Quoted 13 lines
...{fs_firmware_loader.rst => firmware_loader.rst} | 6 +-
doc/develop/driver-model/index.rst | 2 +-
drivers/misc/Kconfig | 8 +
drivers/misc/Makefile | 2 +-
drivers/misc/fs_loader.c | 328 ---------------------
drivers/misc/fw_loader/Makefile | 4 +
drivers/misc/fw_loader/fs_loader.c | 175 +++++++++++
drivers/misc/fw_loader/fw_loader-uclass.c | 188 ++++++++++++
drivers/misc/fw_loader/internal.h | 91 ++++++
include/dm/uclass-id.h | 2 +-
include/fs_loader.h | 47 +--
include/fw_loader.h | 19 ++
12 files changed, 493 insertions(+), 379 deletions(-)PATCH v9 3/8 misc: fw_loader: implement generic get_fw_loader_from_node()
In reply to Christian MarangiImplement a generic function to get a FW loader dev from a node.
There is currently only get_fs_loader() but that is limited to chosen node and is limited only to FS loader.
Introduce get_fw_loader_from_node() that will parse the "firmware-loader" from a specified node and will search and probe a matching FW loader device, if found.
--- drivers/misc/fw_loader/fw_loader-uclass.c | 24 +++++++++++++++++++++++ include/fw_loader.h | 14 +++++++++++++ 2 files changed, 38 insertions(+)
drivers/misc/fw_loader/fw_loader-uclass.c +24 -0
@@ -7,6 +7,8 @@#include <blk.h> #include <dm.h> #include <dm/device.h> +#include <dm/device-internal.h> +#include <dm/uclass.h> #include <env.h> #include <errno.h> #include <fw_loader.h>
@@ -137,6 +139,28 @@ UCLASS_DRIVER(fw_loader) = { .per_device_auto = sizeof(struct firmware), }; +int get_fw_loader_from_node (ofnode node,struct udevice **dev) +{ +struct udevice *fw_dev; +int ret; + + node =ofnode_parse_phandle (node,"firmware-loader" ,0 ); +if (!ofnode_valid (node)) +return -ENODEV ; + + ret =uclass_get_device_by_ofnode (UCLASS_FIRMWARE_LOADER , + node, &fw_dev); +if (ret) +return ret; + + ret =device_probe (fw_dev); +if (ret) +return ret; + + *dev = fw_dev; +return 0 ; +} +/** * _request_firmware_prepare - Prepare firmware struct. *
include/fw_loader.h +14 -0
@@ -6,8 +6,22 @@#ifndef _FW_LOADER_H_#define _FW_LOADER_H_ +#include <dm/ofnode_decl.h> +struct udevice ; +/** +* get_fw_loader_from_node - Get FW loader dev from @node. +* +* @node: ofnode where "firmware-loader" phandle is stored. +* @dev: pointer where to store the FW loader dev. +* +* Search and probe a matching FW loader device, if found. +* +* Return: Negative value if fail, 0 for successful. +*/ +int get_fw_loader_from_node (ofnode node,struct udevice **dev); +/** * request_firmware_into_buf - Load firmware into a previously allocated buffer. * @dev: An instance of a driver.
Signature · 1 line
2.55.0
PATCH v9 4/8 misc: fs_loader: validate requested offset on reading file
In reply to Christian MarangiMake sure we are not requesting an offset for the requesting file beyond the actual size of the actual file.
If it's such the case, log and error and return -EINVAL.
--- drivers/misc/fw_loader/fs_loader.c | 59 ++++++++++++++++++++++++------ 1 file changed, 47 insertions(+), 12 deletions(-)
drivers/misc/fw_loader/fs_loader.c +47 -12
@@ -79,18 +79,10 @@ static int select_fs_dev(struct fw_loader_plat *plat)return ret; } -/** -* fw_get_filesystem_firmware - load firmware into an allocated buffer. -* @dev: An instance of a driver. -* -* Return: Size of total read, negative value when error. -*/ -static int fw_get_filesystem_firmware (struct udevice *dev) +static int fw_get_filesystem_prepare (struct udevice *dev) { -struct firmware *upriv =dev_get_uclass_priv (dev);struct fw_loader_plat *plat =dev_get_uclass_plat (dev);struct fw_loader_env_info info = { }; -loff_t actread =0 ;int ret;generic_fw_loader_env_info (&info);
@@ -113,6 +105,51 @@ static int fw_get_filesystem_firmware(struct udevice *dev) ret =select_fs_dev (plat); } +return ret; +} + +static void fw_get_filesystem_release (struct udevice *dev) +{ +#ifdef CONFIG_CMD_UBIFS +umount_ubifs (); +#endif +} + +static int __fw_get_filesystem_firmware_size (struct udevice *dev, +const char *name,loff_t *size) +{ +int ret; + + ret =fw_get_filesystem_prepare (dev); +if (ret) +return ret; + +return fs_size (name, size); +} + +/** +* fw_get_filesystem_firmware - load firmware into an allocated buffer. +* @dev: An instance of a driver. +* +* Return: Size of total read, negative value when error. +*/ +static int fw_get_filesystem_firmware (struct udevice *dev) +{ +struct firmware *upriv =dev_get_uclass_priv (dev); +loff_t size, actread =0 ; +int ret; + + ret =__fw_get_filesystem_firmware_size (dev, upriv->name, &size); +if (ret) + goto out; + +if (upriv->offset > size) { +log_err ("Invalid offset. Entry too small\n" ); + ret = -EINVAL ; + goto out; + } + + ret =fw_get_filesystem_prepare (dev);if (ret) goto out;
@@ -127,9 +164,7 @@ static int fw_get_filesystem_firmware(struct udevice *dev) } out: -#ifdef CONFIG_CMD_UBIFS -umount_ubifs (); -#endif +fw_get_filesystem_release (dev);return ret; }
Signature · 1 line
2.55.0
Re: [PATCH v9 4/8] misc: fs_loader: validate requested offset on reading file
Hi Christian,
Quoted 7 lines · Christian Marangi
misc:
fs_loader: validate requested offset on reading fileMake sure we are not requesting an offset for the requesting file beyond the actual size of the actual file.
If it's such the case, log and error and return
-EINVAL.
Please can you mention that this patch also splits out fw_get_filesystem_prepare(), fw_get_filesystem_release() and __fw_get_filesystem_firmware_size(), since the next patch uses them? Also, 'log and error' should be 'log an error', and 'the actual size of the actual file' could just be 'the size of the file'.
Quoted 9 lines
Signed-off-by Christian Marangi <[email protected]>drivers/misc/fw_loader/fs_loader.c | 59 ++++++++++++++++++++++++++++++-------- 1 file changed, 47 insertions(+), 12 deletions(-)drivers/misc/fw_loader/fs_loader.c +1
-0@@ -113,6 +105,51 @@ static int fw_get_filesystem_firmware(struct udevice *dev) + ret =__fw_get_filesystem_firmware_size (dev, upriv->name, &size);
drivers/misc/fw_loader/fs_loader.c static int fw_get_filesystem_firmware(struct udevice *dev) · line 115
Quoted 10 lines
drivers/misc/fw_loader/fs_loader.c +10
-0+if (ret) + goto out; + +if (upriv->offset > size) { +log_err ("Invalid offset. Entry too small\n" ); + ret = -EINVAL ; + goto out; + } + + ret =fw_get_filesystem_prepare (dev);
I understand why prepare is called twice: fs_size() calls fs_close(), so the block device has to be set again before fs_read(). For UBI, though, this runs ubi_part() and cmd_ubifs_mount() twice but fw_get_filesystem_release() only once. It still works, since uboot_ubifs_mount() unmounts any existing mount first, but the volume is mounted twice on every load. It would be better to mount once and repeat just the fs_set_blk_dev() step, e.g. by splitting the mount out of fw_get_filesystem_prepare(). What do you think?
Also, please can you print the offset and the file size in the error message? 'Entry' sounds like FIP wording; for a filesystem it is a file.
With those:
Regards,
Simon
PATCH v9 5/8 misc: fw_loader: implement request_firmware_size() OP
In reply to Christian MarangiIt might be useful to get the firmware size before reading it to allocate the correct size. This is needed for case where the firmware size change across different firmware version and is not always the same. In such case the only way to handle this scenario is to allocate a big-enough buffer to read the firmware.
To better handle this, introduce the request_firmware_size() OP to get the firmware size before reading it. This way proper buffer can be allocated and dynamic firmware size can be better supported.
FS loader is updated to handle the new .get_size() handler.
--- drivers/misc/fw_loader/fs_loader.c | 24 +++++++++++++++++++++++ drivers/misc/fw_loader/fw_loader-uclass.c | 19 ++++++++++++++++++ drivers/misc/fw_loader/internal.h | 7 +++++++ include/fw_loader.h | 9 +++++++++ 4 files changed, 59 insertions(+)
drivers/misc/fw_loader/fs_loader.c +24 -0
@@ -168,8 +168,32 @@ out:return ret; } +/** +* fw_get_filesystem_firmware_size - get firmware size. +* @dev: An instance of a driver. +* +* Return: Size of firmware, negative value when error. +*/ +static int fw_get_filesystem_firmware_size (struct udevice *dev) +{ +struct firmware *upriv =dev_get_uclass_priv (dev); +loff_t size; +int ret; + + ret =__fw_get_filesystem_firmware_size (dev, upriv->name, &size); +if (ret) + goto out; + + ret = size; + +out: +fw_get_filesystem_release (dev); +return ret; +} +static const struct fw_loader_ops fs_loader_ops = { .get_firmware = fw_get_filesystem_firmware, + .get_size = fw_get_filesystem_firmware_size, };static const struct udevice_id fs_loader_ids[] = {
drivers/misc/fw_loader/fw_loader-uclass.c +19 -0
@@ -210,3 +210,22 @@ int request_firmware_into_buf(struct udevice *dev,return ops->get_firmware (dev); } + +int request_firmware_size (struct udevice *dev,const char *name) +{ +const struct fw_loader_ops *ops; +int ret; + +if (!dev) +return -EINVAL ; + + ret =_request_firmware_prepare (dev, name,NULL ,0 ,0 ); +if (ret <0 )/* error */ +return ret; + + ops =fw_loader_get_ops (dev); +if (!ops->get_size) +return -EOPNOTSUPP ; + +return ops->get_size (dev); +}
drivers/misc/fw_loader/internal.h +7 -0
@@ -32,6 +32,13 @@ struct fw_loader_ops {* @dev: Firmware Loader device to read firmware from */ int (*get_firmware)(struct udevice *dev); + +/** +* get_size() - get firmware size from Firmware Loader driver +* +* @dev: Firmware Loader device to get firmware size from +*/ +int (*get_size)(struct udevice *dev); };#define fw_loader_get_ops (dev) ((const struct fw_loader_ops *)(dev)->driver->ops)
include/fw_loader.h +9 -0
@@ -38,6 +38,15 @@ int request_firmware_into_buf(struct udevice *dev,const char *name, void *buf, size_t size, u32 offset); +/** +* request_firmware_size - Get firmware size. +* @dev: An instance of a driver. +* @name: Name of firmware file. +* +* Return: Size of firmware, negative value when error. +*/ +int request_firmware_size (struct udevice *dev,const char *name); +/** * request_firmware_into_buf_via_script() - * Load firmware using a U-Boot script and copy to buffer
Signature · 1 line
2.55.0
Re: [PATCH v9 5/8] misc: fw_loader: implement request_firmware_size() OP
Quoted 14 lines · Christian Marangi
misc:
fw_loader: implementrequest_firmware_size()OPIt might be useful to get the firmware size before reading it to allocate the correct size. This is needed for case where the firmware size change across different firmware version and is not always the same. In such case the only way to handle this scenario is to allocate a big-enough buffer to read the firmware.
To better handle this, introduce the
request_firmware_size()OP to get the firmware size before reading it. This way proper buffer can be allocated and dynamic firmware size can be better supported.FS loader is updated to handle the new .get_size() handler.
Quoted 7 lines
Signed-off-by Christian Marangi <[email protected]>drivers/misc/fw_loader/fs_loader.c | 24 ++++++++++++++++++++++++ drivers/misc/fw_loader/fw_loader-uclass.c | 19 +++++++++++++++++++ drivers/misc/fw_loader/internal.h | 7 +++++++ include/fw_loader.h | 9 +++++++++ 4 files changed, 59 insertions(+)
PATCH v9 6/8 doc: dtbinding: Update documentation for Generic Firmware loader
In reply to Christian MarangiUpdate documentation for Generic Firmware loader to YAML schema, generalize it from FS specific and add new property and example for FIP loader.
Also add details on the usage of 'phandlepart', 'mtdpart' and 'ubivol' property.
--- doc/device-tree-bindings/misc/fs_loader.txt | 48 -------- doc/device-tree-bindings/misc/fw_loader.yaml | 112 +++++++++++++++++++ 2 files changed, 112 insertions(+), 48 deletions(-) delete mode 100644 doc/device-tree-bindings/misc/fs_loader.txt create mode 100644 doc/device-tree-bindings/misc/fw_loader.yaml
doc/device-tree-bindings/misc/fs_loader.txt deleted +0 -48
@@ -1,48 +0,0 @@ -* File system firmware loader - -Required properties: --------------------- - -- compatible: should contain "u-boot,fs-loader" -- phandlepart: which block storage device and partition the image loading from, - this property is required for mmc, usb and sata. This is unsigned - 32-bit array. For example phandlepart=<&mmc_0 1>, meaning use - that MMC0 node pointer, partition 1. -- mdtpart: which partition of ubi the image loading from, this property is - required for ubi and mounting. -- ubivol: which volume of ubi the image loading from, this property is required - for ubi and mounting. - -Example of storage device and partition search set for mmc, usb, sata and -ubi in device tree source as shown in below: - - Example of storage type and device partition search set for mmc, usb, - sata and ubi as shown in below: - Example for mmc: - fs_loader0: fs-loader@0 { - bootph-all; - compatible = "u-boot,fs-loader"; - phandlepart = <&mmc_0 1>; - }; - - Example for usb: - fs_loader1: fs-loader@1 { - bootph-all; - compatible = "u-boot,fs-loader"; - phandlepart = <&usb0 1>; - }; - - Example for sata: - fs_loader2: fs-loader@2 { - bootph-all; - compatible = "u-boot,fs-loader"; - phandlepart = <&sata0 1>; - }; - - Example for ubi: - fs_loader3: fs-loader@3 { - bootph-all; - compatible = "u-boot,fs-loader"; - mtdpart = "UBI", - ubivol = "ubi0"; - };
doc/device-tree-bindings/misc/fw_loader.yaml new file +112 -0
112 lines not on this page · raw message
Signature · 1 line
2.55.0
Re: [PATCH v9 6/8] doc: dtbinding: Update documentation for Generic Firmware loader
Quoted 6 lines · Christian Marangi
doc: dtbinding: Update documentation for Generic Firmware loader
Update documentation for Generic Firmware loader to YAML schema, generalize it from FS specific and add new property and example for FIP loader.
Quoted 8 lines
Also add details on the usage of 'phandlepart', 'mtdpart' and 'ubivol' property.
Signed-off-by Christian Marangi <[email protected]>doc/device-tree-bindings/misc/fs_loader.txt | 48 ------------ doc/device-tree-bindings/misc/fw_loader.yaml | 112 +++++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 48 deletions(-)
PATCH v9 7/8 misc: fw_loader: introduce FIP loader driver
In reply to Christian MarangiIntroduce a variant of the FS loader driver to extract images from FIP image. These image can contain additional binary used to init Network accelerator or PHY firmware blob.
The way FIP handle image type is with the usage of UUID.
This FIP loader driver implement a simple FIP image parser that check every entry for a matching UUID.
Similar to FS loader, this driver also support both UBI and Block devices.
Also an additional property is added to handle special case with eMMC that doesn't have a GPT partition and require a global offset to reference the FIP partition.
An example usage of this driver is the following:
Entry in DTS:
fw_loader0: fip-loader {
bootph-all;
compatible = "u-boot,fip-loader";
phandlepart = <&mmc0 0>;
partoffset = <0x100>;
};
ethernet@1fb50000 {
firmware-loader = <&fw_loader0>;
}FIP loader user:
/* get the FW loader from the ethernet node */ get_fw_loader_from_node(dev_ofnode(dev), &fw_loader); /* read the blob identified by "58704aef-389f-3e52-b475-e0bf2234a6a2" UUID */ request_firmware_into_buf(fw_loader, "58704aef-389f-3e52-b475-e0bf2234a6a2", buf, 261400, 0);
--- drivers/misc/Kconfig | 23 ++ drivers/misc/fw_loader/Makefile | 1 + drivers/misc/fw_loader/fip_loader.c | 558 ++++++++++++++++++++++++++++ drivers/misc/fw_loader/internal.h | 2 + 4 files changed, 584 insertions(+) create mode 100644 drivers/misc/fw_loader/fip_loader.c
drivers/misc/Kconfig +23 -0
@@ -624,6 +624,17 @@ config MPC83XX_SERDES config FW_LOADER_UCLASS bool +config FIP_LOADER + bool "Enable loader driver from FIP partition" + select LIB_UUID + select FW_LOADER_UCLASS + help + This is FIP partition generic loader which can be used to load + the file image from the FIP image into target such as memory. + + The consumer driver would then use this loader to program whatever, + ie. the FPGA device/PHY firmware. + config FS_LOADER bool "Enable loader driver for file system" select FW_LOADER_UCLASS
@@ -637,6 +648,18 @@ config FS_LOADER config SPL_FW_LOADER_UCLASS bool +config SPL_FIP_LOADER + bool "Enable loader driver from FIP partition in SPL" + select LIB_UUID + select SPL_FW_LOADER_UCLASS + depends on SPL + help + This is FIP partition generic loader which can be used to load + the file image from the FIP image into target such as memory. + + The consumer driver would then use this loader to program whatever, + ie. the FPGA device/PHY firmware. + config SPL_FS_LOADER bool "Enable loader driver for file system in SPL" select SPL_FW_LOADER_UCLASS
drivers/misc/fw_loader/Makefile +1 -0
@@ -1,4 +1,5 @@ # SPDX-License-Identifier: GPL-2.0+ obj-$(CONFIG_$(PHASE_)FW_LOADER_UCLASS) += fw_loader-uclass.o +obj-$(CONFIG_$(PHASE_)FIP_LOADER) += fip_loader.o obj-$(CONFIG_$(PHASE_)FS_LOADER) += fs_loader.o
drivers/misc/fw_loader/fip_loader.c new file +558 -0
558 lines not on this page · raw message
drivers/misc/fw_loader/internal.h +2 -0
@@ -49,11 +49,13 @@ struct fw_loader_ops {* This holds information about all supported storage devices for driver use. * * @phandlepart: Attribute data for block device. +* @partoffset: Global offset for BLK partition. * @mtdpart: MTD partition for ubi partition. * @ubivol: UBI volume-name for ubifsmount. */ struct fw_loader_plat {struct phandle_part phandlepart; +u32 partoffset;char *mtdpart;char *ubivol; };
Signature · 1 line
2.55.0
Re: [PATCH v9 7/8] misc: fw_loader: introduce FIP loader driver
Hi Christian,
Quoted 35 lines · Christian Marangi
misc:
fw_loader: introduce FIP loader driverIntroduce a variant of the FS loader driver to extract images from FIP image. These image can contain additional binary used to init Network accelerator or PHY firmware blob.
The way FIP handle image type is with the usage of UUID.
This FIP loader driver implement a simple FIP image parser that check every entry for a matching UUID.
Similar to FS loader, this driver also support both UBI and Block devices.
Also an additional property is added to handle special case with eMMC that doesn't have a GPT partition and require a global offset to reference the FIP partition.
An example usage of this driver is the following:
[...]
drivers/misc/Kconfig | 23 ++ drivers/misc/fw_loader/Makefile | 1 + drivers/misc/fw_loader/fip_loader.c | 558 ++++++++++++++++++++++++++++++++++++ drivers/misc/fw_loader/internal.h | 2 + 4 files changed, 584 insertions(+)drivers/misc/fw_loader/fip_loader.c +5
-0@@ -0,0 +1,558 @@ +lbaint_t offset = part_info->start + part_offset; +lbaint_t pos, to_read, read =0 ; +lbaint_t blkstart, blkcnt; +char *read_buf; +size_t size;
drivers/misc/fw_loader/fip_loader.c line 15
Quoted 10 lines
drivers/misc/fw_loader/fip_loader.c +10
-0+int i, ret; + + read_buf =malloc (desc->blksz); +if (!read_buf) +return -ENOMEM ; + + size =min (firmwarep->size, (size_t )ent->size - firmwarep->offset); + blkcnt =BLOCK_CNT (size, desc); + blkstart = ent->offset_address + firmwarep->offset; + pos =do_div (blkstart, desc->blksz);
One thing I'd like to check: the move to lbaint_t in v9 breaks 32-bit builds. Without CONFIG_SYS_64BIT_LBA, lbaint_t is a ulong, so on 32-bit ARM blkstart is only 32 bits wide. do_div() needs a u64, so __div64_32() then writes 64 bits through a pointer to a 32-bit variable. Building Cubietruck_defconfig with CONFIG_FIP_LOADER=y gives:
include/div64.h:220:32: warning: right shift count >= width of type include/div64.h:224:36: warning: passing argument 1 of
'__div64_32' from incompatible pointer type
blkstart is a byte offset here, not an LBA, so please can you make it a u64?
drivers/misc/fw_loader/fip_loader.c line 2
Quoted 4 lines
drivers/misc/fw_loader/fip_loader.c +2
-0@@ -0,0 +1,558 @@ + to_read =min (desc->blksz, + (lbaint_t)(sizeof (*hdr) - read));
The same build also gives 'comparison of distinct pointer types' warnings from min() here and in blk_read_fip_toc_entry(). That build has no CONFIG_SYS_64BIT_LBA, so lbaint_t matches blksz, but size_t is unsigned int on 32-bit ARM, so the two min() calls in blk_read_fip_firmware() that cast to size_t still warn. With CONFIG_SYS_64BIT_LBA=y, lbaint_t becomes uint64_t, so these two calls warn as well. Using min_t() for all four would avoid this. No in-tree board enables FIP_LOADER yet, so CI won't catch it. It would be worth building a 32-bit board with it enabled before v10.
With those two nits fixed:
Regards,
Simon
Re: [PATCH v9 7/8] misc: fw_loader: introduce FIP loader driver
Quoted 77 lines · Simon Glass
Hi Christian,
Quoted 35 lines · Christian Marangi
misc:
fw_loader: introduce FIP loader driverIntroduce a variant of the FS loader driver to extract images from FIP image. These image can contain additional binary used to init Network accelerator or PHY firmware blob.
The way FIP handle image type is with the usage of UUID.
This FIP loader driver implement a simple FIP image parser that check every entry for a matching UUID.
Similar to FS loader, this driver also support both UBI and Block devices.
Also an additional property is added to handle special case with eMMC that doesn't have a GPT partition and require a global offset to reference the FIP partition.
An example usage of this driver is the following:
[...]
drivers/misc/Kconfig | 23 ++ drivers/misc/fw_loader/Makefile | 1 + drivers/misc/fw_loader/fip_loader.c | 558 ++++++++++++++++++++++++++++++++++++ drivers/misc/fw_loader/internal.h | 2 + 4 files changed, 584 insertions(+)drivers/misc/fw_loader/fip_loader.c +5
-0@@ -0,0 +1,558 @@ +lbaint_t offset = part_info->start + part_offset; +lbaint_t pos, to_read, read =0 ; +lbaint_t blkstart, blkcnt; +char *read_buf; +size_t size;drivers/misc/fw_loader/fip_loader.c line 15
Quoted 10 lines
drivers/misc/fw_loader/fip_loader.c +10
-0+int i, ret; + + read_buf =malloc (desc->blksz); +if (!read_buf) +return -ENOMEM ; + + size =min (firmwarep->size, (size_t )ent->size - firmwarep->offset); + blkcnt =BLOCK_CNT (size, desc); + blkstart = ent->offset_address + firmwarep->offset; + pos =do_div (blkstart, desc->blksz);One thing I'd like to check: the move to
lbaint_tin v9 breaks 32-bit builds. WithoutCONFIG_SYS_64BIT_LBA,lbaint_tis a ulong, so on 32-bit ARM blkstart is only 32 bits wide.do_div()needs a u64, so__div64_32()then writes 64 bits through a pointer to a 32-bit variable. BuildingCubietruck_defconfigwithCONFIG_FIP_LOADER=ygives:
include/div64.h:220:32: warning: right shift count >= width of typeinclude/div64.h:224:36: warning: passing argument 1 of
'__div64_32' from incompatible pointer typeblkstart is a byte offset here, not an LBA, so please can you make it a u64?
drivers/misc/fw_loader/fip_loader.c line 2
Quoted 4 lines
drivers/misc/fw_loader/fip_loader.c +2
-0@@ -0,0 +1,558 @@ + to_read =min (desc->blksz, + (lbaint_t)(sizeof (*hdr) - read));The same build also gives 'comparison of distinct pointer types' warnings from
min()here and inblk_read_fip_toc_entry(). That build has noCONFIG_SYS_64BIT_LBA, solbaint_tmatches blksz, butsize_tis unsigned int on 32-bit ARM, so the twomin()calls inblk_read_fip_firmware()that cast tosize_tstill warn. WithCONFIG_SYS_64BIT_LBA=y,lbaint_tbecomesuint64_t, so these two calls warn as well. Usingmin_t()for all four would avoid this. No in-tree board enablesFIP_LOADERyet, so CI won't catch it. It would be worth building a 32-bit board with it enabled before v10.
Quoted 3 lines
With those two nits fixed:
Reviewed-by Simon Glass <[email protected]>
I compiled for qemu_arm_defconfig and used min_t(lbaint_t...
I think should be enough. (I also verified 64bit target...)
Signature · 1 line
Ansuel
PATCH v9 8/8 test: dm: Add test for FW Loader feature
In reply to Christian MarangiAdd basic test for FW Loader feature for the Filesystem way and FIP.
Additional MMC testing image are added that loads a dummy firmware.bin in a fat partition or a simple FIP blob.
--- arch/sandbox/dts/test.dts | 38 +++++ configs/sandbox64_defconfig | 2 + configs/sandbox_defconfig | 2 + configs/sandbox_flattree_defconfig | 2 + configs/sandbox_noinst_defconfig | 1 + configs/sandbox_spl_defconfig | 2 + configs/sandbox_vpl_defconfig | 2 + test/dm/Makefile | 1 + test/dm/fw_loader.c | 218 +++++++++++++++++++++++++++++ test/py/tests/test_ut.py | 58 ++++++++ 10 files changed, 326 insertions(+) create mode 100644 test/dm/fw_loader.c
arch/sandbox/dts/test.dts +38 -0
@@ -189,6 +189,18 @@ }; }; + fs_loader: fs-loader { + bootph-all; + compatible = "u-boot,fs-loader"; + phandlepart = <&mmc12 1>; + }; + + fip_loader: fip-loader { + bootph-all; + compatible = "u-boot,fip-loader"; + phandlepart = <&mmc13 1>; + }; + cedit: cedit { };
@@ -1398,6 +1410,20 @@ filename = "mmc11.img"; }; + /* This is used for FS Loader tests */ + mmc12: mmc12 { + status = "disabled"; + compatible = "sandbox,mmc"; + filename = "mmc12.img"; + }; + + /* This is used for FIP Loader tests */ + mmc13: mmc13 { + status = "disabled"; + compatible = "sandbox,mmc"; + filename = "mmc13.img"; + }; + pch { compatible = "sandbox,pch"; };
@@ -2143,6 +2169,18 @@ ethphy1: ethernet-phy@1 { reg = <1>; }; + + ethernet-phy@2 { + reg = <2>; + + firmware-loader = <&fs_loader>; + }; + + ethernet-phy@3 { + reg = <3>; + + firmware-loader = <&fip_loader>; + }; }; pm-bus-test {
configs/sandbox64_defconfig +2 -0
@@ -266,9 +266,11 @@ CONFIG_WDT=y CONFIG_WDT_GPIO=y CONFIG_WDT_SANDBOX=y CONFIG_WDT_ALARM_SANDBOX=y +CONFIG_FIP_LOADER=y CONFIG_FS_CBFS=y CONFIG_FS_EXFAT=y CONFIG_FS_CRAMFS=y +CONFIG_FS_LOADER=y CONFIG_CMD_DHRYSTONE=y CONFIG_TPM=y CONFIG_ERRNO_STR=y
configs/sandbox_defconfig +2 -0
@@ -383,9 +383,11 @@ CONFIG_WDT_GPIO=y CONFIG_WDT_SANDBOX=y CONFIG_WDT_ALARM_SANDBOX=y CONFIG_WDT_FTWDT010=y +CONFIG_FIP_LOADER=y CONFIG_FS_CBFS=y CONFIG_FS_EXFAT=y CONFIG_FS_CRAMFS=y +CONFIG_FS_LOADER=y CONFIG_ADDR_MAP=y CONFIG_PANIC_HANG=y CONFIG_PMBUS=y
configs/sandbox_flattree_defconfig +2 -0
@@ -12,10 +12,12 @@ CONFIG_EFI_CAPSULE_FIRMWARE_FIT=y CONFIG_EFI_CAPSULE_AUTHENTICATE=y CONFIG_EFI_CAPSULE_CRT_FILE="board/sandbox/capsule_pub_key_good.crt" CONFIG_BUTTON_CMD=y +CONFIG_FIP_LOADER=y CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERITY=y CONFIG_FIT_VERBOSE=y +CONFIG_FS_LOADER=y CONFIG_LEGACY_IMAGE_FORMAT=y CONFIG_BOOTSTAGE=y CONFIG_BOOTSTAGE_REPORT=y
configs/sandbox_noinst_defconfig +1 -0
@@ -21,6 +21,7 @@ CONFIG_SYS_MEMTEST_END=0x00101000 CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y +CONFIG_FS_LOADER=y CONFIG_SPL_LOAD_FIT=y CONFIG_SPL_HAS_LOAD_FIT_ADDRESS=y CONFIG_SPL_LOAD_FIT_ADDRESS=0x0
configs/sandbox_spl_defconfig +2 -0
@@ -223,8 +223,10 @@ CONFIG_I2C_EDID=y CONFIG_VIDEO_SANDBOX_SDL=y CONFIG_OSD=y CONFIG_SANDBOX_OSD=y +CONFIG_FIP_LOADER=y CONFIG_FS_CBFS=y CONFIG_FS_CRAMFS=y +CONFIG_FS_LOADER=y # CONFIG_SPL_USE_TINY_PRINTF is not set CONFIG_CMD_DHRYSTONE=y CONFIG_RSA_VERIFY_WITH_PKEY=y
configs/sandbox_vpl_defconfig +2 -0
@@ -231,8 +231,10 @@ CONFIG_CONSOLE_TRUETYPE_CANTORAONE=y CONFIG_VIDEO_SANDBOX_SDL=y CONFIG_OSD=y CONFIG_SANDBOX_OSD=y +CONFIG_FIP_LOADER=y CONFIG_FS_CBFS=y CONFIG_FS_CRAMFS=y +CONFIG_FS_LOADER=y # CONFIG_SPL_USE_TINY_PRINTF is not set CONFIG_CMD_DHRYSTONE=y CONFIG_RSA_VERIFY_WITH_PKEY=y
test/dm/Makefile +1 -0
@@ -59,6 +59,7 @@ obj-$(CONFIG_EXTCON) += extcon.o ifneq ($(CONFIG_EFI_PARTITION),) obj-$(CONFIG_FASTBOOT_FLASH_MMC) += fastboot.o endif +obj-$(CONFIG_FW_LOADER_UCLASS) += fw_loader.o obj-$(CONFIG_FIRMWARE) += firmware.o obj-$(CONFIG_DM_FPGA) += fpga.o obj-$(CONFIG_FWU_MDATA_GPT_BLK) += fwu_mdata.o
test/dm/fw_loader.c new file +218 -0
218 lines not on this page · raw message
test/py/tests/test_ut.py +58 -0
76 lines not on this page · raw message
Signature · 1 line
2.55.0
Re: [PATCH v9 8/8] test: dm: Add test for FW Loader feature
Hi Christian,
Quoted 23 lines · Christian Marangi
test: dm: Add test for FW Loader feature
Add basic test for FW Loader feature for the Filesystem way and FIP.
Additional MMC testing image are added that loads a dummy firmware.bin in a fat partition or a simple FIP blob.
Signed-off-by Christian Marangi <[email protected]>arch/sandbox/dts/test.dts | 38 +++++++ configs/sandbox64_defconfig | 2 + configs/sandbox_defconfig | 2 + configs/sandbox_flattree_defconfig | 2 + configs/sandbox_noinst_defconfig | 1 + configs/sandbox_spl_defconfig | 2 + configs/sandbox_vpl_defconfig | 2 + test/dm/Makefile | 1 + test/dm/fw_loader.c | 218 +++++++++++++++++++++++++++++++++++++ test/py/tests/test_ut.py | 58 ++++++++++ 10 files changed, 326 insertions(+)
configs/sandbox_noinst_defconfig CONFIG_SYS_MEMTEST_END=0x00101000 · line 24
Quoted 4 lines
configs/sandbox_noinst_defconfig +1
-0@@ -21,6 +21,7 @@ CONFIG_SYS_MEMTEST_END=0x00101000 CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y +CONFIG_FS_LOADER=y
sandbox_noinst already has CONFIG_FS_LOADER=y (next to CONFIG_SPL_FS_LOADER), so this adds a duplicate. It also doesn't enable CONFIG_FIP_LOADER. Since FW_LOADER_UCLASS is enabled, test/dm/fw_loader.c is still built there, and sandbox_noinst runs test.py in CI. So I expect the dm_test_fip_loader_* tests to fail on that board, as nothing binds to the fip-loader node. Please can you drop this line and add CONFIG_FIP_LOADER instead?
The new lines in the other defconfigs also look hand-placed:
savedefconfig would put them next to the other drivers/misc options (as in noinst), not between WDT_* and FS_CBFS, or between BUTTON_CMD and FIT. Please can you regenerate them with 'make savedefconfig'?
test/dm/fw_loader.c line 2
Quoted 4 lines
test/dm/fw_loader.c +2
-0@@ -0,0 +1,218 @@ +static int dm_test_fw_loader_get_dev (struct unit_test_state *uts, +const char *name,struct udevice **dev)
This is a helper, not a test, so please drop the dm_test_ prefix. Also please use 'devp' for the output parameter.
test/dm/fw_loader.c line 7
Quoted 9 lines
test/dm/fw_loader.c +7
-0@@ -0,0 +1,218 @@ + ret =request_firmware_into_buf (fw_loader_dev,"firmware.bin" , + buf, firmware_size,0 ); +ut_asserteq (firmware_size, ret); + + ret =request_firmware_into_buf (fw_loader_dev,"firmware.bin" , + buf, firmware_size -10 ,10 ); +ut_asserteq (firmware_size -10 , ret);
The FS test only checks the return value, not what is read. Please can you check the buffer contents as the FIP test does, e.g. clear the buffer and then check it against the 0xaa pattern? It would also help to use a non-uniform pattern in the image, so that the offset read is actually verified.
test/dm/fw_loader.c line 3
Quoted 5 lines
test/dm/fw_loader.c +3
-0@@ -0,0 +1,218 @@ +/* uuidgen -n @dns --md5 --name test = 45a113ac-c7f2-30b0-90a5-a399ab912716*/ + ret =request_firmware_size (fw_loader_dev, +"45a113ac-c7f2-30b0-90a5-a399ab912716" );
This UUID string is repeated many times, so please put it in a #define (with this comment) at the top. That also fixes the over-long comment line.
test/py/tests/test_ut.py def test_ut_dm_init(ubman): · line 691
Quoted 8 lines
test/py/tests/test_ut.py +6
-0@@ -685,6 +686,61 @@ def test_ut_dm_init(ubman): + # TOC Entry End Marker: Zero UUID + size set to size of entire FIP + # Assume alignment as 1 + fh.write(uuid.UUID(int=0).bytes + + struct.pack('<QQQ', + fip_toc_header_size + 2 * fip_toc_entry_size + len(data), + 0, 0))
The comment says 'size', but this value goes into the offset field and size is 0. That matches TF-A, so only the comment needs fixing.
Regards,
Simon
Re: [PATCH v9 8/8] test: dm: Add test for FW Loader feature
Il giorno lun 26 ott 2026 alle ore 16:08 Simon Glass <[email protected]> ha scritto:
Quoted 79 lines
Hi Christian,
Quoted 23 lines · Christian Marangi
test: dm: Add test for FW Loader feature
Add basic test for FW Loader feature for the Filesystem way and FIP.
Additional MMC testing image are added that loads a dummy firmware.bin in a fat partition or a simple FIP blob.
Signed-off-by Christian Marangi <[email protected]>arch/sandbox/dts/test.dts | 38 +++++++ configs/sandbox64_defconfig | 2 + configs/sandbox_defconfig | 2 + configs/sandbox_flattree_defconfig | 2 + configs/sandbox_noinst_defconfig | 1 + configs/sandbox_spl_defconfig | 2 + configs/sandbox_vpl_defconfig | 2 + test/dm/Makefile | 1 + test/dm/fw_loader.c | 218 +++++++++++++++++++++++++++++++++++++ test/py/tests/test_ut.py | 58 ++++++++++ 10 files changed, 326 insertions(+)configs/sandbox_noinst_defconfig CONFIG_SYS_MEMTEST_END=0x00101000 · line 24
Quoted 4 lines
configs/sandbox_noinst_defconfig +1
-0@@ -21,6 +21,7 @@ CONFIG_SYS_MEMTEST_END=0x00101000 CONFIG_FIT=y CONFIG_FIT_SIGNATURE=y CONFIG_FIT_VERBOSE=y +CONFIG_FS_LOADER=y
sandbox_noinstalready hasCONFIG_FS_LOADER=y(next toCONFIG_SPL_FS_LOADER), so this adds a duplicate. It also doesn't enableCONFIG_FIP_LOADER. SinceFW_LOADER_UCLASSis enabled,test/dm/fw_loader.cis still built there, andsandbox_noinstrunstest.pyin CI. So I expect the dm_test_fip_loader_* tests to fail on that board, as nothing binds to the fip-loader node. Please can you drop this line and addCONFIG_FIP_LOADERinstead?The new lines in the other defconfigs also look hand-placed:
savedefconfig would put them next to the otherdrivers/miscoptions (as in noinst), not between WDT_* andFS_CBFS, or betweenBUTTON_CMDand FIT. Please can you regenerate them with 'make savedefconfig'?test/dm/fw_loader.c line 2
Quoted 4 lines
test/dm/fw_loader.c +2
-0@@ -0,0 +1,218 @@ +static int dm_test_fw_loader_get_dev (struct unit_test_state *uts, +const char *name,struct udevice **dev)This is a helper, not a test, so please drop the
dm_test_prefix. Also please use 'devp' for the output parameter.test/dm/fw_loader.c line 7
Quoted 9 lines
test/dm/fw_loader.c +7
-0@@ -0,0 +1,218 @@ + ret =request_firmware_into_buf (fw_loader_dev,"firmware.bin" , + buf, firmware_size,0 ); +ut_asserteq (firmware_size, ret); + + ret =request_firmware_into_buf (fw_loader_dev,"firmware.bin" , + buf, firmware_size -10 ,10 ); +ut_asserteq (firmware_size -10 , ret);The FS test only checks the return value, not what is read. Please can you check the buffer contents as the FIP test does, e.g. clear the buffer and then check it against the
0xaapattern? It would also help to use a non-uniform pattern in the image, so that the offset read is actually verified.test/dm/fw_loader.c line 3
Quoted 5 lines
test/dm/fw_loader.c +3
-0@@ -0,0 +1,218 @@ +/* uuidgen -n @dns --md5 --name test = 45a113ac-c7f2-30b0-90a5-a399ab912716*/ + ret =request_firmware_size (fw_loader_dev, +"45a113ac-c7f2-30b0-90a5-a399ab912716" );This UUID string is repeated many times, so please put it in a #define (with this comment) at the top. That also fixes the over-long comment line.
Quoted 12 lines
test/py/tests/test_ut.py def test_ut_dm_init(ubman): · line 691
Quoted 8 lines
test/py/tests/test_ut.py +6
-0@@ -685,6 +686,61 @@ def test_ut_dm_init(ubman): + # TOC Entry End Marker: Zero UUID + size set to size of entire FIP + # Assume alignment as 1 + fh.write(uuid.UUID(int=0).bytes + + struct.pack('<QQQ', + fip_toc_header_size + 2 * fip_toc_entry_size + len(data), + 0, 0))The comment says 'size', but this value goes into the offset field and size is 0. That matches TF-A, so only the comment needs fixing.
I posted v10 some h ago... I will address these comments and resubmit. Sorry for not waiting enough time.