Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-28 15:41:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

efi: Rename UCLASS_EFI and IF_TYPE_EFI

Browse source 
These names are better used for access to devices provided by an EFI
layer. Use EFI_LOADER instead here, since these are only available in
U-Boot's EFI_LOADER layer.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
This commit is contained in:
Simon Glass 2021-12-04 08:56:30 -07:00 committed by Heinrich Schuchardt
parent f9b51dcf29
commit 2abd8d1c99
6 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/develop/uefi/uefi.rst
View file

@ -620,12 +620,12 @@ EFI_DRIVER_BINDING_PROTOCOL implementation for the UEFI drivers.
A linker created list is used to keep track of the UEFI drivers. To create an A linker created list is used to keep track of the UEFI drivers. To create an
entry in the list the UEFI driver uses the U_BOOT_DRIVER macro specifying entry in the list the UEFI driver uses the U_BOOT_DRIVER macro specifying
UCLASS_EFI as the ID of its uclass, e.g:: UCLASS_EFI_LOADER as the ID of its uclass, e.g::
/* Identify as UEFI driver */ /* Identify as UEFI driver */
U_BOOT_DRIVER(efi_block) = { U_BOOT_DRIVER(efi_block) = {
.name = "EFI block driver", .name = "EFI block driver",
.id = UCLASS_EFI, .id = UCLASS_EFI_LOADER,
.ops = &driver_ops, .ops = &driver_ops,
}; };
@ -651,8 +651,8 @@ UEFI block IO driver
The UEFI block IO driver supports devices exposing the EFI_BLOCK_IO_PROTOCOL. The UEFI block IO driver supports devices exposing the EFI_BLOCK_IO_PROTOCOL.
When connected it creates a new U-Boot block IO device with interface type When connected it creates a new U-Boot block IO device with interface type
IF_TYPE_EFI, adds child controllers mapping the partitions, and installs the IF_TYPE_EFI_LOADER, adds child controllers mapping the partitions, and installs
EFI_SIMPLE_FILE_SYSTEM_PROTOCOL on these. This can be used together with the the EFI_SIMPLE_FILE_SYSTEM_PROTOCOL on these. This can be used together with the
software iPXE to boot from iSCSI network drives [4]. software iPXE to boot from iSCSI network drives [4].
This driver is only available if U-Boot is configured with:: This driver is only available if U-Boot is configured with::

4
drivers/block/blk-uclass.c
View file

@ -28,7 +28,7 @@ static const char *if_typename_str[IF_TYPE_COUNT] = {
[IF_TYPE_SATA] = "sata", [IF_TYPE_SATA] = "sata",
[IF_TYPE_HOST] = "host", [IF_TYPE_HOST] = "host",
[IF_TYPE_NVME] = "nvme", [IF_TYPE_NVME] = "nvme",
[IF_TYPE_EFI] = "efi", [IF_TYPE_EFI_LOADER] = "efiloader",
[IF_TYPE_VIRTIO] = "virtio", [IF_TYPE_VIRTIO] = "virtio",
[IF_TYPE_PVBLOCK] = "pvblock", [IF_TYPE_PVBLOCK] = "pvblock",
}; };
@ -44,7 +44,7 @@ static enum uclass_id if_type_uclass_id[IF_TYPE_COUNT] = {
[IF_TYPE_SATA] = UCLASS_AHCI, [IF_TYPE_SATA] = UCLASS_AHCI,
[IF_TYPE_HOST] = UCLASS_ROOT, [IF_TYPE_HOST] = UCLASS_ROOT,
[IF_TYPE_NVME] = UCLASS_NVME, [IF_TYPE_NVME] = UCLASS_NVME,
[IF_TYPE_EFI] = UCLASS_EFI, [IF_TYPE_EFI_LOADER] = UCLASS_EFI_LOADER,
[IF_TYPE_VIRTIO] = UCLASS_VIRTIO, [IF_TYPE_VIRTIO] = UCLASS_VIRTIO,
[IF_TYPE_PVBLOCK] = UCLASS_PVBLOCK, [IF_TYPE_PVBLOCK] = UCLASS_PVBLOCK,
}; };

2
include/blk.h
View file

