Skip to contentSkip to conversation

mmc: block: remove non-data R1B ioctl workaround

PATCH In review Christian Löhle 3 participants 3 messages Nov 27, 2022 – Nov 29, 2022 MMC, SD and SDIO

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 mmc: block: remove non-data R1B ioctl workaround

The workaround of pretending R1B non-data transfers are data transfers in order for the busy timeout to be respected by the host controller driver is removed. It wasn't useful in a long time.

Initially the workaround ensured that R1B commands did not time out by setting the data timeout to be the command timeout in commit cb87ea28ed9e ("mmc: core: Add mmc CMD+ACMD passthrough ioctl"). This was moved inside of an if clause with idata->buf_bytes being set in commit 4d6144de8ba2 ("mmc: core: check for zero length ioctl data"). Since the workaround is now inside of the idata->buf_bytes clause and intended to fix R1B non-data transfers that do not have buf_bytes set we can also remove the workaround altogether.
Since there are no data transfer invoking R1B commands this was dead code.

Fixes cb87ea28ed9e ("mmc: core: Add mmc CMD+ACMD passthrough ioctl")

---
-v2: clarified commit message, no code change

 drivers/mmc/core/block.c | 13 -------------
 1 file changed, 13 deletions(-)
drivers/mmc/core/block.c +0 -13
index db6d8a099910..20da7ed43e6d 100644
@@ -514,19 +514,6 @@ static int __mmc_blk_ioctl_cmd(struct mmc_card *card, struct mmc_blk_data *md,
 		if (idata->ic.data_timeout_ns)
 			data.timeout_ns = idata->ic.data_timeout_ns;
 
-		if ((cmd.flags & MMC_RSP_R1B) == MMC_RSP_R1B) {
-			/*
-			 * Pretend this is a data transfer and rely on the
-			 * host driver to compute timeout.  When all host
-			 * drivers support cmd.cmd_timeout for R1B, this
-			 * can be changed to:
-			 *
-			 *     mrq.data = NULL;
-			 *     cmd.cmd_timeout = idata->ic.cmd_timeout_ms;
-			 */
-			data.timeout_ns = idata->ic.cmd_timeout_ms * 1000000;
-		}
-
 		mrq.data = &data;
 	}
 
Signature · 5 lines
2.37.3

Hyperstone GmbH | Reichenaustr. 39a  | 78467 Konstanz
Managing Director: Dr. Jan Peter Berns.
Commercial register of local courts: Freiburg HRB381782
Acked-by on v2 1/1
#1 lore raw
Quoted 16 lines · Christian Löhle

The workaround of pretending R1B non-data transfers are data transfers in order for the busy timeout to be respected by the host controller driver is removed. It wasn't useful in a long time.

Initially the workaround ensured that R1B commands did not time out by setting the data timeout to be the command timeout in commit cb87ea28ed9e ("mmc: core: Add mmc CMD+ACMD passthrough ioctl"). This was moved inside of an if clause with idata->buf_bytes being set in commit 4d6144de8ba2 ("mmc: core: check for zero length ioctl data"). Since the workaround is now inside of the idata->buf_bytes clause and intended to fix R1B non-data transfers that do not have buf_bytes set we can also remove the workaround altogether.
Since there are no data transfer invoking R1B commands this was dead code.

Quoted 2 lines
Fixes cb87ea28ed9e ("mmc: core: Add mmc CMD+ACMD passthrough ioctl")

Doesn't Fixes: 4d6144de8ba2 make more sense?

Otherwise:

Quoted 29 lines

---

(quoted diff) +0 -1
-v2: clarified commit message, no code change
 drivers/mmc/core/block.c | 13 -------------
 1 file changed, 13 deletions(-)
drivers/mmc/core/block.c +0 -13
index db6d8a099910..20da7ed43e6d 100644
@@ -514,19 +514,6 @@ static int __mmc_blk_ioctl_cmd(struct mmc_card *card, struct mmc_blk_data *md,
 		if (idata->ic.data_timeout_ns)
 			data.timeout_ns = idata->ic.data_timeout_ns;
 
-		if ((cmd.flags & MMC_RSP_R1B) == MMC_RSP_R1B) {
-			/*
-			 * Pretend this is a data transfer and rely on the
-			 * host driver to compute timeout.  When all host
-			 * drivers support cmd.cmd_timeout for R1B, this
-			 * can be changed to:
-			 *
-			 *     mrq.data = NULL;
-			 *     cmd.cmd_timeout = idata->ic.cmd_timeout_ms;
-			 */
-			data.timeout_ns = idata->ic.cmd_timeout_ms * 1000000;
-		}
-
 		mrq.data = &data;
 	}
 
#2 lore raw
In reply to Christian Löhle
Quoted 17 lines · Christian Löhle

The workaround of pretending R1B non-data transfers are data transfers in order for the busy timeout to be respected by the host controller driver is removed. It wasn't useful in a long time.

Initially the workaround ensured that R1B commands did not time out by setting the data timeout to be the command timeout in commit cb87ea28ed9e ("mmc: core: Add mmc CMD+ACMD passthrough ioctl"). This was moved inside of an if clause with idata->buf_bytes being set in commit 4d6144de8ba2 ("mmc: core: check for zero length ioctl data"). Since the workaround is now inside of the idata->buf_bytes clause and intended to fix R1B non-data transfers that do not have buf_bytes set we can also remove the workaround altogether.
Since there are no data transfer invoking R1B commands this was dead code.

Quoted 2 lines
Fixes cb87ea28ed9e ("mmc: core: Add mmc CMD+ACMD passthrough ioctl")

Since the code that we now remove doesn't really break anything, I don't think we need to use a fixes tag.

So, applied for next by removing the fixes tag, thanks!

Kind regards
Uffe

Quoted 36 lines

---

(quoted diff) +0 -1
-v2: clarified commit message, no code change
 drivers/mmc/core/block.c | 13 -------------
 1 file changed, 13 deletions(-)
drivers/mmc/core/block.c +0 -14
index db6d8a099910..20da7ed43e6d 100644
@@ -514,19 +514,6 @@ static int __mmc_blk_ioctl_cmd(struct mmc_card *card, struct mmc_blk_data *md,
                if (idata->ic.data_timeout_ns)
                        data.timeout_ns = idata->ic.data_timeout_ns;
 
-               if ((cmd.flags & MMC_RSP_R1B) == MMC_RSP_R1B) {
-                       /*
-                        * Pretend this is a data transfer and rely on the
-                        * host driver to compute timeout.  When all host
-                        * drivers support cmd.cmd_timeout for R1B, this
-                        * can be changed to:
-                        *
-                        *     mrq.data = NULL;
-                        *     cmd.cmd_timeout = idata->ic.cmd_timeout_ms;
-                        */
-                       data.timeout_ns = idata->ic.cmd_timeout_ms * 1000000;
-               }
-
                mrq.data = &data;
        }
 
--

2.37.3

Hyperstone GmbH | Reichenaustr. 39a | 78467 Konstanz Managing Director: Dr. Jan Peter Berns. Commercial register of local courts: Freiburg HRB381782