In efi world, there is no obvious "mkdir" interface, instead, Open()
with EFI_FILE_MODE_CREATE in mode parameter and EFI_FILE_DIRECTORY
in attributes parameter creates a directory.

In this patch, efi_file_open() is extended so as to accept such
a combination of parameters and call u-boot's mkdir interface for
expected action.

Signed-off-by: AKASHI Takahiro <takahiro.aka...@linaro.org>
---
 lib/efi_loader/efi_file.c | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/efi_loader/efi_file.c b/lib/efi_loader/efi_file.c
index e6a15bcb52..6ec98c8022 100644
--- a/lib/efi_loader/efi_file.c
+++ b/lib/efi_loader/efi_file.c
@@ -130,7 +130,8 @@ static int sanitize_path(char *path)
  * With windoze style backlashes, ofc.
  */
 static struct efi_file_handle *file_open(struct file_system *fs,
-               struct file_handle *parent, s16 *file_name, u64 mode)
+               struct file_handle *parent, s16 *file_name, u64 mode,
+               u64 attributes)
 {
        struct file_handle *fh;
        char f0[MAX_UTF8_PER_UTF16] = {0};
@@ -173,7 +174,12 @@ static struct efi_file_handle *file_open(struct 
file_system *fs,
                if (set_blk_dev(fh))
                        goto error;
 
-               if (!((mode & EFI_FILE_MODE_CREATE) || fs_exists(fh->path)))
+               if ((mode & EFI_FILE_MODE_CREATE) &&
+                   (attributes & EFI_FILE_DIRECTORY)) {
+                       if (fs_mkdir(fh->path))
+                               goto error;
+               } else if (!((mode & EFI_FILE_MODE_CREATE) ||
+                            fs_exists(fh->path)))
                        goto error;
 
                /* figure out if file is a directory: */
@@ -199,7 +205,7 @@ static efi_status_t EFIAPI efi_file_open(struct 
efi_file_handle *file,
        EFI_ENTRY("%p, %p, \"%ls\", %llx, %llu", file, new_handle, file_name,
                  open_mode, attributes);
 
-       *new_handle = file_open(fh->fs, fh, file_name, open_mode);
+       *new_handle = file_open(fh->fs, fh, file_name, open_mode, attributes);
        if (!*new_handle)
                return EFI_EXIT(EFI_NOT_FOUND);
 
@@ -598,7 +604,7 @@ efi_open_volume(struct efi_simple_file_system_protocol 
*this,
 
        EFI_ENTRY("%p, %p", this, root);
 
-       *root = file_open(fs, NULL, NULL, 0);
+       *root = file_open(fs, NULL, NULL, 0, 0);
 
        return EFI_EXIT(EFI_SUCCESS);
 }
-- 
2.17.0

_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot

Reply via email to