]> Git Repo - J-u-boot.git/blobdiff - drivers/mmc/fsl_esdhc_spl.c
driver: clk: tegra: init basic clocks on probe
[J-u-boot.git] / drivers / mmc / fsl_esdhc_spl.c
index 8fc263f4f40b864d8c9c8090c88896a7995a2a87..3dd106bed4bf284c7606b5c96aca015fab0e8b49 100644 (file)
@@ -1,23 +1,55 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright 2013 Freescale Semiconductor, Inc.
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#include <common.h>
+#include <config.h>
+#include <cpu_func.h>
+#include <hang.h>
 #include <mmc.h>
 #include <malloc.h>
 
+#ifndef CFG_SYS_MMC_U_BOOT_OFFS
+extern uchar mmc_u_boot_offs[];
+#endif
+
 /*
  * The environment variables are written to just after the u-boot image
  * on SDCard, so we must read the MBR to get the start address and code
  * length of the u-boot image, then calculate the address of the env.
  */
+#define ESDHC_BOOT_SIGNATURE_OFF 0x40
+#define ESDHC_BOOT_SIGNATURE   0x424f4f54
 #define ESDHC_BOOT_IMAGE_SIZE  0x48
 #define ESDHC_BOOT_IMAGE_ADDR  0x50
 #define MBRDBR_BOOT_SIG_55     0x1fe
 #define MBRDBR_BOOT_SIG_AA     0x1ff
-#define CONFIG_CFG_DATA_SECTOR 0
+
+void mmc_spl_load_image(uint32_t offs, unsigned int size, void *vdst)
+{
+       uint blk_start, blk_cnt, err;
+
+       struct mmc *mmc = find_mmc_device(0);
+       if (!mmc) {
+               puts("spl: mmc device not found!!\n");
+               hang();
+       }
+
+       if (mmc_init(mmc)) {
+               puts("MMC init failed\n");
+               return;
+       }
+
+       blk_start = ALIGN(offs, mmc->read_bl_len) / mmc->read_bl_len;
+       blk_cnt = ALIGN(size, mmc->read_bl_len) / mmc->read_bl_len;
+
+       err = mmc->block_dev.block_read(&mmc->block_dev, blk_start, blk_cnt,
+                                       vdst);
+       if (err != blk_cnt) {
+               puts("spl: mmc read failed!!\n");
+               hang();
+       }
+}
 
 /*
  * The main entry for mmc booting. It's necessary that SDRAM is already
@@ -29,10 +61,17 @@ void __noreturn mmc_boot(void)
 {
        __attribute__((noreturn)) void (*uboot)(void);
        uint blk_start, blk_cnt, err;
-       u32 blklen;
        uchar *tmp_buf;
+       u32 blklen;
+       u32 blk_off;
+#ifndef CONFIG_FSL_CORENET
        uchar val;
+#ifndef CONFIG_SPL_FSL_PBL
+       u32 val32;
+#endif
        uint i, byte_num;
+       u32 sector;
+#endif
        u32 offset, code_len;
        struct mmc *mmc;
 
@@ -42,79 +81,125 @@ void __noreturn mmc_boot(void)
                hang();
        }
 
-#ifdef CONFIG_FSL_CORENET
-       offset = CONFIG_SYS_MMC_U_BOOT_OFFS;
-       code_len = CONFIG_SYS_MMC_U_BOOT_SIZE;
-#else
+       if (mmc_init(mmc)) {
+               puts("spl: mmc device init failed!\n");
+               hang();
+       }
+
        blklen = mmc->read_bl_len;
+       if (blklen < 512)
+               blklen = 512;
        tmp_buf = malloc(blklen);
        if (!tmp_buf) {
                puts("spl: malloc memory failed!!\n");
                hang();
        }
+
+#ifdef CONFIG_FSL_CORENET
+       offset = CFG_SYS_MMC_U_BOOT_OFFS;
+#else
+       sector = 0;
+again:
        memset(tmp_buf, 0, blklen);
 
        /*
        * Read source addr from sd card
        */
