projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mmc: refactor MMC startup to make it easier to support new modes
[oweals/u-boot.git]
/
drivers
/
mmc
/
mmc_write.c
diff --git
a/drivers/mmc/mmc_write.c
b/drivers/mmc/mmc_write.c
index 7b186f8500d70c754b8237519c498741447e1f78..54acbf73367b8acbb7d4597ef9c4c9815a05e7f4 100644
(file)
--- a/
drivers/mmc/mmc_write.c
+++ b/
drivers/mmc/mmc_write.c
@@
-9,6
+9,7
@@
#include <config.h>
#include <common.h>
#include <config.h>
#include <common.h>
+#include <dm.h>
#include <part.h>
#include <div64.h>
#include <linux/math64.h>
#include <part.h>
#include <div64.h>
#include <linux/math64.h>
@@
-65,9
+66,15
@@
err_out:
return err;
}
return err;
}
-unsigned long mmc_berase(struct blk_desc *block_dev, lbaint_t start,
- lbaint_t blkcnt)
+#ifdef CONFIG_BLK
+ulong mmc_berase(struct udevice *dev, lbaint_t start, lbaint_t blkcnt)
+#else
+ulong mmc_berase(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt)
+#endif
{
{
+#ifdef CONFIG_BLK
+ struct blk_desc *block_dev = dev_get_uclass_platdata(dev);
+#endif
int dev_num = block_dev->devnum;
int err = 0;
u32 start_rem, blkcnt_rem;
int dev_num = block_dev->devnum;
int err = 0;
u32 start_rem, blkcnt_rem;
@@
-78,7
+85,8
@@
unsigned long mmc_berase(struct blk_desc *block_dev, lbaint_t start,
if (!mmc)
return -1;
if (!mmc)
return -1;
- err = mmc_select_hwpart(dev_num, block_dev->hwpart);
+ err = blk_select_hwpart_devnum(IF_TYPE_MMC, dev_num,
+ block_dev->hwpart);
if (err < 0)
return -1;
if (err < 0)
return -1;
@@
-98,8
+106,13
@@
unsigned long mmc_berase(struct blk_desc *block_dev, lbaint_t start,
& ~(mmc->erase_grp_size - 1)) - 1);
while (blk < blkcnt) {
& ~(mmc->erase_grp_size - 1)) - 1);
while (blk < blkcnt) {
- blk_r = ((blkcnt - blk) > mmc->erase_grp_size) ?
- mmc->erase_grp_size : (blkcnt - blk);
+ if (IS_SD(mmc) && mmc->ssr.au) {
+ blk_r = ((blkcnt - blk) > mmc->ssr.au) ?
+ mmc->ssr.au : (blkcnt - blk);
+ } else {
+ blk_r = ((blkcnt - blk) > mmc->erase_grp_size) ?
+ mmc->erase_grp_size : (blkcnt - blk);
+ }
err = mmc_erase_t(mmc, start + blk, blk_r);
if (err)
break;
err = mmc_erase_t(mmc, start + blk, blk_r);
if (err)
break;
@@
-121,9
+134,9
@@
static ulong mmc_write_blocks(struct mmc *mmc, lbaint_t start,
struct mmc_data data;
int timeout = 1000;
struct mmc_data data;
int timeout = 1000;
- if ((start + blkcnt) > mmc
->block_dev.
lba) {
+ if ((start + blkcnt) > mmc
_get_blk_desc(mmc)->
lba) {
printf("MMC: block number 0x" LBAF " exceeds max(0x" LBAF ")\n",
printf("MMC: block number 0x" LBAF " exceeds max(0x" LBAF ")\n",
- start + blkcnt, mmc
->block_dev.
lba);
+ start + blkcnt, mmc
_get_blk_desc(mmc)->
lba);
return 0;
}
return 0;
}
@@
-171,9
+184,17
@@
static ulong mmc_write_blocks(struct mmc *mmc, lbaint_t start,
return blkcnt;
}
return blkcnt;
}
+#ifdef CONFIG_BLK
+ulong mmc_bwrite(struct udevice *dev, lbaint_t start, lbaint_t blkcnt,
+ const void *src)
+#else
ulong mmc_bwrite(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt,
const void *src)
ulong mmc_bwrite(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt,
const void *src)
+#endif
{
{
+#ifdef CONFIG_BLK
+ struct blk_desc *block_dev = dev_get_uclass_platdata(dev);
+#endif
int dev_num = block_dev->devnum;
lbaint_t cur, blocks_todo = blkcnt;
int err;
int dev_num = block_dev->devnum;
lbaint_t cur, blocks_todo = blkcnt;
int err;
@@
-182,7
+203,7
@@
ulong mmc_bwrite(struct blk_desc *block_dev, lbaint_t start, lbaint_t blkcnt,
if (!mmc)
return 0;
if (!mmc)
return 0;
- err =
mmc_select_hwpart(
dev_num, block_dev->hwpart);
+ err =
blk_select_hwpart_devnum(IF_TYPE_MMC,
dev_num, block_dev->hwpart);
if (err < 0)
return 0;
if (err < 0)
return 0;