FAILED: patch "[PATCH] mmc: core: Allow host controllers to require R1B for CMD6" failed to apply to 5.5-stable tree

PATCH [email protected] 3 participants 4 messages Mar 16, 2020 – Mar 20, 2020

Subsystems (2)

Stable branch MMC, SD and SDIO

lore

Share & tools

lore

[email protected]

author maintainer

2020-03-16 11:31 UTC #0 lore raw

The patch below does not apply to the 5.5-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.

thanks,

greg k-h

------------------ original commit in Linus's tree ------------------

From 1292e3efb149ee21d8d33d725eeed4e6b1ade963 Mon Sep 17 00:00:00 2001
From: Ulf Hansson <[email protected]>
Date: Tue, 10 Mar 2020 12:49:43 +0100
Subject: [PATCH] mmc: core: Allow host controllers to require R1B for CMD6

It has turned out that some host controllers can't use R1B for CMD6 and other commands that have R1B associated with them. Therefore invent a new host cap, MMC_CAP_NEED_RSP_BUSY to let them specify this.

In __mmc_switch(), let's check the flag and use it to prevent R1B responses from being converted into R1. Note that, this also means that the host are on its own, when it comes to manage the busy timeout.

Cc <[email protected]>

Tested-by Anders Roxell <[email protected]>

Tested-by Sowjanya Komatineni <[email protected]>

Tested-by Faiz Abbas <[email protected]>

Tested-by Peter Geis <[email protected]>

Signed-off-by Ulf Hansson <[email protected]>

drivers/mmc/core/mmc_ops.c +4 -2

