summaryrefslogtreecommitdiffstats
path: root/drivers/block/efi-block-io.c
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2017-10-27 09:05:48 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2017-10-27 10:56:52 +0200
commit1bf16188c5922854f384317b7585bc8cd91593b5 (patch)
tree89d8335db06e736370d3930ca4eccf8e764b3a87 /drivers/block/efi-block-io.c
parentc6dc961b7100a6e18988f7bb0d9a12700be90a8f (diff)
downloadbarebox-1bf16188c5922854f384317b7585bc8cd91593b5.tar.gz
barebox-1bf16188c5922854f384317b7585bc8cd91593b5.tar.xz
efi-block: detect when the block device is a USB Disk
use usbdisk as a basename This will be usefull as example when we want to search for a usb disk for failsafe update or install. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'drivers/block/efi-block-io.c')
-rw-r--r--drivers/block/efi-block-io.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/drivers/block/efi-block-io.c b/drivers/block/efi-block-io.c
index a4d9d3a95d..2bbeb99e69 100644
--- a/drivers/block/efi-block-io.c
+++ b/drivers/block/efi-block-io.c
@@ -130,6 +130,18 @@ static void efi_bio_print_info(struct efi_bio_priv *priv)
media->optimal_transfer_length_granularity);
}
+static int is_bio_usbdev(struct efi_device *efidev)
+{
+ int i;
+
+ for (i = 0; i < efidev->num_guids; i++) {
+ if (!efi_guidcmp(efidev->guids[i], EFI_USB_IO_PROTOCOL_GUID))
+ return 1;
+ }
+
+ return 0;
+}
+
int efi_bio_probe(struct efi_device *efidev)
{
int ret;
@@ -147,7 +159,10 @@ int efi_bio_probe(struct efi_device *efidev)
efi_bio_print_info(priv);
priv->dev = &efidev->dev;
- priv->blk.cdev.name = xasprintf("disk%d", cdev_find_free_index("disk"));
+ if (is_bio_usbdev(efidev))
+ priv->blk.cdev.name = xasprintf("usbdisk%d", cdev_find_free_index("usbdisk"));
+ else
+ priv->blk.cdev.name = xasprintf("disk%d", cdev_find_free_index("disk"));
priv->blk.blockbits = ffs(media->block_size) - 1;
priv->blk.num_blocks = media->last_block + 1;
priv->blk.ops = &efi_bio_ops;