part: Drop disk_partition_t typedef

[pandora-u-boot.git] / lib / efi_loader / efi_device_path.c

diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c
index 897fc1b..76ab2d8 100644 (file)
--- a/lib/efi_loader/efi_device_path.c
+++ b/lib/efi_loader/efi_device_path.c
@@ -8,6 +8,7 @@
 #include <common.h>
 #include <blk.h>
 #include <dm.h>
+#include <net.h>
 #include <usb.h>
 #include <mmc.h>
 #include <nvme.h>
@@ -15,6 +16,7 @@
 #include <part.h>
 #include <sandboxblockdev.h>
 #include <asm-generic/unaligned.h>
+#include <linux/compat.h> /* U16_MAX */
 
 #ifdef CONFIG_SANDBOX
 const efi_guid_t efi_guid_host_dev = U_BOOT_HOST_DEV_GUID;
@@ -421,7 +423,7 @@ bool efi_dp_is_multi_instance(const struct efi_device_path *dp)
 /* size of device-path not including END node for device and all parents
  * up to the root device.
  */
-static unsigned dp_size(struct udevice *dev)
+__maybe_unused static unsigned int dp_size(struct udevice *dev)
 {
        if (!dev || !dev->driver)
                return sizeof(ROOT);
@@ -493,7 +495,7 @@ static unsigned dp_size(struct udevice *dev)
  * @dev                device
  * @return     pointer to the end of the device path
  */
-static void *dp_fill(void *buf, struct udevice *dev)
+__maybe_unused static void *dp_fill(void *buf, struct udevice *dev)
 {
        if (!dev || !dev->driver)
                return buf;
@@ -529,7 +531,7 @@ static void *dp_fill(void *buf, struct udevice *dev)
 #ifdef CONFIG_SANDBOX
                case UCLASS_ROOT: {
                        /* stop traversing parents at this point: */
-                       struct efi_device_path_vendor *dp = buf;
+                       struct efi_device_path_vendor *dp;
                        struct blk_desc *desc = dev_get_uclass_platdata(dev);
 
                        dp_fill(buf, dev->parent);
@@ -653,20 +655,6 @@ static void *dp_fill(void *buf, struct udevice *dev)
                return dp_fill(buf, dev->parent);
        }
 }
-
-/* Construct a device-path from a device: */
-struct efi_device_path *efi_dp_from_dev(struct udevice *dev)
-{
-       void *buf, *start;
-
-       start = buf = dp_alloc(dp_size(dev) + sizeof(END));
-       if (!buf)
-               return NULL;
-       buf = dp_fill(buf, dev);
-       *((struct efi_device_path *)buf) = END;
-
-       return start;
-}
 #endif
 
 static unsigned dp_part_size(struct blk_desc *desc, int part)
@@ -706,7 +694,7 @@ static unsigned dp_part_size(struct blk_desc *desc, int part)
  */
 static void *dp_part_node(void *buf, struct blk_desc *desc, int part)
 {
-       disk_partition_t info;
+       struct disk_partition info;
 
        part_get_info(desc, part, &info);
 
@@ -888,13 +876,16 @@ struct efi_device_path *efi_dp_from_file(struct blk_desc *desc, int part,
 {
        struct efi_device_path_file_path *fp;
        void *buf, *start;
-       unsigned dpsize = 0, fpsize;
+       size_t dpsize = 0, fpsize;
 
        if (desc)
                dpsize = dp_part_size(desc, part);
 
        fpsize = sizeof(struct efi_device_path) +
                 2 * (utf8_utf16_strlen(path) + 1);
+       if (fpsize > U16_MAX)
+               return NULL;
+
        dpsize += fpsize;
 
        start = buf = dp_alloc(dpsize + sizeof(END));
@@ -908,7 +899,7 @@ struct efi_device_path *efi_dp_from_file(struct blk_desc *desc, int part,
        fp = buf;
        fp->dp.type = DEVICE_PATH_TYPE_MEDIA_DEVICE;
        fp->dp.sub_type = DEVICE_PATH_SUB_TYPE_FILE_PATH;
-       fp->dp.length = fpsize;
+       fp->dp.length = (u16)fpsize;
        path_to_uefi(fp->str, path);
        buf += fpsize;
 
@@ -1028,6 +1019,16 @@ out:
        return EFI_SUCCESS;
 }
 
+/**
+ * efi_dp_from_name() - convert U-Boot device and file path to device path
+ *
+ * @dev:       U-Boot device, e.g. 'mmc'
+ * @devnr:     U-Boot device number, e.g. 1 for 'mmc:1'
+ * @path:      file path relative to U-Boot device, may be NULL
+ * @device:    pointer to receive device path of the device
+ * @file:      pointer to receive device path for the file
+ * Return:     status code
+ */
 efi_status_t efi_dp_from_name(const char *dev, const char *devnr,
                              const char *path,
                              struct efi_device_path **device,
@@ -1035,7 +1036,7 @@ efi_status_t efi_dp_from_name(const char *dev, const char *devnr,
 {
        int is_net;
        struct blk_desc *desc = NULL;
-       disk_partition_t fs_partition;
+       struct disk_partition fs_partition;
        int part = 0;
        char filename[32] = { 0 }; /* dp->str is u16[32] long */
        char *s;
@@ -1067,8 +1068,10 @@ efi_status_t efi_dp_from_name(const char *dev, const char *devnr,
        s = filename;
        while ((s = strchr(s, '/')))
                *s++ = '\\';
-       *file = efi_dp_from_file(((!is_net && device) ? desc : NULL),
-                                part, filename);
+       *file = efi_dp_from_file(is_net ? NULL : desc, part, filename);
+
+       if (!*file)
+               return EFI_INVALID_PARAMETER;
 
        return EFI_SUCCESS;
 }