Skip to contentSkip to conversation

misc: fs_loader: reorg and split to FS and FW loader + FIP loader

PATCH Superseded Christian Marangi 2 participants 9 messages Mar 3 Char and misc drivers

v1 of 12 Superseded Latest is v12 →

lore
Share & tools
lore
#0 lore raw

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.

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:

fs_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 = <&fs_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

Christian Marangi (5):
misc: fs_loader: fix ubifs not unmounted on dev_get_priv error
misc: fs_loader: reorganize and split to FS and FW loader
misc: fw_loader: implement generic get_fw_loader_from_node()
misc: fw_loader: introduce FIP loader driver
misc: fw_loader: implement request_firmware_size() OP

 drivers/misc/Kconfig                     |  16 +
 drivers/misc/Makefile                    |   2 +-
 drivers/misc/fw_loader/Makefile          |   5 +
 drivers/misc/fw_loader/fip_loader.c      | 610 +++++++++++++++++++++++
 drivers/misc/{ => fw_loader}/fs_loader.c | 180 +++----
 drivers/misc/fw_loader/fw_loader.c       | 184 +++++++
 drivers/misc/fw_loader/internal.h        |  63 +++
 include/dm/uclass-id.h                   |   3 +-
 include/fs_loader.h                      |  47 +-
 include/fw_loader.h                      |  41 ++
 10 files changed, 980 insertions(+), 171 deletions(-)
 create mode 100644 drivers/misc/fw_loader/Makefile
 create mode 100644 drivers/misc/fw_loader/fip_loader.c
 rename drivers/misc/{ => fw_loader}/fs_loader.c (62%)
 create mode 100644 drivers/misc/fw_loader/fw_loader.c
 create mode 100644 drivers/misc/fw_loader/internal.h
Signature · 1 line
2.51.0
#1 lore raw

PATCH 1/5 misc: fs_loader: fix ubifs not unmounted on dev_get_priv error

When dev_get_priv errors out, the ubifs is not unbounted (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
index 2928cf75f89e..7e432a7ebd62 100644
@@ -178,8 +178,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.51.0
#2 lore raw

Re: [PATCH 1/5] misc: fs_loader: fix ubifs not unmounted on dev_get_priv error

Quoted 1 line · Christian Marangi

When dev_get_priv errors out, the ubifs is not unbounted (if used)

I don't understand why or where UBIFS is being used here. Did you mean to say "UBI is not attached"?
UBI != UBIFS.

Quoted 30 lines

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
index 2928cf75f89e..7e432a7ebd62 100644
@@ -178,8 +178,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.51.0
#3 lore raw

Re: [PATCH 1/5] misc: fs_loader: fix ubifs not unmounted on dev_get_priv error

Quoted 7 lines · Daniel Golle
Quoted 1 line · Christian Marangi

When dev_get_priv errors out, the ubifs is not unbounted (if used)

I don't understand why or where UBIFS is being used here. Did you mean to say "UBI is not attached"?
UBI != UBIFS.

Function that is not called is umount_ubifs. That calls cmd_ubifs_umount. unbounted is a typo for unmounted.

Probably the confusion is present already in the FS loader driver where ubi needed to be used instead of ubifs?

There are mount_ubifs and umount_ubifs but they should have been mount_ubi and umount_ubi ? But then they use ubifs cmd OPs. I'm a bit confused here.

Quoted 30 lines
Quoted 30 lines

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
index 2928cf75f89e..7e432a7ebd62 100644
@@ -178,8 +178,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.51.0
Signature · 1 line
	Ansuel
#4 lore raw

Re: [PATCH 1/5] misc: fs_loader: fix ubifs not unmounted on dev_get_priv error

Quoted 11 lines · Christian Marangi
Quoted 7 lines · Daniel Golle
Quoted 1 line · Christian Marangi

When dev_get_priv errors out, the ubifs is not unbounted (if used)

I don't understand why or where UBIFS is being used here. Did you mean to say "UBI is not attached"?
UBI != UBIFS.

Function that is not called is umount_ubifs. That calls cmd_ubifs_umount. unbounted is a typo for unmounted.

Ok, so it *is* UBIFS, because you cannot mount UBI. You can only "attach" an MTD partition to serve as UBI device (ubi part ... command in U-Boot).

Quoted 3 lines

Probably the confusion is present already in the FS loader driver where ubi needed to be used instead of ubifs?

If you are loading a file from a directory and rely on full POSIX-like permissions, file ownership, ... then you need a proper filesystem, like UBIFS, or SquashFS, ...
If all you need is to load raw data early at boot, using a static UBI volume to hold the raw data is probably better (see below).

Quoted 3 lines

There are mount_ubifs and umount_ubifs but they should have been mount_ubi and umount_ubi ? But then they use ubifs cmd OPs. I'm a bit confused here.

UBIFS is a read/write filesystem used on top of UBI.

UBI is a bit like a light version of LVM2, you can have multiple named volumes, dynamically create them, rename or resize them.

Volumes can be static (ie. write-once, CRC32 over the whole volume which is validated on access) or dynamic (no CRC validation, content may change).

Inside dynamic volumes you may have either a filesystem or just raw data. Any read-only filesystem can be used on top of UBI with the help of ubiblock devices (eg. squashfs, erofs, ...).

In static volumes you typically store raw data, like it is the case for U-Boot SPL loading U-Boot proper from UBI requires u-boot.bin stored in a raw static volume, **not** inside a filesystem).

