提交 37aefa02 编写于 作者: A Andy Shevchenko 提交者: Greg Kroah-Hartman

dmaengine: dw: Fix FIFO size for Intel Merrifield

commit ffe843b1 upstream.

Intel Merrifield has a reduced size of FIFO used in iDMA 32-bit controller,
i.e. 512 bytes instead of 1024.

Fix this by partitioning it as 64 bytes per channel.

Note, in the future we might switch to 'fifo-size' property instead of
hard coded value.

Fixes: 199244d6 ("dmaengine: dw: add support of iDMA 32-bit hardware")
Signed-off-by: NAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: stable@vger.kernel.org
Signed-off-by: NVinod Koul <vkoul@kernel.org>
Signed-off-by: NGreg Kroah-Hartman <gregkh@linuxfoundation.org>
上级 33154a29
...@@ -1064,12 +1064,12 @@ static void dwc_issue_pending(struct dma_chan *chan) ...@@ -1064,12 +1064,12 @@ static void dwc_issue_pending(struct dma_chan *chan)
/* /*
* Program FIFO size of channels. * Program FIFO size of channels.
* *
* By default full FIFO (1024 bytes) is assigned to channel 0. Here we * By default full FIFO (512 bytes) is assigned to channel 0. Here we
* slice FIFO on equal parts between channels. * slice FIFO on equal parts between channels.
*/ */
static void idma32_fifo_partition(struct dw_dma *dw) static void idma32_fifo_partition(struct dw_dma *dw)
{ {
u64 value = IDMA32C_FP_PSIZE_CH0(128) | IDMA32C_FP_PSIZE_CH1(128) | u64 value = IDMA32C_FP_PSIZE_CH0(64) | IDMA32C_FP_PSIZE_CH1(64) |
IDMA32C_FP_UPDATE; IDMA32C_FP_UPDATE;
u64 fifo_partition = 0; u64 fifo_partition = 0;
...@@ -1082,7 +1082,7 @@ static void idma32_fifo_partition(struct dw_dma *dw) ...@@ -1082,7 +1082,7 @@ static void idma32_fifo_partition(struct dw_dma *dw)
/* Fill FIFO_PARTITION high bits (Channels 2..3, 6..7) */ /* Fill FIFO_PARTITION high bits (Channels 2..3, 6..7) */
fifo_partition |= value << 32; fifo_partition |= value << 32;
/* Program FIFO Partition registers - 128 bytes for each channel */ /* Program FIFO Partition registers - 64 bytes per channel */
idma32_writeq(dw, FIFO_PARTITION1, fifo_partition); idma32_writeq(dw, FIFO_PARTITION1, fifo_partition);
idma32_writeq(dw, FIFO_PARTITION0, fifo_partition); idma32_writeq(dw, FIFO_PARTITION0, fifo_partition);
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册