random-mirrors/smaeul-u-boot
1
0
Fork 0
mirror of https://github.com/smaeul/u-boot.git synced 2025-10-14 04:46:01 +01:00
Code Issues Packages Projects Releases Wiki Activity

mmc: fsl_esdhc_spl: Add support for loading proper U-Boot from unaligned location

Browse Source 
This allows to concatenate SPL and proper U-Boot without extra alignment.

Signed-off-by: Pali Rohár <pali@kernel.org>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Marek Behún <kabel@kernel.org>
This commit is contained in:
Pali Rohár 2022-08-05 22:09:39 +02:00 committed by Marek Behún
parent 1e1d12adbc
commit 04e9cd7a98
No known key found for this signature in database
GPG Key ID: 26BCFA05FCF60E4C
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
drivers/mmc/fsl_esdhc_spl.c
View File

@ -58,10 +58,10 @@ void __noreturn mmc_boot(void)
{ {
__attribute__((noreturn)) void (*uboot)(void); __attribute__((noreturn)) void (*uboot)(void);
uint blk_start, blk_cnt, err; uint blk_start, blk_cnt, err;
#ifndef CONFIG_FSL_CORENET
uchar *tmp_buf; uchar *tmp_buf;
u32 blklen; u32 blklen;
u32 blk_off; u32 blk_off;
#ifndef CONFIG_FSL_CORENET
uchar val; uchar val;
#ifndef CONFIG_SPL_FSL_PBL #ifndef CONFIG_SPL_FSL_PBL
u32 val32; u32 val32;
@ -83,9 +83,6 @@ void __noreturn mmc_boot(void)
hang(); hang();
} }
#ifdef CONFIG_FSL_CORENET
offset = CONFIG_SYS_MMC_U_BOOT_OFFS;
#else
blklen = mmc->read_bl_len; blklen = mmc->read_bl_len;
if (blklen < 512) if (blklen < 512)
blklen = 512; blklen = 512;
@ -95,6 +92,9 @@ void __noreturn mmc_boot(void)
hang(); hang();
} }
#ifdef CONFIG_FSL_CORENET
offset = CONFIG_SYS_MMC_U_BOOT_OFFS;
#else
sector = 0; sector = 0;
again: again:
memset(tmp_buf, 0, blklen); memset(tmp_buf, 0, blklen);
@ -155,17 +155,34 @@ again:
* Load U-Boot image from mmc into RAM * Load U-Boot image from mmc into RAM
*/ */
code_len = CONFIG_SYS_MMC_U_BOOT_SIZE; code_len = CONFIG_SYS_MMC_U_BOOT_SIZE;
blk_start = ALIGN(offset, mmc->read_bl_len) / mmc->read_bl_len; blk_start = offset / mmc->read_bl_len;
blk_cnt = ALIGN(code_len, mmc->read_bl_len) / 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, err = mmc->block_dev.block_read(&mmc->block_dev, blk_start, blk_cnt,
(uchar *)CONFIG_SYS_MMC_U_BOOT_DST); (uchar *)CONFIG_SYS_MMC_U_BOOT_DST +
(blk_off ? (mmc->read_bl_len - blk_off) : 0));
if (err != blk_cnt) { if (err != blk_cnt) {
puts("spl: mmc read failed!!\n"); puts("spl: mmc read failed!!\n");
#ifndef CONFIG_FSL_CORENET
free(tmp_buf); free(tmp_buf);
#endif
hang(); 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 *)CONFIG_SYS_MMC_U_BOOT_DST,
tmp_buf + blk_off, mmc->read_bl_len - blk_off);
/* /*
* Clean d-cache and invalidate i-cache, to * Clean d-cache and invalidate i-cache, to