From: Sascha Hauer <s.hauer@pengutronix.de>
To: "open list:BAREBOX" <barebox@lists.infradead.org>
Subject: [PATCH 2/6] mmc: merge block read/write functions
Date: Mon, 17 Mar 2025 10:34:34 +0100 [thread overview]
Message-ID: <20250317-mci-misc-cleanup-v1-2-24b4d6f5d31a@pengutronix.de> (raw)
In-Reply-To: <20250317-mci-misc-cleanup-v1-0-24b4d6f5d31a@pengutronix.de>
mci_block_write() and mci_read_block() both have very similar
implementations. Merge them into a mci_do_block_op() function
and call it from the actual block read/write functions.
While at it rename mci_read_block() to mci_block_read() to get a
naming consistent to mci_block_write().
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
drivers/mci/mci-core.c | 123 +++++++++++++++++++++++--------------------------
1 file changed, 57 insertions(+), 66 deletions(-)
diff --git a/drivers/mci/mci-core.c b/drivers/mci/mci-core.c
index 34ea775813..975896d2d8 100644
--- a/drivers/mci/mci-core.c
+++ b/drivers/mci/mci-core.c
@@ -260,59 +260,6 @@ static int mci_poll_until_ready(struct mci *mci, int timeout_ms)
return 0;
}
-
-/**
- * Write one or several blocks of data to the card
- * @param mci_dev MCI instance
- * @param src Where to read from to write to the card
- * @param blocknum Block number to write
- * @param blocks Block count to write
- * @return Transaction status (0 on success)
- */
-static int mci_block_write(struct mci *mci, const void *src, int blocknum,
- int blocks)
-{
- struct mci_cmd cmd = {};
- struct mci_data data;
- unsigned mmccmd;
- int ret;
-
- /*
- * Quoting eMMC Spec v5.1 (JEDEC Standard No. 84-B51):
- * Due to legacy reasons, a Device may still treat CMD24/25 during
- * prg-state (while busy is active) as a legal or illegal command.
- * A host should not send CMD24/25 while the Device is in the prg
- * state and busy is active.
- */
- ret = mci_poll_until_ready(mci, 1000 /* ms */);
- if (ret && ret != -ENOSYS)
- return ret;
-
- if (blocks > 1)
- mmccmd = MMC_CMD_WRITE_MULTIPLE_BLOCK;
- else
- mmccmd = MMC_CMD_WRITE_SINGLE_BLOCK;
-
- mci_setup_cmd(&cmd,
- mmccmd,
- mci->high_capacity != 0 ? blocknum : blocknum * mci->write_bl_len,
- MMC_RSP_R1);
-
- data.src = src;
- data.blocks = blocks;
- data.blocksize = mci->write_bl_len;
- data.flags = MMC_DATA_WRITE;
-
- ret = mci_send_cmd(mci, &cmd, &data);
-
- if (ret || blocks > 1) {
- mci_setup_cmd(&cmd, MMC_CMD_STOP_TRANSMISSION, 0, MMC_RSP_R1b);
- mci_send_cmd(mci, &cmd, NULL);
- }
-
- return ret;
-}
-
/**
* Erase one or several blocks of data to the card
* @param mci_dev MCI instance
@@ -364,35 +311,51 @@ static int mci_block_erase(struct mci *card, unsigned int from,
return -EIO;
}
-/**
- * Read one or several block(s) of data from the card
- * @param mci MCI instance
- * @param dst Where to store the data read from the card
- * @param blocknum Block number to read
- * @param blocks number of blocks to read
- */
-static int mci_read_block(struct mci *mci, void *dst, int blocknum,
+static int mci_do_block_op(struct mci *mci, const void *src, void *dst, int blocknum,
int blocks)
{
struct mci_cmd cmd = {};
struct mci_data data;
int ret;
- unsigned mmccmd;
+ unsigned mmccmd_multi_block, mmccmd_single_block, mmccmd;
+ unsigned int flags;
+
+ if (dst) {
+ mmccmd_multi_block = MMC_CMD_READ_MULTIPLE_BLOCK;
+ mmccmd_single_block = MMC_CMD_READ_SINGLE_BLOCK;
+ flags = MMC_DATA_READ;
+ } else {
+ /*
+ * Quoting eMMC Spec v5.1 (JEDEC Standard No. 84-B51):
+ * Due to legacy reasons, a Device may still treat CMD24/25 during
+ * prg-state (while busy is active) as a legal or illegal command.
+ * A host should not send CMD24/25 while the Device is in the prg
+ * state and busy is active.
+ */
+ ret = mci_poll_until_ready(mci, 1000 /* ms */);
+ if (ret && ret != -ENOSYS)
+ return ret;
+
+ mmccmd_multi_block = MMC_CMD_WRITE_MULTIPLE_BLOCK;
+ mmccmd_single_block = MMC_CMD_WRITE_SINGLE_BLOCK;
+ flags = MMC_DATA_WRITE;
+ }
if (blocks > 1)
- mmccmd = MMC_CMD_READ_MULTIPLE_BLOCK;
+ mmccmd = mmccmd_multi_block;
else
- mmccmd = MMC_CMD_READ_SINGLE_BLOCK;
+ mmccmd = mmccmd_single_block;
mci_setup_cmd(&cmd,
mmccmd,
mci->high_capacity != 0 ? blocknum : blocknum * mci->read_bl_len,
MMC_RSP_R1);
+ data.src = src;
data.dest = dst;
data.blocks = blocks;
data.blocksize = mci->read_bl_len;
- data.flags = MMC_DATA_READ;
+ data.flags = flags;
ret = mci_send_cmd(mci, &cmd, &data);
@@ -401,9 +364,37 @@ static int mci_read_block(struct mci *mci, void *dst, int blocknum,
IS_SD(mci) ? MMC_RSP_R1b : MMC_RSP_R1);
mci_send_cmd(mci, &cmd, NULL);
}
+
return ret;
}
+/**
+ * Read one or several block(s) of data from the card
+ * @param mci MCI instance
+ * @param dst Where to store the data read from the card
+ * @param blocknum Block number to read
+ * @param blocks number of blocks to read
+ */
+static int mci_block_read(struct mci *mci, void *dst, int blocknum,
+ int blocks)
+{
+ return mci_do_block_op(mci, NULL, dst, blocknum, blocks);
+}
+
+/**
+ * Write one or several blocks of data to the card
+ * @param mci_dev MCI instance
+ * @param src Where to read from to write to the card
+ * @param blocknum Block number to write
+ * @param blocks Block count to write
+ * @return Transaction status (0 on success)
+ */
+static int mci_block_write(struct mci *mci, const void *src, int blocknum,
+ int blocks)
+{
+ return mci_do_block_op(mci, src, NULL, blocknum, blocks);
+}
+
/**
* Reset the attached MMC/SD card
* @param mci MCI instance
@@ -2244,7 +2235,7 @@ static int mci_sd_read(struct block_device *blk, void *buffer, sector_t block,
while (num_blocks) {
read_block = min(num_blocks, max_req_block);
- rc = mci_read_block(mci, buffer, block, read_block);
+ rc = mci_block_read(mci, buffer, block, read_block);
if (rc != 0) {
dev_dbg(&mci->dev, "Reading block %llu failed with %d\n", block, rc);
return rc;
--
2.39.5
next prev parent reply other threads:[~2025-03-17 9:36 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-03-17 9:34 [PATCH 0/6] mci: some cleanups Sascha Hauer
2025-03-17 9:34 ` [PATCH 1/6] mci: use struct cid Sascha Hauer
2025-03-17 9:41 ` Alexander Shiyan
2025-03-17 10:53 ` Sascha Hauer
2025-03-17 9:34 ` Sascha Hauer [this message]
2025-03-17 9:34 ` [PATCH 3/6] mci: cleanup code around ready_for_use flag Sascha Hauer
2025-03-17 9:34 ` [PATCH 4/6] mci: mci_spi: remove stray return 0 Sascha Hauer
2025-03-17 9:34 ` [PATCH 5/6] mci: mci_spi: fix warning message Sascha Hauer
2025-03-17 9:34 ` [PATCH 6/6] mci: mci_spi: use mci_of_parse() Sascha Hauer
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=20250317-mci-misc-cleanup-v1-2-24b4d6f5d31a@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
/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