Fixes for 5.4

Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/queue-5.4/mmc-sdhci-acpi-add-sdhci_quirk2_broken_64_bit_dma-fo.patch b/queue-5.4/mmc-sdhci-acpi-add-sdhci_quirk2_broken_64_bit_dma-fo.patch
new file mode 100644 (file)
index 0000000..1e1a58a
--- /dev/null
+++ b/queue-5.4/mmc-sdhci-acpi-add-sdhci_quirk2_broken_64_bit_dma-fo.patch
@@ -0,0 +1,47 @@
+From 922f7ed44e2978f5452a2cc5773524299a2f64fe Mon Sep 17 00:00:00 2001
+From: Sasha Levin <sashal@kernel.org>
+Date: Fri, 8 May 2020 16:54:21 -0600
+Subject: mmc: sdhci-acpi: Add SDHCI_QUIRK2_BROKEN_64_BIT_DMA for AMDI0040
+
+From: Raul E Rangel <rrangel@chromium.org>
+
+[ Upstream commit 45a3fe3bf93b7cfeddc28ef7386555e05dc57f06 ]
+
+The AMD eMMC 5.0 controller does not support 64 bit DMA.
+
+Fixes: 34597a3f60b1 ("mmc: sdhci-acpi: Add support for ACPI HID of AMD Controller with HS400")
+Signed-off-by: Raul E Rangel <rrangel@chromium.org>
+Link: https://marc.info/?l=linux-mmc&m=158879884514552&w=2
+Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Acked-by: Adrian Hunter <adrian.hunter@intel.com>
+Link: https://lore.kernel.org/r/20200508165344.1.Id5bb8b1ae7ea576f26f9d91c761df7ccffbf58c5@changeid
+Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
+Signed-off-by: Sasha Levin <sashal@kernel.org>
+---
+ drivers/mmc/host/sdhci-acpi.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/drivers/mmc/host/sdhci-acpi.c b/drivers/mmc/host/sdhci-acpi.c
+index 1604f512c7bd1..01fc437ed9659 100644
+--- a/drivers/mmc/host/sdhci-acpi.c
++++ b/drivers/mmc/host/sdhci-acpi.c
+@@ -602,10 +602,12 @@ static int sdhci_acpi_emmc_amd_probe_slot(struct platform_device *pdev,
+ }
+ 
+ static const struct sdhci_acpi_slot sdhci_acpi_slot_amd_emmc = {
+-      .chip   = &sdhci_acpi_chip_amd,
+-      .caps   = MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE,
+-      .quirks = SDHCI_QUIRK_32BIT_DMA_ADDR | SDHCI_QUIRK_32BIT_DMA_SIZE |
+-                      SDHCI_QUIRK_32BIT_ADMA_SIZE,
++      .chip           = &sdhci_acpi_chip_amd,
++      .caps           = MMC_CAP_8_BIT_DATA | MMC_CAP_NONREMOVABLE,
++      .quirks         = SDHCI_QUIRK_32BIT_DMA_ADDR |
++                        SDHCI_QUIRK_32BIT_DMA_SIZE |
++                        SDHCI_QUIRK_32BIT_ADMA_SIZE,
++      .quirks2        = SDHCI_QUIRK2_BROKEN_64_BIT_DMA,
+       .probe_slot     = sdhci_acpi_emmc_amd_probe_slot,
+ };
+ 
+-- 
+2.20.1
+

diff --git a/queue-5.4/series b/queue-5.4/series
index 08129c38ebbbfe82de1f2f2ef1a845d3af929b89..e285d390b8f32620381ec3fa2f2207174129f0bd 100644 (file)
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -14,3 +14,4 @@ sun6i-dsi-fix-gcc-4.8.patch
 net_sched-fix-tcm_parent-in-tc-filter-dump.patch
 scsi-sg-add-sg_remove_request-in-sg_write.patch
 selftests-bpf-fix-goto-cleanup-label-not-defined.patch
+mmc-sdhci-acpi-add-sdhci_quirk2_broken_64_bit_dma-fo.patch