From: Kuninori Morimoto <kuninori.morimoto.gx@gmail.com>
To: Ulf Hansson <ulf.hansson@linaro.org>, Chris Ball <cjb@laptop.org>,
Simon <horms@verge.net.au>
Cc: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>,
Linux-SH <linux-sh@vger.kernel.org>,
linux-mmc <linux-mmc@vger.kernel.org>
Subject: [PATCH 7/7] mmc: remove MMC_CAP2_NO_MULTI_READ flags
Date: Mon, 01 Sep 2014 02:23:08 -0700 (PDT) [thread overview]
Message-ID: <87ha0rzock.wl%kuninori.morimoto.gx@gmail.com> (raw)
In-Reply-To: <87r3zvzohj.wl%kuninori.morimoto.gx@gmail.com>
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Now, mmc framework uses blk_size_workaround
for block size HW bug workaround.
MMC_CAP2_NO_MULTI_READ flag is no longer needed
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
drivers/mmc/card/block.c | 5 -----
include/linux/mmc/host.h | 1 -
2 files changed, 6 deletions(-)
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c
index e946067..7b09ac3 100644
--- a/drivers/mmc/card/block.c
+++ b/drivers/mmc/card/block.c
@@ -1398,11 +1398,6 @@ static void mmc_blk_rw_rq_prep(struct mmc_queue_req *mqrq,
if (disable_multi)
brq->data.blocks = 1;
- /* Some controllers can't do multiblock reads due to hw bugs */
- if (card->host->caps2 & MMC_CAP2_NO_MULTI_READ &&
- rq_data_dir(req) == READ)
- brq->data.blocks = 1;
-
/* Some controllers needs workaround */
if (card->host->ops->blk_size_workaround)
brq->data.blocks = card->host->ops->blk_size_workaround(
diff --git a/include/linux/mmc/host.h b/include/linux/mmc/host.h
index 95bd903..70d2cfc 100644
--- a/include/linux/mmc/host.h
+++ b/include/linux/mmc/host.h
@@ -269,7 +269,6 @@ struct mmc_host {
#define MMC_CAP2_BOOTPART_NOACC (1 << 0) /* Boot partition no access */
#define MMC_CAP2_FULL_PWR_CYCLE (1 << 2) /* Can do full power cycle */
-#define MMC_CAP2_NO_MULTI_READ (1 << 3) /* Multiblock reads don't work */
#define MMC_CAP2_HS200_1_8V_SDR (1 << 5) /* can support */
#define MMC_CAP2_HS200_1_2V_SDR (1 << 6) /* can support */
#define MMC_CAP2_HS200 (MMC_CAP2_HS200_1_8V_SDR | \
--
1.7.9.5
next prev parent reply other threads:[~2014-09-01 9:23 UTC|newest]
Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-01 9:20 [PATCH 0/7] mmc: remove MMC_CAP2_NO_MULTI_READ flags Kuninori Morimoto
2014-09-01 9:20 ` [PATCH 1/7] mmc: add blk_size_workaround for HW bug Kuninori Morimoto
2014-09-01 9:21 ` [PATCH 2/7] mmc: omap_hsmmc: use blk_size_workaround Kuninori Morimoto
2014-09-01 10:05 ` Sergei Shtylyov
2014-09-01 23:52 ` Kuninori Morimoto
2014-09-01 9:21 ` [PATCH 3/7] mmc: tmio_mmc: " Kuninori Morimoto
2014-09-01 9:22 ` [PATCH 4/7] mmc: sh_mobile_sdhi: " Kuninori Morimoto
2014-09-01 9:22 ` [PATCH 5/7] ARM: shmobile: koelsch: remove MMC_CAP2_NO_MULTI_READ Kuninori Morimoto
2014-09-01 9:22 ` [PATCH 6/7] ARM: shmobile: lager: " Kuninori Morimoto
2014-09-01 9:23 ` Kuninori Morimoto [this message]
2014-09-02 2:00 ` [PATCH 0/7 v2] mmc: remove MMC_CAP2_NO_MULTI_READ flags Kuninori Morimoto
2014-09-02 2:01 ` [PATCH 1/7 v2] mmc: add blk_size_workaround for HW bug Kuninori Morimoto
2014-09-02 9:09 ` Ulf Hansson
2014-09-03 0:44 ` Kuninori Morimoto
2014-09-02 2:01 ` [PATCH 2/7 v2] mmc: omap_hsmmc: use blk_size_workaround Kuninori Morimoto
2014-09-02 2:02 ` [PATCH 3/7 v2] mmc: tmio_mmc: " Kuninori Morimoto
2014-09-02 2:02 ` [PATCH 4/7 v2] mmc: sh_mobile_sdhi: " Kuninori Morimoto
2014-09-02 2:02 ` [PATCH 5/7 v2] ARM: shmobile: koelsch: remove MMC_CAP2_NO_MULTI_READ Kuninori Morimoto
2014-09-02 2:03 ` [PATCH 6/7 v2] ARM: shmobile: lager: " Kuninori Morimoto
2014-09-02 2:03 ` [PATCH 7/7 v2] mmc: remove MMC_CAP2_NO_MULTI_READ flags Kuninori Morimoto
2014-09-03 2:08 ` [PATCH 0/7 v3] " Kuninori Morimoto
2014-09-03 2:08 ` [PATCH 1/7 v3] mmc: add .multi_io_quirk callback for multi I/O HW bug Kuninori Morimoto
2014-09-08 9:08 ` Ulf Hansson
2014-09-03 2:09 ` [PATCH 2/7 v3] mmc: use .multi_io_quirk on omap_hsmmc Kuninori Morimoto
2014-09-08 9:10 ` Ulf Hansson
2014-09-09 0:09 ` Kuninori Morimoto
2014-09-09 6:00 ` Ulf Hansson
2014-09-09 6:07 ` Kuninori Morimoto
2014-09-09 6:36 ` Ulf Hansson
2014-09-09 6:39 ` Kuninori Morimoto
2014-09-03 2:09 ` [PATCH 3/7 v3] mmc: use .multi_io_quirk on tmio_mmc Kuninori Morimoto
2014-09-08 10:43 ` Ulf Hansson
2014-09-08 11:11 ` Lee Jones
2014-09-08 11:45 ` Ulf Hansson
2014-09-09 0:14 ` Kuninori Morimoto
2014-09-09 6:32 ` Ulf Hansson
2014-09-09 6:33 ` Kuninori Morimoto
2014-09-03 2:09 ` [PATCH 4/7 v3] mmc: use .multi_io_quirk on sh_mobile Kuninori Morimoto
2014-09-08 10:28 ` Ulf Hansson
2014-09-08 10:53 ` Ulf Hansson
2014-09-03 2:10 ` [PATCH 5/7 v3] ARM: shmobile: remove MMC_CAP2_NO_MULTI_READ from koelsch Kuninori Morimoto
2014-09-03 2:10 ` [PATCH 6/7 v3] ARM: shmobile: remove MMC_CAP2_NO_MULTI_READ from lager Kuninori Morimoto
2014-09-03 2:10 ` [PATCH 7/7 v3] mmc: remove MMC_CAP2_NO_MULTI_READ flags Kuninori Morimoto
2014-09-09 2:43 ` [PATCH 0/7 " Simon Horman
2014-09-09 2:45 ` Kuninori Morimoto
2014-09-09 3:56 ` Simon Horman
2014-09-09 6:43 ` [PATCH 0/6 v4] " Kuninori Morimoto
2014-09-09 6:44 ` [PATCH 1/6 v4] mmc: use .multi_io_quirk on omap_hsmmc Kuninori Morimoto
2014-09-09 6:45 ` [PATCH 2/6 v4] mmc: use .multi_io_quirk on tmio_mmc Kuninori Morimoto
2014-09-09 7:00 ` Ulf Hansson
2014-09-09 7:04 ` Kuninori Morimoto
2014-09-09 7:23 ` Lee Jones
2014-09-09 6:45 ` [PATCH 3/6 v4] mmc: use .multi_io_quirk on sh_mobile Kuninori Morimoto
2014-09-09 6:46 ` [PATCH 4/6 v4] ARM: shmobile: remove MMC_CAP2_NO_MULTI_READ from koelsch Kuninori Morimoto
2014-09-09 8:20 ` Simon Horman
2014-09-09 6:46 ` [PATCH 5/6 v4] ARM: shmobile: remove MMC_CAP2_NO_MULTI_READ from lager Kuninori Morimoto
2014-09-09 8:21 ` Simon Horman
2014-09-09 6:46 ` [PATCH 6/6 v4] mmc: remove MMC_CAP2_NO_MULTI_READ flags Kuninori Morimoto
2014-09-09 12:19 ` [PATCH 0/6 " Ulf Hansson
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=87ha0rzock.wl%kuninori.morimoto.gx@gmail.com \
--to=kuninori.morimoto.gx@gmail.com \
--cc=cjb@laptop.org \
--cc=horms@verge.net.au \
--cc=kuninori.morimoto.gx@renesas.com \
--cc=linux-mmc@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=ulf.hansson@linaro.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;
as well as URLs for NNTP newsgroup(s).