Home Home > GIT Browse > SLE15
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2019-07-19 14:33:00 +0200
committerTakashi Iwai <tiwai@suse.de>2019-07-19 14:33:06 +0200
commit77838b241a649d7901a246e0d9d31ffdab6be83c (patch)
treeff44904f3d450572852bdfefcca942e5809feeb7
parent06827821f71daeac41526b8dc2ba5bd623e97513 (diff)
dmaengine: hsu: Revert "set HSU_CH_MTSR to memory width"
(bsc#1051510).
-rw-r--r--patches.drivers/dmaengine-hsu-Revert-set-HSU_CH_MTSR-to-memory-width.patch51
-rw-r--r--series.conf1
2 files changed, 52 insertions, 0 deletions
diff --git a/patches.drivers/dmaengine-hsu-Revert-set-HSU_CH_MTSR-to-memory-width.patch b/patches.drivers/dmaengine-hsu-Revert-set-HSU_CH_MTSR-to-memory-width.patch
new file mode 100644
index 0000000000..eabef6274a
--- /dev/null
+++ b/patches.drivers/dmaengine-hsu-Revert-set-HSU_CH_MTSR-to-memory-width.patch
@@ -0,0 +1,51 @@
+From c24a5c735f87d0549060de31367c095e8810b895 Mon Sep 17 00:00:00 2001
+From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Date: Thu, 13 Jun 2019 16:32:32 +0300
+Subject: [PATCH] dmaengine: hsu: Revert "set HSU_CH_MTSR to memory width"
+Git-commit: c24a5c735f87d0549060de31367c095e8810b895
+Patch-mainline: 5.3-rc1
+References: bsc#1051510
+
+The commit
+
+ 080edf75d337 ("dmaengine: hsu: set HSU_CH_MTSR to memory width")
+
+has been mistakenly submitted. The further investigations show that
+the original code does better job since the memory side transfer size
+has never been configured by DMA users.
+
+As per latest revision of documentation: "Channel minimum transfer size
+(CHnMTSR)... For IOSF UART, maximum value that can be programmed is 64 and
+minimum value that can be programmed is 1."
+
+This reverts commit 080edf75d337d35faa6fc3df99342b10d2848d16.
+
+Fixes: 080edf75d337 ("dmaengine: hsu: set HSU_CH_MTSR to memory width")
+Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
+Signed-off-by: Vinod Koul <vkoul@kernel.org>
+Acked-by: Takashi Iwai <tiwai@suse.de>
+
+---
+ drivers/dma/hsu/hsu.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/dma/hsu/hsu.c b/drivers/dma/hsu/hsu.c
+index e06f20272fd7..dfabc64c2ab0 100644
+--- a/drivers/dma/hsu/hsu.c
++++ b/drivers/dma/hsu/hsu.c
+@@ -64,10 +64,10 @@ static void hsu_dma_chan_start(struct hsu_dma_chan *hsuc)
+
+ if (hsuc->direction == DMA_MEM_TO_DEV) {
+ bsr = config->dst_maxburst;
+- mtsr = config->src_addr_width;
++ mtsr = config->dst_addr_width;
+ } else if (hsuc->direction == DMA_DEV_TO_MEM) {
+ bsr = config->src_maxburst;
+- mtsr = config->dst_addr_width;
++ mtsr = config->src_addr_width;
+ }
+
+ hsu_chan_disable(hsuc);
+--
+2.16.4
+
diff --git a/series.conf b/series.conf
index b67c44eff9..668836f93d 100644
--- a/series.conf
+++ b/series.conf
@@ -22945,6 +22945,7 @@
patches.drivers/mfd-intel-lpss-Release-IDA-resources.patch
patches.drivers/PCI-Return-error-if-cannot-probe-VF.patch
patches.drivers/PCI-Always-allow-probing-with-driver_override.patch
+ patches.drivers/dmaengine-hsu-Revert-set-HSU_CH_MTSR-to-memory-width.patch
patches.drivers/ALSA-hda-realtek-Fixed-Headphone-Mic-can-t-record-on.patch
patches.drivers/ALSA-hda-realtek-apply-ALC891-headset-fixup-to-one-D.patch
patches.drivers/ALSA-seq-Break-too-long-mutex-context-in-the-write-l.patch