From: Eric Nelson <eric@nelint.com>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH 2/3] mmc: use block layer in mmc command
Date: Sun, 27 Mar 2016 12:00:14 -0700 [thread overview]
Message-ID: <1459105215-3647-3-git-send-email-eric@nelint.com> (raw)
In-Reply-To: <1459105215-3647-1-git-send-email-eric@nelint.com>
Call blk_dread, blk_dwrite, blk_derase to ensure that the block cache is
used if enabled and to remove build breakage when CONFIG_BLK is enabled.
Signed-off-by: Eric Nelson <eric@nelint.com>
---
cmd/mmc.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/cmd/mmc.c b/cmd/mmc.c
index fb4382e..39ef072 100644
--- a/cmd/mmc.c
+++ b/cmd/mmc.c
@@ -150,6 +150,7 @@ static struct mmc *init_mmc_device(int dev, bool force_init)
printf("no mmc device at slot %x\n", dev);
return NULL;
}
+
if (force_init)
mmc->has_init = 0;
if (mmc_init(mmc))
@@ -345,7 +346,7 @@ static int do_mmc_read(cmd_tbl_t *cmdtp, int flag,
printf("\nMMC read: dev # %d, block # %d, count %d ... ",
curr_device, blk, cnt);
- n = mmc->block_dev.block_read(&mmc->block_dev, blk, cnt, addr);
+ n = blk_dread(&mmc->block_dev, blk, cnt, addr);
/* flush cache after read */
flush_cache((ulong)addr, cnt * 512); /* FIXME */
printf("%d blocks read: %s\n", n, (n == cnt) ? "OK" : "ERROR");
@@ -377,7 +378,7 @@ static int do_mmc_write(cmd_tbl_t *cmdtp, int flag,
printf("Error: card is write protected!\n");
return CMD_RET_FAILURE;
}
- n = mmc->block_dev.block_write(&mmc->block_dev, blk, cnt, addr);
+ n = blk_dwrite(&mmc->block_dev, blk, cnt, addr);
printf("%d blocks written: %s\n", n, (n == cnt) ? "OK" : "ERROR");
return (n == cnt) ? CMD_RET_SUCCESS : CMD_RET_FAILURE;
@@ -405,7 +406,7 @@ static int do_mmc_erase(cmd_tbl_t *cmdtp, int flag,
printf("Error: card is write protected!\n");
return CMD_RET_FAILURE;
}
- n = mmc->block_dev.block_erase(&mmc->block_dev, blk, cnt);
+ n = blk_derase(&mmc->block_dev, blk, cnt);
printf("%d blocks erased: %s\n", n, (n == cnt) ? "OK" : "ERROR");
return (n == cnt) ? CMD_RET_SUCCESS : CMD_RET_FAILURE;
--
2.6.2
next prev parent reply other threads:[~2016-03-27 19:00 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-03-21 1:45 [U-Boot] [RFC V2 PATCH 0/3] Add cache for block devices Eric Nelson
2016-03-21 1:45 ` [U-Boot] [RFC V2 PATCH 1/3] drivers: block: add block device cache Eric Nelson
2016-03-21 17:59 ` Eric Nelson
2016-03-23 17:22 ` Stephen Warren
2016-03-23 17:43 ` Eric Nelson
2016-03-21 1:45 ` [U-Boot] [RFC V2 PATCH 2/3] block: add Kconfig options for [CMD_]BLOCK_CACHE Eric Nelson
2016-03-23 17:24 ` Stephen Warren
2016-03-23 17:45 ` Eric Nelson
2016-03-21 1:45 ` [U-Boot] [RFC V2 PATCH 3/3] mmc: add support for block device cache Eric Nelson
2016-03-23 17:27 ` Stephen Warren
2016-03-23 17:46 ` Eric Nelson
2016-03-21 1:59 ` [U-Boot] [RFC V2 PATCH 0/3] Add cache for block devices Marek Vasut
2016-03-21 13:48 ` Eric Nelson
2016-03-21 16:49 ` Marek Vasut
2016-03-21 17:56 ` Eric Nelson
2016-03-21 18:54 ` Marek Vasut
2016-03-27 19:00 ` [U-Boot] [PATCH " Eric Nelson
2016-03-27 19:00 ` [U-Boot] [PATCH 1/3] drivers: block: add block device cache Eric Nelson
2016-03-28 14:16 ` Tom Rini
2016-03-28 14:33 ` Eric Nelson
2016-03-28 16:24 ` [U-Boot] [PATCH V2 " Eric Nelson
2016-03-28 17:05 ` [U-Boot] [PATCH V3 " Eric Nelson
2016-03-30 14:36 ` Stephen Warren
2016-03-30 15:19 ` Tom Rini
2016-03-30 15:21 ` Stephen Warren
2016-03-30 17:37 ` Eric Nelson
2016-03-30 17:34 ` Eric Nelson
2016-03-30 21:57 ` Stephen Warren
2016-03-31 20:24 ` Eric Nelson
2016-04-01 22:57 ` Stephen Warren
2016-04-01 23:16 ` Eric Nelson
2016-04-01 23:41 ` Tom Rini
2016-04-02 14:17 ` Eric Nelson
2016-04-02 2:07 ` Stephen Warren
2016-04-02 14:24 ` Eric Nelson
2016-04-02 1:59 ` [U-Boot] [U-Boot, V3, " Tom Rini
2016-04-02 14:19 ` Eric Nelson
2016-04-02 14:37 ` [U-Boot] [PATCH 0/3] minor blkcache updates Eric Nelson
2016-04-02 14:37 ` [U-Boot] [PATCH 1/3] cmd: blkcache: remove indentation from output of 'show' Eric Nelson
2016-04-12 2:28 ` [U-Boot] [U-Boot, " Tom Rini
2016-04-02 14:37 ` [U-Boot] [PATCH 2/3] cmd: blkcache: simplify sub-command handling Eric Nelson
2016-04-04 17:39 ` Stephen Warren
2016-04-12 2:28 ` [U-Boot] [U-Boot, " Tom Rini
2016-04-02 14:37 ` [U-Boot] [PATCH 3/3] drivers: block: fix placement of parameters Eric Nelson
2016-04-12 2:29 ` [U-Boot] [U-Boot, " Tom Rini
2016-03-27 19:00 ` Eric Nelson [this message]
2016-03-28 14:16 ` [U-Boot] [PATCH 2/3] mmc: use block layer in mmc command Tom Rini
2016-04-02 1:58 ` [U-Boot] [U-Boot,2/3] " Tom Rini
2016-03-27 19:00 ` [U-Boot] [PATCH 3/3] sata: use block layer for sata command Eric Nelson
2016-03-28 14:16 ` Tom Rini
2016-04-02 1:59 ` [U-Boot] [U-Boot,3/3] " Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1459105215-3647-3-git-send-email-eric@nelint.com \
--to=eric@nelint.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox