From: Bean Huo <huobean@gmail.com>
To: ulf.hansson@linaro.org, yoshihiro.shimoda.uh@renesas.com,
wsa+renesas@sang-engineering.com, adrian.hunter@intel.com
Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org,
Bean Huo <beanhuo@micron.com>
Subject: [PATCH v1 1/2] mmc: core: Let sanitize timeout readable/writable via sysfs
Date: Thu, 1 Apr 2021 14:43:42 +0200 [thread overview]
Message-ID: <20210401124343.102915-2-huobean@gmail.com> (raw)
In-Reply-To: <20210401124343.102915-1-huobean@gmail.com>
From: Bean Huo <beanhuo@micron.com>
As the density increases, the 4-minute timeout value for
disinfection is no longer feasible. At the same time, devices
of different densities have different timeout values, and it is
difficult to obtain a unified standard timeout value. Therefore,
it is better to let the user controls its cleaning timeout value.
Signed-off-by: Bean Huo <beanhuo@micron.com>
---
drivers/mmc/core/mmc.c | 33 +++++++++++++++++++++++++++++++++
drivers/mmc/core/mmc_ops.c | 3 +--
include/linux/mmc/card.h | 1 +
3 files changed, 35 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index 8741271d3971..4e4b3592d3d6 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -28,6 +28,7 @@
#define DEFAULT_CMD6_TIMEOUT_MS 500
#define MIN_CACHE_EN_TIMEOUT_MS 1600
+#define MMC_SANITIZE_TIMEOUT_MS (240 * 1000) /* 240s */
static const unsigned int tran_exp[] = {
10000, 100000, 1000000, 10000000,
@@ -835,6 +836,36 @@ static ssize_t mmc_dsr_show(struct device *dev,
static DEVICE_ATTR(dsr, S_IRUGO, mmc_dsr_show, NULL);
+static ssize_t sanitize_timeout_ms_show(struct device *dev,
+ struct device_attribute *attr,
+ char *buf)
+{
+ struct mmc_card *card = mmc_dev_to_card(dev);
+ return sysfs_emit(buf, "%d\n", card->sanitize_timeout_ms);
+}
+
+static ssize_t sanitize_timeout_ms_store(struct device *dev,
+ struct device_attribute *attr,
+ const char *buf, size_t len)
+{
+ struct mmc_card *card = mmc_dev_to_card(dev);
+ unsigned int new;
+ int ret;
+
+ ret = kstrtouint(buf, 0, &new);
+ if (ret < 0)
+ return ret;
+
+ if (new == 0)
+ return -EINVAL;
+
+ card->sanitize_timeout_ms = new;
+
+ return len;
+}
+static DEVICE_ATTR_RW(sanitize_timeout_ms);
+
+
static struct attribute *mmc_std_attrs[] = {
&dev_attr_cid.attr,
&dev_attr_csd.attr,
@@ -861,6 +892,7 @@ static struct attribute *mmc_std_attrs[] = {
&dev_attr_rca.attr,
&dev_attr_dsr.attr,
&dev_attr_cmdq_en.attr,
+ &dev_attr_sanitize_timeout_ms.attr,
NULL,
};
ATTRIBUTE_GROUPS(mmc_std);
@@ -1623,6 +1655,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
card->ocr = ocr;
card->type = MMC_TYPE_MMC;
card->rca = 1;
+ card->sanitize_timeout_ms = MMC_SANITIZE_TIMEOUT_MS;
memcpy(card->raw_cid, cid, sizeof(card->raw_cid));
}
diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index f413474f0f80..40a4f9e22d30 100644
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -21,7 +21,6 @@
#define MMC_BKOPS_TIMEOUT_MS (120 * 1000) /* 120s */
#define MMC_CACHE_FLUSH_TIMEOUT_MS (30 * 1000) /* 30s */
-#define MMC_SANITIZE_TIMEOUT_MS (240 * 1000) /* 240s */
static const u8 tuning_blk_pattern_4bit[] = {
0xff, 0x0f, 0xff, 0x00, 0xff, 0xcc, 0xc3, 0xcc,
@@ -1025,7 +1024,7 @@ int mmc_sanitize(struct mmc_card *card)
mmc_retune_hold(host);
err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, EXT_CSD_SANITIZE_START,
- 1, MMC_SANITIZE_TIMEOUT_MS);
+ 1, card->sanitize_timeout_ms);
if (err)
pr_err("%s: Sanitize failed err=%d\n", mmc_hostname(host), err);
diff --git a/include/linux/mmc/card.h b/include/linux/mmc/card.h
index f9ad35dd6012..9db0dcd9661e 100644
--- a/include/linux/mmc/card.h
+++ b/include/linux/mmc/card.h
@@ -273,6 +273,7 @@ struct mmc_card {
bool reenable_cmdq; /* Re-enable Command Queue */
+ unsigned int sanitize_timeout_ms;
unsigned int erase_size; /* erase size in sectors */
unsigned int erase_shift; /* if erase unit is power 2 */
unsigned int pref_erase; /* in sectors */
--
2.25.1
next prev parent reply other threads:[~2021-04-01 18:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-04-01 12:43 [PATCH v1 0/2] Tow minor changes of eMMC sanitize Bean Huo
2021-04-01 12:43 ` Bean Huo [this message]
2021-04-01 12:43 ` [PATCH v1 2/2] mmc: core: Let sanitize not retry in case of timeout/failure Bean Huo
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=20210401124343.102915-2-huobean@gmail.com \
--to=huobean@gmail.com \
--cc=adrian.hunter@intel.com \
--cc=beanhuo@micron.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--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).