configs: colibri_imx7: enable DM_VIDEO
[oweals/u-boot.git] / disk / part.c
index baceb19c60c7212c215e69eaba0be55d3f720170..7e842147317194309b5691d0eda004d35545ef1a 100644 (file)
@@ -1,15 +1,16 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2001
  * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <common.h>
 #include <command.h>
+#include <errno.h>
 #include <ide.h>
 #include <malloc.h>
 #include <part.h>
+#include <ubifs_uboot.h>
 
 #undef PART_DEBUG
 
 #define PRINTF(fmt,args...)
 #endif
 
-struct block_drvr {
-       char *name;
-       block_dev_desc_t* (*get_dev)(int dev);
-       int (*select_hwpart)(int dev_num, int hwpart);
-};
+/* Check all partition types */
+#define PART_TYPE_ALL          -1
 
-static const struct block_drvr block_drvr[] = {
-#if defined(CONFIG_CMD_IDE)
-       { .name = "ide", .get_dev = ide_get_dev, },
-#endif
-#if defined(CONFIG_CMD_SATA)
-       {.name = "sata", .get_dev = sata_get_dev, },
-#endif
-#if defined(CONFIG_CMD_SCSI)
-       { .name = "scsi", .get_dev = scsi_get_dev, },
-#endif
-#if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
-       { .name = "usb", .get_dev = usb_stor_get_dev, },
-#endif
-#if defined(CONFIG_MMC)
-       {
-               .name = "mmc",
-               .get_dev = mmc_get_dev,
-               .select_hwpart = mmc_select_hwpart,
-       },
-#endif
-#if defined(CONFIG_SYSTEMACE)
-       { .name = "ace", .get_dev = systemace_get_dev, },
-#endif
-#if defined(CONFIG_SANDBOX)
-       { .name = "host", .get_dev = host_get_dev, },
-#endif
-       { },
-};
+static struct part_driver *part_driver_lookup_type(struct blk_desc *dev_desc)
+{
+       struct part_driver *drv =
+               ll_entry_start(struct part_driver, part_driver);
+       const int n_ents = ll_entry_count(struct part_driver, part_driver);
+       struct part_driver *entry;
+
+       if (dev_desc->part_type == PART_TYPE_UNKNOWN) {
+               for (entry = drv; entry != drv + n_ents; entry++) {
+                       int ret;
+
+                       ret = entry->test(dev_desc);
+                       if (!ret) {
+                               dev_desc->part_type = entry->part_type;
+                               return entry;
+                       }
+               }
+       } else {
+               for (entry = drv; entry != drv + n_ents; entry++) {
+                       if (dev_desc->part_type == entry->part_type)
+                               return entry;
+               }
+       }
 
-DECLARE_GLOBAL_DATA_PTR;
+       /* Not found */
+       return NULL;
+}
 
