Merge tag 'u-boot-amlogic-20200618' of https://gitlab.denx.de/u-boot/custodians/u...

[oweals/u-boot.git] / common / spl / spl_sata.c

diff --git a/common/spl/spl_sata.c b/common/spl/spl_sata.c
index 2e7adca0ca6d903da35f5966b2a0a6afc755954a..e108af0576aa971a1714a9170cc63173ae3d0bdf 100644 (file)
--- a/common/spl/spl_sata.c
+++ b/common/spl/spl_sata.c
@@ -1,11 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * (C) Copyright 2013
  * Texas Instruments, <www.ti.com>
  *
  * Dan Murphy <dmurphy@ti.com>
  *
- * SPDX-License-Identifier:    GPL-2.0+
- *
  * Derived work from spl_usb.c
  */
 
@@ -13,37 +12,94 @@
 #include <spl.h>
 #include <asm/u-boot.h>
 #include <sata.h>
+#include <scsi.h>
+#include <errno.h>
 #include <fat.h>
-#include <version.h>
 #include <image.h>
 
-DECLARE_GLOBAL_DATA_PTR;
+#ifndef CONFIG_SYS_SATA_FAT_BOOT_PARTITION
+#define CONFIG_SYS_SATA_FAT_BOOT_PARTITION     1
+#endif
 
-void spl_sata_load_image(void)
+#ifndef CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
+#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME        "u-boot.img"
+#endif
+
+#ifndef CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR
+/* Dummy value to make the compiler happy */
+#define CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR 0x100
+#endif
+
+static int spl_sata_load_image_raw(struct spl_image_info *spl_image,
+               struct blk_desc *stor_dev, unsigned long sector)
 {
-       int err;
-       block_dev_desc_t *stor_dev;
+       struct image_header *header;
+       unsigned long count;
+       u32 image_size_sectors;
+       int ret;
+
+       header = spl_get_load_buffer(-sizeof(*header), stor_dev->blksz);
+       count = blk_dread(stor_dev, sector, 1, header);
+       if (count == 0)
+               return -EIO;
+
+       ret = spl_parse_image_header(spl_image, header);
+       if (ret)
+               return ret;
+
+       image_size_sectors = DIV_ROUND_UP(spl_image->size, stor_dev->blksz);
+       count = blk_dread(stor_dev, sector, image_size_sectors,
+                       (void *)spl_image->load_addr);
+       if (count != image_size_sectors)
+               return -EIO;
 
+       return 0;
+}
+
+static int spl_sata_load_image(struct spl_image_info *spl_image,
+                              struct spl_boot_device *bootdev)
+{
+       int err = 0;
+       struct blk_desc *stor_dev;
+
+#if !defined(CONFIG_DM_SCSI) && !defined(CONFIG_AHCI)
        err = init_sata(CONFIG_SPL_SATA_BOOT_DEVICE);
+#endif
        if (err) {
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
                printf("spl: sata init failed: err - %d\n", err);
 #endif
-               hang();
+               return err;
        } else {
                /* try to recognize storage devices immediately */
-               stor_dev = scsi_get_dev(0);
+               scsi_scan(false);
+               stor_dev = blk_get_devnum_by_type(IF_TYPE_SCSI, 0);
+               if (!stor_dev)
+                       return -ENODEV;
        }
 
 #ifdef CONFIG_SPL_OS_BOOT
-       if (spl_start_uboot() || spl_load_image_fat_os(stor_dev,
-                                                                       CONFIG_SYS_SATA_FAT_BOOT_PARTITION))
+       if (spl_start_uboot() ||
+           spl_load_image_fat_os(spl_image, stor_dev,
+                                 CONFIG_SYS_SATA_FAT_BOOT_PARTITION))
 #endif
-       err = spl_load_image_fat(stor_dev,
-                               CONFIG_SYS_SATA_FAT_BOOT_PARTITION,
-                               CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME);
+       {
+               err = -ENOSYS;
+
+               if (IS_ENABLED(CONFIG_SPL_FS_FAT)) {
+                       err = spl_load_image_fat(spl_image, stor_dev,
+                                       CONFIG_SYS_SATA_FAT_BOOT_PARTITION,
+                                       CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
+               } else if (IS_ENABLED(CONFIG_SPL_SATA_RAW_U_BOOT_USE_SECTOR)) {
+                       err = spl_sata_load_image_raw(spl_image, stor_dev,
+                               CONFIG_SPL_SATA_RAW_U_BOOT_SECTOR);
+               }
+       }
        if (err) {
                puts("Error loading sata device\n");
-               hang();
+               return err;
        }
+
+       return 0;
 }
+SPL_LOAD_IMAGE_METHOD("SATA", 0, BOOT_DEVICE_SATA, spl_sata_load_image);