From: Chris Ruehl <chris.ruehl@gtsys.com.hk>
To: linux-mmc@vger.kernel.org
Cc: Ulf Hansson <ulf.hansson@linaro.org>,
Chris Ruehl <chris.ruehl@gtsys.com.hk>,
Wolfram Sang <wsa+renesas@sang-engineering.com>,
Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>,
Ludovic Barre <ludovic.barre@st.com>,
Krishna Konda <kkonda@codeaurora.org>,
linux-kernel@vger.kernel.org, Jack <jack.lo@gtsys.com.hk>
Subject: [PATCH 3/6] mmc: core: add enhanced strobe to mmc_select_hs400()
Date: Tue, 8 Dec 2020 14:18:36 +0800 [thread overview]
Message-ID: <20201208061839.21163-4-chris.ruehl@gtsys.com.hk> (raw)
In-Reply-To: <20201208061839.21163-1-chris.ruehl@gtsys.com.hk>
Function mmc_select_hs400() and mmc_select_hs400es have almost
identical code it seems okay to merge them.
Add the function calls for enhanced strobe to mmc_select_hs400 and
add a bool variable to the function call to enable them if HS400ES
is selected.
mmc_select_hs400es() becomes obsolate and can be removed.
Signed-off-by: Chris Ruehl <chris.ruehl@gtsys.com.hk>
---
drivers/mmc/core/mmc.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index e7b4de3d4f47..84c09d9e0317 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -1333,7 +1333,7 @@ static int mmc_select_hs400es(struct mmc_card *card)
return err;
}
-static int mmc_select_hs400(struct mmc_card *card)
+static int mmc_select_hs400(struct mmc_card *card, bool enhancedstrobe)
{
struct mmc_host *host = card->host;
unsigned int max_dtr;
@@ -1409,9 +1409,12 @@ static int mmc_select_hs400(struct mmc_card *card)
host->ops->hs400_prepare_ddr(host);
/* Switch card to DDR */
+ val = EXT_CSD_DDR_BUS_WIDTH_8;
+ if (enhancedstrobe)
+ val |= EXT_CSD_BUS_WIDTH_STROBE;
err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
EXT_CSD_BUS_WIDTH,
- EXT_CSD_DDR_BUS_WIDTH_8,
+ val,
card->ext_csd.generic_cmd6_time);
if (err) {
pr_err("%s: switch to bus width for hs400 failed, err:%d\n",
@@ -1451,6 +1454,13 @@ static int mmc_select_hs400(struct mmc_card *card)
if (host->ops->hs400_complete)
host->ops->hs400_complete(host);
+ if (enhancedstrobe) {
+ /* Controller enable enhanced strobe function */
+ host->ios.enhanced_strobe = true;
+ if (host->ops->hs400_enhanced_strobe)
+ host->ops->hs400_enhanced_strobe(host, &host->ios);
+ }
+
err = mmc_switch_status(card, true);
if (err)
goto out_err;
@@ -1465,7 +1475,7 @@ static int mmc_select_hs400(struct mmc_card *card)
int mmc_hs200_to_hs400(struct mmc_card *card)
{
- return mmc_select_hs400(card);
+ return mmc_select_hs400(card, false);
}
/*
@@ -1549,9 +1559,9 @@ static int mmc_select_timing(struct mmc_card *card)
goto bus_speed;
if (card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS400ES)
- err = mmc_select_hs400es(card);
+ err = mmc_select_hs400(card, true);
else if (card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS400)
- err = mmc_select_hs400(card);
+ err = mmc_select_hs400(card, false);
else if (card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS200)
err = mmc_select_hs200(card);
else if (card->mmc_avail_type & EXT_CSD_CARD_TYPE_HS)
--
2.20.1
next prev parent reply other threads:[~2020-12-08 6:20 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-08 6:18 [PATCH 0/6] mmc: core: hs400(es) fix probe/init Chris Ruehl
2020-12-08 6:18 ` [PATCH 1/6] mmc: core: prepare hs400 update, code order Chris Ruehl
2020-12-08 6:18 ` [PATCH 2/6] mmc: core: make hs400 independent from hs200 init Chris Ruehl
2020-12-08 6:18 ` Chris Ruehl [this message]
2020-12-08 6:18 ` [PATCH 4/6] mmc: core: remove mmc_select_hs400es() Chris Ruehl
2020-12-08 6:18 ` [PATCH 5/6] mmc: core: simplify hs200 tuning Chris Ruehl
2020-12-08 6:18 ` [PATCH 6/6] mmc: core: with mmc-hs400-1_8(2)v not add MMC_CAP2_HS200* to host->caps2 Chris Ruehl
2021-02-01 10:52 ` Ulf Hansson
2020-12-12 1:01 ` [PATCH 0/6] mmc: core: hs400(es) fix probe/init Chris Ruehl
2021-01-22 12:40 ` 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=20201208061839.21163-4-chris.ruehl@gtsys.com.hk \
--to=chris.ruehl@gtsys.com.hk \
--cc=jack.lo@gtsys.com.hk \
--cc=kkonda@codeaurora.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=ludovic.barre@st.com \
--cc=ulf.hansson@linaro.org \
--cc=wsa+renesas@sang-engineering.com \
--cc=yoshihiro.shimoda.uh@renesas.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).