Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-24 21:54:01 +00:00
Code Issues Projects Releases Packages Wiki Activity

efi_loader: device_path: support blkmap devices

Browse source 
Create a distinct EFI device path for each blkmap device.

Signed-off-by: Tobias Waldekranz <tobias@waldekranz.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Tobias Waldekranz 2023-02-16 16:33:55 +01:00 committed by Tom Rini
parent 3eee5d073a
commit 272ec6b453
2 changed files with 34 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/efi_loader.h
View file

@ -134,6 +134,10 @@ static inline efi_status_t efi_launch_capsules(void)
#define U_BOOT_GUID \ #define U_BOOT_GUID \
EFI_GUID(0xe61d73b9, 0xa384, 0x4acc, \ EFI_GUID(0xe61d73b9, 0xa384, 0x4acc, \
0xae, 0xab, 0x82, 0xe8, 0x28, 0xf3, 0x62, 0x8b) 0xae, 0xab, 0x82, 0xe8, 0x28, 0xf3, 0x62, 0x8b)
/* GUID used as root for blkmap devices */
#define U_BOOT_BLKMAP_DEV_GUID \
EFI_GUID(0x4cad859d, 0xd644, 0x42ff, \
0x87, 0x0b, 0xc0, 0x2e, 0xac, 0x05, 0x58, 0x63)
/* GUID used as host device on sandbox */ /* GUID used as host device on sandbox */
#define U_BOOT_HOST_DEV_GUID \ #define U_BOOT_HOST_DEV_GUID \
EFI_GUID(0xbbe4e671, 0x5773, 0x4ea1, \ EFI_GUID(0xbbe4e671, 0x5773, 0x4ea1, \

30
lib/efi_loader/efi_device_path.c
View file

@ -21,6 +21,9 @@
#include <asm-generic/unaligned.h> #include <asm-generic/unaligned.h>
#include <linux/compat.h> /* U16_MAX */ #include <linux/compat.h> /* U16_MAX */
#ifdef CONFIG_BLKMAP
const efi_guid_t efi_guid_blkmap_dev = U_BOOT_BLKMAP_DEV_GUID;
#endif
#ifdef CONFIG_SANDBOX #ifdef CONFIG_SANDBOX
const efi_guid_t efi_guid_host_dev = U_BOOT_HOST_DEV_GUID; const efi_guid_t efi_guid_host_dev = U_BOOT_HOST_DEV_GUID;
#endif #endif
@ -555,6 +558,16 @@ __maybe_unused static unsigned int dp_size(struct udevice *dev)
*/ */
return dp_size(dev->parent) return dp_size(dev->parent)
+ sizeof(struct efi_device_path_vendor) + 1; + sizeof(struct efi_device_path_vendor) + 1;
#endif
#ifdef CONFIG_BLKMAP
case UCLASS_BLKMAP:
/*
* blkmap devices will be represented as a vendor
* device node with an extra byte for the device
* number.
*/
return dp_size(dev->parent)
+ sizeof(struct efi_device_path_vendor) + 1;
#endif #endif
default: default:
return dp_size(dev->parent); return dp_size(dev->parent);
@ -613,6 +626,23 @@ __maybe_unused static void *dp_fill(void *buf, struct udevice *dev)
#endif #endif
case UCLASS_BLK: case UCLASS_BLK:
switch (dev->parent->uclass->uc_drv->id) { switch (dev->parent->uclass->uc_drv->id) {
#ifdef CONFIG_BLKMAP
case UCLASS_BLKMAP: {
struct efi_device_path_vendor *dp;
struct blk_desc *desc = dev_get_uclass_plat(dev);
dp_fill(buf, dev->parent);
dp = buf;
++dp;
dp->dp.type = DEVICE_PATH_TYPE_HARDWARE_DEVICE;
dp->dp.sub_type = DEVICE_PATH_SUB_TYPE_VENDOR;
dp->dp.length = sizeof(*dp) + 1;
memcpy(&dp->guid, &efi_guid_blkmap_dev,
sizeof(efi_guid_t));
dp->vendor_data[0] = desc->devnum;
return &dp->vendor_data[1];
}
#endif
#ifdef CONFIG_SANDBOX #ifdef CONFIG_SANDBOX
case UCLASS_HOST: { case UCLASS_HOST: {
/* stop traversing parents at this point: */ /* stop traversing parents at this point: */