-#ifdef HAVE_BLOCK_DEVICE
-block_dev_desc_t *get_dev_hwpart(const char *ifname, int dev, int hwpart)
+#ifdef CONFIG_HAVE_BLOCK_DEVICE
+static struct blk_desc *get_dev_hwpart(const char *ifname, int dev, int hwpart)
 {
-       const struct block_drvr *drvr = block_drvr;
-       block_dev_desc_t* (*reloc_get_dev)(int dev);
-       int (*select_hwpart)(int dev_num, int hwpart);
-       char *name;
+       struct blk_desc *dev_desc;
        int ret;
 
-       if (!ifname)
+       dev_desc = blk_get_devnum_by_typename(ifname, dev);
+       if (!dev_desc) {
+               debug("%s: No device for iface '%s', dev %d\n", __func__,
+                     ifname, dev);
                return NULL;
-
-       name = drvr->name;
-#ifdef CONFIG_NEEDS_MANUAL_RELOC
-       name += gd->reloc_off;
-#endif
-       while (drvr->name) {
-               name = drvr->name;
-               reloc_get_dev = drvr->get_dev;
-               select_hwpart = drvr->select_hwpart;
-#ifdef CONFIG_NEEDS_MANUAL_RELOC
-               name += gd->reloc_off;
-               reloc_get_dev += gd->reloc_off;
-               if (select_hwpart)
-                       select_hwpart += gd->reloc_off;
-#endif
-               if (strncmp(ifname, name, strlen(name)) == 0) {
-                       block_dev_desc_t *dev_desc = reloc_get_dev(dev);
-                       if (!dev_desc)
-                               return NULL;
-                       if (hwpart == 0 && !select_hwpart)
-                               return dev_desc;
-                       if (!select_hwpart)
-                               return NULL;
-                       ret = select_hwpart(dev_desc->dev, hwpart);
-                       if (ret < 0)
-                               return NULL;
-                       return dev_desc;
-               }
-               drvr++;
        }
-       return NULL;
+       ret = blk_dselect_hwpart(dev_desc, hwpart);
+       if (ret) {
+               debug("%s: Failed to select h/w partition: err-%d\n", __func__,
+                     ret);
+               return NULL;
+       }
+
+       return dev_desc;
 }
 
-block_dev_desc_t *get_dev(const char *ifname, int dev)
+struct blk_desc *blk_get_dev(const char *ifname, int dev)
 {
        return get_dev_hwpart(ifname, dev, 0);
 }
 #else
-block_dev_desc_t *get_dev_hwpart(const char *ifname, int dev, int hwpart)
+struct blk_desc *get_dev_hwpart(const char *ifname, int dev, int hwpart)
 {
        return NULL;
 }
 
-block_dev_desc_t *get_dev(const char *ifname, int dev)
+struct blk_desc *blk_get_dev(const char *ifname, int dev)
 {
        return NULL;
 }
 #endif
 
-#ifdef HAVE_BLOCK_DEVICE
+#ifdef CONFIG_HAVE_BLOCK_DEVICE
 
 /* ------------------------------------------------------------------------- */
 /*
@@ -130,20 +103,20 @@ typedef lbaint_t lba512_t;
 #endif
 
 /*
- * Overflowless variant of (block_count * mul_by / div_by)
+ * Overflowless variant of (block_count * mul_by / 2**div_by)
  * when div_by > mul_by
  */
-static lba512_t lba512_muldiv (lba512_t block_count, lba512_t mul_by, lba512_t div_by)
+static lba512_t lba512_muldiv(lba512_t block_count, lba512_t mul_by, int div_by)
 {
        lba512_t bc_quot, bc_rem;
 
        /* x * m / d == x / d * m + (x % d) * m / d */
-       bc_quot = block_count / div_by;
-       bc_rem  = block_count - div_by * bc_quot;
-       return bc_quot * mul_by + (bc_rem * mul_by) / div_by;
+       bc_quot = block_count >> div_by;
+       bc_rem  = block_count - (bc_quot << div_by);
+       return bc_quot * mul_by + ((bc_rem * mul_by) >> div_by);
 }
 
-void dev_print (block_dev_desc_t *dev_desc)
+void dev_print (struct blk_desc *dev_desc)
 {
        lba512_t lba512; /* number of blocks if 512bytes block size */
 
@@ -171,11 +144,15 @@ void dev_print (block_dev_desc_t *dev_desc)
        case IF_TYPE_SD:
        case IF_TYPE_MMC:
        case IF_TYPE_USB:
+       case IF_TYPE_NVME:
                printf ("Vendor: %s Rev: %s Prod: %s\n",
                        dev_desc->vendor,
                        dev_desc->revision,
                        dev_desc->product);
                break;
+       case IF_TYPE_VIRTIO:
+               printf("%s VirtIO Block Device\n", dev_desc->vendor);
+               break;
        case IF_TYPE_DOC:
                puts("device type DOC\n");
                return;
@@ -215,7 +192,8 @@ void dev_print (block_dev_desc_t *dev_desc)
 
                lba512 = (lba * (dev_desc->blksz/512));
                /* round to 1 digit */
-               mb = lba512_muldiv(lba512, 10, 2048);   /* 2048 = (1024 * 1024) / 512 MB */
+               /* 2048 = (1024 * 1024) / 512 MB */
+               mb = lba512_muldiv(lba512, 10, 11);
 
                mb_quot = mb / 10;
                mb_rem  = mb - (10 * mb_quot);
@@ -228,13 +206,13 @@ void dev_print (block_dev_desc_t *dev_desc)
                        printf ("            Supports 48-bit addressing\n");
 #endif
 #if defined(CONFIG_SYS_64BIT_LBA)
-               printf ("            Capacity: %ld.%ld MB = %ld.%ld GB (%Ld x %ld)\n",
+               printf ("            Capacity: %lu.%lu MB = %lu.%lu GB (%llu x %lu)\n",
                        mb_quot, mb_rem,
                        gb_quot, gb_rem,
                        lba,
                        dev_desc->blksz);
 #else
-               printf ("            Capacity: %ld.%ld MB = %ld.%ld GB (%ld x %ld)\n",
+               printf ("            Capacity: %lu.%lu MB = %lu.%lu GB (%lu x %lu)\n",
                        mb_quot, mb_rem,
                        gb_quot, gb_rem,
                        (ulong)lba,
@@ -246,57 +224,37 @@ void dev_print (block_dev_desc_t *dev_desc)
 }
 #endif
 
-#ifdef HAVE_BLOCK_DEVICE
+#ifdef CONFIG_HAVE_BLOCK_DEVICE
 
-void init_part (block_dev_desc_t * dev_desc)
+void part_init(struct blk_desc *dev_desc)
 {
-#ifdef CONFIG_ISO_PARTITION
-       if (test_part_iso(dev_desc) == 0) {
-               dev_desc->part_type = PART_TYPE_ISO;
-               return;
-       }
-#endif
+       struct part_driver *drv =
+               ll_entry_start(struct part_driver, part_driver);
+       const int n_ents = ll_entry_count(struct part_driver, part_driver);
+       struct part_driver *entry;
 
-#ifdef CONFIG_MAC_PARTITION
-       if (test_part_mac(dev_desc) == 0) {
-               dev_desc->part_type = PART_TYPE_MAC;
-               return;
-       }
-#endif
+       blkcache_invalidate(dev_desc->if_type, dev_desc->devnum);
 
-/* must be placed before DOS partition detection */
-#ifdef CONFIG_EFI_PARTITION
-       if (test_part_efi(dev_desc) == 0) {
-               dev_desc->part_type = PART_TYPE_EFI;
-               return;
-       }
-#endif
-
-#ifdef CONFIG_DOS_PARTITION
-       if (test_part_dos(dev_desc) == 0) {
-               dev_desc->part_type = PART_TYPE_DOS;
-               return;
-       }
-#endif
-
-#ifdef CONFIG_AMIGA_PARTITION
-       if (test_part_amiga(dev_desc) == 0) {
-           dev_desc->part_type = PART_TYPE_AMIGA;
-           return;
-       }
-#endif
        dev_desc->part_type = PART_TYPE_UNKNOWN;
+       for (entry = drv; entry != drv + n_ents; entry++) {
+               int ret;
+
+               ret = entry->test(dev_desc);
+               debug("%s: try '%s': ret=%d\n", __func__, entry->name, ret);
+               if (!ret) {
+                       dev_desc->part_type = entry->part_type;
+                       break;
+               }
+       }
 }
 
-
-#if defined(CONFIG_MAC_PARTITION) || \
-       defined(CONFIG_DOS_PARTITION) || \
-       defined(CONFIG_ISO_PARTITION) || \
-       defined(CONFIG_AMIGA_PARTITION) || \
-       defined(CONFIG_EFI_PARTITION)
-
-static void print_part_header (const char *type, block_dev_desc_t * dev_desc)
+static void print_part_header(const char *type, struct blk_desc *dev_desc)
 {
+#if CONFIG_IS_ENABLED(MAC_PARTITION) || \
+       CONFIG_IS_ENABLED(DOS_PARTITION) || \
+       CONFIG_IS_ENABLED(ISO_PARTITION) || \
+       CONFIG_IS_ENABLED(AMIGA_PARTITION) || \
+       CONFIG_IS_ENABLED(EFI_PARTITION)
        puts ("\nPartition Map for ");
        switch (dev_desc->if_type) {
        case IF_TYPE_IDE:
@@ -321,131 +279,96 @@ static void print_part_header (const char *type, block_dev_desc_t * dev_desc)
                puts ("MMC");
                break;
        case IF_TYPE_HOST:
-               puts("HOST");
+               puts ("HOST");
+               break;
+       case IF_TYPE_NVME:
+               puts ("NVMe");
+               break;
+       case IF_TYPE_VIRTIO:
+               puts("VirtIO");
                break;
        default:
                puts ("UNKNOWN");
                break;
        }
        printf (" device %d  --   Partition Type: %s\n\n",
-                       dev_desc->dev, type);
-}
-
+                       dev_desc->devnum, type);
 #endif /* any CONFIG_..._PARTITION */
+}
 
-void print_part (block_dev_desc_t * dev_desc)
+void part_print(struct blk_desc *dev_desc)
 {
+       struct part_driver *drv;
 
-               switch (dev_desc->part_type) {
-#ifdef CONFIG_MAC_PARTITION
-       case PART_TYPE_MAC:
-               PRINTF ("## Testing for valid MAC partition ##\n");
-               print_part_header ("MAC", dev_desc);
-               print_part_mac (dev_desc);
-               return;
-#endif
-#ifdef CONFIG_DOS_PARTITION
-       case PART_TYPE_DOS:
-               PRINTF ("## Testing for valid DOS partition ##\n");
-               print_part_header ("DOS", dev_desc);
-               print_part_dos (dev_desc);
+       drv = part_driver_lookup_type(dev_desc);
+       if (!drv) {
+               printf("## Unknown partition table type %x\n",
+                      dev_desc->part_type);
                return;
-#endif
-
-#ifdef CONFIG_ISO_PARTITION
-       case PART_TYPE_ISO:
-               PRINTF ("## Testing for valid ISO Boot partition ##\n");
-               print_part_header ("ISO", dev_desc);
-               print_part_iso (dev_desc);
-               return;
-#endif
-
-#ifdef CONFIG_AMIGA_PARTITION
-       case PART_TYPE_AMIGA:
-           PRINTF ("## Testing for a valid Amiga partition ##\n");
-           print_part_header ("AMIGA", dev_desc);
-           print_part_amiga (dev_desc);
-           return;
-#endif
-
-#ifdef CONFIG_EFI_PARTITION
-       case PART_TYPE_EFI:
-               PRINTF ("## Testing for valid EFI partition ##\n");
-               print_part_header ("EFI", dev_desc);
-               print_part_efi (dev_desc);
-               return;
-#endif
        }
-       puts ("## Unknown partition table\n");
+
+       PRINTF("## Testing for valid %s partition ##\n", drv->name);
+       print_part_header(drv->name, dev_desc);
+       if (drv->print)
+               drv->print(dev_desc);
 }
 
-#endif /* HAVE_BLOCK_DEVICE */
+#endif /* CONFIG_HAVE_BLOCK_DEVICE */
 
-int get_partition_info(block_dev_desc_t *dev_desc, int part
-                                       , disk_partition_t *info)
+int part_get_info(struct blk_desc *dev_desc, int part,
+                      disk_partition_t *info)
 {
-#ifdef HAVE_BLOCK_DEVICE
+#ifdef CONFIG_HAVE_BLOCK_DEVICE
+       struct part_driver *drv;
 
-#ifdef CONFIG_PARTITION_UUIDS
+#if CONFIG_IS_ENABLED(PARTITION_UUIDS)
        /* The common case is no UUID support */
        info->uuid[0] = 0;
 #endif
-
-       switch (dev_desc->part_type) {
-#ifdef CONFIG_MAC_PARTITION
-       case PART_TYPE_MAC:
-               if (get_partition_info_mac(dev_desc, part, info) == 0) {
-                       PRINTF("## Valid MAC partition found ##\n");
-                       return 0;
-               }
-               break;
+#ifdef CONFIG_PARTITION_TYPE_GUID
+       info->type_guid[0] = 0;
 #endif
 
-#ifdef CONFIG_DOS_PARTITION
-       case PART_TYPE_DOS:
-               if (get_partition_info_dos(dev_desc, part, info) == 0) {
-                       PRINTF("## Valid DOS partition found ##\n");
-                       return 0;
-               }
-               break;
-#endif
+       drv = part_driver_lookup_type(dev_desc);
+       if (!drv) {
+               debug("## Unknown partition table type %x\n",
+                     dev_desc->part_type);
+               return -EPROTONOSUPPORT;
+       }
+       if (!drv->get_info) {
+               PRINTF("## Driver %s does not have the get_info() method\n",
+                      drv->name);
+               return -ENOSYS;
+       }
+       if (drv->get_info(dev_desc, part, info) == 0) {
+               PRINTF("## Valid %s partition found ##\n", drv->name);
+               return 0;
+       }
+#endif /* CONFIG_HAVE_BLOCK_DEVICE */
 
-#ifdef CONFIG_ISO_PARTITION
-       case PART_TYPE_ISO:
-               if (get_partition_info_iso(dev_desc, part, info) == 0) {
-                       PRINTF("## Valid ISO boot partition found ##\n");
-                       return 0;
-               }
-               break;
-#endif
+       return -1;
+}
 
-#ifdef CONFIG_AMIGA_PARTITION
-       case PART_TYPE_AMIGA:
-               if (get_partition_info_amiga(dev_desc, part, info) == 0) {
-                       PRINTF("## Valid Amiga partition found ##\n");
-                       return 0;
-               }
-               break;
+int part_get_info_whole_disk(struct blk_desc *dev_desc, disk_partition_t *info)
+{
+       info->start = 0;
+       info->size = dev_desc->lba;
+       info->blksz = dev_desc->blksz;
+       info->bootable = 0;
+       strcpy((char *)info->type, BOOT_PART_TYPE);
+       strcpy((char *)info->name, "Whole Disk");
+#if CONFIG_IS_ENABLED(PARTITION_UUIDS)
+       info->uuid[0] = 0;
 #endif
-
-#ifdef CONFIG_EFI_PARTITION
-       case PART_TYPE_EFI:
-               if (get_partition_info_efi(dev_desc, part, info) == 0) {
-                       PRINTF("## Valid EFI partition found ##\n");
-                       return 0;
-               }
-               break;
+#ifdef CONFIG_PARTITION_TYPE_GUID
+       info->type_guid[0] = 0;
 #endif
-       default:
-               break;
-       }
-#endif /* HAVE_BLOCK_DEVICE */
 
-       return -1;
+       return 0;
 }
 
-int get_device(const char *ifname, const char *dev_hwpart_str,
-              block_dev_desc_t **dev_desc)
+int blk_get_device_by_str(const char *ifname, const char *dev_hwpart_str,
+                         struct blk_desc **dev_desc)
 {
        char *ep;
        char *dup_str = NULL;
@@ -467,7 +390,7 @@ int get_device(const char *ifname, const char *dev_hwpart_str,
        if (*ep) {
                printf("** Bad device specification %s %s **\n",
                       ifname, dev_str);
-               dev = -1;
+               dev = -EINVAL;
                goto cleanup;
        }
 
@@ -476,18 +399,27 @@ int get_device(const char *ifname, const char *dev_hwpart_str,
                if (*ep) {
                        printf("** Bad HW partition specification %s %s **\n",
                            ifname, hwpart_str);
-                       dev = -1;
+                       dev = -EINVAL;
                        goto cleanup;
                }
        }
 
        *dev_desc = get_dev_hwpart(ifname, dev, hwpart);
        if (!(*dev_desc) || ((*dev_desc)->type == DEV_TYPE_UNKNOWN)) {
-               printf("** Bad device %s %s **\n", ifname, dev_hwpart_str);
-               dev = -1;
+               debug("** Bad device %s %s **\n", ifname, dev_hwpart_str);
+               dev = -ENOENT;
                goto cleanup;
        }
 
+#ifdef CONFIG_HAVE_BLOCK_DEVICE
+       /*
+        * Updates the partition table for the specified hw partition.
+        * Always should be done, otherwise hw partition 0 will return stale
+        * data after displaying a non-zero hw partition.
+        */
+       part_init(*dev_desc);
+#endif
+
 cleanup:
        free(dup_str);
        return dev;
@@ -495,9 +427,8 @@ cleanup:
 
 #define PART_UNSPECIFIED -2
 #define PART_AUTO -1
-#define MAX_SEARCH_PARTITIONS 16
-int get_device_and_partition(const char *ifname, const char *dev_part_str,
-                            block_dev_desc_t **dev_desc,
+int blk_get_device_part_str(const char *ifname, const char *dev_part_str,
+                            struct blk_desc **dev_desc,
                             disk_partition_t *info, int allow_whole_dev)
 {
        int ret = -1;
@@ -510,8 +441,9 @@ int get_device_and_partition(const char *ifname, const char *dev_part_str,
        int part;
        disk_partition_t tmpinfo;
 
+#ifdef CONFIG_SANDBOX
        /*
-        * Special-case a psuedo block device "hostfs", to allow access to the
+        * Special-case a pseudo block device "hostfs", to allow access to the
         * host's own filesystem.
         */
        if (0 == strcmp(ifname, "hostfs")) {
@@ -522,17 +454,43 @@ int get_device_and_partition(const char *ifname, const char *dev_part_str,
                info->bootable = 0;
                strcpy((char *)info->type, BOOT_PART_TYPE);
                strcpy((char *)info->name, "Sandbox host");
-#ifdef CONFIG_PARTITION_UUIDS
+#if CONFIG_IS_ENABLED(PARTITION_UUIDS)
                info->uuid[0] = 0;
 #endif
+#ifdef CONFIG_PARTITION_TYPE_GUID
+               info->type_guid[0] = 0;
+#endif
 
                return 0;
        }
+#endif
+
+#ifdef CONFIG_CMD_UBIFS
+       /*
+        * Special-case ubi, ubi goes through a mtd, rather than through
+        * a regular block device.
+        */
+       if (0 == strcmp(ifname, "ubi")) {
+               if (!ubifs_is_mounted()) {
+                       printf("UBIFS not mounted, use ubifsmount to mount volume first!\n");
+                       return -1;
+               }
+
+               *dev_desc = NULL;
+               memset(info, 0, sizeof(*info));
+               strcpy((char *)info->type, BOOT_PART_TYPE);
+               strcpy((char *)info->name, "UBI");
+#if CONFIG_IS_ENABLED(PARTITION_UUIDS)
+               info->uuid[0] = 0;
+#endif
+               return 0;
+       }
+#endif
 
        /* If no dev_part_str, use bootdevice environment variable */
        if (!dev_part_str || !strlen(dev_part_str) ||
            !strcmp(dev_part_str, "-"))
-               dev_part_str = getenv("bootdevice");
+               dev_part_str = env_get("bootdevice");
 
        /* If still no dev_part_str, it's an error */
        if (!dev_part_str) {
@@ -552,7 +510,7 @@ int get_device_and_partition(const char *ifname, const char *dev_part_str,
        }
 
        /* Look up the device */
-       dev = get_device(ifname, dev_str, dev_desc);
+       dev = blk_get_device_by_str(ifname, dev_str, dev_desc);
        if (dev < 0)
                goto cleanup;
 
@@ -600,15 +558,7 @@ int get_device_and_partition(const char *ifname, const char *dev_part_str,
 
                (*dev_desc)->log2blksz = LOG2((*dev_desc)->blksz);
 
-               info->start = 0;
-               info->size = (*dev_desc)->lba;
-               info->blksz = (*dev_desc)->blksz;
-               info->bootable = 0;
-               strcpy((char *)info->type, BOOT_PART_TYPE);
-               strcpy((char *)info->name, "Whole Disk");
-#ifdef CONFIG_PARTITION_UUIDS
-               info->uuid[0] = 0;
-#endif
+               part_get_info_whole_disk(*dev_desc, info);
 
                ret = 0;
                goto cleanup;
@@ -626,7 +576,7 @@ int get_device_and_partition(const char *ifname, const char *dev_part_str,
         * other than "auto", use that partition number directly.
         */
        if (part != PART_AUTO) {
-               ret = get_partition_info(*dev_desc, part, info);
+               ret = part_get_info(*dev_desc, part, info);
                if (ret) {
                        printf("** Invalid partition %d **\n", part);
                        goto cleanup;
@@ -638,7 +588,7 @@ int get_device_and_partition(const char *ifname, const char *dev_part_str,
                 */
                part = 0;
                for (p = 1; p <= MAX_SEARCH_PARTITIONS; p++) {
-                       ret = get_partition_info(*dev_desc, p, info);
+                       ret = part_get_info(*dev_desc, p, info);
                        if (ret)
                                continue;
 
@@ -692,3 +642,134 @@ cleanup:
        free(dup_str);
        return ret;
 }
+
+int part_get_info_by_name_type(struct blk_desc *dev_desc, const char *name,
+                              disk_partition_t *info, int part_type)
+{
+       struct part_driver *part_drv;
+       int ret;
+       int i;
+
+       part_drv = part_driver_lookup_type(dev_desc);
+       if (!part_drv)
+               return -1;
+       for (i = 1; i < part_drv->max_entries; i++) {
+               ret = part_drv->get_info(dev_desc, i, info);
+               if (ret != 0) {
+                       /* no more entries in table */
+                       break;
+               }
+               if (strcmp(name, (const char *)info->name) == 0) {
+                       /* matched */
+                       return i;
+               }
+       }
+
+       return -1;
+}
+
+int part_get_info_by_name(struct blk_desc *dev_desc, const char *name,
+                         disk_partition_t *info)
+{
+       return part_get_info_by_name_type(dev_desc, name, info, PART_TYPE_ALL);
+}
+
+/**
+ * Get partition info from device number and partition name.
+ *
+ * Parse a device number and partition name string in the form of
+ * "device_num#partition_name", for example "0#misc". If the partition
+ * is found, sets dev_desc and part_info accordingly with the information
+ * of the partition with the given partition_name.
+ *
+ * @param[in] dev_iface Device interface
+ * @param[in] dev_part_str Input string argument, like "0#misc"
+ * @param[out] dev_desc Place to store the device description pointer
+ * @param[out] part_info Place to store the partition information
+ * @return 0 on success, or a negative on error
+ */
+static int part_get_info_by_dev_and_name(const char *dev_iface,
+                                        const char *dev_part_str,
+                                        struct blk_desc **dev_desc,
+                                        disk_partition_t *part_info)
+{
+       char *ep;
+       const char *part_str;
+       int dev_num;
+
+       part_str = strchr(dev_part_str, '#');
+       if (!part_str || part_str == dev_part_str)
+               return -EINVAL;
+
+       dev_num = simple_strtoul(dev_part_str, &ep, 16);
+       if (ep != part_str) {
+               /* Not all the first part before the # was parsed. */
+               return -EINVAL;
+       }
+       part_str++;
+
+       *dev_desc = blk_get_dev(dev_iface, dev_num);
+       if (!*dev_desc) {
+               printf("Could not find %s %d\n", dev_iface, dev_num);
+               return -EINVAL;
+       }
+       if (part_get_info_by_name(*dev_desc, part_str, part_info) < 0) {
+               printf("Could not find \"%s\" partition\n", part_str);
+               return -EINVAL;
+       }
+       return 0;
+}
+
+int part_get_info_by_dev_and_name_or_num(const char *dev_iface,
+                                        const char *dev_part_str,
+                                        struct blk_desc **dev_desc,
+                                        disk_partition_t *part_info)
+{
+       /* Split the part_name if passed as "$dev_num#part_name". */
+       if (!part_get_info_by_dev_and_name(dev_iface, dev_part_str,
+                                          dev_desc, part_info))
+               return 0;
+       /*
+        * Couldn't lookup by name, try looking up the partition description
+        * directly.
+        */
+       if (blk_get_device_part_str(dev_iface, dev_part_str,
+                                   dev_desc, part_info, 1) < 0) {
+               printf("Couldn't find partition %s %s\n",
+                      dev_iface, dev_part_str);
+               return -EINVAL;
+       }
+       return 0;
+}
+
+void part_set_generic_name(const struct blk_desc *dev_desc,
+       int part_num, char *name)
+{
+       char *devtype;
+
+       switch (dev_desc->if_type) {
+       case IF_TYPE_IDE:
+       case IF_TYPE_SATA:
+       case IF_TYPE_ATAPI:
+               devtype = "hd";
+               break;
+       case IF_TYPE_SCSI:
+               devtype = "sd";
+               break;
+       case IF_TYPE_USB:
+               devtype = "usbd";
+               break;
+       case IF_TYPE_DOC:
+               devtype = "docd";
+               break;
+       case IF_TYPE_MMC:
+       case IF_TYPE_SD:
+               devtype = "mmcsd";
+               break;
+       default:
+               devtype = "xx";
+               break;
+       }
+
+       sprintf(name, "%s%c%d", devtype, 'a' + dev_desc->devnum, part_num);
+}