From: Maxime Ripard <maxime.ripard@free-electrons.com>
To: Vinod Koul <vinod.koul@intel.com>, dmaengine@vger.kernel.org
Cc: "Laurent Pinchart" <laurent.pinchart@ideasonboard.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org,
"Antoine Ténart" <antoine@free-electrons.com>,
lars@metafoo.de,
"Maxime Ripard" <maxime.ripard@free-electrons.com>
Subject: [PATCH 7/9] dmaengine: Move slave caps to dma_device
Date: Sat, 27 Sep 2014 10:54:43 +0200 [thread overview]
Message-ID: <1411808085-27792-8-git-send-email-maxime.ripard@free-electrons.com> (raw)
In-Reply-To: <1411808085-27792-1-git-send-email-maxime.ripard@free-electrons.com>
The previous code was relying on the fact that the slave_caps were to be
defined on a per channel basis.
However, this proved to be a bit overkill, since every driver filling these so
far were hardcoding it, disregarding which channel was actually given.
Add these capabilities to the dma_device structure, so that drivers can just
provide them at probe time, and be done with it.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
include/linux/dmaengine.h | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h
index cfcbee145898..e25a365b808c 100644
--- a/include/linux/dmaengine.h
+++ b/include/linux/dmaengine.h
@@ -594,6 +594,14 @@ struct dma_tx_state {
* @fill_align: alignment shift for memset operations
* @dev_id: unique device ID
* @dev: struct device reference for dma mapping api
+ * @src_addr_widths: bit mask of src addr widths the device supports
+ * @dst_addr_widths: bit mask of dst addr widths the device supports
+ * @directions: bit mask of slave direction the device supports since
+ * the enum dma_transfer_direction is not defined as bits for
+ * each type of direction, the dma controller should fill (1 <<
+ * <TYPE>) and same should be checked by controller as well
+ * @residue_granularity: granularity of the transfer residue reported
+ * by tx_status
* @device_alloc_chan_resources: allocate resources and return the
* number of allocated descriptors
* @device_free_chan_resources: release DMA channel's resources
@@ -643,6 +651,11 @@ struct dma_device {
int dev_id;
struct device *dev;
+ u32 src_addr_widths;
+ u32 dst_addr_widths;
+ u32 directions;
+ enum dma_residue_granularity residue_granularity;
+
int (*device_alloc_chan_resources)(struct dma_chan *chan);
void (*device_free_chan_resources)(struct dma_chan *chan);
@@ -783,6 +796,11 @@ static inline int dma_get_slave_caps(struct dma_chan *chan, struct dma_slave_cap
if (!test_bit(DMA_SLAVE, device->cap_mask.bits))
return -ENXIO;
+ caps->src_addr_widths = device->src_addr_widths;
+ caps->dst_addr_widths = device->dst_addr_widths;
+ caps->directions = device->directions;
+ caps->residue_granularity = device->residue_granularity;
+
caps->cmd_pause = !!device->device_pause;
caps->cmd_terminate = !!device->device_terminate_all;
--
2.1.0
next prev parent reply other threads:[~2014-09-27 8:56 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-27 8:54 [PATCH 0/9] dmaengine: Implement generic slave capabilities retrieval Maxime Ripard
2014-09-27 8:54 ` [PATCH 1/9] dmaengine: Make the destination abbreviation coherent Maxime Ripard
2014-09-27 8:54 ` [PATCH 2/9] dmaengine: Make channel allocation callbacks optional Maxime Ripard
2014-09-28 16:07 ` Vinod Koul
2014-10-01 8:39 ` Maxime Ripard
2014-09-27 8:54 ` [PATCH 3/9] dmaengine: Introduce a device_config callback Maxime Ripard
2014-09-28 16:13 ` Vinod Koul
2014-09-28 16:14 ` Vinod Koul
2014-09-27 8:54 ` [PATCH 4/9] dmaengine: split out pause/resume operations from device_control Maxime Ripard
2014-09-27 8:54 ` [PATCH 5/9] dmaengine: Add device_terminate_all callback Maxime Ripard
2014-09-27 8:54 ` [PATCH 6/9] dmaengine: Create a generic dma_slave_caps callback Maxime Ripard
2014-09-27 9:25 ` Russell King - ARM Linux
2014-10-01 8:21 ` Maxime Ripard
2014-09-27 8:54 ` Maxime Ripard [this message]
2014-09-27 9:28 ` [PATCH 7/9] dmaengine: Move slave caps to dma_device Russell King - ARM Linux
2014-10-01 8:27 ` Maxime Ripard
2014-10-01 8:55 ` Russell King - ARM Linux
2014-09-27 8:54 ` [PATCH 8/9] dmaengine: Mark device_control as deprecated Maxime Ripard
2014-09-27 8:54 ` [PATCH 9/9] dmaengine: sun6i: Convert to generic slave_caps Maxime Ripard
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=1411808085-27792-8-git-send-email-maxime.ripard@free-electrons.com \
--to=maxime.ripard@free-electrons.com \
--cc=antoine@free-electrons.com \
--cc=dmaengine@vger.kernel.org \
--cc=lars@metafoo.de \
--cc=laurent.pinchart@ideasonboard.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=vinod.koul@intel.com \
/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
all inboxes | Powered by JetHome®