Merge git://git.denx.de/u-boot-dm
[platform/kernel/u-boot.git] / common / spl / spl_mmc.c
index fc2f226..c0e76be 100644 (file)
  * SPDX-License-Identifier:    GPL-2.0+
  */
 #include <common.h>
+#include <dm.h>
 #include <spl.h>
+#include <linux/compiler.h>
+#include <errno.h>
 #include <asm/u-boot.h>
+#include <errno.h>
 #include <mmc.h>
-#include <fat.h>
-#include <version.h>
 #include <image.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-static int mmc_load_image_raw(struct mmc *mmc, unsigned long sector)
+static int mmc_load_legacy(struct mmc *mmc, ulong sector,
+                          struct image_header *header)
 {
-       unsigned long err;
        u32 image_size_sectors;
+       unsigned long count;
+
+       spl_parse_image_header(header);
+       /* convert size to sectors - round up */
+       image_size_sectors = (spl_image.size + mmc->read_bl_len - 1) /
+                            mmc->read_bl_len;
+
+       /* Read the header too to avoid extra memcpy */
+       count = mmc->block_dev.block_read(&mmc->block_dev, sector,
+                                         image_size_sectors,
+                                         (void *)(ulong)spl_image.load_addr);
+       debug("read %x sectors to %x\n", image_size_sectors,
+             spl_image.load_addr);
+       if (count != image_size_sectors)
+               return -EIO;
+
+       return 0;
+}
+
+#ifdef CONFIG_SPL_LOAD_FIT
+static ulong h_spl_load_read(struct spl_load_info *load, ulong sector,
+                            ulong count, void *buf)
+{
+       struct mmc *mmc = load->dev;
+
+       return mmc->block_dev.block_read(&mmc->block_dev, sector, count, buf);
+}
+#endif
+
+static int mmc_load_image_raw_sector(struct mmc *mmc, unsigned long sector)
+{
+       unsigned long count;
        struct image_header *header;
+       int ret = 0;
 
        header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -
-                                               sizeof(struct image_header));
+                                        sizeof(struct image_header));
 
        /* read image header to find the image size & load address */
-       err = mmc->block_dev.block_read(0, sector, 1, header);
-       if (err == 0)
+       count = mmc->block_dev.block_read(&mmc->block_dev, sector, 1, header);
+       debug("hdr read sector %lx, count=%lu\n", sector, count);
+       if (count == 0) {
+               ret = -EIO;
                goto end;
+       }
 
-       if (image_get_magic(header) != IH_MAGIC)
-               return -1;
-
-       spl_parse_image_header(header);
+       switch (image_get_magic(header)) {
+       case IH_MAGIC:
+               ret = mmc_load_legacy(mmc, sector, header);
+               break;
+#ifdef CONFIG_SPL_LOAD_FIT
+       case FDT_MAGIC: {
+               struct spl_load_info load;
 
-       /* convert size to sectors - round up */
-       image_size_sectors = (spl_image.size + mmc->read_bl_len - 1) /
-                               mmc->read_bl_len;
-
-       /* Read the header too to avoid extra memcpy */
-       err = mmc->block_dev.block_read(0, sector, image_size_sectors,
-                                       (void *)spl_image.load_addr);
+               debug("Found FIT\n");
+               load.dev = mmc;
+               load.priv = NULL;
+               load.bl_len = mmc->read_bl_len;
+               load.read = h_spl_load_read;
+               ret = spl_load_simple_fit(&load, sector, header);
+               break;
+       }
+#endif
+       default:
+               puts("bad magic\n");
+               return -1;
+       }
 
 end:
+       if (ret) {
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
-       if (err == 0)
-               printf("spl: mmc blk read err - %lu\n", err);
+               puts("spl: mmc block read error\n");
 #endif
+               return -1;
+       }
 
-       return (err == 0);
+       return 0;
 }
 
-#ifdef CONFIG_SPL_OS_BOOT
-static int mmc_load_image_raw_os(struct mmc *mmc)
+int spl_mmc_get_device_index(u32 boot_device)
 {
-       if (!mmc->block_dev.block_read(0,
-                                      CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR,
-                                      CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS,
-                                      (void *)CONFIG_SYS_SPL_ARGS_ADDR)) {
+       switch (boot_device) {
+       case BOOT_DEVICE_MMC1:
+               return 0;
+       case BOOT_DEVICE_MMC2:
+       case BOOT_DEVICE_MMC2_2:
+               return 1;
+       }
+
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
-               printf("mmc args blk read error\n");
+       printf("spl: unsupported mmc boot device.\n");
 #endif
-               return -1;
-       }
 
-       return mmc_load_image_raw(mmc, CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR);
+       return -ENODEV;
 }