index da425ee2d9bf..e025604e17d4 100644
@@ -542,9 +542,11 @@ int __mmc_switch(struct mmc_card *card, u8 set, u8 index, u8 value,
 	 * If the max_busy_timeout of the host is specified, make sure it's
 	 * enough to fit the used timeout_ms. In case it's not, let's instruct
 	 * the host to avoid HW busy detection, by converting to a R1 response
-	 * instead of a R1B.
+	 * instead of a R1B. Note, some hosts requires R1B, which also means
+	 * they are on their own when it comes to deal with the busy timeout.
 	 */
-	if (host->max_busy_timeout && (timeout_ms > host->max_busy_timeout))
+	if (!(host->caps & MMC_CAP_NEED_RSP_BUSY) && host->max_busy_timeout &&
+	    (timeout_ms > host->max_busy_timeout))
 		use_r1b_resp = false;
 
 	cmd.opcode = MMC_SWITCH;

include/linux/mmc/host.h +1 -0

index ba703384bea0..4c5eb3aa8e72 100644
@@ -333,6 +333,7 @@ struct mmc_host {
 				 MMC_CAP_UHS_SDR50 | MMC_CAP_UHS_SDR104 | \
 				 MMC_CAP_UHS_DDR50)
 #define MMC_CAP_SYNC_RUNTIME_PM	(1 << 21)	/* Synced runtime PM suspends. */
+#define MMC_CAP_NEED_RSP_BUSY	(1 << 22)	/* Commands with R1B can't use R1. */
 #define MMC_CAP_DRIVER_TYPE_A	(1 << 23)	/* Host supports Driver Type A */
 #define MMC_CAP_DRIVER_TYPE_C	(1 << 24)	/* Host supports Driver Type C */
 #define MMC_CAP_DRIVER_TYPE_D	(1 << 25)	/* Host supports Driver Type D */

Sasha Levin

maintainer

2020-03-18 19:25 UTC #1 lore raw

Quoted 25 lines · On Mon, Mar 16, 2020 at 12:31:18PM +0100, [email protected] wrote:

The patch below does not apply to the 5.5-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 1292e3efb149ee21d8d33d725eeed4e6b1ade963 Mon Sep 17 00:00:00 2001
From: Ulf Hansson <[email protected]>
Date: Tue, 10 Mar 2020 12:49:43 +0100
Subject: [PATCH] mmc: core: Allow host controllers to require R1B for CMD6
It has turned out that some host controllers can't use R1B for CMD6 and other commands that have R1B associated with them. Therefore invent a new host cap, MMC_CAP_NEED_RSP_BUSY to let them specify this.
In __mmc_switch(), let's check the flag and use it to prevent R1B responses from being converted into R1. Note that, this also means that the host are on its own, when it comes to manage the busy timeout.

Quoted 7 lines

Suggested-by Sowjanya Komatineni <[email protected]>
Cc <[email protected]>
Tested-by Anders Roxell <[email protected]>
Tested-by Sowjanya Komatineni <[email protected]>
Tested-by Faiz Abbas <[email protected]>
Tested-by Peter Geis <[email protected]>
Signed-off-by Ulf Hansson <[email protected]>

I've fixed up and queued this whole mmc series of stable tagged patches for 4.19-5.5.

Signature · 2 lines

Thanks,
Sasha

Ulf Hansson

2020-03-20 09:12 UTC #2 lore raw

+ Naresh

Quoted 35 lines · Sasha Levin

Quoted 25 lines · On Mon, Mar 16, 2020 at 12:31:18PM +0100, [email protected] wrote:
The patch below does not apply to the 5.5-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 1292e3efb149ee21d8d33d725eeed4e6b1ade963 Mon Sep 17 00:00:00 2001
From: Ulf Hansson <[email protected]>
Date: Tue, 10 Mar 2020 12:49:43 +0100
Subject: [PATCH] mmc: core: Allow host controllers to require R1B for CMD6
It has turned out that some host controllers can't use R1B for CMD6 and other commands that have R1B associated with them. Therefore invent a new host cap, MMC_CAP_NEED_RSP_BUSY to let them specify this.
In __mmc_switch(), let's check the flag and use it to prevent R1B responses from being converted into R1. Note that, this also means that the host are on its own, when it comes to manage the busy timeout.
Quoted 7 lines
Suggested-by Sowjanya Komatineni <[email protected]>
Cc <[email protected]>
Tested-by Anders Roxell <[email protected]>
Tested-by Sowjanya Komatineni <[email protected]>
Tested-by Faiz Abbas <[email protected]>
Tested-by Peter Geis <[email protected]>
Signed-off-by Ulf Hansson <[email protected]>

Quoted 2 lines

I've fixed up and queued this whole mmc series of stable tagged patches for 4.19-5.5.

I looked at stable-rc tree and realized that you have also picked the following patch:

commit 533a6cfe08f96a7b5c65e06d20916d552c11b256
Author: Ulf Hansson <[email protected]>
Date: Wed Jan 22 15:27:47 2020 +0100
mmc: core: Default to generic_cmd6_time as timeout in __mmc_switch()

I assume this one was needed to apply the others mmc patches on top. This is a problem, because the above patch should not go for stable as it causes problems (unless additional patches are backported as well).

I suggest to drop the whole slew of mmc patches for the current stable rcs. Then I can send manual backports instead, is that okay?

Kind regards
Uffe

Greg Kroah-Hartman

author maintainer

2020-03-20 09:50 UTC #3 lore raw

Quoted 49 lines · Ulf Hansson

+ Naresh
Quoted 35 lines · Sasha Levin
Quoted 25 lines · On Mon, Mar 16, 2020 at 12:31:18PM +0100, [email protected] wrote:
The patch below does not apply to the 5.5-stable tree.
If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to <[email protected]>.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From 1292e3efb149ee21d8d33d725eeed4e6b1ade963 Mon Sep 17 00:00:00 2001
From: Ulf Hansson <[email protected]>
Date: Tue, 10 Mar 2020 12:49:43 +0100
Subject: [PATCH] mmc: core: Allow host controllers to require R1B for CMD6
It has turned out that some host controllers can't use R1B for CMD6 and other commands that have R1B associated with them. Therefore invent a new host cap, MMC_CAP_NEED_RSP_BUSY to let them specify this.
In __mmc_switch(), let's check the flag and use it to prevent R1B responses from being converted into R1. Note that, this also means that the host are on its own, when it comes to manage the busy timeout.
Quoted 7 lines
Suggested-by Sowjanya Komatineni <[email protected]>
Cc <[email protected]>
Tested-by Anders Roxell <[email protected]>
Tested-by Sowjanya Komatineni <[email protected]>
Tested-by Faiz Abbas <[email protected]>
Tested-by Peter Geis <[email protected]>
Signed-off-by Ulf Hansson <[email protected]>
Quoted 2 lines
I've fixed up and queued this whole mmc series of stable tagged patches for 4.19-5.5.
I looked at stable-rc tree and realized that you have also picked the following patch:
commit 533a6cfe08f96a7b5c65e06d20916d552c11b256
Author: Ulf Hansson <[email protected]>
Date: Wed Jan 22 15:27:47 2020 +0100
mmc: core: Default to generic_cmd6_time as timeout in __mmc_switch()

Quoted 6 lines

I assume this one was needed to apply the others mmc patches on top. This is a problem, because the above patch should not go for stable as it causes problems (unless additional patches are backported as well).
I suggest to drop the whole slew of mmc patches for the current stable rcs. Then I can send manual backports instead, is that okay?

Yes, I have now done that, having a properly backported set of patches would be great, thanks!

greg k-h