spl: fat: Add option to disable DMA alignment

[thirdparty/u-boot.git] / common / spl / spl_fat.c

diff --git a/common/spl/spl_fat.c b/common/spl/spl_fat.c
index db676186d354b7b07c1a96920f5ecd582f3adba3..a52f9e178e664813f0109305ab6e2bfa1ccf7631 100644 (file)
--- a/common/spl/spl_fat.c
+++ b/common/spl/spl_fat.c
@@ -1,25 +1,31 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2014
  * Texas Instruments, <www.ti.com>
  *
  * Dan Murphy <dmurphy@ti.com>
  *
- * SPDX-License-Identifier:    GPL-2.0+
- *
  * FAT Image Functions copied from spl_mmc.c
  */
 
 #include <common.h>
+#include <env.h>
+#include <log.h>
 #include <spl.h>
+#include <spl_load.h>
 #include <asm/u-boot.h>
 #include <fat.h>
 #include <errno.h>
 #include <image.h>
-#include <libfdt.h>
+#include <linux/libfdt.h>
 
 static int fat_registered;
 
-#ifdef CONFIG_SPL_FAT_SUPPORT
+void spl_fat_force_reregister(void)
+{
+       fat_registered = 0;
+}
+
 static int spl_register_fat_device(struct blk_desc *block_dev, int partition)
 {
        int err = 0;
@@ -45,7 +51,7 @@ static ulong spl_fit_read(struct spl_load_info *load, ulong file_offset,
 {
        loff_t actread;
        int ret;
-       char *filename = (char *)load->filename;
+       char *filename = load->priv;
 
        ret = fat_read_file(filename, buf, file_offset, size, &actread);
        if (ret)
@@ -54,55 +60,53 @@ static ulong spl_fit_read(struct spl_load_info *load, ulong file_offset,
        return actread;
 }
 
-int spl_load_image_fat(struct blk_desc *block_dev,
-                                               int partition,
-                                               const char *filename)
+int spl_load_image_fat(struct spl_image_info *spl_image,
+                      struct spl_boot_device *bootdev,
+                      struct blk_desc *block_dev, int partition,
+                      const char *filename)
 {
        int err;
-       struct image_header *header;
+       loff_t size;
+       struct spl_load_info load;
 
        err = spl_register_fat_device(block_dev, partition);
        if (err)
                goto end;
 
-       header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -
-                                               sizeof(struct image_header));
-
-       err = file_fat_read(filename, header, sizeof(struct image_header));
-       if (err <= 0)
-               goto end;
-
-       if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
-           image_get_magic(header) == FDT_MAGIC) {
-               struct spl_load_info load;
-
-               debug("Found FIT\n");
-               load.read = spl_fit_read;
-               load.bl_len = 1;
-               load.filename = (void *)filename;
-               load.priv = NULL;
-
-               return spl_load_simple_fit(&load, 0, header);
-       } else {
-               err = spl_parse_image_header(header);
+       /*
+        * Avoid pulling in this function for other image types since we are
+        * very short on space on some boards.
+        */
+       if (IS_ENABLED(CONFIG_SPL_LOAD_FIT_FULL)) {
+               err = fat_size(filename, &size);
                if (err)
                        goto end;
-
-               err = file_fat_read(filename, (u8 *)spl_image.load_addr, 0);
+       } else {
+               size = 0;
        }
 
+       load.read = spl_fit_read;
+       if (IS_ENABLED(CONFIG_SPL_FS_FAT_DMA_ALIGN))
+               spl_set_bl_len(&load, ARCH_DMA_MINALIGN);
+       else
+               spl_set_bl_len(&load, 1);
+       load.priv = (void *)filename;
+       err = spl_load(spl_image, bootdev, &load, size, 0);
+
 end:
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
-       if (err <= 0)
+       if (err < 0)
                printf("%s: error reading image %s, err - %d\n",
                       __func__, filename, err);
 #endif
 
-       return (err <= 0);
+       return err;
 }
 
-#ifdef CONFIG_SPL_OS_BOOT
-int spl_load_image_fat_os(struct blk_desc *block_dev, int partition)
+#if CONFIG_IS_ENABLED(OS_BOOT)
+int spl_load_image_fat_os(struct spl_image_info *spl_image,
+                         struct spl_boot_device *bootdev,
+                         struct blk_desc *block_dev, int partition)
 {
        int err;
        __maybe_unused char *file;
@@ -112,17 +116,18 @@ int spl_load_image_fat_os(struct blk_desc *block_dev, int partition)
                return err;
 
 #if defined(CONFIG_SPL_ENV_SUPPORT) && defined(CONFIG_SPL_OS_BOOT)
-       file = getenv("falcon_args_file");
+       file = env_get("falcon_args_file");
        if (file) {
-               err = file_fat_read(file, (void *)CONFIG_SYS_SPL_ARGS_ADDR, 0);
+               err = file_fat_read(file, (void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR, 0);
                if (err <= 0) {
                        printf("spl: error reading image %s, err - %d, falling back to default\n",
                               file, err);
                        goto defaults;
                }
-               file = getenv("falcon_image_file");
+               file = env_get("falcon_image_file");
                if (file) {
-                       err = spl_load_image_fat(block_dev, partition, file);
+                       err = spl_load_image_fat(spl_image, bootdev, block_dev,
+                                                partition, file);
                        if (err != 0) {
                                puts("spl: falling back to default\n");
                                goto defaults;
@@ -138,7 +143,7 @@ defaults:
 #endif
 
        err = file_fat_read(CONFIG_SPL_FS_LOAD_ARGS_NAME,
-                           (void *)CONFIG_SYS_SPL_ARGS_ADDR, 0);
+                           (void *)CONFIG_SPL_PAYLOAD_ARGS_ADDR, 0);
        if (err <= 0) {
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
                printf("%s: error reading image %s, err - %d\n",
@@ -147,13 +152,14 @@ defaults:
                return -1;
        }
 
-       return spl_load_image_fat(block_dev, partition,
+       return spl_load_image_fat(spl_image, bootdev, block_dev, partition,
                        CONFIG_SPL_FS_LOAD_KERNEL_NAME);
 }
 #else
-int spl_load_image_fat_os(struct blk_desc *block_dev, int partition)
+int spl_load_image_fat_os(struct spl_image_info *spl_image,
+                         struct spl_boot_device *bootdev,
+                         struct blk_desc *block_dev, int partition)
 {
        return -ENOSYS;
 }
 #endif
-#endif