2016-03-04 00:10:02 +00:00
|
|
|
/*
|
|
|
|
* EFI application disk support
|
|
|
|
*
|
|
|
|
* Copyright (c) 2016 Alexander Graf
|
|
|
|
*
|
|
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include <common.h>
|
2016-05-01 19:52:32 +00:00
|
|
|
#include <blk.h>
|
2016-05-14 20:03:05 +00:00
|
|
|
#include <dm.h>
|
2016-03-04 00:10:02 +00:00
|
|
|
#include <efi_loader.h>
|
|
|
|
#include <inttypes.h>
|
|
|
|
#include <part.h>
|
|
|
|
#include <malloc.h>
|
|
|
|
|
2018-01-19 19:24:45 +00:00
|
|
|
const efi_guid_t efi_block_io_guid = BLOCK_IO_GUID;
|
2016-03-04 00:10:02 +00:00
|
|
|
|
|
|
|
struct efi_disk_obj {
|
|
|
|
/* Generic EFI object parent class data */
|
|
|
|
struct efi_object parent;
|
|
|
|
/* EFI Interface callback struct for block I/O */
|
|
|
|
struct efi_block_io ops;
|
|
|
|
/* U-Boot ifname for block device */
|
|
|
|
const char *ifname;
|
|
|
|
/* U-Boot dev_index for block device */
|
|
|
|
int dev_index;
|
|
|
|
/* EFI Interface Media descriptor struct, referenced by ops */
|
|
|
|
struct efi_block_io_media media;
|
|
|
|
/* EFI device path to this block device */
|
efi_loader: use proper device-paths for partitions
Also, create disk objects for the disk itself, in addition to the
partitions. (UEFI terminology is a bit confusing, a "disk" object is
really a partition.) This helps grub properly identify the boot device
since it is trying to match up partition "disk" object with it's parent
device.
Now instead of seeing devices like:
/File(sdhci@07864000.blk)/EndEntire
/File(usb_mass_storage.lun0)/EndEntire
You see:
/ACPI(133741d0,0)/UnknownMessaging(1d)/EndEntire
/ACPI(133741d0,0)/UnknownMessaging(1d)/HD(0,800,64000,dd904a8c00000000,1,1)/EndEntire
/ACPI(133741d0,0)/UnknownMessaging(1d)/HD(1,64800,200000,dd904a8c00000000,1,1)/EndEntire
/ACPI(133741d0,0)/UnknownMessaging(1d)/HD(2,264800,19a000,dd904a8c00000000,1,1)/EndEntire
/ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/EndEntire
/ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/HD(0,800,60000,38ca680200000000,1,1)/EndEntire
/ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/HD(1,61000,155000,38ca680200000000,1,1)/EndEntire
/ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/HD(2,20fa800,1bbf8800,38ca680200000000,1,1)/EndEntire
/ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/HD(3,1b6800,1f44000,38ca680200000000,1,1)/EndEntire
This is on a board with single USB disk and single sd-card. The
UnknownMessaging(1d) node in the device-path is the MMC device,
but grub_efi_print_device_path() hasn't been updated yet for some
of the newer device-path sub-types.
This patch is inspired by a patch originally from Peter Jones, but
re-worked to use efi_device_path, so it doesn't much resemble the
original.
Signed-off-by: Rob Clark <robdclark@gmail.com>
[agraf: s/unsigned/unsigned int/]
Signed-off-by: Alexander Graf <agraf@suse.de>
2017-09-13 22:05:31 +00:00
|
|
|
struct efi_device_path *dp;
|
|
|
|
/* partition # */
|
|
|
|
unsigned int part;
|
2017-09-13 22:05:34 +00:00
|
|
|
/* handle to filesys proto (for partition objects) */
|
|
|
|
struct efi_simple_file_system_protocol *volume;
|
2016-04-11 14:16:18 +00:00
|
|
|
/* Offset into disk for simple partitions */
|
|
|
|
lbaint_t offset;
|
2016-08-05 12:49:53 +00:00
|
|
|
/* Internal block device */
|
efi_loader: use proper device-paths for partitions
Also, create disk objects for the disk itself, in addition to the
partitions. (UEFI terminology is a bit confusing, a "disk" object is
really a partition.) This helps grub properly identify the boot device
since it is trying to match up partition "disk" object with it's parent
device.
Now instead of seeing devices like:
/File(sdhci@07864000.blk)/EndEntire
/File(usb_mass_storage.lun0)/EndEntire
You see:
/ACPI(133741d0,0)/UnknownMessaging(1d)/EndEntire
/ACPI(133741d0,0)/UnknownMessaging(1d)/HD(0,800,64000,dd904a8c00000000,1,1)/EndEntire
/ACPI(133741d0,0)/UnknownMessaging(1d)/HD(1,64800,200000,dd904a8c00000000,1,1)/EndEntire
/ACPI(133741d0,0)/UnknownMessaging(1d)/HD(2,264800,19a000,dd904a8c00000000,1,1)/EndEntire
/ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/EndEntire
/ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/HD(0,800,60000,38ca680200000000,1,1)/EndEntire
/ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/HD(1,61000,155000,38ca680200000000,1,1)/EndEntire
/ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/HD(2,20fa800,1bbf8800,38ca680200000000,1,1)/EndEntire
/ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/HD(3,1b6800,1f44000,38ca680200000000,1,1)/EndEntire
This is on a board with single USB disk and single sd-card. The
UnknownMessaging(1d) node in the device-path is the MMC device,
but grub_efi_print_device_path() hasn't been updated yet for some
of the newer device-path sub-types.
This patch is inspired by a patch originally from Peter Jones, but
re-worked to use efi_device_path, so it doesn't much resemble the
original.
Signed-off-by: Rob Clark <robdclark@gmail.com>
[agraf: s/unsigned/unsigned int/]
Signed-off-by: Alexander Graf <agraf@suse.de>
2017-09-13 22:05:31 +00:00
|
|
|
struct blk_desc *desc;
|
2016-03-04 00:10:02 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static efi_status_t EFIAPI efi_disk_reset(struct efi_block_io *this,
|
|
|
|
char extended_verification)
|
|
|
|
{
|
|
|
|
EFI_ENTRY("%p, %x", this, extended_verification);
|
|
|
|
return EFI_EXIT(EFI_DEVICE_ERROR);
|
|
|
|
}
|
|
|
|
|
|
|
|
enum efi_disk_direction {
|
|
|
|
EFI_DISK_READ,
|
|
|
|
EFI_DISK_WRITE,
|
|
|
|
};
|
|
|
|
|
2017-08-26 20:33:13 +00:00
|
|
|
static efi_status_t efi_disk_rw_blocks(struct efi_block_io *this,
|
2016-03-04 00:10:02 +00:00
|
|
|
u32 media_id, u64 lba, unsigned long buffer_size,
|
|
|
|
void *buffer, enum efi_disk_direction direction)
|
|
|
|
{
|
|
|
|
struct efi_disk_obj *diskobj;
|
|
|
|
struct blk_desc *desc;
|
|
|
|
int blksz;
|
|
|
|
int blocks;
|
|
|
|
unsigned long n;
|
|
|
|
|
|
|
|
diskobj = container_of(this, struct efi_disk_obj, ops);
|
2016-08-05 12:49:53 +00:00
|
|
|
desc = (struct blk_desc *) diskobj->desc;
|
2016-03-04 00:10:02 +00:00
|
|
|
blksz = desc->blksz;
|
|
|
|
blocks = buffer_size / blksz;
|
2016-04-11 14:16:18 +00:00
|
|
|
lba += diskobj->offset;
|
2016-03-04 00:10:02 +00:00
|
|
|
|
2016-06-02 09:38:27 +00:00
|
|
|
debug("EFI: %s:%d blocks=%x lba=%"PRIx64" blksz=%x dir=%d\n", __func__,
|
|
|
|
__LINE__, blocks, lba, blksz, direction);
|
2016-03-04 00:10:02 +00:00
|
|
|
|
|
|
|
/* We only support full block access */
|
|
|
|
if (buffer_size & (blksz - 1))
|
2017-07-26 00:28:29 +00:00
|
|
|
return EFI_DEVICE_ERROR;
|
2016-03-04 00:10:02 +00:00
|
|
|
|
|
|
|
if (direction == EFI_DISK_READ)
|
2016-05-14 20:03:05 +00:00
|
|
|
n = blk_dread(desc, lba, blocks, buffer);
|
2016-03-04 00:10:02 +00:00
|
|
|
else
|
2016-05-14 20:03:05 +00:00
|
|
|
n = blk_dwrite(desc, lba, blocks, buffer);
|
2016-03-04 00:10:02 +00:00
|
|
|
|
|
|
|
/* We don't do interrupts, so check for timers cooperatively */
|
|
|
|
efi_timer_check();
|
|
|
|
|
2016-06-02 09:38:27 +00:00
|
|
|
debug("EFI: %s:%d n=%lx blocks=%x\n", __func__, __LINE__, n, blocks);
|
|
|
|
|
2016-03-04 00:10:02 +00:00
|
|
|
if (n != blocks)
|
2017-07-26 00:28:29 +00:00
|
|
|
return EFI_DEVICE_ERROR;
|
2016-03-04 00:10:02 +00:00
|
|
|
|
2017-07-26 00:28:29 +00:00
|
|
|
return EFI_SUCCESS;
|
2016-03-04 00:10:02 +00:00
|
|
|
}
|
|
|
|
|
2016-09-25 21:27:32 +00:00
|
|
|
static efi_status_t EFIAPI efi_disk_read_blocks(struct efi_block_io *this,
|
2018-01-19 19:24:48 +00:00
|
|
|
u32 media_id, u64 lba, efi_uintn_t buffer_size,
|
2016-03-04 00:10:02 +00:00
|
|
|
void *buffer)
|
|
|
|
{
|
2016-05-11 16:25:48 +00:00
|
|
|
void *real_buffer = buffer;
|
|
|
|
efi_status_t r;
|
|
|
|
|
|
|
|
#ifdef CONFIG_EFI_LOADER_BOUNCE_BUFFER
|
|
|
|
if (buffer_size > EFI_LOADER_BOUNCE_BUFFER_SIZE) {
|
|
|
|
r = efi_disk_read_blocks(this, media_id, lba,
|
|
|
|
EFI_LOADER_BOUNCE_BUFFER_SIZE, buffer);
|
|
|
|
if (r != EFI_SUCCESS)
|
|
|
|
return r;
|
|
|
|
return efi_disk_read_blocks(this, media_id, lba +
|
|
|
|
EFI_LOADER_BOUNCE_BUFFER_SIZE / this->media->block_size,
|
|
|
|
buffer_size - EFI_LOADER_BOUNCE_BUFFER_SIZE,
|
|
|
|
buffer + EFI_LOADER_BOUNCE_BUFFER_SIZE);
|
|
|
|
}
|
|
|
|
|
|
|
|
real_buffer = efi_bounce_buffer;
|
|
|
|
#endif
|
|
|
|
|
2018-01-19 19:24:48 +00:00
|
|
|
EFI_ENTRY("%p, %x, %" PRIx64 ", %zx, %p", this, media_id, lba,
|
2016-05-11 16:25:48 +00:00
|
|
|
buffer_size, buffer);
|
|
|
|
|
|
|
|
r = efi_disk_rw_blocks(this, media_id, lba, buffer_size, real_buffer,
|
|
|
|
EFI_DISK_READ);
|
|
|
|
|
|
|
|
/* Copy from bounce buffer to real buffer if necessary */
|
|
|
|
if ((r == EFI_SUCCESS) && (real_buffer != buffer))
|
|
|
|
memcpy(buffer, real_buffer, buffer_size);
|
|
|
|
|
|
|
|
return EFI_EXIT(r);
|
2016-03-04 00:10:02 +00:00
|
|
|
}
|
|
|
|
|
2016-09-25 21:27:32 +00:00
|
|
|
static efi_status_t EFIAPI efi_disk_write_blocks(struct efi_block_io *this,
|
2018-01-19 19:24:48 +00:00
|
|
|
u32 media_id, u64 lba, efi_uintn_t buffer_size,
|
2016-03-04 00:10:02 +00:00
|
|
|
void *buffer)
|
|
|
|
{
|
2016-05-11 16:25:48 +00:00
|
|
|
void *real_buffer = buffer;
|
|
|
|
efi_status_t r;
|
|
|
|
|
|
|
|
#ifdef CONFIG_EFI_LOADER_BOUNCE_BUFFER
|
|
|
|
if (buffer_size > EFI_LOADER_BOUNCE_BUFFER_SIZE) {
|
|
|
|
r = efi_disk_write_blocks(this, media_id, lba,
|
|
|
|
EFI_LOADER_BOUNCE_BUFFER_SIZE, buffer);
|
|
|
|
if (r != EFI_SUCCESS)
|
|
|
|
return r;
|
|
|
|
return efi_disk_write_blocks(this, media_id, lba +
|
|
|
|
EFI_LOADER_BOUNCE_BUFFER_SIZE / this->media->block_size,
|
|
|
|
buffer_size - EFI_LOADER_BOUNCE_BUFFER_SIZE,
|
|
|
|
buffer + EFI_LOADER_BOUNCE_BUFFER_SIZE);
|
|
|
|
}
|
|
|
|
|
|
|
|
real_buffer = efi_bounce_buffer;
|
|
|
|
#endif
|
|
|
|
|
2018-01-19 19:24:48 +00:00
|
|
|
EFI_ENTRY("%p, %x, %" PRIx64 ", %zx, %p", this, media_id, lba,
|
2016-05-11 16:25:48 +00:00
|
|
|
buffer_size, buffer);
|
|
|
|
|
|
|
|
/* Populate bounce buffer if necessary */
|
|
|
|
if (real_buffer != buffer)
|
|
|
|
memcpy(real_buffer, buffer, buffer_size);
|
|
|
|
|
|
|
|
r = efi_disk_rw_blocks(this, media_id, lba, buffer_size, real_buffer,
|
|
|
|
EFI_DISK_WRITE);
|
|
|
|
|
|
|
|
return EFI_EXIT(r);
|
2016-03-04 00:10:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static efi_status_t EFIAPI efi_disk_flush_blocks(struct efi_block_io *this)
|
|
|
|
{
|
|
|
|
/* We always write synchronously */
|
|
|
|
EFI_ENTRY("%p", this);
|
|
|
|
return EFI_EXIT(EFI_SUCCESS);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct efi_block_io block_io_disk_template = {
|
|
|
|
.reset = &efi_disk_reset,
|
|
|
|
.read_blocks = &efi_disk_read_blocks,
|
|
|
|
.write_blocks = &efi_disk_write_blocks,
|
|
|
|
.flush_blocks = &efi_disk_flush_blocks,
|
|
|
|
};
|
|
|
|
|
2017-09-13 22:05:34 +00:00
|
|
|
/*
|
2018-01-19 19:24:39 +00:00
|
|
|
* Get the simple file system protocol for a file device path.
|
|
|
|
*
|
|
|
|
* The full path provided is split into device part and into a file
|
|
|
|
* part. The device part is used to find the handle on which the
|
|
|
|
* simple file system protocol is installed.
|
|
|
|
*
|
|
|
|
* @full_path device path including device and file
|
|
|
|
* @return simple file system protocol
|
2017-09-13 22:05:34 +00:00
|
|
|
*/
|
|
|
|
struct efi_simple_file_system_protocol *
|
2018-01-19 19:24:39 +00:00
|
|
|
efi_fs_from_path(struct efi_device_path *full_path)
|
2017-09-13 22:05:34 +00:00
|
|
|
{
|
|
|
|
struct efi_object *efiobj;
|
2018-01-19 19:24:39 +00:00
|
|
|
struct efi_handler *handler;
|
|
|
|
struct efi_device_path *device_path;
|
|
|
|
struct efi_device_path *file_path;
|
|
|
|
efi_status_t ret;
|
2017-09-13 22:05:34 +00:00
|
|
|
|
2018-01-19 19:24:39 +00:00
|
|
|
/* Split the path into a device part and a file part */
|
|
|
|
ret = efi_dp_split_file_path(full_path, &device_path, &file_path);
|
|
|
|
if (ret != EFI_SUCCESS)
|
|
|
|
return NULL;
|
|
|
|
efi_free_pool(file_path);
|
|
|
|
|
|
|
|
/* Get the EFI object for the partition */
|
|
|
|
efiobj = efi_dp_find_obj(device_path, NULL);
|
|
|
|
efi_free_pool(device_path);
|
2017-09-13 22:05:34 +00:00
|
|
|
if (!efiobj)
|
|
|
|
return NULL;
|
|
|
|
|
2018-01-19 19:24:39 +00:00
|
|
|
/* Find the simple file system protocol */
|
|
|
|
ret = efi_search_protocol(efiobj, &efi_simple_file_system_protocol_guid,
|
|
|
|
&handler);
|
|
|
|
if (ret != EFI_SUCCESS)
|
|
|
|
return NULL;
|
2017-09-13 22:05:34 +00:00
|
|
|
|
2018-01-19 19:24:39 +00:00
|
|
|
/* Return the simple file system protocol for the partition */
|
|
|
|
return handler->protocol_interface;
|
2017-09-13 22:05:34 +00:00
|
|
|
}
|
|
|
|
|
2017-10-26 17:25:46 +00:00
|
|
|
/*
|
2018-01-19 19:24:47 +00:00
|
|
|
* Create a handle for a partition or disk
|
2017-10-26 17:25:46 +00:00
|
|
|
*
|
2018-01-19 19:24:47 +00:00
|
|
|
* @parent parent handle
|
|
|
|
* @dp_parent parent device path
|
2017-10-26 17:25:46 +00:00
|
|
|
* @if_typename interface name for block device
|
|
|
|
* @desc internal block device
|
|
|
|
* @dev_index device index for block device
|
|
|
|
* @offset offset into disk for simple partitions
|
2018-01-19 19:24:47 +00:00
|
|
|
* @return disk object
|
2017-10-26 17:25:46 +00:00
|
|
|
*/
|
2018-02-09 19:55:47 +00:00
|
|
|
static efi_status_t efi_disk_add_dev(
|
2018-01-19 19:24:47 +00:00
|
|
|
efi_handle_t parent,
|
|
|
|
struct efi_device_path *dp_parent,
|
|
|
|
const char *if_typename,
|
|
|
|
struct blk_desc *desc,
|
|
|
|
int dev_index,
|
|
|
|
lbaint_t offset,
|
2018-02-09 19:55:47 +00:00
|
|
|
unsigned int part,
|
|
|
|
struct efi_disk_obj **disk)
|
2016-04-11 14:16:17 +00:00
|
|
|
{
|
|
|
|
struct efi_disk_obj *diskobj;
|
2017-11-26 13:05:12 +00:00
|
|
|
efi_status_t ret;
|
2016-04-11 14:16:17 +00:00
|
|
|
|
2016-08-05 12:51:47 +00:00
|
|
|
/* Don't add empty devices */
|
|
|
|
if (!desc->lba)
|
2018-02-09 19:55:47 +00:00
|
|
|
return EFI_NOT_READY;
|
2016-08-05 12:51:47 +00:00
|
|
|
|
efi_loader: use proper device-paths for partitions
Also, create disk objects for the disk itself, in addition to the
partitions. (UEFI terminology is a bit confusing, a "disk" object is
really a partition.) This helps grub properly identify the boot device
since it is trying to match up partition "disk" object with it's parent
device.
Now instead of seeing devices like:
/File(sdhci@07864000.blk)/EndEntire
/File(usb_mass_storage.lun0)/EndEntire
You see:
/ACPI(133741d0,0)/UnknownMessaging(1d)/EndEntire
/ACPI(133741d0,0)/UnknownMessaging(1d)/HD(0,800,64000,dd904a8c00000000,1,1)/EndEntire
/ACPI(133741d0,0)/UnknownMessaging(1d)/HD(1,64800,200000,dd904a8c00000000,1,1)/EndEntire
/ACPI(133741d0,0)/UnknownMessaging(1d)/HD(2,264800,19a000,dd904a8c00000000,1,1)/EndEntire
/ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/EndEntire
/ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/HD(0,800,60000,38ca680200000000,1,1)/EndEntire
/ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/HD(1,61000,155000,38ca680200000000,1,1)/EndEntire
/ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/HD(2,20fa800,1bbf8800,38ca680200000000,1,1)/EndEntire
/ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/HD(3,1b6800,1f44000,38ca680200000000,1,1)/EndEntire
This is on a board with single USB disk and single sd-card. The
UnknownMessaging(1d) node in the device-path is the MMC device,
but grub_efi_print_device_path() hasn't been updated yet for some
of the newer device-path sub-types.
This patch is inspired by a patch originally from Peter Jones, but
re-worked to use efi_device_path, so it doesn't much resemble the
original.
Signed-off-by: Rob Clark <robdclark@gmail.com>
[agraf: s/unsigned/unsigned int/]
Signed-off-by: Alexander Graf <agraf@suse.de>
2017-09-13 22:05:31 +00:00
|
|
|
diskobj = calloc(1, sizeof(*diskobj));
|
2017-11-26 13:05:12 +00:00
|
|
|
if (!diskobj)
|
2018-02-09 19:55:47 +00:00
|
|
|
return EFI_OUT_OF_RESOURCES;
|
2017-11-26 13:05:12 +00:00
|
|
|
|
|
|
|
/* Hook up to the device list */
|
2017-11-26 13:05:23 +00:00
|
|
|
efi_add_handle(&diskobj->parent);
|
2016-04-11 14:16:17 +00:00
|
|
|
|
|
|
|
/* Fill in object data */
|
2018-01-19 19:24:47 +00:00
|
|
|
if (part) {
|
|
|
|
struct efi_device_path *node = efi_dp_part_node(desc, part);
|
|
|
|
|
|
|
|
diskobj->dp = efi_dp_append_node(dp_parent, node);
|
|
|
|
efi_free_pool(node);
|
|
|
|
} else {
|
|
|
|
diskobj->dp = efi_dp_from_part(desc, part);
|
|
|
|
}
|
efi_loader: use proper device-paths for partitions
Also, create disk objects for the disk itself, in addition to the
partitions. (UEFI terminology is a bit confusing, a "disk" object is
really a partition.) This helps grub properly identify the boot device
since it is trying to match up partition "disk" object with it's parent
device.
Now instead of seeing devices like:
/File(sdhci@07864000.blk)/EndEntire
/File(usb_mass_storage.lun0)/EndEntire
You see:
/ACPI(133741d0,0)/UnknownMessaging(1d)/EndEntire
/ACPI(133741d0,0)/UnknownMessaging(1d)/HD(0,800,64000,dd904a8c00000000,1,1)/EndEntire
/ACPI(133741d0,0)/UnknownMessaging(1d)/HD(1,64800,200000,dd904a8c00000000,1,1)/EndEntire
/ACPI(133741d0,0)/UnknownMessaging(1d)/HD(2,264800,19a000,dd904a8c00000000,1,1)/EndEntire
/ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/EndEntire
/ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/HD(0,800,60000,38ca680200000000,1,1)/EndEntire
/ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/HD(1,61000,155000,38ca680200000000,1,1)/EndEntire
/ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/HD(2,20fa800,1bbf8800,38ca680200000000,1,1)/EndEntire
/ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/HD(3,1b6800,1f44000,38ca680200000000,1,1)/EndEntire
This is on a board with single USB disk and single sd-card. The
UnknownMessaging(1d) node in the device-path is the MMC device,
but grub_efi_print_device_path() hasn't been updated yet for some
of the newer device-path sub-types.
This patch is inspired by a patch originally from Peter Jones, but
re-worked to use efi_device_path, so it doesn't much resemble the
original.
Signed-off-by: Rob Clark <robdclark@gmail.com>
[agraf: s/unsigned/unsigned int/]
Signed-off-by: Alexander Graf <agraf@suse.de>
2017-09-13 22:05:31 +00:00
|
|
|
diskobj->part = part;
|
2017-11-26 13:05:12 +00:00
|
|
|
ret = efi_add_protocol(diskobj->parent.handle, &efi_block_io_guid,
|
|
|
|
&diskobj->ops);
|
|
|
|
if (ret != EFI_SUCCESS)
|
2018-02-09 19:55:47 +00:00
|
|
|
return ret;
|
2017-11-26 13:05:12 +00:00
|
|
|
ret = efi_add_protocol(diskobj->parent.handle, &efi_guid_device_path,
|
|
|
|
diskobj->dp);
|
|
|
|
if (ret != EFI_SUCCESS)
|
2018-02-09 19:55:47 +00:00
|
|
|
return ret;
|
2017-09-13 22:05:34 +00:00
|
|
|
if (part >= 1) {
|
|
|
|
diskobj->volume = efi_simple_file_system(desc, part,
|
|
|
|
diskobj->dp);
|
2017-11-26 13:05:12 +00:00
|
|
|
ret = efi_add_protocol(diskobj->parent.handle,
|
|
|
|
&efi_simple_file_system_protocol_guid,
|
2018-01-19 19:24:38 +00:00
|
|
|
diskobj->volume);
|
2017-11-26 13:05:12 +00:00
|
|
|
if (ret != EFI_SUCCESS)
|
2018-02-09 19:55:47 +00:00
|
|
|
return ret;
|
2017-09-13 22:05:34 +00:00
|
|
|
}
|
2016-04-11 14:16:17 +00:00
|
|
|
diskobj->ops = block_io_disk_template;
|
2016-05-14 20:03:05 +00:00
|
|
|
diskobj->ifname = if_typename;
|
2016-04-11 14:16:17 +00:00
|
|
|
diskobj->dev_index = dev_index;
|
2016-04-11 14:16:18 +00:00
|
|
|
diskobj->offset = offset;
|
2016-08-05 12:49:53 +00:00
|
|
|
diskobj->desc = desc;
|
2016-04-11 14:16:17 +00:00
|
|
|
|
|
|
|
/* Fill in EFI IO Media info (for read/write callbacks) */
|
|
|
|
diskobj->media.removable_media = desc->removable;
|
|
|
|
diskobj->media.media_present = 1;
|
|
|
|
diskobj->media.block_size = desc->blksz;
|
|
|
|
diskobj->media.io_align = desc->blksz;
|
2016-08-05 12:51:47 +00:00
|
|
|
diskobj->media.last_block = desc->lba - offset;
|
2017-12-11 18:22:33 +00:00
|
|
|
if (part != 0)
|
|
|
|
diskobj->media.logical_partition = 1;
|
2016-04-11 14:16:17 +00:00
|
|
|
diskobj->ops.media = &diskobj->media;
|
2018-02-09 19:55:47 +00:00
|
|
|
if (disk)
|
|
|
|
*disk = diskobj;
|
|
|
|
return EFI_SUCCESS;
|
2016-04-11 14:16:17 +00:00
|
|
|
}
|
|
|
|
|
2018-01-19 19:24:47 +00:00
|
|
|
/*
|
|
|
|
* Create handles and protocols for the partitions of a block device
|
|
|
|
*
|
|
|
|
* @parent handle of the parent disk
|
|
|
|
* @blk_desc block device
|
|
|
|
* @if_typename interface type
|
|
|
|
* @diskid device number
|
|
|
|
* @pdevname device name
|
|
|
|
* @return number of partitions created
|
|
|
|
*/
|
|
|
|
int efi_disk_create_partitions(efi_handle_t parent, struct blk_desc *desc,
|
|
|
|
const char *if_typename, int diskid,
|
|
|
|
const char *pdevname)
|
2016-04-11 14:16:18 +00:00
|
|
|
{
|
|
|
|
int disks = 0;
|
2016-04-11 14:16:20 +00:00
|
|
|
char devname[32] = { 0 }; /* dp->str is u16[32] long */
|
2016-04-11 14:16:18 +00:00
|
|
|
disk_partition_t info;
|
2017-10-10 02:55:26 +00:00
|
|
|
int part;
|
2018-01-19 19:24:47 +00:00
|
|
|
struct efi_device_path *dp = NULL;
|
|
|
|
efi_status_t ret;
|
|
|
|
struct efi_handler *handler;
|
|
|
|
|
|
|
|
/* Get the device path of the parent */
|
|
|
|
ret = efi_search_protocol(parent, &efi_guid_device_path, &handler);
|
|
|
|
if (ret == EFI_SUCCESS)
|
|
|
|
dp = handler->protocol_interface;
|
2016-04-11 14:16:18 +00:00
|
|
|
|
2017-12-01 15:10:33 +00:00
|
|
|
/* Add devices for each partition */
|
2017-10-10 02:55:26 +00:00
|
|
|
for (part = 1; part <= MAX_SEARCH_PARTITIONS; part++) {
|
|
|
|
if (part_get_info(desc, part, &info))
|
|
|
|
continue;
|
2016-08-05 12:49:53 +00:00
|
|
|
snprintf(devname, sizeof(devname), "%s:%d", pdevname,
|
|
|
|
part);
|
2018-02-09 19:55:47 +00:00
|
|
|
ret = efi_disk_add_dev(parent, dp, if_typename, desc, diskid,
|
|
|
|
info.start, part, NULL);
|
|
|
|
if (ret != EFI_SUCCESS) {
|
|
|
|
printf("Adding partition %s failed\n", pdevname);
|
|
|
|
continue;
|
|
|
|
}
|
2016-04-11 14:16:18 +00:00
|
|
|
disks++;
|
|
|
|
}
|
efi_loader: use proper device-paths for partitions
Also, create disk objects for the disk itself, in addition to the
partitions. (UEFI terminology is a bit confusing, a "disk" object is
really a partition.) This helps grub properly identify the boot device
since it is trying to match up partition "disk" object with it's parent
device.
Now instead of seeing devices like:
/File(sdhci@07864000.blk)/EndEntire
/File(usb_mass_storage.lun0)/EndEntire
You see:
/ACPI(133741d0,0)/UnknownMessaging(1d)/EndEntire
/ACPI(133741d0,0)/UnknownMessaging(1d)/HD(0,800,64000,dd904a8c00000000,1,1)/EndEntire
/ACPI(133741d0,0)/UnknownMessaging(1d)/HD(1,64800,200000,dd904a8c00000000,1,1)/EndEntire
/ACPI(133741d0,0)/UnknownMessaging(1d)/HD(2,264800,19a000,dd904a8c00000000,1,1)/EndEntire
/ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/EndEntire
/ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/HD(0,800,60000,38ca680200000000,1,1)/EndEntire
/ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/HD(1,61000,155000,38ca680200000000,1,1)/EndEntire
/ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/HD(2,20fa800,1bbf8800,38ca680200000000,1,1)/EndEntire
/ACPI(133741d0,0)/USB(0,0)/USB(0,0)/USB(0,0)/HD(3,1b6800,1f44000,38ca680200000000,1,1)/EndEntire
This is on a board with single USB disk and single sd-card. The
UnknownMessaging(1d) node in the device-path is the MMC device,
but grub_efi_print_device_path() hasn't been updated yet for some
of the newer device-path sub-types.
This patch is inspired by a patch originally from Peter Jones, but
re-worked to use efi_device_path, so it doesn't much resemble the
original.
Signed-off-by: Rob Clark <robdclark@gmail.com>
[agraf: s/unsigned/unsigned int/]
Signed-off-by: Alexander Graf <agraf@suse.de>
2017-09-13 22:05:31 +00:00
|
|
|
|
2016-04-11 14:16:18 +00:00
|
|
|
return disks;
|
|
|
|
}
|
|
|
|
|
2016-03-04 00:10:02 +00:00
|
|
|
/*
|
|
|
|
* U-Boot doesn't have a list of all online disk devices. So when running our
|
|
|
|
* EFI payload, we scan through all of the potentially available ones and
|
|
|
|
* store them in our object pool.
|
|
|
|
*
|
2016-05-14 20:03:05 +00:00
|
|
|
* TODO(sjg@chromium.org): Actually with CONFIG_BLK, U-Boot does have this.
|
|
|
|
* Consider converting the code to look up devices as needed. The EFI device
|
|
|
|
* could be a child of the UCLASS_BLK block device, perhaps.
|
|
|
|
*
|
2016-03-04 00:10:02 +00:00
|
|
|
* This gets called from do_bootefi_exec().
|
|
|
|
*/
|
2018-02-09 19:55:47 +00:00
|
|
|
efi_status_t efi_disk_register(void)
|
2016-03-04 00:10:02 +00:00
|
|
|
{
|
2018-01-19 19:24:47 +00:00
|
|
|
struct efi_disk_obj *disk;
|
2016-03-04 00:10:02 +00:00
|
|
|
int disks = 0;
|
2018-02-09 19:55:47 +00:00
|
|
|
efi_status_t ret;
|
2016-05-14 20:03:05 +00:00
|
|
|
#ifdef CONFIG_BLK
|
|
|
|
struct udevice *dev;
|
|
|
|
|
2018-02-09 19:55:47 +00:00
|
|
|
for (uclass_first_device_check(UCLASS_BLK, &dev); dev;
|
2017-06-20 19:10:27 +00:00
|
|
|
uclass_next_device_check(&dev)) {
|
2016-05-14 20:03:05 +00:00
|
|
|
struct blk_desc *desc = dev_get_uclass_platdata(dev);
|
2018-01-19 19:24:44 +00:00
|
|
|
const char *if_typename = blk_get_if_type_name(desc->if_type);
|
2016-05-14 20:03:05 +00:00
|
|
|
|
2017-12-01 15:10:33 +00:00
|
|
|
/* Add block device for the full device */
|
2018-02-09 19:55:47 +00:00
|
|
|
printf("Scanning disk %s...\n", dev->name);
|
|
|
|
ret = efi_disk_add_dev(NULL, NULL, if_typename,
|
|
|
|
desc, desc->devnum, 0, 0, &disk);
|
|
|
|
if (ret == EFI_NOT_READY) {
|
|
|
|
printf("Disk %s not ready\n", dev->name);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (ret) {
|
|
|
|
printf("ERROR: failure to add disk device %s, r = %lu\n",
|
|
|
|
dev->name, ret & ~EFI_ERROR_MASK);
|
|
|
|
return ret;
|
|
|
|
}
|
2016-05-14 20:03:05 +00:00
|
|
|
disks++;
|
|
|
|
|
2017-12-01 15:10:33 +00:00
|
|
|
/* Partitions show up as block devices in EFI */
|
2018-01-19 19:24:47 +00:00
|
|
|
disks += efi_disk_create_partitions(
|
|
|
|
disk->parent.handle, desc, if_typename,
|
|
|
|
desc->devnum, dev->name);
|
2016-05-14 20:03:05 +00:00
|
|
|
}
|
|
|
|
#else
|
|
|
|
int i, if_type;
|
2016-03-04 00:10:02 +00:00
|
|
|
|
|
|
|
/* Search for all available disk devices */
|
2016-05-01 19:52:32 +00:00
|
|
|
for (if_type = 0; if_type < IF_TYPE_COUNT; if_type++) {
|
2016-05-14 20:03:05 +00:00
|
|
|
const struct blk_driver *cur_drvr;
|
|
|
|
const char *if_typename;
|
|
|
|
|
2016-05-01 19:52:32 +00:00
|
|
|
cur_drvr = blk_driver_lookup_type(if_type);
|
|
|
|
if (!cur_drvr)
|
|
|
|
continue;
|
|
|
|
|
2016-05-14 20:03:05 +00:00
|
|
|
if_typename = cur_drvr->if_typename;
|
|
|
|
printf("Scanning disks on %s...\n", if_typename);
|
2016-03-04 00:10:02 +00:00
|
|
|
for (i = 0; i < 4; i++) {
|
|
|
|
struct blk_desc *desc;
|
2016-04-11 14:16:20 +00:00
|
|
|
char devname[32] = { 0 }; /* dp->str is u16[32] long */
|
2016-03-04 00:10:02 +00:00
|
|
|
|
2016-05-01 19:52:32 +00:00
|
|
|
desc = blk_get_devnum_by_type(if_type, i);
|
2016-03-04 00:10:02 +00:00
|
|
|
if (!desc)
|
|
|
|
continue;
|
|
|
|
if (desc->type == DEV_TYPE_UNKNOWN)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
snprintf(devname, sizeof(devname), "%s%d",
|
2016-05-14 20:03:05 +00:00
|
|
|
if_typename, i);
|
2017-10-08 15:33:08 +00:00
|
|
|
|
2017-12-01 15:10:33 +00:00
|
|
|
/* Add block device for the full device */
|
2018-02-09 19:55:47 +00:00
|
|
|
ret = efi_disk_add_dev(NULL, NULL, if_typename, desc,
|
|
|
|
i, 0, 0, &disk);
|
|
|
|
if (ret == EFI_NOT_READY) {
|
|
|
|
printf("Disk %s not ready\n", devname);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (ret) {
|
|
|
|
printf("ERROR: failure to add disk device %s, r = %lu\n",
|
|
|
|
devname, ret & ~EFI_ERROR_MASK);
|
|
|
|
return ret;
|
|
|
|
}
|
2016-03-04 00:10:02 +00:00
|
|
|
disks++;
|
2016-04-11 14:16:18 +00:00
|
|
|
|
2017-12-01 15:10:33 +00:00
|
|
|
/* Partitions show up as block devices in EFI */
|
2018-01-19 19:24:47 +00:00
|
|
|
disks += efi_disk_create_partitions(
|
|
|
|
disk->parent.handle, desc,
|
|
|
|
if_typename, i, devname);
|
2016-03-04 00:10:02 +00:00
|
|
|
}
|
|
|
|
}
|
2016-05-14 20:03:05 +00:00
|
|
|
#endif
|
2016-03-04 00:10:02 +00:00
|
|
|
printf("Found %d disks\n", disks);
|
|
|
|
|
2018-02-09 19:55:47 +00:00
|
|
|
return EFI_SUCCESS;
|
2016-03-04 00:10:02 +00:00
|
|
|
}
|