From: Greg Kroah-Hartman Date: Fri, 20 Mar 2020 11:31:49 +0000 (+0100) Subject: drop more mmc patches... X-Git-Tag: v5.4.27~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=403c8db11537745b8c519509b1287c30bef580e2;p=thirdparty%2Fkernel%2Fstable-queue.git drop more mmc patches... --- diff --git a/queue-5.4/mmc-sdhci-tegra-fix-busy-detection-by-enabling-mmc_c.patch b/queue-5.4/mmc-sdhci-tegra-fix-busy-detection-by-enabling-mmc_c.patch deleted file mode 100644 index cf6614455aa..00000000000 --- a/queue-5.4/mmc-sdhci-tegra-fix-busy-detection-by-enabling-mmc_c.patch +++ /dev/null @@ -1,47 +0,0 @@ -From e27134843b8c72a6d253c68077a5638d15136b8d Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 10 Mar 2020 15:50:11 +0100 -Subject: mmc: sdhci-tegra: Fix busy detection by enabling - MMC_CAP_NEED_RSP_BUSY - -From: Ulf Hansson - -[ Upstream commit d2f8bfa4bff5028bc40ed56b4497c32e05b0178f ] - -It has turned out that the sdhci-tegra 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: Bitan Biswas -Reported-by: Peter Geis -Suggested-by: Sowjanya Komatineni -Cc: -Tested-by: Sowjanya Komatineni -Tested-By: Peter Geis -Signed-off-by: Ulf Hansson -Signed-off-by: Sasha Levin ---- - drivers/mmc/host/sdhci-tegra.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c -index 403ac44a73782..a25c3a4d3f6cb 100644 ---- a/drivers/mmc/host/sdhci-tegra.c -+++ b/drivers/mmc/host/sdhci-tegra.c -@@ -1552,6 +1552,9 @@ static int sdhci_tegra_probe(struct platform_device *pdev) - if (tegra_host->soc_data->nvquirks & NVQUIRK_ENABLE_DDR50) - host->mmc->caps |= MMC_CAP_1_8V_DDR; - -+ /* R1B responses is required to properly manage HW busy detection. */ -+ host->mmc->caps |= MMC_CAP_NEED_RSP_BUSY; -+ - tegra_sdhci_parse_dt(host); - - tegra_host->power_gpio = devm_gpiod_get_optional(&pdev->dev, "power", --- -2.20.1 - diff --git a/queue-5.4/series b/queue-5.4/series index fc57c33e3c9..327008164b6 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -1,7 +1,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 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-sdhci-tegra-fix-busy-detection-by-enabling-mmc_c.patch b/queue-5.5/mmc-sdhci-tegra-fix-busy-detection-by-enabling-mmc_c.patch deleted file mode 100644 index 31a2cd98d3d..00000000000 --- a/queue-5.5/mmc-sdhci-tegra-fix-busy-detection-by-enabling-mmc_c.patch +++ /dev/null @@ -1,47 +0,0 @@ -From 4e3bb73ec2bd46302e3fb46fd2f2bfb85c926d58 Mon Sep 17 00:00:00 2001 -From: Sasha Levin -Date: Tue, 10 Mar 2020 15:50:11 +0100 -Subject: mmc: sdhci-tegra: Fix busy detection by enabling - MMC_CAP_NEED_RSP_BUSY - -From: Ulf Hansson - -[ Upstream commit d2f8bfa4bff5028bc40ed56b4497c32e05b0178f ] - -It has turned out that the sdhci-tegra 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: Bitan Biswas -Reported-by: Peter Geis -Suggested-by: Sowjanya Komatineni -Cc: -Tested-by: Sowjanya Komatineni -Tested-By: Peter Geis -Signed-off-by: Ulf Hansson -Signed-off-by: Sasha Levin ---- - drivers/mmc/host/sdhci-tegra.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/drivers/mmc/host/sdhci-tegra.c b/drivers/mmc/host/sdhci-tegra.c -index 403ac44a73782..a25c3a4d3f6cb 100644 ---- a/drivers/mmc/host/sdhci-tegra.c -+++ b/drivers/mmc/host/sdhci-tegra.c -@@ -1552,6 +1552,9 @@ static int sdhci_tegra_probe(struct platform_device *pdev) - if (tegra_host->soc_data->nvquirks & NVQUIRK_ENABLE_DDR50) - host->mmc->caps |= MMC_CAP_1_8V_DDR; - -+ /* R1B responses is required to properly manage HW busy detection. */ -+ host->mmc->caps |= MMC_CAP_NEED_RSP_BUSY; -+ - tegra_sdhci_parse_dt(host); - - tegra_host->power_gpio = devm_gpiod_get_optional(&pdev->dev, "power", --- -2.20.1 - diff --git a/queue-5.5/series b/queue-5.5/series index 1db2ad7c173..f2323adf5b4 100644 --- a/queue-5.5/series +++ b/queue-5.5/series @@ -1,5 +1,4 @@ pinctrl-qcom-ssbi-gpio-fix-fwspec-parsing-bug.patch -mmc-sdhci-tegra-fix-busy-detection-by-enabling-mmc_c.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