From: NeilBrown <neil@brown.name>
To: Ulf Hansson <ulf.hansson@linaro.org>,
Chaotian Jing <chaotian.jing@mediatek.com>
Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org,
thirtythreeforty@gmail.com
Subject: [PATCH 5/5] mmc: mtk-sd: enable internal write-protect logic.
Date: Tue, 16 Apr 2019 14:47:29 +1000 [thread overview]
Message-ID: <155539004934.25108.642381572389480964.stgit@noble.brown> (raw)
In-Reply-To: <155538933003.25108.3338569916935462285.stgit@noble.brown>
The mtk-sd silicon has integrated write-protect detection logic.
If the sdhci isn't marked no-write-protect and doesn't have a
ro-gpio configured, assume the internal wp logic should be used.
Signed-off-by: NeilBrown <neil@brown.name>
---
drivers/mmc/host/mtk-sd.c | 30 +++++++++++++++++++++++++++++-
1 file changed, 29 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/host/mtk-sd.c b/drivers/mmc/host/mtk-sd.c
index 341cf5f03429..d63d6b62f49a 100644
--- a/drivers/mmc/host/mtk-sd.c
+++ b/drivers/mmc/host/mtk-sd.c
@@ -433,6 +433,7 @@ struct msdc_host {
/* cmd response sample selection for HS400 */
bool hs400_mode; /* current eMMC will run at hs400 mode */
bool internal_cd; /* Use internal card-detect logic */
+ bool internal_ro; /* Use internal write-protect logic */
struct msdc_save_para save_para; /* used when gate HCLK */
struct msdc_tune_para def_tune_para; /* default tune setting */
struct msdc_tune_para saved_tune_para; /* tune result of CMD21/CMD19 */
@@ -2119,12 +2120,30 @@ static int msdc_get_cd(struct mmc_host *mmc)
return !val;
}
+static int msdc_get_ro(struct mmc_host *mmc)
+{
+ struct msdc_host *host = mmc_priv(mmc);
+ int val;
+
+ if (mmc->caps2 & MMC_CAP2_NO_WRITE_PROTECT)
+ return 0;
+
+ if (!host->internal_ro)
+ return mmc_gpio_get_ro(mmc);
+
+ val = readl(host->base + MSDC_PS) & MSDC_PS_WP;
+ if (mmc->caps2 & MMC_CAP2_RO_ACTIVE_HIGH)
+ return !!val;
+ else
+ return !val;
+}
+
static const struct mmc_host_ops mt_msdc_ops = {
.post_req = msdc_post_req,
.pre_req = msdc_pre_req,
.request = msdc_ops_request,
.set_ios = msdc_ops_set_ios,
- .get_ro = mmc_gpio_get_ro,
+ .get_ro = msdc_get_ro,
.get_cd = msdc_get_cd,
.enable_sdio_irq = msdc_enable_sdio_irq,
.ack_sdio_irq = msdc_ack_sdio_irq,
@@ -2256,6 +2275,15 @@ static int msdc_drv_probe(struct platform_device *pdev)
host->internal_cd = true;
}
+ if (!(mmc->caps2 & MMC_CAP2_NO_WRITE_PROTECT) &&
+ !mmc_can_gpio_ro(mmc)) {
+ /*
+ * Has write-protect but no GPIO declared, so
+ * use internal functionality.
+ */
+ host->internal_ro = true;
+ }
+
msdc_of_property_parse(pdev, host);
host->dev = &pdev->dev;
next prev parent reply other threads:[~2019-04-16 4:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-16 4:47 [PATCH 0/5] mtk-sd enhancement to support MT7621 NeilBrown
2019-04-16 4:47 ` [PATCH 1/5] mmc: mtk-sd: support "voltage-ranges" setting NeilBrown
2019-04-16 4:47 ` NeilBrown [this message]
2019-04-16 4:47 ` [PATCH 4/5] mmc: mtk-sd: enable internal card-detect logic NeilBrown
2019-04-18 6:39 ` Chaotian Jing
2019-05-04 8:18 ` NeilBrown
2019-04-16 4:47 ` [PATCH 2/5] mmc: mtk-sd: don't hard-code interrupt trigger type NeilBrown
2019-04-16 8:11 ` Chaotian Jing
2019-04-16 22:12 ` NeilBrown
2019-04-18 6:36 ` Chaotian Jing
2019-04-16 4:47 ` [PATCH 3/5] mmc: mtk-sd: add support for config found in mt7620 family SOCs NeilBrown
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=155539004934.25108.642381572389480964.stgit@noble.brown \
--to=neil@brown.name \
--cc=chaotian.jing@mediatek.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=thirtythreeforty@gmail.com \
--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).