-       err = mmc->block_dev.block_read(0, CONFIG_CFG_DATA_SECTOR, 1, tmp_buf);
-       if (err != 1) {
+       blk_start = (sector * 512) / mmc->read_bl_len;
+       blk_off = (sector * 512) % mmc->read_bl_len;
+       blk_cnt = DIV_ROUND_UP(512,  mmc->read_bl_len);
+       err = mmc->block_dev.block_read(&mmc->block_dev, blk_start, blk_cnt, tmp_buf);
+       if (err != blk_cnt) {
                puts("spl: mmc read failed!!\n");
-               free(tmp_buf);
                hang();
        }
 
-       val = *(tmp_buf + MBRDBR_BOOT_SIG_55);
+#ifdef CONFIG_SPL_FSL_PBL
+       val = *(tmp_buf + blk_off + MBRDBR_BOOT_SIG_55);
        if (0x55 != val) {
-               puts("spl: mmc signature is not valid!!\n");
-               free(tmp_buf);
+               puts("spl: mmc MBR/DBR signature is not valid!!\n");
                hang();
        }
-       val = *(tmp_buf + MBRDBR_BOOT_SIG_AA);
+       val = *(tmp_buf + blk_off + MBRDBR_BOOT_SIG_AA);
        if (0xAA != val) {
-               puts("spl: mmc signature is not valid!!\n");
-               free(tmp_buf);
+               puts("spl: mmc MBR/DBR signature is not valid!!\n");
                hang();
        }
-
+#else
+       /*
+        * Booting from On-Chip ROM (eSDHC or eSPI), Document Number: AN3659, Rev. 2, 06/2012.
+        * Pre-PBL BootROMs (MPC8536E, MPC8569E, P2020, P1011, P1012, P1013, P1020, P1021, P1022)
+        * require custom BOOT signature on sector 0 and MBR/DBR signature is not required at all.
+        */
        byte_num = 4;
-       offset = 0;
+       val32 = 0;
        for (i = 0; i < byte_num; i++) {
-               val = *(tmp_buf + ESDHC_BOOT_IMAGE_ADDR + i);
-               offset = (offset << 8) + val;
+               val = *(tmp_buf + blk_off + ESDHC_BOOT_SIGNATURE_OFF + i);
+               val32 = (val32 << 8) + val;
+       }
+       if (val32 != ESDHC_BOOT_SIGNATURE) {
+               /* BOOT signature may be on the first 24 sectors (each being 512 bytes) */
+               if (++sector < 24)
+                       goto again;
+               puts("spl: mmc BOOT signature is not valid!!\n");
+               hang();
        }
-       offset += CONFIG_SYS_MMC_U_BOOT_OFFS;
-       /* Get the code size from offset 0x48 */
+#endif
+
        byte_num = 4;
-       code_len = 0;
+       offset = 0;
        for (i = 0; i < byte_num; i++) {
-               val = *(tmp_buf + ESDHC_BOOT_IMAGE_SIZE + i);
-               code_len = (code_len << 8) + val;
+               val = *(tmp_buf + blk_off + ESDHC_BOOT_IMAGE_ADDR + i);
+               offset = (offset << 8) + val;
        }
-       code_len -= CONFIG_SYS_MMC_U_BOOT_OFFS;
+#ifndef CFG_SYS_MMC_U_BOOT_OFFS
+       offset += (ulong)&mmc_u_boot_offs - CONFIG_SPL_TEXT_BASE;
+#else
+       offset += CFG_SYS_MMC_U_BOOT_OFFS;
+#endif
+#endif
        /*
        * Load U-Boot image from mmc into RAM
        */
-#endif
-       blk_start = ALIGN(offset, mmc->read_bl_len) / mmc->read_bl_len;
-       blk_cnt = ALIGN(code_len, mmc->read_bl_len) / mmc->read_bl_len;
-       err = mmc->block_dev.block_read(0, blk_start, blk_cnt,
-                                       (uchar *)CONFIG_SYS_MMC_U_BOOT_DST);
+       code_len = CFG_SYS_MMC_U_BOOT_SIZE;
+       blk_start = offset / mmc->read_bl_len;
+       blk_off = offset % mmc->read_bl_len;
+       blk_cnt = ALIGN(code_len, mmc->read_bl_len) / mmc->read_bl_len + 1;
+       if (blk_off) {
+               err = mmc->block_dev.block_read(&mmc->block_dev,
+                                               blk_start, 1, tmp_buf);
+               if (err != 1) {
+                       puts("spl: mmc read failed!!\n");
+                       hang();
+               }
+               blk_start++;
+       }
+       err = mmc->block_dev.block_read(&mmc->block_dev, blk_start, blk_cnt,
+                                       (uchar *)CFG_SYS_MMC_U_BOOT_DST +
+                                       (blk_off ? (mmc->read_bl_len - blk_off) : 0));
        if (err != blk_cnt) {
                puts("spl: mmc read failed!!\n");
                free(tmp_buf);
                hang();
        }
+       /*
+        * SDHC DMA may erase bytes at dst + bl_len - blk_off - 8
+        * due to unaligned access. So copy leading bytes from tmp_buf
+        * after SDHC DMA transfer.
+        */
+       if (blk_off)
+               memcpy((uchar *)CFG_SYS_MMC_U_BOOT_DST,
+                      tmp_buf + blk_off, mmc->read_bl_len - blk_off);
 
        /*
        * Clean d-cache and invalidate i-cache, to
        * make sure that no stale data is executed.
        */
-       flush_cache(CONFIG_SYS_MMC_U_BOOT_DST, CONFIG_SYS_MMC_U_BOOT_SIZE);
+       flush_cache(CFG_SYS_MMC_U_BOOT_DST, CFG_SYS_MMC_U_BOOT_SIZE);
 
        /*
        * Jump to U-Boot image
        */
-       uboot = (void *)CONFIG_SYS_MMC_U_BOOT_START;
+       uboot = (void *)CFG_SYS_MMC_U_BOOT_START;
        (*uboot)();
 }
This page took 0.032341 seconds and 4 git commands to generate.