Imho using static volumes also makes a lot of sense for storing those PHY or Ethernet firmware blobs, potentially even storing them redundantly (ie. two static volumes, if one got broken CRC, move on to the next one).

Quoted 34 lines
Quoted 31 lines
Quoted 31 lines

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
index 2928cf75f89e..7e432a7ebd62 100644
@@ -178,8 +178,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.51.0
Signature · 1 line
	Ansuel
#5 lore raw

PATCH 2/5 misc: fs_loader: reorganize and split to FS and FW loader

In reply to Christian Marangi

In preparation to the introduction of variant of the FS loader, reorganize and split the driver to generic fw_loader function and specific fs_loader function. Create a dedicated directory for the loader and move the internal structs and functions to a dedicated header file.

This will permit to reuse all the property and logic of FS loader with container that are not exactly a readable filesystem.

---
 drivers/misc/Kconfig                     |   5 +
 drivers/misc/Makefile                    |   2 +-
 drivers/misc/fw_loader/Makefile          |   4 +
 drivers/misc/{ => fw_loader}/fs_loader.c | 134 ++---------------------
 drivers/misc/fw_loader/fw_loader.c       | 121 ++++++++++++++++++++
 drivers/misc/fw_loader/internal.h        |  60 ++++++++++
 include/fs_loader.h                      |  47 +-------
 include/fw_loader.h                      |  19 ++++
 8 files changed, 220 insertions(+), 172 deletions(-)
 create mode 100644 drivers/misc/fw_loader/Makefile
 rename drivers/misc/{ => fw_loader}/fs_loader.c (60%)
 create mode 100644 drivers/misc/fw_loader/fw_loader.c
 create mode 100644 drivers/misc/fw_loader/internal.h
drivers/misc/Kconfig +5 -0
index a0aa290480eb..9d332230b1f9 100644
@@ -610,8 +610,12 @@ config MPC83XX_SERDES
 	help
 	  Support for serdes found on MPC83xx SoCs.
 
+config FW_LOADER
+	bool
+
 config FS_LOADER
 	bool "Enable loader driver for file system"
+	select FW_LOADER
 	help
 	  This is file system generic loader which can be used to load
 	  the file image from the storage into target such as memory.
@@ -621,6 +625,7 @@ config FS_LOADER
 
 config SPL_FS_LOADER
 	bool "Enable loader driver for file system in SPL"
+	select FW_LOADER
 	depends on SPL
 	help
 	  This is file system generic loader which can be used to load
drivers/misc/Makefile +1 -1
index 1d950f7a0ab2..c1b83d576bbb 100644
@@ -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_FW_LOADER) += fw_loader/
 obj-$(CONFIG_GATEWORKS_SC) += gsc.o
 obj-$(CONFIG_GDSYS_IOEP) += gdsys_ioep.o
 obj-$(CONFIG_GDSYS_RXAUI_CTRL) += gdsys_rxaui_ctrl.o
drivers/misc/fw_loader/Makefile new file +4 -0
new file mode 100644
index 000000000000..96baebede788
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0+
+
+obj-y += fw_loader.o
+obj-$(CONFIG_$(PHASE_)FS_LOADER) += fs_loader.o
drivers/misc/fw_loader/fs_loader.c renamed from drivers/misc/fs_loader.c +8 -126

164 lines not on this page · raw message

drivers/misc/fw_loader/fw_loader.c new file +121 -0

121 lines not on this page · raw message

drivers/misc/fw_loader/internal.h new file +60 -0

60 lines not on this page · raw message

include/fs_loader.h +2 -45

54 lines not on this page · raw message

include/fw_loader.h +19 -0
index 35574482b2b9..56f5e3be6195 100644
@@ -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.51.0
#6 lore raw

PATCH 3/5 misc: fw_loader: implement generic get_fw_loader_from_node()

