From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Viresh Kumar <vireshk@kernel.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Vinod Koul <vinod.koul@intel.com>,
linux-kernel@vger.kernel.org, dmaengine@vger.kernel.org,
Rob Herring <robh+dt@kernel.org>,
Hans-Christian Egtvedt <egtvedt@samfundet.no>,
Tejun Heo <tj@kernel.org>, Mark Brown <broonie@kernel.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Mark Rutland <mark.rutland@arm.com>,
Vineet Gupta <vgupta@synopsys.com>
Cc: Mans Rullgard <mans@mansr.com>
Subject: [PATCH v2 04/15] dmaengine: dw: set src and dst master select according to xfer direction
Date: Mon, 22 Feb 2016 18:03:39 +0200 [thread overview]
Message-ID: <1456157030-54677-5-git-send-email-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <1456157030-54677-1-git-send-email-andriy.shevchenko@linux.intel.com>
From: Mans Rullgard <mans@mansr.com>
On some architectures the DMA controller can have two masters connected to
different buses and thus access to memory is possible only through one and
to peripheral through the other.
This patch changes the src and dst master setting to match the direction
of the transfer.
Signed-off-by: Mans Rullgard <mans@mansr.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/dma/dw/core.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/dma/dw/core.c b/drivers/dma/dw/core.c
index 2573b04..67e8618 100644
--- a/drivers/dma/dw/core.c
+++ b/drivers/dma/dw/core.c
@@ -45,13 +45,17 @@
DW_DMA_MSIZE_16; \
u8 _dmsize = _is_slave ? _sconfig->dst_maxburst : \
DW_DMA_MSIZE_16; \
+ u8 _dms = (_dwc->direction == DMA_MEM_TO_DEV) ? \
+ _dwc->p_master : _dwc->m_master; \
+ u8 _sms = (_dwc->direction == DMA_DEV_TO_MEM) ? \
+ _dwc->p_master : _dwc->m_master; \
\
(DWC_CTLL_DST_MSIZE(_dmsize) \
| DWC_CTLL_SRC_MSIZE(_smsize) \
| DWC_CTLL_LLP_D_EN \
| DWC_CTLL_LLP_S_EN \
- | DWC_CTLL_DMS(_dwc->p_master) \
- | DWC_CTLL_SMS(_dwc->m_master)); \
+ | DWC_CTLL_DMS(_dms) \
+ | DWC_CTLL_SMS(_sms)); \
})
/*
--
2.7.0
next prev parent reply other threads:[~2016-02-22 16:05 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-22 16:03 [PATCH v2 00/15] Fixes / cleanups in dw_dmac (affects on few subsystems) Andy Shevchenko
2016-02-22 16:03 ` [PATCH v2 01/15] dmaengine: dw: fix byte order of hw descriptor fields Andy Shevchenko
2016-02-22 16:03 ` [PATCH v2 02/15] dmaengine: dw: clear LLP_[SD]_EN bits in last descriptor of a chain Andy Shevchenko
2016-02-22 16:03 ` [PATCH v2 03/15] dmaengine: dw: rename masters to reflect actual topology Andy Shevchenko
2016-02-22 16:03 ` Andy Shevchenko [this message]
2016-02-22 16:03 ` [PATCH v2 05/15] dmaengine: dw: set LMS field in descriptors Andy Shevchenko
2016-02-22 16:03 ` [PATCH v2 06/15] dmaengine: dw: substitute dma_read_byaddr by dma_readl_native Andy Shevchenko
2016-02-22 16:03 ` [PATCH v2 07/15] dmaengine: dw: revisit data_width property Andy Shevchenko
2016-02-22 16:03 ` [PATCH v2 08/15] dmaengine: dw: define counter variables as unsigned int Andy Shevchenko
2016-02-22 16:03 ` [PATCH v2 09/15] dmaengine: dw: keep entire platform data in struct dw_dma Andy Shevchenko
2016-02-22 16:03 ` [PATCH v2 10/15] dmaengine: dw: pass platform data via struct dw_dma_chip Andy Shevchenko
2016-02-22 16:03 ` [PATCH v2 11/15] dmaengine: dw: platform: use field-by-field initialization Andy Shevchenko
2016-02-22 16:03 ` [PATCH v2 12/15] dmaengine: dw: move dwc->paused to dwc->flags Andy Shevchenko
2016-02-22 16:03 ` [PATCH v2 13/15] dmaengine: dw: move dwc->initialized " Andy Shevchenko
2016-02-22 16:03 ` [PATCH v2 14/15] dmaengine: dw: move residue to a descriptor Andy Shevchenko
2016-02-22 16:03 ` [PATCH v2 15/15] dmaengine: dw: set cdesc to NULL when free cyclic transfers Andy Shevchenko
2016-03-04 12:34 ` [PATCH v2 00/15] Fixes / cleanups in dw_dmac (affects on few subsystems) Andy Shevchenko
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1456157030-54677-5-git-send-email-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=broonie@kernel.org \
--cc=dmaengine@vger.kernel.org \
--cc=egtvedt@samfundet.no \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mans@mansr.com \
--cc=mark.rutland@arm.com \
--cc=robh+dt@kernel.org \
--cc=tj@kernel.org \
--cc=vgupta@synopsys.com \
--cc=vinod.koul@intel.com \
--cc=vireshk@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox