Merge branch 'master' of git://git.denx.de/u-boot-spi

[platform/kernel/u-boot.git] / lib / efi_loader / efi_file.c

diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c
index 92ca444..128cb0a 100644 (file)
--- a/lib/efi_loader/efi_file.c
+++ b/lib/efi_loader/efi_file.c
@@ -52,11 +52,18 @@ static int set_blk_dev(struct file_handle *fh)
        return fs_set_blk_dev_with_part(fh->fs->desc, fh->fs->part);
 }
 
+/**
+ * is_dir() - check if file handle points to directory
+ *
+ * We assume that set_blk_dev(fh) has been called already.
+ *
+ * @fh:                file handle
+ * Return:     true if file handle points to a directory
+ */
 static int is_dir(struct file_handle *fh)
 {
        struct fs_dir_stream *dirs;
 
-       set_blk_dev(fh);
        dirs = fs_opendir(fh->path);
        if (!dirs)
                return 0;
@@ -127,8 +134,18 @@ static int sanitize_path(char *path)
        return 0;
 }
 
-/* NOTE: despite what you would expect, 'file_name' is actually a path.
- * With windoze style backlashes, ofc.
+/**
+ * file_open() - open a file handle
+ *
+ * @fs:                        file system
+ * @parent:            directory relative to which the file is to be opened
+ * @file_name:         path of the file to be opened. '\', '.', or '..' may
+ *                     be used as modifiers. A leading backslash indicates an
+ *                     absolute path.
+ * @mode:              bit mask indicating the access mode (read, write,
+ *                     create)
+ * @attributes:                attributes for newly created file
+ * Returns:            handle to the opened file or NULL
  */
 static struct efi_file_handle *file_open(struct file_system *fs,
                struct file_handle *parent, s16 *file_name, u64 mode,
@@ -208,7 +225,7 @@ static efi_status_t EFIAPI efi_file_open(struct efi_file_handle *file,
                  open_mode, attributes);
 
        /* Check parameters */
-       if (!file || !file || !file_name) {
+       if (!file || !new_handle || !file_name) {
                ret = EFI_INVALID_PARAMETER;
                goto out;
        }
@@ -219,7 +236,16 @@ static efi_status_t EFIAPI efi_file_open(struct efi_file_handle *file,
                ret = EFI_INVALID_PARAMETER;
                goto out;
        }
-       if ((!(open_mode & EFI_FILE_MODE_CREATE) && attributes) ||
+       /*
+        * The UEFI spec requires that attributes are only set in create mode.
+        * The SCT does not care about this and sets EFI_FILE_DIRECTORY in
+        * read mode. EDK2 does not check that attributes are zero if not in
+        * create mode.
+        *
+        * So here we only check attributes in create mode and do not check
+        * that they are zero otherwise.
+        */
+       if ((open_mode & EFI_FILE_MODE_CREATE) &&
            (attributes & (EFI_FILE_READ_ONLY | ~EFI_FILE_VALID_ATTR))) {
                ret = EFI_INVALID_PARAMETER;
                goto out;
@@ -273,10 +299,8 @@ static efi_status_t file_read(struct file_handle *fh, u64 *buffer_size,
                void *buffer)
 {
        loff_t actread;
-       /* fs_read expects buffer address, not pointer */
-       uintptr_t buffer_addr = (uintptr_t)map_to_sysmem(buffer);
 
-       if (fs_read(fh->path, buffer_addr, fh->offset,
+       if (fs_read(fh->path, map_to_sysmem(buffer), fh->offset,
                    *buffer_size, &actread))
                return EFI_DEVICE_ERROR;
 
@@ -406,7 +430,7 @@ static efi_status_t EFIAPI efi_file_write(struct efi_file_handle *file,
                goto error;
        }
 
-       if (fs_write(fh->path, (ulong)buffer, fh->offset, *buffer_size,
+       if (fs_write(fh->path, map_to_sysmem(buffer), fh->offset, *buffer_size,
                     &actwrite)) {
                ret = EFI_DEVICE_ERROR;
                goto error;
@@ -419,28 +443,51 @@ error:
        return EFI_EXIT(ret);
 }
 
+/**
+ * efi_file_getpos() - get current position in file
+ *
+ * This function implements the GetPosition service of the EFI file protocol.
+ * See the UEFI spec for details.
+ *
+ * @file:      file handle
+ * @pos:       pointer to file position
+ * Return:     status code
+ */
 static efi_status_t EFIAPI efi_file_getpos(struct efi_file_handle *file,
-                                          efi_uintn_t *pos)
+                                          u64 *pos)
 {
+       efi_status_t ret = EFI_SUCCESS;
        struct file_handle *fh = to_fh(file);
 
        EFI_ENTRY("%p, %p", file, pos);
 
-       if (fh->offset <= SIZE_MAX) {
-               *pos = fh->offset;
-               return EFI_EXIT(EFI_SUCCESS);
-       } else {
-               return EFI_EXIT(EFI_DEVICE_ERROR);
+       if (fh->isdir) {
+               ret = EFI_UNSUPPORTED;
+               goto out;
        }
+
+       *pos = fh->offset;
+out:
+       return EFI_EXIT(ret);
 }
 
+/**
+ * efi_file_setpos() - set current position in file
+ *
+ * This function implements the SetPosition service of the EFI file protocol.
+ * See the UEFI spec for details.
+ *
+ * @file:      file handle
+ * @pos:       new file position
+ * Return:     status code
+ */
 static efi_status_t EFIAPI efi_file_setpos(struct efi_file_handle *file,
-               efi_uintn_t pos)
+                                          u64 pos)
 {
        struct file_handle *fh = to_fh(file);
        efi_status_t ret = EFI_SUCCESS;
 
-       EFI_ENTRY("%p, %zu", file, pos);
+       EFI_ENTRY("%p, %llu", file, pos);
 
        if (fh->isdir) {
                if (pos != 0) {
@@ -481,7 +528,7 @@ static efi_status_t EFIAPI efi_file_getinfo(struct efi_file_handle *file,
        struct file_handle *fh = to_fh(file);
        efi_status_t ret = EFI_SUCCESS;
 
-       EFI_ENTRY("%p, %p, %p, %p", file, info_type, buffer_size, buffer);
+       EFI_ENTRY("%p, %pUl, %p, %p", file, info_type, buffer_size, buffer);
 
        if (!guidcmp(info_type, &efi_file_info_guid)) {
                struct efi_file_info *info = buffer;
@@ -516,7 +563,7 @@ static efi_status_t EFIAPI efi_file_getinfo(struct efi_file_handle *file,
                if (fh->isdir)
                        info->attribute |= EFI_FILE_DIRECTORY;
 
-               ascii2unicode((u16 *)info->file_name, filename);
+               ascii2unicode(info->file_name, filename);
        } else if (!guidcmp(info_type, &efi_file_system_info_guid)) {
                struct efi_file_system_info *info = buffer;
                disk_partition_t part;