In reply to Christian Marangi

Implement 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 loop over all the available FW loader until one is found (as it will be probed by the dedicated compatible)

---
 drivers/misc/fw_loader/fw_loader.c | 40 ++++++++++++++++++++++++++++++
 include/fw_loader.h                | 13 ++++++++++
 2 files changed, 53 insertions(+)
drivers/misc/fw_loader/fw_loader.c +40 -0
index 6459ba23a15b..e477a631fae3 100644
@@ -8,6 +8,7 @@
 #include <blk.h>
 #include <linux/types.h>
 #include <dm/device.h>
+#include <dm/uclass.h>
 #include <fw_loader.h>
 
 #include "internal.h"
@@ -67,6 +68,45 @@ int generic_fw_loader_probe(struct udevice *dev)
 	return 0;
 }
 
+static int fw_loaders[] = {
+#if CONFIG_IS_ENABLED(FS_LOADER)
+	UCLASS_FS_FIRMWARE_LOADER,
+#endif
+};
+
+/**
+ * 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.
+ *
+ * Loop over all the supported FW loader and find a matching
+ * one.
+ *
+ * Return: Negative value if fail, 0 for successful.
+ */
+int get_fw_loader_from_node(ofnode node, struct udevice **dev)
+{
+	int i, ret;
+
+	node = ofnode_parse_phandle(node, "firmware-loader", 0);
+	if (!ofnode_valid(node))
+		return -ENODEV;
+
+	/*
+	 * Loop over all the available FW loaders and stop when
+	 * found one.
+	 */
+	for (i = 0; i < ARRAY_SIZE(fw_loaders); i++) {
+		ret = uclass_get_device_by_ofnode(fw_loaders[i],
+						  node, dev);
+		if (!ret)
+			return 0;
+	}
+
+	return -ENODEV;
+}
+
 /**
  * _request_firmware_prepare - Prepare firmware struct.
  *
include/fw_loader.h +13 -0
index 56f5e3be6195..d07306c0674f 100644
@@ -8,6 +8,19 @@
 
 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.
+ *
+ * Loop over all the supported FW loader and find a matching
+ * one.
+ *
+ * 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.51.0
#7 lore raw

PATCH 4/5 misc: fw_loader: introduce FIP loader driver

In reply to Christian Marangi

Introduce a variant of the FS loader driver to extract images from FIP image. These image can contain additional binary used to init Network accellerator 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:

	fs_loader0: fip-loader {
		bootph-all;
		compatible = "u-boot,fip-loader";
		phandlepart = <&mmc0 0>;
		partoffset = <0x100>;
	};

	ethernet@1fb50000 {
		firmware-loader = <&fs_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                |  11 +
 drivers/misc/fw_loader/Makefile     |   1 +
 drivers/misc/fw_loader/fip_loader.c | 575 ++++++++++++++++++++++++++++
 drivers/misc/fw_loader/fw_loader.c  |   3 +
 drivers/misc/fw_loader/internal.h   |   2 +
 include/dm/uclass-id.h              |   3 +-
 6 files changed, 594 insertions(+), 1 deletion(-)
 create mode 100644 drivers/misc/fw_loader/fip_loader.c
drivers/misc/Kconfig +11 -0
index 9d332230b1f9..8d2f11de0fe7 100644
@@ -613,6 +613,17 @@ config MPC83XX_SERDES
 config FW_LOADER
 	bool
 
+config FIP_LOADER
+	bool "Enable loader driver from FIP partition"
+	select LIB_UUID
+	select FW_LOADER
+	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
drivers/misc/fw_loader/Makefile +1 -0
index 96baebede788..7854b64148e6 100644
@@ -1,4 +1,5 @@
 # SPDX-License-Identifier: GPL-2.0+
 
 obj-y += fw_loader.o
+obj-$(CONFIG_FIP_LOADER) += fip_loader.o
 obj-$(CONFIG_$(PHASE_)FS_LOADER) += fs_loader.o
drivers/misc/fw_loader/fip_loader.c new file +575 -0

575 lines not on this page · raw message

drivers/misc/fw_loader/fw_loader.c +3 -0
index e477a631fae3..d2446fdc07da 100644
@@ -72,6 +72,9 @@ static int fw_loaders[] = {
 #if CONFIG_IS_ENABLED(FS_LOADER)
 	UCLASS_FS_FIRMWARE_LOADER,
 #endif
+#if CONFIG_IS_ENABLED(FIP_LOADER)
+	UCLASS_FIP_FIRMWARE_LOADER,
+#endif
 };
 
 /**
drivers/misc/fw_loader/internal.h +2 -0
index fc78a4add59d..5513e043925f 100644
@@ -25,11 +25,13 @@ struct phandle_part {
  * 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 device_plat {
 	struct phandle_part phandlepart;
+	int partoffset;
 	char *mtdpart;
 	char *ubivol;
 
include/dm/uclass-id.h +2 -1
index 36b5d87c304f..641d8e1e42fa 100644
@@ -69,7 +69,8 @@ enum uclass_id {
 	UCLASS_FIRMWARE,	/* Firmware */
 	UCLASS_FPGA,		/* FPGA device */
 	UCLASS_FUZZING_ENGINE,	/* Fuzzing engine */
