Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMian Yousaf Kaukab <yousaf.kaukab@suse.com>2019-10-01 16:57:48 +0200
committerMian Yousaf Kaukab <yousaf.kaukab@suse.com>2019-10-01 16:57:48 +0200
commit075db4dccaf450f0b20a0022401430347ee4a075 (patch)
tree3466a0433659408aec7e7d76cc347ecd8b5ef82d
parentdb9714ba7bbb4270a34c071d6945db6fdb04abf3 (diff)
arm64: mmc: remove patches already applied to v5.3
Both patches landed in v5.0 Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
-rw-r--r--patches.suse/0001-mmc-sdhci-add-delay-after-the-last-tuning-command.patch53
-rw-r--r--patches.suse/0002-mmc-sdhci-correct-the-maximum-timeout-when-enable-CM.patch53
-rw-r--r--series.conf2
3 files changed, 0 insertions, 108 deletions
diff --git a/patches.suse/0001-mmc-sdhci-add-delay-after-the-last-tuning-command.patch b/patches.suse/0001-mmc-sdhci-add-delay-after-the-last-tuning-command.patch
deleted file mode 100644
index 594e3cda09..0000000000
--- a/patches.suse/0001-mmc-sdhci-add-delay-after-the-last-tuning-command.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: BOUGH CHEN <haibo.chen@nxp.com>
-Date: Fri, 28 Dec 2018 08:35:49 +0000
-Subject: mmc: sdhci: add delay after the last tuning command
-
-Git-commit: 920ce03ed27541029f2322d05177457ea473973d
-Patch-mainline: Queued
-Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
-References: bsc#1123999
-
-When host set the host->tuning_delay, even the last tuning
-command need a delay, otherwise the first command after the
-tuning will meet issue.
-
-Take i.MX7D as an example, there will be the following log:
- mmc2: switch to high-speed from hs200 failed, err:-110
- mmc2: error -110 whilst initialising MMC card
-
-Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
-Acked-by: Adrian Hunter <adrian.hunter@intel.com>
-Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
----
- drivers/mmc/host/sdhci.c | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
-index eba9bcc92ad3..283dab5fc8d4 100644
---- a/drivers/mmc/host/sdhci.c
-+++ b/drivers/mmc/host/sdhci.c
-@@ -2376,6 +2376,10 @@ static int __sdhci_execute_tuning(struct sdhci_host *host, u32 opcode)
- return -ETIMEDOUT;
- }
-
-+ /* Spec does not require a delay between tuning cycles */
-+ if (host->tuning_delay > 0)
-+ mdelay(host->tuning_delay);
-+
- ctrl = sdhci_readw(host, SDHCI_HOST_CONTROL2);
- if (!(ctrl & SDHCI_CTRL_EXEC_TUNING)) {
- if (ctrl & SDHCI_CTRL_TUNED_CLK)
-@@ -2383,9 +2387,6 @@ static int __sdhci_execute_tuning(struct sdhci_host *host, u32 opcode)
- break;
- }
-
-- /* Spec does not require a delay between tuning cycles */
-- if (host->tuning_delay > 0)
-- mdelay(host->tuning_delay);
- }
-
- pr_info("%s: Tuning failed, falling back to fixed sampling clock\n",
---
-2.11.0
-
diff --git a/patches.suse/0002-mmc-sdhci-correct-the-maximum-timeout-when-enable-CM.patch b/patches.suse/0002-mmc-sdhci-correct-the-maximum-timeout-when-enable-CM.patch
deleted file mode 100644
index 92137a88b1..0000000000
--- a/patches.suse/0002-mmc-sdhci-correct-the-maximum-timeout-when-enable-CM.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From: BOUGH CHEN <haibo.chen@nxp.com>
-Date: Mon, 7 Jan 2019 10:11:36 +0000
-Subject: mmc: sdhci: correct the maximum timeout when enable CMDQ
-
-Git-commit: ac60ee24931a2a79c95d79319087eda5ee1d4639
-Patch-mainline: Queued
-Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
-References: bsc#1123999
-
-Change to use sdhci_set_timeout() to set the maximum timeout, so that
-the host can use it's own set_timeout() callback to set the maximum
-timeout if the host has.
-
-Signed-off-by: Haibo Chen <haibo.chen@nxp.com>
-Acked-by: Adrian Hunter <adrian.hunter@intel.com>
-Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
-Signed-off-by: Mian Yousaf Kaukab <yousaf.kaukab@suse.com>
----
- drivers/mmc/host/sdhci.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
---- a/drivers/mmc/host/sdhci.c
-+++ b/drivers/mmc/host/sdhci.c
-@@ -716,7 +716,7 @@ static u32 sdhci_sdma_address(struct sdh
- static u8 sdhci_calc_timeout(struct sdhci_host *host, struct mmc_command *cmd)
- {
- u8 count;
-- struct mmc_data *data = cmd->data;
-+ struct mmc_data *data;
- unsigned target_timeout, current_timeout;
-
- /*
-@@ -728,6 +728,11 @@ static u8 sdhci_calc_timeout(struct sdhc
- if (host->quirks & SDHCI_QUIRK_BROKEN_TIMEOUT_VAL)
- return 0xE;
-
-+ /* Unspecified command, asume max */
-+ if (cmd == NULL)
-+ return 0xE;
-+
-+ data = cmd->data;
- /* Unspecified timeout, assume max */
- if (!data && !cmd->busy_timeout)
- return 0xE;
-@@ -3100,7 +3105,7 @@ void sdhci_cqe_enable(struct mmc_host *m
- SDHCI_BLOCK_SIZE);
-
- /* Set maximum timeout */
-- sdhci_writeb(host, 0xE, SDHCI_TIMEOUT_CONTROL);
-+ sdhci_set_timeout(host, NULL);
-
- host->ier = host->cqe_ier;
-
diff --git a/series.conf b/series.conf
index 1e92d46fd1..1bf73c3563 100644
--- a/series.conf
+++ b/series.conf
@@ -731,7 +731,5 @@
+yousaf.kaukab patches.suse/0001-PCI-Vulcan-AHCI-PCI-bar-fix-for-Broadcom-Vulcan-earl.patch
+yousaf.kaukab patches.suse/0001-ahci-thunderx2-stop-engine-fix-update.patch
+yousaf.kaukab patches.suse/0001-ahci-thunderx2-update-stop-engine-errata-delay-value.patch
-+yousaf.kaukab patches.suse/0001-mmc-sdhci-add-delay-after-the-last-tuning-command.patch
-+yousaf.kaukab patches.suse/0002-mmc-sdhci-correct-the-maximum-timeout-when-enable-CM.patch
+yousaf.kaukab patches.suse/0013-ahci-thunderx2-Fix-for-errata-that-affects-stop-engi.patch
+yousaf.kaukab patches.suse/0008-kabi-arm64-reserve-space-in-cpu_hwcaps-and-cpu_hwcap.patch