All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mans Rullgard <mans@mansr.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
Cc: Dan Williams <dan.j.williams@intel.com>
Subject: [PATCH 04/15] dmaengine: dw: set src and dst master select according to xfer direction
Date: Sun, 24 Jan 2016 19:21:51 +0000	[thread overview]
Message-ID: <1453663322-14474-5-git-send-email-mans@mansr.com> (raw)
In-Reply-To: <1453663322-14474-1-git-send-email-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>
---
 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 8d1b87ff2ac6..1e29efad2bf1 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

  parent reply	other threads:[~2016-01-24 19:28 UTC|newest]

Thread overview: 82+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-01-24 19:21 [PATCH 00/15] dmaengine: dw: various fixes and cleanups Mans Rullgard
2016-01-24 19:21 ` [PATCH 01/15] dmaengine: dw: fix byte order of hw descriptor fields Mans Rullgard
2016-01-24 19:21 ` [PATCH 02/15] dmaengine: dw: clear LLP_[SD]_EN bits in last descriptor of a chain Mans Rullgard
     [not found] ` <1453663322-14474-1-git-send-email-mans-2StjZFpD7GcAvxtiuMwx3w@public.gmane.org>
2016-01-24 19:21   ` [PATCH 03/15] dmaengine: dw: rename masters to reflect actual topology Mans Rullgard
2016-01-24 19:21     ` Mans Rullgard
2016-01-24 19:21     ` Mans Rullgard
2016-01-24 20:09     ` Hans-Christian Noren Egtvedt
2016-01-24 20:09       ` Hans-Christian Noren Egtvedt
     [not found]       ` <20160124200959.GA15633-BrfabpQBY5qlHtIdYg32fQ@public.gmane.org>
2016-01-24 20:19         ` Måns Rullgård
2016-01-24 20:19           ` Måns Rullgård
2016-01-24 20:19           ` Måns Rullgård
2016-01-24 20:37           ` Hans-Christian Noren Egtvedt
2016-01-24 20:37             ` Hans-Christian Noren Egtvedt
     [not found]             ` <20160124203720.GA29010-BrfabpQBY5qlHtIdYg32fQ@public.gmane.org>
2016-01-24 20:57               ` Måns Rullgård
2016-01-24 20:57                 ` Måns Rullgård
2016-01-24 20:57                 ` Måns Rullgård
     [not found]     ` <1453663322-14474-4-git-send-email-mans-2StjZFpD7GcAvxtiuMwx3w@public.gmane.org>
2016-01-24 22:36       ` Mark Brown
2016-01-24 22:36         ` Mark Brown
2016-01-24 22:36         ` Mark Brown
2016-01-24 22:38         ` Måns Rullgård
2016-01-24 22:38           ` Måns Rullgård
     [not found]           ` <yw1xk2myli0u.fsf-OEaqT8BN2ezZK2NkWkPsZwC/G2K4zDHf@public.gmane.org>
2016-01-25  6:03             ` Viresh Kumar
2016-01-25  6:03               ` Viresh Kumar
2016-01-25  6:03               ` Viresh Kumar
2016-01-25  6:03               ` Viresh Kumar
2016-01-25 12:05           ` Vinod Koul
2016-01-25 12:05             ` Vinod Koul
2016-01-25 12:23           ` Mark Brown
2016-01-25 12:23             ` Mark Brown
2016-01-25  8:35         ` Andy Shevchenko
2016-01-25  8:35           ` Andy Shevchenko
2016-01-25 12:24           ` Mark Brown
2016-01-25 12:24             ` Mark Brown
2016-01-25 14:01             ` Andy Shevchenko
2016-01-25 14:01               ` Andy Shevchenko
2016-01-27 12:47     ` Mark Brown
2016-01-27 12:47       ` Mark Brown
2016-01-24 19:21 ` Mans Rullgard [this message]
2016-01-24 19:21 ` [PATCH 05/15] dmaengine: dw: set LMS field in descriptors Mans Rullgard
2016-01-24 19:21 ` [PATCH 06/15] dmaengine: dw: substitute dma_read_byaddr by dma_readl_native Mans Rullgard
2016-01-24 19:21 ` [PATCH 07/15] dmaengine: dw: revisit data_width property Mans Rullgard
2016-01-24 19:21   ` Mans Rullgard
2016-01-24 19:21   ` Mans Rullgard
2016-01-25  7:32   ` Vineet Gupta
2016-01-25  7:32     ` Vineet Gupta
2016-01-25  7:32     ` Vineet Gupta
2016-01-25  7:32     ` Vineet Gupta
2016-01-25  8:45     ` Andy Shevchenko
2016-01-25  8:45       ` Andy Shevchenko
2016-01-25  8:45       ` Andy Shevchenko
2016-01-25  8:45       ` Andy Shevchenko
2016-01-25 10:31       ` Måns Rullgård
2016-01-25 10:31         ` Måns Rullgård
2016-01-25 10:31         ` Måns Rullgård
2016-01-25 10:31         ` Måns Rullgård
2016-01-25 10:36         ` Andy Shevchenko
2016-01-25 10:36           ` Andy Shevchenko
2016-01-25 10:36           ` Andy Shevchenko
2016-01-25 10:36           ` Andy Shevchenko
2016-01-25  8:42   ` Andy Shevchenko
2016-01-25  8:42     ` Andy Shevchenko
2016-01-25  8:42     ` Andy Shevchenko
2016-01-25  8:42     ` Andy Shevchenko
2016-01-26 21:07   ` Rob Herring
2016-01-26 21:07     ` Rob Herring
2016-01-26 21:07     ` Rob Herring
2016-01-26 21:07     ` Rob Herring
2016-01-27 12:26     ` Andy Shevchenko
2016-01-27 12:26       ` Andy Shevchenko
2016-01-27 12:26       ` Andy Shevchenko
2016-01-27 12:26       ` Andy Shevchenko
2016-01-24 19:21 ` [PATCH 08/15] dmaengine: dw: define counter variables as unsigned int Mans Rullgard
2016-01-24 19:21 ` [PATCH 09/15] dmaengine: dw: keep entire platform data in struct dw_dma Mans Rullgard
2016-01-24 19:21 ` [PATCH 10/15] dmaengine: dw: pass platform data via struct dw_dma_chip Mans Rullgard
2016-01-24 19:21 ` [PATCH 11/15] dmaengine: dw: platform: use field-by-field initialization Mans Rullgard
2016-01-25  8:48   ` Andy Shevchenko
2016-01-24 19:21 ` [PATCH 12/15] dmaengine: dw: move dwc->paused to dwc->flags Mans Rullgard
2016-01-24 19:22 ` [PATCH 13/15] dmaengine: dw: move dwc->initialized " Mans Rullgard
2016-01-24 19:22 ` [PATCH 14/15] dmaengine: dw: move residue to a descriptor Mans Rullgard
2016-01-24 19:22 ` [PATCH 15/15] dmaengine: dw: set cdesc to NULL when free cyclic transfers Mans Rullgard
2016-01-25 10:37 ` [PATCH 00/15] dmaengine: dw: various fixes and cleanups Andy Shevchenko
2016-01-25 12:07 ` Vinod Koul

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=1453663322-14474-5-git-send-email-mans@mansr.com \
    --to=mans@mansr.com \
    --cc=andriy.shevchenko@linux.intel.com \
    --cc=dan.j.williams@intel.com \
    --cc=dmaengine@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.