qiurui
/
rv1126-uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dm: mmc: remove mmc_bread_prepare in mmc_blk_ops 

Merge it to mmc_bread() with using op_flag.

Signed-off-by: Jason Zhu <jason.zhu@rock-chips.com>
Change-Id: I3f63ebf66c43184a134c49a39a62feb2d5ae9821
This commit is contained in:
Jason Zhu 2020-08-06 10:04:00 +08:00
parent 1f3b6bbf4e
commit 7863dac107
2 changed files with 84 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/mmc/mmc-uclass.c
View File

@ -315,9 +315,6 @@ static int mmc_blk_probe(struct udevice *dev)
static const struct blk_ops mmc_blk_ops = { static const struct blk_ops mmc_blk_ops = {
.read = mmc_bread, .read = mmc_bread,
#ifdef CONFIG_SPL_BLK_READ_PREPARE
.read_prepare = mmc_bread_prepare,
#endif
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
.write = mmc_bwrite, .write = mmc_bwrite,
.erase = mmc_berase, .erase = mmc_berase,

160
drivers/mmc/mmc.c
View File

@ -294,82 +294,6 @@ static int mmc_read_blocks_prepare(struct mmc *mmc, void *dst, lbaint_t start,
} }
#endif #endif
#if CONFIG_IS_ENABLED(BLK)
ulong mmc_bread(struct udevice *dev, lbaint_t start, lbaint_t blkcnt, void *dst)
#else
ulong mmc_bread(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt,
void *dst)
#endif
{
#if CONFIG_IS_ENABLED(BLK)
struct blk_desc *block_dev = dev_get_uclass_platdata(dev);
#endif
int dev_num = block_dev->devnum;
int err;
lbaint_t cur, blocks_todo = blkcnt;
if (blkcnt == 0)
return 0;
struct mmc *mmc = find_mmc_device(dev_num);
if (!mmc)
return 0;
if (CONFIG_IS_ENABLED(MMC_TINY))
err = mmc_switch_part(mmc, block_dev->hwpart);
else
err = blk_dselect_hwpart(block_dev, block_dev->hwpart);
if (err < 0)
return 0;
if ((start + blkcnt) > block_dev->lba) {
#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
printf("MMC: block number 0x" LBAF " exceeds max(0x" LBAF ")\n",
start + blkcnt, block_dev->lba);
#endif
return 0;
}
if (mmc_set_blocklen(mmc, mmc->read_bl_len)) {
debug("%s: Failed to set blocklen\n", __func__);
return 0;
}
do {
cur = (blocks_todo > mmc->cfg->b_max) ?
mmc->cfg->b_max : blocks_todo;
if (mmc_read_blocks(mmc, dst, start, cur) != cur) {
debug("%s: Failed to read blocks\n", __func__);
int timeout = 0;
re_init_retry:
timeout++;
/*
* Try re-init seven times.
*/
if (timeout > 7) {
printf("Re-init retry timeout\n");
return 0;
}
mmc->has_init = 0;
if (mmc_init(mmc))
return 0;
if (mmc_read_blocks(mmc, dst, start, cur) != cur) {
printf("%s: Re-init mmc_read_blocks error\n",
__func__);
goto re_init_retry;
}
}
blocks_todo -= cur;
start += cur;
dst += cur * mmc->read_bl_len;
} while (blocks_todo > 0);
return blkcnt;
}
#ifdef CONFIG_SPL_BLK_READ_PREPARE #ifdef CONFIG_SPL_BLK_READ_PREPARE
#if CONFIG_IS_ENABLED(BLK) #if CONFIG_IS_ENABLED(BLK)
ulong mmc_bread_prepare(struct udevice *dev, lbaint_t start, lbaint_t blkcnt, void *dst) ulong mmc_bread_prepare(struct udevice *dev, lbaint_t start, lbaint_t blkcnt, void *dst)
@ -441,6 +365,90 @@ re_init_retry:
} }
#endif #endif
#if CONFIG_IS_ENABLED(BLK)
ulong mmc_bread(struct udevice *dev, lbaint_t start, lbaint_t blkcnt, void *dst)
#else
ulong mmc_bread(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt,
void *dst)
#endif
{
#if CONFIG_IS_ENABLED(BLK)
struct blk_desc *block_dev = dev_get_uclass_platdata(dev);
#endif
int dev_num = block_dev->devnum;
int err;
lbaint_t cur, blocks_todo = blkcnt;
#ifdef CONFIG_SPL_BLK_READ_PREPARE
if (block_dev->op_flag == BLK_PRE_RW)
#if CONFIG_IS_ENABLED(BLK)
return mmc_bread_prepare(dev, start, blkcnt, dst);
#else
return mmc_bread_prepare(block_dev, start, blkcnt, dst);
#endif
#endif
if (blkcnt == 0)
return 0;
struct mmc *mmc = find_mmc_device(dev_num);
if (!mmc)
return 0;
if (CONFIG_IS_ENABLED(MMC_TINY))
err = mmc_switch_part(mmc, block_dev->hwpart);
else
err = blk_dselect_hwpart(block_dev, block_dev->hwpart);
if (err < 0)
return 0;
if ((start + blkcnt) > block_dev->lba) {
#if !defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_LIBCOMMON_SUPPORT)
printf("MMC: block number 0x" LBAF " exceeds max(0x" LBAF ")\n",
start + blkcnt, block_dev->lba);
#endif
return 0;
}
if (mmc_set_blocklen(mmc, mmc->read_bl_len)) {
debug("%s: Failed to set blocklen\n", __func__);
return 0;
}
do {
cur = (blocks_todo > mmc->cfg->b_max) ?
mmc->cfg->b_max : blocks_todo;
if (mmc_read_blocks(mmc, dst, start, cur) != cur) {
debug("%s: Failed to read blocks\n", __func__);
int timeout = 0;
re_init_retry:
timeout++;
/*
* Try re-init seven times.
*/
if (timeout > 7) {
printf("Re-init retry timeout\n");
return 0;
}
mmc->has_init = 0;
if (mmc_init(mmc))
return 0;
if (mmc_read_blocks(mmc, dst, start, cur) != cur) {
printf("%s: Re-init mmc_read_blocks error\n",
__func__);
goto re_init_retry;
}
}
blocks_todo -= cur;
start += cur;
dst += cur * mmc->read_bl_len;
} while (blocks_todo > 0);
return blkcnt;
}
void mmc_set_clock(struct mmc *mmc, uint clock) void mmc_set_clock(struct mmc *mmc, uint clock)
{ {
if (clock > mmc->cfg->f_max) if (clock > mmc->cfg->f_max)