From: "Christian Löhle" <CLoehle@hyperstone.com>
To: "Avri Altman" <Avri.Altman@wdc.com>,
"ulf.hansson@linaro.org" <ulf.hansson@linaro.org>,
"adrian.hunter@intel.com" <adrian.hunter@intel.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-mmc@vger.kernel.org" <linux-mmc@vger.kernel.org>,
"Christian Löhle" <CLoehle@hyperstone.com>
Cc: "axboe@kernel.dk" <axboe@kernel.dk>,
"zliua@micron.com" <zliua@micron.com>
Subject: [PATCH v2] mmc: block: ioctl: No busywaiting of non-TRAN CMDs
Date: Fri, 7 May 2021 10:34:33 +0000 [thread overview]
Message-ID: <CWXP265MB2680A8DD0FFA6FECBFDFB027C4579@CWXP265MB2680.GBRP265.PROD.OUTLOOK.COM> (raw)
In-Reply-To: <DM6PR04MB657570DB58E7ABBE2C3B0449FC589@DM6PR04MB6575.namprd04.prod.outlook.com>
Prevent busywaiting for TRAN state indication
after issuing a command that will not transition
to TRAN state.
Signed-off-by: Christian Loehle <cloehle@hyperstone.com>
---
drivers/mmc/core/block.c | 17 ++++++++++++++++-
1 file changed, 16 insertions(+), 1 deletion(-)
diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index 689eb9afeeed..48be2ca5e3d1 100644
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -446,6 +446,20 @@ static int card_busy_detect(struct mmc_card *card, unsigned int timeout_ms,
return err;
}
+static inline bool is_tran_transition_cmd(struct mmc_command *cmd,
+ struct mmc_card *card)
+{
+ /* Cards will not be in TRAN after completing identification commands
+ * or MMC_SEND_STATUS if they are not selected.
+ */
+ return !(cmd->opcode == MMC_SEND_CID
+ || cmd->opcode == MMC_ALL_SEND_CID
+ || cmd->opcode == MMC_SEND_CSD
+ || (cmd->opcode == MMC_SEND_STATUS &&
+ MMC_EXTRACT_INDEX_FROM_ARG(cmd->arg) != card->rca));
+
+}
+
static int __mmc_blk_ioctl_cmd(struct mmc_card *card, struct mmc_blk_data *md,
struct mmc_blk_ioc_data *idata)
{
@@ -593,7 +607,8 @@ static int __mmc_blk_ioctl_cmd(struct mmc_card *card, struct mmc_blk_data *md,
memcpy(&(idata->ic.response), cmd.resp, sizeof(cmd.resp));
- if (idata->rpmb || (cmd.flags & MMC_RSP_R1B) == MMC_RSP_R1B) {
+ if ((idata->rpmb || (cmd.flags & MMC_RSP_R1B))
+ && is_tran_transition_cmd(&cmd, card)) {
/*
* Ensure RPMB/R1B command has completed by polling CMD13
* "Send Status".
--
2.31.1
Hyperstone GmbH | Line-Eid-Strasse 3 | 78467 Konstanz
Managing Directors: Dr. Jan Peter Berns.
Commercial register of local courts: Freiburg HRB381782
next prev parent reply other threads:[~2021-05-07 10:34 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-05 13:12 [PATCH] mmc: block: ioctl: No busywaiting of non-TRAN CMDs Christian Löhle
2021-05-06 6:15 ` Avri Altman
2021-05-07 10:34 ` Christian Löhle [this message]
2021-05-07 11:34 ` [PATCH v2] " Ulf Hansson
2021-05-11 16:07 ` Christian Löhle
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=CWXP265MB2680A8DD0FFA6FECBFDFB027C4579@CWXP265MB2680.GBRP265.PROD.OUTLOOK.COM \
--to=cloehle@hyperstone.com \
--cc=Avri.Altman@wdc.com \
--cc=adrian.hunter@intel.com \
--cc=axboe@kernel.dk \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=ulf.hansson@linaro.org \
--cc=zliua@micron.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).