From: Greg Kroah-Hartman Date: Fri, 20 Mar 2020 09:51:34 +0000 (+0100) Subject: drop a bunch of mmc patches from 4.19, 5.4, and 5.5 queues X-Git-Tag: v4.14.174~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=804bcfd6d26cbfe7525d5cd995dcc6937d252473;p=thirdparty%2Fkernel%2Fstable-queue.git drop a bunch of mmc patches from 4.19, 5.4, and 5.5 queues --- diff --git a/queue-4.19/mmc-core-respect-mmc_cap_need_rsp_busy-for-emmc-slee.patch b/queue-4.19/mmc-core-respect-mmc_cap_need_rsp_busy-for-emmc-slee.patch deleted file mode 100644 index 3cb46cdcbef..00000000000 --- a/queue-4.19/mmc-core-respect-mmc_cap_need_rsp_busy-for-emmc-slee.patch +++ /dev/null @@ -1,50 +0,0 @@ -From d50c3dd17725d72444f0b9920c181bcd50acf2eb Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 11 Mar 2020 10:20:36 +0100 -Subject: mmc: core: Respect MMC_CAP_NEED_RSP_BUSY for eMMC sleep command - -From: Ulf Hansson - -[ Upstream commit 18d200460cd73636d4f20674085c39e32b4e0097 ] - -The busy timeout for the CMD5 to put the eMMC into sleep state, is specific -to the card. Potentially the timeout may exceed the host->max_busy_timeout. -If that becomes the case, mmc_sleep() converts from using an R1B response -to an R1 response, as to prevent the host from doing HW busy detection. - -However, it has turned out that some hosts requires an R1B response no -matter what, so let's respect that via checking MMC_CAP_NEED_RSP_BUSY. Note -that, if the R1B gets enforced, the host becomes fully responsible of -managing the needed busy timeout, in one way or the other. - -Suggested-by: Sowjanya Komatineni -Cc: -Link: https://lore.kernel.org/r/20200311092036.16084-1-ulf.hansson@linaro.org -Signed-off-by: Ulf Hansson -Signed-off-by: Sasha Levin ---- - drivers/mmc/core/mmc.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c -index f1fe446eee666..5ca53e225382d 100644 ---- a/drivers/mmc/core/mmc.c -+++ b/drivers/mmc/core/mmc.c -@@ -1901,9 +1901,12 @@ static int mmc_sleep(struct mmc_host *host) - * If the max_busy_timeout of the host is specified, validate it against - * the sleep cmd timeout. A failure means we need to prevent the host - * from doing hw busy detection, which is done by converting to a R1 -- * response instead of a R1B. -+ * response 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)) { - cmd.flags = MMC_RSP_R1 | MMC_CMD_AC; - } else { - cmd.flags = MMC_RSP_R1B | MMC_CMD_AC; --- -2.20.1 - diff --git a/queue-4.19/mmc-core-respect-mmc_cap_need_rsp_busy-for-erase-tri.patch b/queue-4.19/mmc-core-respect-mmc_cap_need_rsp_busy-for-erase-tri.patch deleted file mode 100644 index 899f5ed46f0..00000000000 --- a/queue-4.19/mmc-core-respect-mmc_cap_need_rsp_busy-for-erase-tri.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 21560a8e38f26028e1fbf2ab3cdce79581c439bc Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 10 Mar 2020 14:43:00 +0100 -Subject: mmc: core: Respect MMC_CAP_NEED_RSP_BUSY for erase/trim/discard - -From: Ulf Hansson - -[ Upstream commit 43cc64e5221cc6741252b64bc4531dd1eefb733d ] - -The busy timeout that is computed for each erase/trim/discard operation, -can become quite long and may thus exceed the host->max_busy_timeout. If -that becomes the case, mmc_do_erase() converts from using an R1B response -to an R1 response, as to prevent the host from doing HW busy detection. - -However, it has turned out that some hosts requires an R1B response no -matter what, so let's respect that via checking MMC_CAP_NEED_RSP_BUSY. Note -that, if the R1B gets enforced, the host becomes fully responsible of -managing the needed busy timeout, in one way or the other. - -Suggested-by: Sowjanya Komatineni -Cc: -Tested-by: Anders Roxell -Tested-by: Sowjanya Komatineni -Tested-by: Faiz Abbas -Tested-By: Peter Geis -Signed-off-by: Ulf Hansson -Signed-off-by: Sasha Levin ---- - drivers/mmc/core/core.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c -index 0a74785e575ba..56f7f3600469a 100644 ---- a/drivers/mmc/core/core.c -+++ b/drivers/mmc/core/core.c -@@ -2043,8 +2043,11 @@ static int mmc_do_erase(struct mmc_card *card, unsigned int from, - * the erase operation does not exceed the max_busy_timeout, we should - * use R1B response. Or we need to prevent the host from doing hw busy - * detection, which is done by converting to a R1 response instead. -+ * Note, some hosts requires R1B, which also means they are on their own -+ * when it comes to deal with the busy timeout. - */ -- if (card->host->max_busy_timeout && -+ if (!(card->host->caps & MMC_CAP_NEED_RSP_BUSY) && -+ card->host->max_busy_timeout && - busy_timeout > card->host->max_busy_timeout) { - cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC; - } else { --- -2.20.1 - diff --git a/queue-4.19/mmc-sdhci-omap-fix-busy-detection-by-enabling-mmc_ca.patch b/queue-4.19/mmc-sdhci-omap-fix-busy-detection-by-enabling-mmc_ca.patch deleted file mode 100644 index bb248204591..00000000000 --- a/queue-4.19/mmc-sdhci-omap-fix-busy-detection-by-enabling-mmc_ca.patch +++ /dev/null @@ -1,46 +0,0 @@ -From c37abc6411777705461a67821ec7bad61a1056b3 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 10 Mar 2020 15:05:02 +0100 -Subject: mmc: sdhci-omap: Fix busy detection by enabling MMC_CAP_NEED_RSP_BUSY - -From: Ulf Hansson - -[ Upstream commit 055e04830d4544c57f2a5192a26c9e25915c29c0 ] - -It has turned out that the sdhci-omap controller requires the R1B response, -for commands that has this response associated with them. So, converting -from an R1B to an R1 response for a CMD6 for example, leads to problems -with the HW busy detection support. - -Fix this by informing the mmc core about the requirement, via setting the -host cap, MMC_CAP_NEED_RSP_BUSY. - -Reported-by: Naresh Kamboju -Reported-by: Anders Roxell -Reported-by: Faiz Abbas -Cc: -Tested-by: Anders Roxell -Tested-by: Faiz Abbas -Signed-off-by: Ulf Hansson -Signed-off-by: Sasha Levin ---- - drivers/mmc/host/sdhci-omap.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/drivers/mmc/host/sdhci-omap.c b/drivers/mmc/host/sdhci-omap.c -index 5698af25caef6..79ee5fc5a2013 100644 ---- a/drivers/mmc/host/sdhci-omap.c -+++ b/drivers/mmc/host/sdhci-omap.c -@@ -1109,6 +1109,9 @@ static int sdhci_omap_probe(struct platform_device *pdev) - host->mmc_host_ops.execute_tuning = sdhci_omap_execute_tuning; - host->mmc_host_ops.enable_sdio_irq = sdhci_omap_enable_sdio_irq; - -+ /* R1B responses is required to properly manage HW busy detection. */ -+ mmc->caps |= MMC_CAP_NEED_RSP_BUSY; -+ - ret = sdhci_setup_host(host); - if (ret) - goto err_put_sync; --- -2.20.1 - diff --git a/queue-4.19/series b/queue-4.19/series index c023d20148a..e48e67fab53 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -2,9 +2,6 @@ perf-amd-uncore-replace-manual-sampling-check-with-c.patch mmc-sdhci-omap-add-platform-specific-reset-callback.patch mmc-sdhci-omap-workaround-errata-regarding-sdr104-hs.patch mmc-host-fix-kconfig-warnings-on-keystone_defconfig.patch -mmc-sdhci-omap-fix-busy-detection-by-enabling-mmc_ca.patch -mmc-core-respect-mmc_cap_need_rsp_busy-for-emmc-slee.patch -mmc-core-respect-mmc_cap_need_rsp_busy-for-erase-tri.patch acpi-watchdog-allow-disabling-wdat-at-boot.patch hid-apple-add-support-for-recent-firmware-on-magic-k.patch hid-i2c-hid-add-trekstor-surfbook-e11b-to-descriptor.patch diff --git a/queue-5.4/mmc-core-respect-mmc_cap_need_rsp_busy-for-emmc-slee.patch b/queue-5.4/mmc-core-respect-mmc_cap_need_rsp_busy-for-emmc-slee.patch deleted file mode 100644 index 0350cbd168f..00000000000 --- a/queue-5.4/mmc-core-respect-mmc_cap_need_rsp_busy-for-emmc-slee.patch +++ /dev/null @@ -1,50 +0,0 @@ -From f75bf6fc10f5519e68968df317b6f82fd0e731b2 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 11 Mar 2020 10:20:36 +0100 -Subject: mmc: core: Respect MMC_CAP_NEED_RSP_BUSY for eMMC sleep command - -From: Ulf Hansson - -[ Upstream commit 18d200460cd73636d4f20674085c39e32b4e0097 ] - -The busy timeout for the CMD5 to put the eMMC into sleep state, is specific -to the card. Potentially the timeout may exceed the host->max_busy_timeout. -If that becomes the case, mmc_sleep() converts from using an R1B response -to an R1 response, as to prevent the host from doing HW busy detection. - -However, it has turned out that some hosts requires an R1B response no -matter what, so let's respect that via checking MMC_CAP_NEED_RSP_BUSY. Note -that, if the R1B gets enforced, the host becomes fully responsible of -managing the needed busy timeout, in one way or the other. - -Suggested-by: Sowjanya Komatineni -Cc: -Link: https://lore.kernel.org/r/20200311092036.16084-1-ulf.hansson@linaro.org -Signed-off-by: Ulf Hansson -Signed-off-by: Sasha Levin ---- - drivers/mmc/core/mmc.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c -index c8804895595f4..b7159e243323b 100644 ---- a/drivers/mmc/core/mmc.c -+++ b/drivers/mmc/core/mmc.c -@@ -1911,9 +1911,12 @@ static int mmc_sleep(struct mmc_host *host) - * If the max_busy_timeout of the host is specified, validate it against - * the sleep cmd timeout. A failure means we need to prevent the host - * from doing hw busy detection, which is done by converting to a R1 -- * response instead of a R1B. -+ * response 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)) { - cmd.flags = MMC_RSP_R1 | MMC_CMD_AC; - } else { - cmd.flags = MMC_RSP_R1B | MMC_CMD_AC; --- -2.20.1 - diff --git a/queue-5.4/mmc-core-respect-mmc_cap_need_rsp_busy-for-erase-tri.patch b/queue-5.4/mmc-core-respect-mmc_cap_need_rsp_busy-for-erase-tri.patch deleted file mode 100644 index cc3b81298f0..00000000000 --- a/queue-5.4/mmc-core-respect-mmc_cap_need_rsp_busy-for-erase-tri.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 6962ee503cebdcaf7ec8194714723e4fa5fcc1e7 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 10 Mar 2020 14:43:00 +0100 -Subject: mmc: core: Respect MMC_CAP_NEED_RSP_BUSY for erase/trim/discard - -From: Ulf Hansson - -[ Upstream commit 43cc64e5221cc6741252b64bc4531dd1eefb733d ] - -The busy timeout that is computed for each erase/trim/discard operation, -can become quite long and may thus exceed the host->max_busy_timeout. If -that becomes the case, mmc_do_erase() converts from using an R1B response -to an R1 response, as to prevent the host from doing HW busy detection. - -However, it has turned out that some hosts requires an R1B response no -matter what, so let's respect that via checking MMC_CAP_NEED_RSP_BUSY. Note -that, if the R1B gets enforced, the host becomes fully responsible of -managing the needed busy timeout, in one way or the other. - -Suggested-by: Sowjanya Komatineni -Cc: -Tested-by: Anders Roxell -Tested-by: Sowjanya Komatineni -Tested-by: Faiz Abbas -Tested-By: Peter Geis -Signed-off-by: Ulf Hansson -Signed-off-by: Sasha Levin ---- - drivers/mmc/core/core.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c -index abf8f5eb0a1c8..26644b7ec13e3 100644 ---- a/drivers/mmc/core/core.c -+++ b/drivers/mmc/core/core.c -@@ -1732,8 +1732,11 @@ static int mmc_do_erase(struct mmc_card *card, unsigned int from, - * the erase operation does not exceed the max_busy_timeout, we should - * use R1B response. Or we need to prevent the host from doing hw busy - * detection, which is done by converting to a R1 response instead. -+ * Note, some hosts requires R1B, which also means they are on their own -+ * when it comes to deal with the busy timeout. - */ -- if (card->host->max_busy_timeout && -+ if (!(card->host->caps & MMC_CAP_NEED_RSP_BUSY) && -+ card->host->max_busy_timeout && - busy_timeout > card->host->max_busy_timeout) { - cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC; - } else { --- -2.20.1 - diff --git a/queue-5.4/mmc-sdhci-omap-fix-busy-detection-by-enabling-mmc_ca.patch b/queue-5.4/mmc-sdhci-omap-fix-busy-detection-by-enabling-mmc_ca.patch deleted file mode 100644 index ed4d9fd6891..00000000000 --- a/queue-5.4/mmc-sdhci-omap-fix-busy-detection-by-enabling-mmc_ca.patch +++ /dev/null @@ -1,46 +0,0 @@ -From cd89d80d29c76ad1d6557efc891c1ce5067b37b8 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 10 Mar 2020 15:05:02 +0100 -Subject: mmc: sdhci-omap: Fix busy detection by enabling MMC_CAP_NEED_RSP_BUSY - -From: Ulf Hansson - -[ Upstream commit 055e04830d4544c57f2a5192a26c9e25915c29c0 ] - -It has turned out that the sdhci-omap controller requires the R1B response, -for commands that has this response associated with them. So, converting -from an R1B to an R1 response for a CMD6 for example, leads to problems -with the HW busy detection support. - -Fix this by informing the mmc core about the requirement, via setting the -host cap, MMC_CAP_NEED_RSP_BUSY. - -Reported-by: Naresh Kamboju -Reported-by: Anders Roxell -Reported-by: Faiz Abbas -Cc: -Tested-by: Anders Roxell -Tested-by: Faiz Abbas -Signed-off-by: Ulf Hansson -Signed-off-by: Sasha Levin ---- - drivers/mmc/host/sdhci-omap.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/drivers/mmc/host/sdhci-omap.c b/drivers/mmc/host/sdhci-omap.c -index 083e7e053c954..d3135249b2e40 100644 ---- a/drivers/mmc/host/sdhci-omap.c -+++ b/drivers/mmc/host/sdhci-omap.c -@@ -1134,6 +1134,9 @@ static int sdhci_omap_probe(struct platform_device *pdev) - host->mmc_host_ops.execute_tuning = sdhci_omap_execute_tuning; - host->mmc_host_ops.enable_sdio_irq = sdhci_omap_enable_sdio_irq; - -+ /* R1B responses is required to properly manage HW busy detection. */ -+ mmc->caps |= MMC_CAP_NEED_RSP_BUSY; -+ - ret = sdhci_setup_host(host); - if (ret) - goto err_put_sync; --- -2.20.1 - diff --git a/queue-5.4/series b/queue-5.4/series index b9fa0687510..18029a92d79 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -2,9 +2,6 @@ netfilter-hashlimit-do-not-use-indirect-calls-during.patch netfilter-xt_hashlimit-unregister-proc-file-before-r.patch drm-amdgpu-fix-tlb-invalidation-request-when-using-s.patch mmc-sdhci-tegra-fix-busy-detection-by-enabling-mmc_c.patch -mmc-sdhci-omap-fix-busy-detection-by-enabling-mmc_ca.patch -mmc-core-respect-mmc_cap_need_rsp_busy-for-emmc-slee.patch -mmc-core-respect-mmc_cap_need_rsp_busy-for-erase-tri.patch acpi-watchdog-allow-disabling-wdat-at-boot.patch hid-apple-add-support-for-recent-firmware-on-magic-k.patch acpi-watchdog-set-default-timeout-in-probe.patch diff --git a/queue-5.5/mmc-core-respect-mmc_cap_need_rsp_busy-for-emmc-slee.patch b/queue-5.5/mmc-core-respect-mmc_cap_need_rsp_busy-for-emmc-slee.patch deleted file mode 100644 index 05962a27bb1..00000000000 --- a/queue-5.5/mmc-core-respect-mmc_cap_need_rsp_busy-for-emmc-slee.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 586bb8ad748ec1c102d2359c4ba90f678a2b6c01 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Wed, 11 Mar 2020 10:20:36 +0100 -Subject: mmc: core: Respect MMC_CAP_NEED_RSP_BUSY for eMMC sleep command - -From: Ulf Hansson - -[ Upstream commit 18d200460cd73636d4f20674085c39e32b4e0097 ] - -The busy timeout for the CMD5 to put the eMMC into sleep state, is specific -to the card. Potentially the timeout may exceed the host->max_busy_timeout. -If that becomes the case, mmc_sleep() converts from using an R1B response -to an R1 response, as to prevent the host from doing HW busy detection. - -However, it has turned out that some hosts requires an R1B response no -matter what, so let's respect that via checking MMC_CAP_NEED_RSP_BUSY. Note -that, if the R1B gets enforced, the host becomes fully responsible of -managing the needed busy timeout, in one way or the other. - -Suggested-by: Sowjanya Komatineni -Cc: -Link: https://lore.kernel.org/r/20200311092036.16084-1-ulf.hansson@linaro.org -Signed-off-by: Ulf Hansson -Signed-off-by: Sasha Levin ---- - drivers/mmc/core/mmc.c | 7 +++++-- - 1 file changed, 5 insertions(+), 2 deletions(-) - -diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c -index f6912ded652dc..de14b5845f525 100644 ---- a/drivers/mmc/core/mmc.c -+++ b/drivers/mmc/core/mmc.c -@@ -1910,9 +1910,12 @@ static int mmc_sleep(struct mmc_host *host) - * If the max_busy_timeout of the host is specified, validate it against - * the sleep cmd timeout. A failure means we need to prevent the host - * from doing hw busy detection, which is done by converting to a R1 -- * response instead of a R1B. -+ * response 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)) { - cmd.flags = MMC_RSP_R1 | MMC_CMD_AC; - } else { - cmd.flags = MMC_RSP_R1B | MMC_CMD_AC; --- -2.20.1 - diff --git a/queue-5.5/mmc-core-respect-mmc_cap_need_rsp_busy-for-erase-tri.patch b/queue-5.5/mmc-core-respect-mmc_cap_need_rsp_busy-for-erase-tri.patch deleted file mode 100644 index 49cd0125097..00000000000 --- a/queue-5.5/mmc-core-respect-mmc_cap_need_rsp_busy-for-erase-tri.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 718168b10350f5a0ad7dd1ca8bb6f76aa30fcd25 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 10 Mar 2020 14:43:00 +0100 -Subject: mmc: core: Respect MMC_CAP_NEED_RSP_BUSY for erase/trim/discard - -From: Ulf Hansson - -[ Upstream commit 43cc64e5221cc6741252b64bc4531dd1eefb733d ] - -The busy timeout that is computed for each erase/trim/discard operation, -can become quite long and may thus exceed the host->max_busy_timeout. If -that becomes the case, mmc_do_erase() converts from using an R1B response -to an R1 response, as to prevent the host from doing HW busy detection. - -However, it has turned out that some hosts requires an R1B response no -matter what, so let's respect that via checking MMC_CAP_NEED_RSP_BUSY. Note -that, if the R1B gets enforced, the host becomes fully responsible of -managing the needed busy timeout, in one way or the other. - -Suggested-by: Sowjanya Komatineni -Cc: -Tested-by: Anders Roxell -Tested-by: Sowjanya Komatineni -Tested-by: Faiz Abbas -Tested-By: Peter Geis -Signed-off-by: Ulf Hansson -Signed-off-by: Sasha Levin ---- - drivers/mmc/core/core.c | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c -index abf8f5eb0a1c8..26644b7ec13e3 100644 ---- a/drivers/mmc/core/core.c -+++ b/drivers/mmc/core/core.c -@@ -1732,8 +1732,11 @@ static int mmc_do_erase(struct mmc_card *card, unsigned int from, - * the erase operation does not exceed the max_busy_timeout, we should - * use R1B response. Or we need to prevent the host from doing hw busy - * detection, which is done by converting to a R1 response instead. -+ * Note, some hosts requires R1B, which also means they are on their own -+ * when it comes to deal with the busy timeout. - */ -- if (card->host->max_busy_timeout && -+ if (!(card->host->caps & MMC_CAP_NEED_RSP_BUSY) && -+ card->host->max_busy_timeout && - busy_timeout > card->host->max_busy_timeout) { - cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC; - } else { --- -2.20.1 - diff --git a/queue-5.5/mmc-sdhci-omap-fix-busy-detection-by-enabling-mmc_ca.patch b/queue-5.5/mmc-sdhci-omap-fix-busy-detection-by-enabling-mmc_ca.patch deleted file mode 100644 index dfb7764282b..00000000000 --- a/queue-5.5/mmc-sdhci-omap-fix-busy-detection-by-enabling-mmc_ca.patch +++ /dev/null @@ -1,46 +0,0 @@ -From 8729df3cf4f0efd1d2659657d38cdec027dfd5bd Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 10 Mar 2020 15:05:02 +0100 -Subject: mmc: sdhci-omap: Fix busy detection by enabling MMC_CAP_NEED_RSP_BUSY - -From: Ulf Hansson - -[ Upstream commit 055e04830d4544c57f2a5192a26c9e25915c29c0 ] - -It has turned out that the sdhci-omap controller requires the R1B response, -for commands that has this response associated with them. So, converting -from an R1B to an R1 response for a CMD6 for example, leads to problems -with the HW busy detection support. - -Fix this by informing the mmc core about the requirement, via setting the -host cap, MMC_CAP_NEED_RSP_BUSY. - -Reported-by: Naresh Kamboju -Reported-by: Anders Roxell -Reported-by: Faiz Abbas -Cc: -Tested-by: Anders Roxell -Tested-by: Faiz Abbas -Signed-off-by: Ulf Hansson -Signed-off-by: Sasha Levin ---- - drivers/mmc/host/sdhci-omap.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/drivers/mmc/host/sdhci-omap.c b/drivers/mmc/host/sdhci-omap.c -index 083e7e053c954..d3135249b2e40 100644 ---- a/drivers/mmc/host/sdhci-omap.c -+++ b/drivers/mmc/host/sdhci-omap.c -@@ -1134,6 +1134,9 @@ static int sdhci_omap_probe(struct platform_device *pdev) - host->mmc_host_ops.execute_tuning = sdhci_omap_execute_tuning; - host->mmc_host_ops.enable_sdio_irq = sdhci_omap_enable_sdio_irq; - -+ /* R1B responses is required to properly manage HW busy detection. */ -+ mmc->caps |= MMC_CAP_NEED_RSP_BUSY; -+ - ret = sdhci_setup_host(host); - if (ret) - goto err_put_sync; --- -2.20.1 - diff --git a/queue-5.5/series b/queue-5.5/series index e6078ce51a3..f12af18ddb8 100644 --- a/queue-5.5/series +++ b/queue-5.5/series @@ -1,8 +1,5 @@ pinctrl-qcom-ssbi-gpio-fix-fwspec-parsing-bug.patch mmc-sdhci-tegra-fix-busy-detection-by-enabling-mmc_c.patch -mmc-sdhci-omap-fix-busy-detection-by-enabling-mmc_ca.patch -mmc-core-respect-mmc_cap_need_rsp_busy-for-emmc-slee.patch -mmc-core-respect-mmc_cap_need_rsp_busy-for-erase-tri.patch acpi-watchdog-allow-disabling-wdat-at-boot.patch hid-apple-add-support-for-recent-firmware-on-magic-k.patch acpi-watchdog-set-default-timeout-in-probe.patch