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@spreadtrum.com>,
zhang.lyra@gmail.com
Subject: [PATCH V2 4/7] mmc: sdhci: add 32-bit block count support for v4 mode
Date: Fri, 15 Jun 2018 10:04:12 +0800 [thread overview]
Message-ID: <1529028255-6022-5-git-send-email-zhang.chunyan@linaro.org> (raw)
In-Reply-To: <1529028255-6022-1-git-send-email-zhang.chunyan@linaro.org>
When Host Version 4 is enabled, SDMA System Address register is
re-defined as 32-bit Block Count, and SDMA uses ADMA System
Address register (05Fh-058h) instead.
Signed-off-by: Chunyan Zhang <zhang.chunyan@linaro.org>
---
drivers/mmc/host/sdhci.c | 3 ++-
drivers/mmc/host/sdhci.h | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
index 5d3b0d8..b8ee124 100644
--- a/drivers/mmc/host/sdhci.c
+++ b/drivers/mmc/host/sdhci.c
@@ -943,7 +943,8 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd)
/* Set the DMA boundary value and block size */
sdhci_writew(host, SDHCI_MAKE_BLKSZ(host->sdma_boundary, data->blksz),
SDHCI_BLOCK_SIZE);
- sdhci_writew(host, data->blocks, SDHCI_BLOCK_COUNT);
+ reg = host->v4_mode ? SDHCI_32BIT_BLK_CNT : SDHCI_BLOCK_COUNT;
+ sdhci_writew(host, data->blocks, reg);
}
static inline bool sdhci_auto_cmd12(struct sdhci_host *host,
diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
index 820a863..1e84539 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_32BIT_BLK_CNT SDHCI_DMA_ADDRESS
#define SDHCI_BLOCK_SIZE 0x04
#define SDHCI_MAKE_BLKSZ(dma, blksz) (((dma & 0x7) << 12) | (blksz & 0xFFF))
--
2.7.4
next prev parent reply other threads:[~2018-06-15 2:05 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-06-15 2:04 [PATCH V2 0/7] mmc: add support for sdhci 4.0 Chunyan Zhang
2018-06-15 2:04 ` [PATCH V2 1/7] mmc: sdhci: add sd host v4 mode Chunyan Zhang
2018-06-21 10:49 ` Adrian Hunter
2018-06-21 11:14 ` Chunyan Zhang
2018-06-21 13:15 ` Adrian Hunter
2018-07-04 3:02 ` Chunyan Zhang
2018-06-15 2:04 ` [PATCH V2 2/7] mmc: sdhci: made changes for System Address register of SDMA Chunyan Zhang
2018-06-21 11:22 ` Adrian Hunter
2018-07-04 3:02 ` Chunyan Zhang
2018-06-15 2:04 ` [PATCH V2 3/7] mmc: sdhci: add ADMA2 64-bit addressing support for V4 mode Chunyan Zhang
2018-06-21 13:20 ` Adrian Hunter
2018-07-04 3:03 ` Chunyan Zhang
2018-06-15 2:04 ` Chunyan Zhang [this message]
2018-06-15 2:04 ` [PATCH V2 5/7] mmc: sdhci: add CMD23 support for v4 mode Chunyan Zhang
2018-06-22 19:40 ` Adrian Hunter
2018-07-04 3:03 ` Chunyan Zhang
2018-06-15 2:04 ` [PATCH V2 6/7] mmc: sdhci-sprd: added Spreadtrum's initial host controller Chunyan Zhang
2018-06-15 9:36 ` [PATCH V3 " Chunyan Zhang
2018-06-18 8:56 ` Ulf Hansson
2018-06-15 2:04 ` [PATCH V2 7/7] dt-bindings: sdhci-sprd: Add bindings for the sdhci-sprd controller 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=1529028255-6022-5-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@spreadtrum.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).