efi_loader: parameter checks SetVariable()

[platform/kernel/u-boot.git] / disk / part.c

diff --git a/disk/part.c b/disk/part.c
index e9e18a0..862078f 100644 (file)
--- a/disk/part.c
+++ b/disk/part.c
@@ -1,8 +1,7 @@
+// 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>
@@ -24,25 +23,35 @@
 /* Check all partition types */
 #define PART_TYPE_ALL          -1
 
-DECLARE_GLOBAL_DATA_PTR;
-
-#ifdef CONFIG_HAVE_BLOCK_DEVICE
-static struct part_driver *part_driver_lookup_type(int part_type)
+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;
 
-       for (entry = drv; entry != drv + n_ents; entry++) {
-               if (part_type == entry->part_type)
-                       return 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;
+               }
        }
 
        /* Not found */
        return NULL;
 }
 
+#ifdef CONFIG_HAVE_BLOCK_DEVICE
 static struct blk_desc *get_dev_hwpart(const char *ifname, int dev, int hwpart)
 {
        struct blk_desc *dev_desc;
@@ -94,17 +103,17 @@ 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 (struct blk_desc *dev_desc)
@@ -141,6 +150,9 @@ void dev_print (struct blk_desc *dev_desc)
                        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;
@@ -181,7 +193,7 @@ void dev_print (struct blk_desc *dev_desc)
                lba512 = (lba * (dev_desc->blksz/512));
                /* round to 1 digit */
                /* 2048 = (1024 * 1024) / 512 MB */
-               mb = lba512_muldiv(lba512, 10, 2048);
+               mb = lba512_muldiv(lba512, 10, 11);
 
                mb_quot = mb / 10;
                mb_rem  = mb - (10 * mb_quot);
@@ -272,6 +284,9 @@ static void print_part_header(const char *type, struct blk_desc *dev_desc)
        case IF_TYPE_NVME:
                puts ("NVMe");
                break;
+       case IF_TYPE_VIRTIO:
+               puts("VirtIO");
+               break;
        default:
                puts ("UNKNOWN");
                break;
@@ -285,7 +300,7 @@ void part_print(struct blk_desc *dev_desc)
 {
        struct part_driver *drv;
 
-       drv = part_driver_lookup_type(dev_desc->part_type);
+       drv = part_driver_lookup_type(dev_desc);
        if (!drv) {
                printf("## Unknown partition table type %x\n",
                       dev_desc->part_type);
@@ -314,7 +329,7 @@ int part_get_info(struct blk_desc *dev_desc, int part,
        info->type_guid[0] = 0;
 #endif
 
-       drv = part_driver_lookup_type(dev_desc->part_type);
+       drv = part_driver_lookup_type(dev_desc);
        if (!drv) {
                debug("## Unknown partition table type %x\n",
                      dev_desc->part_type);
@@ -391,7 +406,7 @@ int blk_get_device_by_str(const char *ifname, const char *dev_hwpart_str,
 
        *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);
+               debug("** Bad device %s %s **\n", ifname, dev_hwpart_str);
                dev = -ENOENT;
                goto cleanup;
        }
@@ -453,7 +468,7 @@ int blk_get_device_part_str(const char *ifname, const char *dev_part_str,
 
 #ifdef CONFIG_CMD_UBIFS
        /*
-        * Special-case ubi, ubi goes through a mtd, rathen then through
+        * Special-case ubi, ubi goes through a mtd, rather than through
         * a regular block device.
         */
        if (0 == strcmp(ifname, "ubi")) {
@@ -632,28 +647,25 @@ cleanup:
 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 *first_drv =
-               ll_entry_start(struct part_driver, part_driver);
-       const int n_drvs = ll_entry_count(struct part_driver, part_driver);
        struct part_driver *part_drv;
-
-       for (part_drv = first_drv; part_drv != first_drv + n_drvs; part_drv++) {
-               int ret;
-               int i;
-               for (i = 1; i < part_drv->max_entries; i++) {
-                       if (part_type >= 0 && part_type != part_drv->part_type)
-                               break;
-                       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;
-                       }
+       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;
 }