From: Chunyan Zhang <zhang.chunyan@linaro.org>
To: Ulf Hansson <ulf.hansson@linaro.org>,
Adrian Hunter <adrian.hunter@intel.com>
Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org,
Orson Zhai <orsonzhai@gmail.com>,
Baolin Wang <baolin.wang@linaro.org>,
Billows Wu <billows.wu@unisoc.com>,
Jason Wu <jason.wu@unisoc.com>,
Chunyan Zhang <zhang.lyra@gmail.com>
Subject: [PATCH V5 06/10] mmc: sdhci: Disable auto-CMD23 if stuff bits is set in CMD23 argument
Date: Thu, 16 Aug 2018 16:19:56 +0800 [thread overview]
Message-ID: <1534407596-29696-1-git-send-email-zhang.chunyan@linaro.org> (raw)
In-Reply-To: <1534406064-10065-7-git-send-email-zhang.chunyan@linaro.org>
For version 4.10 and aboves, SDHCI_ARGUMENT2 is also used to indicate
32-bit number of blocks, so it doesn't support stuff bits in argument
of CMD23, but only block count for the following command (CMD18/25).
Signed-off-by: Chunyan Zhang <zhang.chunyan@linaro.org>
---
drivers/mmc/host/sdhci.c | 10 ++++++++++
drivers/mmc/host/sdhci.h | 1 +
2 files changed, 11 insertions(+)
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index b3328ee..04e0904 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -1729,6 +1729,16 @@ static void sdhci_request(struct mmc_host *mmc, struct mmc_request *mrq)
}
}
+ /*
+ * From version 4.10 onward, ARGUMENT2 register is also used as 32-bit
+ * block count register which doesn't support stuff bits of
+ * CMD23 argument.
+ */
+ if (host->version >= SDHCI_SPEC_410 &&
+ mrq->sbc && (mrq->sbc->arg & SDHCI_ARG2_STUFF) &&
+ (host->flags & SDHCI_AUTO_CMD23))
+ host->flags &= ~SDHCI_AUTO_CMD23;
+
if (!present || host->flags & SDHCI_DEVICE_DEAD) {
mrq->cmd->error = -ENOMEDIUM;
sdhci_finish_mrq(host, mrq);
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index d34971ac..daf8c1e 100644
--- a/drivers/mmc/host/sdhci.h
+++ b/drivers/mmc/host/sdhci.h
@@ -28,6 +28,7 @@
#define SDHCI_DMA_ADDRESS 0x00
#define SDHCI_ARGUMENT2 SDHCI_DMA_ADDRESS
+#define SDHCI_ARG2_STUFF GENMASK(31, 16)
#define SDHCI_32BIT_BLK_CNT SDHCI_DMA_ADDRESS
#define SDHCI_BLOCK_SIZE 0x04
--
2.7.4
next prev parent reply other threads:[~2018-08-16 8:20 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-16 7:54 [PATCH V5 00/10] mmc: add support for sdhci 4.0 Chunyan Zhang
2018-08-16 7:54 ` [PATCH V5 01/10] mmc: sdhci: Add version V4 definition Chunyan Zhang
2018-08-16 7:54 ` [PATCH V5 02/10] mmc: sdhci: Add sd host v4 mode Chunyan Zhang
2018-08-16 7:54 ` [PATCH V5 03/10] mmc: sdhci: Change SDMA address register for " Chunyan Zhang
2018-08-16 7:54 ` [PATCH V5 04/10] mmc: sdhci: Add ADMA2 64-bit addressing support for V4 mode Chunyan Zhang
2018-08-16 7:54 ` [PATCH V5 05/10] mmc: sdhci: Add 32-bit block count support for v4 mode Chunyan Zhang
2018-08-23 12:48 ` Adrian Hunter
2018-08-16 7:54 ` [PATCH V5 06/10] mmc: sdhci: Disable auto-CMD23 if stuff bits is set in CMD23 argument Chunyan Zhang
2018-08-16 8:19 ` Chunyan Zhang [this message]
2018-08-23 12:50 ` Adrian Hunter
2018-08-27 10:07 ` Ulf Hansson
2018-08-27 11:07 ` Chunyan Zhang
2018-08-16 7:54 ` [PATCH V5 07/10] mmc: sdhci: Add Auto CMD Auto Select support Chunyan Zhang
2018-08-23 12:55 ` Adrian Hunter
2018-08-24 6:52 ` Chunyan Zhang
2018-08-24 6:55 ` Adrian Hunter
2018-08-16 7:54 ` [PATCH V5 08/10] mmc: sdhci: SDMA may use Auto-CMD23 in v4 mode Chunyan Zhang
2018-08-16 7:54 ` [PATCH V5 09/10] mmc: sdhci-sprd: Add Spreadtrum's initial host controller Chunyan Zhang
2018-08-16 7:54 ` [PATCH V5 10/10] dt-bindings: sdhci-sprd: Add bindings for the sdhci-sprd controller Chunyan Zhang
[not found] ` <CAAfSe-sJYD4_9KGo+z8UzYHkdP15qz4=5U42_cT9tA9+B4bk1Q@mail.gmail.com>
2018-08-22 7:16 ` [PATCH V5 00/10] mmc: add support for sdhci 4.0 Chunyan Zhang (张春艳)
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=1534407596-29696-1-git-send-email-zhang.chunyan@linaro.org \
--to=zhang.chunyan@linaro.org \
--cc=adrian.hunter@intel.com \
--cc=baolin.wang@linaro.org \
--cc=billows.wu@unisoc.com \
--cc=jason.wu@unisoc.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=orsonzhai@gmail.com \
--cc=ulf.hansson@linaro.org \
--cc=zhang.lyra@gmail.com \
/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;
as well as URLs for NNTP newsgroup(s).