[05/12] mmc: core: Split up mmc_poll_for_busy()

Message ID	20200204085449.32585-6-ulf.hansson@linaro.org
State	New
Headers	show Delivered-To: patches@linaro.org Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates 209.85.220.65 as permitted sender) client-ip=209.85.220.65; From: Ulf Hansson <ulf.hansson@linaro.org> To: linux-mmc@vger.kernel.org, Ulf Hansson <ulf.hansson@linaro.org> Cc: Adrian Hunter <adrian.hunter@intel.com>, Wolfram Sang <wsa+renesas@sang-engineering.com>, Ludovic Barre <ludovic.barre@st.com>, Baolin Wang <baolin.wang7@gmail.com>, Linus Walleij <linus.walleij@linaro.org>, Chaotian Jing <chaotian.jing@mediatek.com>, Shawn Lin <shawn.lin@rock-chips.com>, mirq-linux@rere.qmqm.pl Subject: [PATCH 05/12] mmc: core: Split up mmc_poll_for_busy() Date: Tue, 4 Feb 2020 09:54:42 +0100 Message-Id: <20200204085449.32585-6-ulf.hansson@linaro.org> In-Reply-To: <20200204085449.32585-1-ulf.hansson@linaro.org> References: <20200204085449.32585-1-ulf.hansson@linaro.org>
Series	mmc: core: Improve code for polling and HW busy detect \| expand [00/12] mmc: core: Improve code for polling and HW busy detect [01/12] mmc: core: Throttle polling rate for CMD6 [02/12] mmc: core: Drop unused define [03/12] mmc: core: Extend mmc_switch_status() to rid of __mmc_switch_status() [04/12] mmc: core: Drop redundant in-parameter to __mmc_switch() [05/12] mmc: core: Split up mmc_poll_for_busy() [06/12] mmc: core: Enable re-use of mmc_blk_in_tran_state() [07/12] mmc: core: Update CMD13 busy check for CMD6 commands [08/12] mmc: core: Convert to mmc_poll_for_busy() for erase/trim/discard [09/12] mmc: core: Drop redundant out-parameter to mmc_send_hpi_cmd() [10/12] mmc: core: Convert to mmc_poll_for_busy() for HPI commands [11/12] mmc: core: Fixup support for HW busy detection for HPI commands [12/12] mmc: core: Re-work the error path for the eMMC sanitize command

Message ID

20200204085449.32585-6-ulf.hansson@linaro.org

State

New

Headers

Received-SPF: pass (google.com: domain of ulf.hansson@linaro.org designates
	209.85.220.65 as permitted sender) client-ip=209.85.220.65; 
From: Ulf Hansson <ulf.hansson@linaro.org>
To: linux-mmc@vger.kernel.org,
	Ulf Hansson <ulf.hansson@linaro.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>,
	Wolfram Sang <wsa+renesas@sang-engineering.com>,
	Ludovic Barre <ludovic.barre@st.com>,
	Baolin Wang <baolin.wang7@gmail.com>,
	Linus Walleij <linus.walleij@linaro.org>,
	Chaotian Jing <chaotian.jing@mediatek.com>,
	Shawn Lin <shawn.lin@rock-chips.com>, mirq-linux@rere.qmqm.pl
Subject: [PATCH 05/12] mmc: core: Split up mmc_poll_for_busy()
Date: Tue,  4 Feb 2020 09:54:42 +0100
Message-Id: <20200204085449.32585-6-ulf.hansson@linaro.org>
In-Reply-To: <20200204085449.32585-1-ulf.hansson@linaro.org>
References: <20200204085449.32585-1-ulf.hansson@linaro.org>

Series

mmc: core: Improve code for polling and HW busy detect | expand

Commit Message

Ulf Hansson Feb. 4, 2020, 8:54 a.m. UTC

To make the code more readable, move the part that gets the busy status of
the card out into a separate function, mmc_busy_status(). Then call it from
mmc_poll_for_busy().

Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

---
 drivers/mmc/core/mmc_ops.c | 47 +++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 16 deletions(-)

-- 
2.17.1

diff --git a/drivers/mmc/core/mmc_ops.c b/drivers/mmc/core/mmc_ops.c
index 1c5b23d99b77..c17b13aacc6e 100644
--- a/drivers/mmc/core/mmc_ops.c
+++ b/drivers/mmc/core/mmc_ops.c
@@ -444,6 +444,34 @@  int mmc_switch_status(struct mmc_card *card, bool crc_err_fatal)
 	return mmc_switch_status_error(card->host, status);
 }
 
+static int mmc_busy_status(struct mmc_card *card, bool retry_crc_err,
+			   bool *busy)
+{
+	struct mmc_host *host = card->host;
+	u32 status = 0;
+	int err;
+
+	if (host->ops->card_busy) {
+		*busy = host->ops->card_busy(host);
+		return 0;
+	}
+
+	err = mmc_send_status(card, &status);
+	if (retry_crc_err && err == -EILSEQ) {
+		*busy = true;
+		return 0;
+	}
+	if (err)
+		return err;
+
+	err = mmc_switch_status_error(card->host, status);
+	if (err)
+		return err;
+
+	*busy = R1_CURRENT_STATE(status) == R1_STATE_PRG;
+	return 0;
+}
+
 static int mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms,
 			bool send_status, bool retry_crc_err)
 {
@@ -451,7 +479,6 @@  static int mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms,
 	int err;
 	unsigned long timeout;
 	unsigned int udelay = 32, udelay_max = 32768;
-	u32 status = 0;
 	bool expired = false;
 	bool busy = false;
 
@@ -473,21 +500,9 @@  static int mmc_poll_for_busy(struct mmc_card *card, unsigned int timeout_ms,
 		 */
 		expired = time_after(jiffies, timeout);
 
-		if (host->ops->card_busy) {
-			busy = host->ops->card_busy(host);
-		} else {
-			err = mmc_send_status(card, &status);
-			if (retry_crc_err && err == -EILSEQ) {
-				busy = true;
-			} else if (err) {
-				return err;
-			} else {
-				err = mmc_switch_status_error(host, status);
-				if (err)
-					return err;
-				busy = R1_CURRENT_STATE(status) == R1_STATE_PRG;
-			}
-		}
+		err = mmc_busy_status(card, retry_crc_err, &busy);
+		if (err)
+			return err;
 
 		/* Timeout if the device still remains busy. */
 		if (expired && busy) {

[05/12] mmc: core: Split up mmc_poll_for_busy()

Commit Message

Patch