@ -34,7 +34,7 @@ enum if_type {
IF_TYPE_SATA, IF_TYPE_SATA,
IF_TYPE_HOST, IF_TYPE_HOST,
IF_TYPE_NVME, IF_TYPE_NVME,
IF_TYPE_EFI, IF_TYPE_EFI_LOADER,
IF_TYPE_PVBLOCK, IF_TYPE_PVBLOCK,
IF_TYPE_VIRTIO, IF_TYPE_VIRTIO,

2
include/dm/uclass-id.h
View file

@ -48,7 +48,7 @@ enum uclass_id {
UCLASS_DMA, /* Direct Memory Access */ UCLASS_DMA, /* Direct Memory Access */
UCLASS_DSA, /* Distributed (Ethernet) Switch Architecture */ UCLASS_DSA, /* Distributed (Ethernet) Switch Architecture */
UCLASS_ECDSA, /* Elliptic curve cryptographic device */ UCLASS_ECDSA, /* Elliptic curve cryptographic device */
UCLASS_EFI, /* EFI managed devices */ UCLASS_EFI_LOADER, /* Devices created by UEFI applications */
UCLASS_ETH, /* Ethernet device */ UCLASS_ETH, /* Ethernet device */
UCLASS_ETH_PHY, /* Ethernet PHY device */ UCLASS_ETH_PHY, /* Ethernet PHY device */
UCLASS_FIRMWARE, /* Firmware */ UCLASS_FIRMWARE, /* Firmware */

8
lib/efi_driver/efi_block_device.c
View file

@ -147,7 +147,7 @@ static int efi_bl_bind(efi_handle_t handle, void *interface)
if (!obj) if (!obj)
return -ENOENT; return -ENOENT;
devnum = blk_find_max_devnum(IF_TYPE_EFI); devnum = blk_find_max_devnum(IF_TYPE_EFI_LOADER);
if (devnum == -ENODEV) if (devnum == -ENODEV)
devnum = 0; devnum = 0;
else if (devnum < 0) else if (devnum < 0)
@ -159,8 +159,8 @@ static int efi_bl_bind(efi_handle_t handle, void *interface)
sprintf(name, "efiblk#%d", devnum); sprintf(name, "efiblk#%d", devnum);
/* Create driver model udevice for the EFI block io device */ /* Create driver model udevice for the EFI block io device */
ret = blk_create_device(parent, "efi_blk", name, IF_TYPE_EFI, devnum, ret = blk_create_device(parent, "efi_blk", name, IF_TYPE_EFI_LOADER,
io->media->block_size, devnum, io->media->block_size,
(lbaint_t)io->media->last_block, &bdev); (lbaint_t)io->media->last_block, &bdev);
if (ret) if (ret)
return ret; return ret;
@ -209,6 +209,6 @@ static const struct efi_driver_ops driver_ops = {
/* Identify as EFI driver */ /* Identify as EFI driver */
U_BOOT_DRIVER(efi_block) = { U_BOOT_DRIVER(efi_block) = {
.name = "EFI block driver", .name = "EFI block driver",
.id = UCLASS_EFI, .id = UCLASS_EFI_LOADER,
.ops = &driver_ops, .ops = &driver_ops,
}; };

8
lib/efi_driver/efi_uclass.c
View file

@ -308,7 +308,7 @@ efi_status_t efi_driver_init(void)
log_debug("Initializing EFI driver framework\n"); log_debug("Initializing EFI driver framework\n");
for (drv = ll_entry_start(struct driver, driver); for (drv = ll_entry_start(struct driver, driver);
drv < ll_entry_end(struct driver, driver); ++drv) { drv < ll_entry_end(struct driver, driver); ++drv) {
if (drv->id == UCLASS_EFI) { if (drv->id == UCLASS_EFI_LOADER) {
ret = efi_add_driver(drv); ret = efi_add_driver(drv);
if (ret != EFI_SUCCESS) { if (ret != EFI_SUCCESS) {
log_err("Failed to add EFI driver %s\n", log_err("Failed to add EFI driver %s\n",
@ -328,7 +328,7 @@ efi_status_t efi_driver_init(void)
*/ */
static int efi_uc_init(struct uclass *class) static int efi_uc_init(struct uclass *class)
{ {
log_debug("Initializing UCLASS_EFI\n"); log_debug("Initializing UCLASS_EFI_LOADER\n");
return 0; return 0;
} }
@ -340,13 +340,13 @@ static int efi_uc_init(struct uclass *class)
*/ */
static int efi_uc_destroy(struct uclass *class) static int efi_uc_destroy(struct uclass *class)
{ {
log_debug("Destroying UCLASS_EFI\n"); log_debug("Destroying UCLASS_EFI_LOADER\n");
return 0; return 0;
} }
UCLASS_DRIVER(efi) = { UCLASS_DRIVER(efi) = {
.name = "efi", .name = "efi",
.id = UCLASS_EFI, .id = UCLASS_EFI_LOADER,
.init = efi_uc_init, .init = efi_uc_init,
.destroy = efi_uc_destroy, .destroy = efi_uc_destroy,
}; };