summaryrefslogtreecommitdiff
path: root/lib/efi_driver
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2025-02-20 11:21:41 -0600
committerTom Rini <trini@konsulko.com>2025-02-20 11:21:41 -0600
commit313b9856f95419b01df7cc6b9a16f7b07d9fe13c (patch)
treee7dbb656e3fc05ad4a7fa7a67c89ba0945cfcfc3 /lib/efi_driver
parent7a6dbb9dbe2ed4f6e51b3902fc7aa5a425f5f203 (diff)
parent5ce629db2512d70f298bc1d422fefad63a74c7f5 (diff)
Merge tag 'efi-2025-04-rc3' of https://source.denx.de/u-boot/custodians/u-boot-efi
CI: * https://source.denx.de/u-boot/custodians/u-boot-efi/-/pipelines/24709 UEFI: * create a parent device for all EFI block devices * move lmb_map_update_notify() to EFI * make efi_add_memory_map_pg() static * remove comparisons to string literals from runtime * ix potential deref-after-null Other: * avoid superfluous value check in lmb_map_update_notify() * support more efi protocols in uuid_guid_get_str()
Diffstat (limited to 'lib/efi_driver')
-rw-r--r--lib/efi_driver/efi_block_device.c29
1 files changed, 28 insertions, 1 deletions
diff --git a/lib/efi_driver/efi_block_device.c b/lib/efi_driver/efi_block_device.c
index d3c668dc183..070747de515 100644
--- a/lib/efi_driver/efi_block_device.c
+++ b/lib/efi_driver/efi_block_device.c
@@ -35,8 +35,10 @@
#include <efi_driver.h>
#include <malloc.h>
#include <dm/device-internal.h>
+#include <dm/lists.h>
#include <dm/root.h>
#include <dm/tag.h>
+#include <dm/uclass-internal.h>
/**
* struct efi_blk_plat - attributes of a block device
@@ -118,13 +120,18 @@ static ulong efi_bl_write(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt,
static efi_status_t
efi_bl_create_block_device(efi_handle_t handle, void *interface)
{
- struct udevice *bdev = NULL, *parent = dm_root();
+ struct udevice *bdev = NULL, *parent;
efi_status_t ret;
+ int r;
int devnum;
char *name;
struct efi_block_io *io = interface;
struct efi_blk_plat *plat;
+ r = uclass_find_first_device(UCLASS_EFI_LOADER, &parent);
+ if (r)
+ return EFI_OUT_OF_RESOURCES;
+
devnum = blk_next_free_devnum(UCLASS_EFI_LOADER);
if (devnum < 0)
return EFI_OUT_OF_RESOURCES;
@@ -221,6 +228,24 @@ efi_bl_init(struct efi_driver_binding_extended_protocol *this)
return EFI_SUCCESS;
}
+/**
+ * efi_block_device_create() - create parent for EFI block devices
+ *
+ * Create a device that serves as parent for all block devices created via
+ * ConnectController().
+ *
+ * Return: 0 for success
+ */
+static int efi_block_device_create(void)
+{
+ int ret;
+ struct udevice *dev;
+
+ ret = device_bind_driver(gd->dm_root, "EFI block driver", "efi", &dev);
+
+ return ret;
+}
+
/* Block device driver operators */
static const struct blk_ops efi_blk_ops = {
.read = efi_bl_read,
@@ -249,3 +274,5 @@ U_BOOT_DRIVER(efi_block) = {
.id = UCLASS_EFI_LOADER,
.ops = &driver_ops,
};
+
+EVENT_SPY_SIMPLE(EVT_LAST_STAGE_INIT, efi_block_device_create);