-#endif
 
-#ifdef CONFIG_SPL_FAT_SUPPORT
-static int mmc_load_image_fat(struct mmc *mmc, const char *filename)
+static int spl_mmc_find_device(struct mmc **mmcp, u32 boot_device)
 {
-       int err;
-       struct image_header *header;
+#ifdef CONFIG_DM_MMC
+       struct udevice *dev;
+#endif
+       int err, mmc_dev;
 
-       header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -
-                                               sizeof(struct image_header));
+       mmc_dev = spl_mmc_get_device_index(boot_device);
+       if (mmc_dev < 0)
+               return mmc_dev;
 
-       err = file_fat_read(filename, header, sizeof(struct image_header));
-       if (err <= 0)
-               goto end;
+       err = mmc_initialize(NULL);
+       if (err) {
+#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
+               printf("spl: could not initialize mmc. error: %d\n", err);
+#endif
+               return err;
+       }
 
-       spl_parse_image_header(header);
+#ifdef CONFIG_DM_MMC
+       err = uclass_get_device(UCLASS_MMC, mmc_dev, &dev);
+       if (!err)
+               *mmcp = mmc_get_mmc_dev(dev);
+#else
+       *mmcp = find_mmc_device(mmc_dev);
+       err = *mmcp ? 0 : -ENODEV;
+#endif
+       if (err) {
+#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
+               printf("spl: could not find mmc device. error: %d\n", err);
+#endif
+               return err;
+       }
 
-       err = file_fat_read(filename, (u8 *)spl_image.load_addr, 0);
+       return 0;
+}
 
-end:
+#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION
+static int mmc_load_image_raw_partition(struct mmc *mmc, int partition)
+{
+       disk_partition_t info;
+       int err;
+
+       err = part_get_info(&mmc->block_dev, partition, &info);
+       if (err) {
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
-       if (err <= 0)
-               printf("spl: error reading image %s, err - %d\n",
-                      filename, err);
+               puts("spl: partition error\n");
 #endif
+               return -1;
+       }
 
-       return (err <= 0);
+#ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR
+       return mmc_load_image_raw_sector(mmc, info.start +
+                                        CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR);
+#else
+       return mmc_load_image_raw_sector(mmc, info.start);
+#endif
 }
+#else
+#define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION -1
+static int mmc_load_image_raw_partition(struct mmc *mmc, int partition)
+{
+       return -ENOSYS;
+}
+#endif
 
 #ifdef CONFIG_SPL_OS_BOOT