-	UCLASS_FS_FIRMWARE_LOADER,		/* Generic loader */
+	UCLASS_FIP_FIRMWARE_LOADER, /* FIP image loader */
+	UCLASS_FS_FIRMWARE_LOADER, /* Generic loader */
 	UCLASS_FWU_MDATA,	/* FWU Metadata Access */
 	UCLASS_GPIO,		/* Bank of general-purpose I/O pins */
 	UCLASS_HASH,		/* Hash device */
Signature · 1 line
2.51.0
#8 lore raw

PATCH 5/5 misc: fw_loader: implement request_firmware_size() OP

In reply to Christian Marangi

It 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.

Both FS and FIP lodaer are updated to handle the new .get_size() handler.

---
 drivers/misc/fw_loader/fip_loader.c | 35 +++++++++++++++
 drivers/misc/fw_loader/fs_loader.c  | 70 ++++++++++++++++++++++++-----
 drivers/misc/fw_loader/fw_loader.c  | 20 +++++++++
 drivers/misc/fw_loader/internal.h   |  1 +
 include/fw_loader.h                 |  9 ++++
 5 files changed, 124 insertions(+), 11 deletions(-)
drivers/misc/fw_loader/fip_loader.c +35 -0
index 376e1d2a59d8..a285f785db37 100644
@@ -523,6 +523,40 @@ out:
 	return ret;
 }
 
+/**
+ * fw_get_fip_firmware_size - get firmware size.
+ * @dev: An instance of a driver.
+ *
+ * Return: Size of firmware, negative value when error.
+ */
+static int fw_get_fip_firmware_size(struct udevice *dev)
+{
+	struct fip_toc_entry ent;
+	struct fip_storage_info info = { };
+	int ret;
+
+	ret = fw_parse_storage_info(dev, &info);
+	if (ret)
+		goto out;
+
+	struct firmware *firmwarep = dev_get_priv(dev);
+
+	if (!firmwarep) {
+		ret = -EINVAL;
+		goto out;
+	}
+
+	ret = parse_fip_firmware(firmwarep, &info, &ent);
+	if (ret)
+		goto out;
+
+	ret = ent.size;
+
+out:
+	fw_storage_info_release(dev, &info);
+	return ret;
+}
+
 static int fip_loader_probe(struct udevice *dev)
 {
 	struct device_plat *plat = dev_get_plat(dev);
@@ -533,6 +567,7 @@ static int fip_loader_probe(struct udevice *dev)
 		return ret;
 
 	plat->get_firmware = fw_get_fip_firmware;
+	plat->get_size = fw_get_fip_firmware_size;
 
 	return 0;
 };
drivers/misc/fw_loader/fs_loader.c +59 -11

95 lines not on this page · raw message

drivers/misc/fw_loader/fw_loader.c +20 -0
index d2446fdc07da..d5973fce4b9c 100644
@@ -162,3 +162,23 @@ int request_firmware_into_buf(struct udevice *dev,
 
 	return plat->get_firmware(dev);
 }
+
+int request_firmware_size(struct udevice *dev, const char *name)
+{
+	struct device_plat *plat;
+	int ret;
+
+	if (!dev)
+		return -EINVAL;
+
+	ret = _request_firmware_prepare(dev, name, NULL, 0, 0);
+	if (ret < 0) /* error */
+		return ret;
+
+	plat = dev_get_plat(dev);
+
+	if (!plat->get_size)
+		return -EOPNOTSUPP;
+
+	return plat->get_size(dev);
+}
drivers/misc/fw_loader/internal.h +1 -0
index 5513e043925f..4701b494bf3f 100644
@@ -36,6 +36,7 @@ struct device_plat {
 	char *ubivol;
 
 	int (*get_firmware)(struct udevice *dev);
+	int (*get_size)(struct udevice *dev);
 };
 
 /**
include/fw_loader.h +9 -0
index d07306c0674f..a3fa980c768d 100644
@@ -37,6 +37,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.51.0