1 files changed, 67 insertions, 5 deletions

diff --git a/src/cpu/samsung/exynos5250/alternate_cbfs.c b/src/cpu/samsung/exynos5250/alternate_cbfs.c
index 49c9d4c194..59843fb97b 100644
--- a/src/cpu/samsung/exynos5250/alternate_cbfs.c
+++ b/src/cpu/samsung/exynos5250/alternate_cbfs.c
@@ -24,6 +24,8 @@
 #include <string.h>
 #include <console/console.h>
 #include "alternate_cbfs.h"
+#include "cpu.h"
+#include "power.h"
 #include "spi.h"
 
 /* This allows USB A-A firmware upload from a compatible host in four parts:
@@ -53,7 +55,7 @@ static int usb_cbfs_open(struct cbfs_media *media)
 		return 0;
 
 	if (!irom_load_usb()) {
-		printk(BIOS_ERR, "Unable to load CBFS image via USB!\n");
+		printk(BIOS_EMERG, "Unable to load CBFS image via USB!\n");
 		return -1;
 	}
 
@@ -70,6 +72,45 @@ static int usb_cbfs_open(struct cbfs_media *media)
 	return 0;
 }
 
+/*
+ * SDMMC works very similar to USB A-A: we copy the CBFS image into memory
+ * and read it from there. While SDMMC would also allow direct block by block
+ * on-demand reading, we might run into problems if we call back into the IROM
+ * in very late boot stages (e.g. after initializing/changing MMC clocks)... so
+ * this seems like a safer approach. It also makes it easy to pass our image
+ * down to payloads.
+ */
+static int sdmmc_cbfs_open(struct cbfs_media *media)
+{
+#ifdef __PRE_RAM__
+	/*
+	 * In the bootblock, we just copy the small part that fits in the buffer
+	 * and hope that it's enough (since the romstage is currently always the
+	 * first component in the image, this should work out). In the romstage,
+	 * we copy until our buffer is full (currently 12M) to avoid the pain of
+	 * figuring out the true image size from in here. Since this is mainly a
+	 * developer/debug boot mode, those shortcomings should be bearable.
+	 */
+	const u32 count = alternate_cbfs_size / 512;
+	static int first_run = 1;
+	int (*irom_load_sdmmc)(u32 start, u32 count, void *dst) =
+		*irom_sdmmc_read_blocks_ptr;
+
+	if (!first_run)
+		return 0;
+
+	if (!irom_load_sdmmc(1, count, alternate_cbfs_buffer)) {
+		printk(BIOS_EMERG, "Unable to load CBFS image from SDMMC!\n");
+		return -1;
+	}
+
+	printk(BIOS_DEBUG, "SDMMC read successful, CBFS image should now be"
+		" at %p\n", alternate_cbfs_buffer);
+	first_run = 0;
+#endif
+	return 0;
+}
+
 static int alternate_cbfs_close(struct cbfs_media *media) { return 0; }
 
 static size_t alternate_cbfs_read(struct cbfs_media *media, void *dest,
@@ -90,6 +131,19 @@ static void *alternate_cbfs_map(struct cbfs_media *media, size_t offset,
 static void *alternate_cbfs_unmap(struct cbfs_media *media,
 				  const void *buffer) { return 0; }
 
+static int initialize_exynos_sdmmc_cbfs_media(struct cbfs_media *media)
+{
+	printk(BIOS_DEBUG, "Using Exynos alternate boot mode SDMMC\n");
+
+	media->open = sdmmc_cbfs_open;
+	media->close = alternate_cbfs_close;
+	media->read = alternate_cbfs_read;
+	media->map = alternate_cbfs_map;
+	media->unmap = alternate_cbfs_unmap;
+
+	return 0;
+}
+
 static int initialize_exynos_usb_cbfs_media(struct cbfs_media *media)
 {
 	printk(BIOS_DEBUG, "Using Exynos alternate boot mode USB A-A\n");
@@ -108,8 +162,16 @@ int init_default_cbfs_media(struct cbfs_media *media)
 	if (*iram_secondary_base == SECONDARY_BASE_BOOT_USB)
 		return initialize_exynos_usb_cbfs_media(media);
 
-	/* TODO: implement SDMMC (and possibly other) boot mode */
-
-	return initialize_exynos_spi_cbfs_media(media,
-		(void*)CONFIG_CBFS_CACHE_ADDRESS, CONFIG_CBFS_CACHE_SIZE);
+	switch (samsung_get_base_power()->om_stat & OM_STAT_MASK) {
+	case OM_STAT_SDMMC:
+		return initialize_exynos_sdmmc_cbfs_media(media);
+	case OM_STAT_SPI:
+		return initialize_exynos_spi_cbfs_media(media,
+			(void*)CONFIG_CBFS_CACHE_ADDRESS,
+			CONFIG_CBFS_CACHE_SIZE);
+	default:
+		printk(BIOS_EMERG, "Exynos OM_STAT value 0x%x not supported!\n",
+			samsung_get_base_power()->om_stat);
+		return 0;
+	}
 }