-static int mmc_load_image_fat_os(struct mmc *mmc)
+static int mmc_load_image_raw_os(struct mmc *mmc)
 {
-       int err;
+       unsigned long count;
 
-       err = file_fat_read(CONFIG_SPL_FAT_LOAD_ARGS_NAME,
-                           (void *)CONFIG_SYS_SPL_ARGS_ADDR, 0);
-       if (err <= 0) {
+       count = mmc->block_dev.block_read(&mmc->block_dev,
+               CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR,
+               CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS,
+               (void *) CONFIG_SYS_SPL_ARGS_ADDR);
+       if (count == 0) {
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
-               printf("spl: error reading image %s, err - %d\n",
-                      CONFIG_SPL_FAT_LOAD_ARGS_NAME, err);
+               puts("spl: mmc block read error\n");
 #endif
                return -1;
        }
 
-       return mmc_load_image_fat(mmc, CONFIG_SPL_FAT_LOAD_KERNEL_NAME);
+       return mmc_load_image_raw_sector(mmc,
+               CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR);
+}
+#else
+int spl_start_uboot(void)
+{
+       return 1;
+}
+static int mmc_load_image_raw_os(struct mmc *mmc)
+{
+       return -ENOSYS;
 }
 #endif
 
+#ifdef CONFIG_SYS_MMCSD_FS_BOOT_PARTITION
+int spl_mmc_do_fs_boot(struct mmc *mmc)
+{
+       int err = -ENOSYS;
+
+#ifdef CONFIG_SPL_FAT_SUPPORT
+       if (!spl_start_uboot()) {
+               err = spl_load_image_fat_os(&mmc->block_dev,
+                       CONFIG_SYS_MMCSD_FS_BOOT_PARTITION);
+               if (!err)
+                       return err;
+       }
+#ifdef CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
+       err = spl_load_image_fat(&mmc->block_dev,
+                                CONFIG_SYS_MMCSD_FS_BOOT_PARTITION,
+                                CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
+       if (!err)
+               return err;
+#endif
+#endif
+#ifdef CONFIG_SPL_EXT_SUPPORT
+       if (!spl_start_uboot()) {
+               err = spl_load_image_ext_os(&mmc->block_dev,
+                       CONFIG_SYS_MMCSD_FS_BOOT_PARTITION);
+               if (!err)
+                       return err;
+       }
+#ifdef CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
+       err = spl_load_image_ext(&mmc->block_dev,
+                                CONFIG_SYS_MMCSD_FS_BOOT_PARTITION,
+                                CONFIG_SPL_FS_LOAD_PAYLOAD_NAME);
+       if (!err)
+               return err;
+#endif
+#endif
+
+#if defined(CONFIG_SPL_FAT_SUPPORT) || defined(CONFIG_SPL_EXT_SUPPORT)
+       err = -ENOENT;
 #endif
 
-void spl_mmc_load_image(void)
+       return err;
+}
+#else
+int spl_mmc_do_fs_boot(struct mmc *mmc)
 {
-       struct mmc *mmc;
-       int err;
+       return -ENOSYS;
+}
+#endif
+
+int spl_mmc_load_image(u32 boot_device)
+{
+       struct mmc *mmc = NULL;
        u32 boot_mode;
+       int err = 0;
+       __maybe_unused int part;
 
-       mmc_initialize(gd->bd);
-       /* We register only one device. So, the dev id is always 0 */
-       mmc = find_mmc_device(0);
-       if (!mmc) {
-#ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
-               puts("spl: mmc device not found!!\n");
-#endif
-               hang();
-       }
+       err = spl_mmc_find_device(&mmc, boot_device);
+       if (err)
+               return err;
 
        err = mmc_init(mmc);
        if (err) {
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
-               printf("spl: mmc init failed: err - %d\n", err);
+               printf("spl: mmc init failed with error: %d\n", err);
 #endif
-               hang();
+               return err;
        }
 
        boot_mode = spl_boot_mode();
-       if (boot_mode == MMCSD_MODE_RAW) {
-               debug("boot mode - RAW\n");
-#ifdef CONFIG_SPL_OS_BOOT
-               if (spl_start_uboot() || mmc_load_image_raw_os(mmc))
-#endif
-               err = mmc_load_image_raw(mmc,
-                                        CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR);
-#ifdef CONFIG_SPL_FAT_SUPPORT
-       } else if (boot_mode == MMCSD_MODE_FAT) {
-               debug("boot mode - FAT\n");
+       err = -EINVAL;
+       switch (boot_mode) {
+       case MMCSD_MODE_EMMCBOOT:
+                       /*
+                        * We need to check what the partition is configured to.
+                        * 1 and 2 match up to boot0 / boot1 and 7 is user data
+                        * which is the first physical partition (0).
+                        */
+                       part = (mmc->part_config >> 3) & PART_ACCESS_MASK;
+
+                       if (part == 7)
+                               part = 0;
 
-               err = fat_register_device(&mmc->block_dev,
-                                         CONFIG_SYS_MMC_SD_FAT_BOOT_PARTITION);
-               if (err) {
+                       err = mmc_switch_part(0, part);
+                       if (err) {
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
-                       printf("spl: fat register err - %d\n", err);
+                               puts("spl: mmc partition switch failed\n");
 #endif
-                       hang();
+                               return err;
+                       }
+                       /* Fall through */
+       case MMCSD_MODE_RAW:
+               debug("spl: mmc boot mode: raw\n");
+
+               if (!spl_start_uboot()) {
+                       err = mmc_load_image_raw_os(mmc);
+                       if (!err)
+                               return err;
                }
 
-#ifdef CONFIG_SPL_OS_BOOT
-               if (spl_start_uboot() || mmc_load_image_fat_os(mmc))
-#endif
-               err = mmc_load_image_fat(mmc, CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME);
+               err = mmc_load_image_raw_partition(mmc,
+                       CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION);
+               if (!err)
+                       return err;
+#if defined(CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR)
+               err = mmc_load_image_raw_sector(mmc,
+                       CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR);
+               if (!err)
+                       return err;
 #endif
-       } else {
+               /* If RAW mode fails, try FS mode. */
+       case MMCSD_MODE_FS:
+               debug("spl: mmc boot mode: fs\n");
+
+               err = spl_mmc_do_fs_boot(mmc);
+               if (!err)
+                       return err;
+
+               break;
+       case MMCSD_MODE_UNDEFINED:
 #ifdef CONFIG_SPL_LIBCOMMON_SUPPORT
-               puts("spl: wrong MMC boot mode\n");
+       default:
+               puts("spl: mmc: wrong boot mode\n");
 #endif
-               hang();
        }
 
-       if (err)
-               hang();
+       return err;
 }