Merge tag 'tpm-030822' of https://source.denx.de/u-boot/custodians/u-boot-tpm

[platform/kernel/u-boot.git] / common / spl / spl_mmc.c

diff --git a/common/spl/spl_mmc.c b/common/spl/spl_mmc.c
index d52f8a3..23a395e 100644 (file)
--- a/common/spl/spl_mmc.c
+++ b/common/spl/spl_mmc.c
@@ -17,7 +17,9 @@
 #include <mmc.h>
 #include <image.h>
 
-static int mmc_load_legacy(struct spl_image_info *spl_image, struct mmc *mmc,
+static int mmc_load_legacy(struct spl_image_info *spl_image,
+                          struct spl_boot_device *bootdev,
+                          struct mmc *mmc,
                           ulong sector, struct image_header *header)
 {
        u32 image_offset_sectors;
@@ -26,7 +28,7 @@ static int mmc_load_legacy(struct spl_image_info *spl_image, struct mmc *mmc,
        u32 image_offset;
        int ret;
 
-       ret = spl_parse_image_header(spl_image, header);
+       ret = spl_parse_image_header(spl_image, bootdev, header);
        if (ret)
                return ret;
 
@@ -77,6 +79,7 @@ static __maybe_unused unsigned long spl_mmc_raw_uboot_offset(int part)
 
 static __maybe_unused
 int mmc_load_image_raw_sector(struct spl_image_info *spl_image,
+                             struct spl_boot_device *bootdev,
                              struct mmc *mmc, unsigned long sector)
 {
        unsigned long count;
@@ -116,7 +119,7 @@ int mmc_load_image_raw_sector(struct spl_image_info *spl_image,
 
                ret = spl_load_imx_container(spl_image, &load, sector);
        } else {
-               ret = mmc_load_legacy(spl_image, mmc, sector, header);
+               ret = mmc_load_legacy(spl_image, bootdev, mmc, sector, header);
        }
 
 end:
@@ -181,6 +184,7 @@ static int spl_mmc_find_device(struct mmc **mmcp, u32 boot_device)
 
 #ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
 static int mmc_load_image_raw_partition(struct spl_image_info *spl_image,
+                                       struct spl_boot_device *bootdev,
                                        struct mmc *mmc, int partition,
                                        unsigned long sector)
 {
@@ -211,20 +215,21 @@ static int mmc_load_image_raw_partition(struct spl_image_info *spl_image,
        }
 
 #ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
-       return mmc_load_image_raw_sector(spl_image, mmc, info.start + sector);
+       return mmc_load_image_raw_sector(spl_image, bootdev, mmc, info.start + sector);
 #else
-       return mmc_load_image_raw_sector(spl_image, mmc, info.start);
+       return mmc_load_image_raw_sector(spl_image, bootdev, mmc, info.start);
 #endif
 }
 #endif
 
-#ifdef CONFIG_SPL_OS_BOOT
+#if CONFIG_IS_ENABLED(FALCON_BOOT_MMCSD)
 static int mmc_load_image_raw_os(struct spl_image_info *spl_image,
+                                struct spl_boot_device *bootdev,
                                 struct mmc *mmc)
 {
        int ret;
 
-#if defined(CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR)
+#if CONFIG_VAL(SYS_MMCSD_RAW_MODE_ARGS_SECTOR)
        unsigned long count;
 
        count = blk_dread(mmc_get_blk_desc(mmc),
@@ -239,7 +244,7 @@ static int mmc_load_image_raw_os(struct spl_image_info *spl_image,
        }
 #endif /* CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR */
 
-       ret = mmc_load_image_raw_sector(spl_image, mmc,
+       ret = mmc_load_image_raw_sector(spl_image, bootdev, mmc,
                CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR);
        if (ret)
                return ret;
@@ -252,33 +257,63 @@ static int mmc_load_image_raw_os(struct spl_image_info *spl_image,
        return 0;
 }
 #else
-int spl_start_uboot(void)
-{
-       return 1;
-}
 static int mmc_load_image_raw_os(struct spl_image_info *spl_image,
+                                struct spl_boot_device *bootdev,
                                 struct mmc *mmc)
 {
        return -ENOSYS;
 }
 #endif
 
+#ifndef CONFIG_SPL_OS_BOOT
+int spl_start_uboot(void)
+{
+       return 1;
+}
+#endif
+
 #ifdef CONFIG_SYS_MMCSD_FS_BOOT_PARTITION
-static int spl_mmc_do_fs_boot(struct spl_image_info *spl_image, struct mmc *mmc,
+static int spl_mmc_do_fs_boot(struct spl_image_info *spl_image,
+                             struct spl_boot_device *bootdev,
+                             struct mmc *mmc,
                              const char *filename)
 {
        int err = -ENOSYS;
 
+       __maybe_unused int partition = CONFIG_SYS_MMCSD_FS_BOOT_PARTITION;
+
+#if CONFIG_SYS_MMCSD_FS_BOOT_PARTITION == -1
+       {
+               struct disk_partition info;
+               debug("Checking for the first MBR bootable partition\n");
+               for (int type_part = 1; type_part <= DOS_ENTRY_NUMBERS; type_part++) {
+                       err = part_get_info(mmc_get_blk_desc(mmc), type_part, &info);
+                       if (err)
+                               continue;
+                       debug("Partition %d is of type %d and bootable=%d\n", type_part, info.sys_ind, info.bootable);
+                       if (info.bootable != 0) {
+                               debug("Partition %d is bootable, using it\n", type_part);
+                               partition = type_part;
+                               break;
+                       }
+               }
+               printf("Using first bootable partition: %d\n", partition);
+               if (partition == CONFIG_SYS_MMCSD_FS_BOOT_PARTITION) {
+                       return -ENOSYS;
+               }
+       }
+#endif
+
 #ifdef CONFIG_SPL_FS_FAT
        if (!spl_start_uboot()) {
-               err = spl_load_image_fat_os(spl_image, mmc_get_blk_desc(mmc),
-                       CONFIG_SYS_MMCSD_FS_BOOT_PARTITION);
+               err = spl_load_image_fat_os(spl_image, bootdev, mmc_get_blk_desc(mmc),
+                       partition);
                if (!err)
                        return err;
        }
 #ifdef CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
-       err = spl_load_image_fat(spl_image, mmc_get_blk_desc(mmc),
-                                CONFIG_SYS_MMCSD_FS_BOOT_PARTITION,
+       err = spl_load_image_fat(spl_image, bootdev, mmc_get_blk_desc(mmc),
+                                partition,
                                 filename);
        if (!err)
                return err;
@@ -286,14 +321,14 @@ static int spl_mmc_do_fs_boot(struct spl_image_info *spl_image, struct mmc *mmc,
 #endif
 #ifdef CONFIG_SPL_FS_EXT4
        if (!spl_start_uboot()) {
-               err = spl_load_image_ext_os(spl_image, mmc_get_blk_desc(mmc),
-                       CONFIG_SYS_MMCSD_FS_BOOT_PARTITION);
+               err = spl_load_image_ext_os(spl_image, bootdev, mmc_get_blk_desc(mmc),
+                       partition);
                if (!err)
                        return err;
        }
 #ifdef CONFIG_SPL_FS_LOAD_PAYLOAD_NAME
-       err = spl_load_image_ext(spl_image, mmc_get_blk_desc(mmc),
-                                CONFIG_SYS_MMCSD_FS_BOOT_PARTITION,
+       err = spl_load_image_ext(spl_image, bootdev, mmc_get_blk_desc(mmc),
+                                partition,
                                 filename);
        if (!err)
                return err;
@@ -307,14 +342,16 @@ static int spl_mmc_do_fs_boot(struct spl_image_info *spl_image, struct mmc *mmc,
        return err;
 }
 #else
-static int spl_mmc_do_fs_boot(struct spl_image_info *spl_image, struct mmc *mmc,
+static int spl_mmc_do_fs_boot(struct spl_image_info *spl_image,
+                             struct spl_boot_device *bootdev,
+                             struct mmc *mmc,
                              const char *filename)
 {
        return -ENOSYS;
 }
 #endif
 
-u32 __weak spl_mmc_boot_mode(const u32 boot_device)
+u32 __weak spl_mmc_boot_mode(struct mmc *mmc, const u32 boot_device)
 {
 #if defined(CONFIG_SPL_FS_FAT) || defined(CONFIG_SPL_FS_EXT4)
        return MMCSD_MODE_FS;
@@ -361,6 +398,17 @@ int __weak spl_mmc_emmc_boot_partition(struct mmc *mmc)
        return default_spl_mmc_emmc_boot_partition(mmc);
 }
 
+static int spl_mmc_get_mmc_devnum(struct mmc *mmc)
+{
+       struct blk_desc *block_dev;
+#if !CONFIG_IS_ENABLED(BLK)
+       block_dev = &mmc->block_dev;
+#else
+       block_dev = dev_get_uclass_plat(mmc->dev);
+#endif
+       return block_dev->devnum;
+}
+
 int spl_mmc_load(struct spl_image_info *spl_image,
                 struct spl_boot_device *bootdev,
                 const char *filename,
@@ -371,9 +419,11 @@ int spl_mmc_load(struct spl_image_info *spl_image,
        u32 boot_mode;
        int err = 0;
        __maybe_unused int part = 0;
+       int mmc_dev;
 
-       /* Perform peripheral init only once */
-       if (!mmc) {
+       /* Perform peripheral init only once for an mmc device */
+       mmc_dev = spl_mmc_get_device_index(bootdev->boot_device);
+       if (!mmc || spl_mmc_get_mmc_devnum(mmc) != mmc_dev) {
                err = spl_mmc_find_device(&mmc, bootdev->boot_device);
                if (err)
                        return err;
@@ -388,7 +438,7 @@ int spl_mmc_load(struct spl_image_info *spl_image,
                }
        }
 
-       boot_mode = spl_mmc_boot_mode(bootdev->boot_device);
+       boot_mode = spl_mmc_boot_mode(mmc, bootdev->boot_device);
        err = -EINVAL;
        switch (boot_mode) {
        case MMCSD_MODE_EMMCBOOT:
@@ -410,7 +460,7 @@ int spl_mmc_load(struct spl_image_info *spl_image,
                debug("spl: mmc boot mode: raw\n");
 
                if (!spl_start_uboot()) {
-                       err = mmc_load_image_raw_os(spl_image, mmc);
+                       err = mmc_load_image_raw_os(spl_image, bootdev, mmc);
                        if (!err)
                                return err;
                }
@@ -418,13 +468,14 @@ int spl_mmc_load(struct spl_image_info *spl_image,
                raw_sect = spl_mmc_get_uboot_raw_sector(mmc, raw_sect);
 
 #ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
-               err = mmc_load_image_raw_partition(spl_image, mmc, raw_part,
+               err = mmc_load_image_raw_partition(spl_image, bootdev,
+                                                  mmc, raw_part,
                                                   raw_sect);
                if (!err)
                        return err;
 #endif
 #ifdef CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR
-               err = mmc_load_image_raw_sector(spl_image, mmc,
+               err = mmc_load_image_raw_sector(spl_image, bootdev, mmc,
                                raw_sect + spl_mmc_raw_uboot_offset(part));
                if (!err)
                        return err;
@@ -433,7 +484,7 @@ int spl_mmc_load(struct spl_image_info *spl_image,
        case MMCSD_MODE_FS:
                debug("spl: mmc boot mode: fs\n");
 
-               err = spl_mmc_do_fs_boot(spl_image, mmc, filename);
+               err = spl_mmc_do_fs_boot(spl_image, bootdev, mmc, filename);
                if (!err)
                        return err;