| Message ID | 1357844826-30746-2-git-send-email-mporter@ti.com (mailing list archive) |
|---|---|
| State | Not Applicable |
| Headers | show |
On Thu, Jan 10, 2013 at 02:07:04PM -0500, Matt Porter wrote: > +/* struct dmaengine_chan_caps - expose capability of a channel > + * Note: each channel can have same or different capabilities > + * > + * This primarily classifies capabilities into > + * a) APIs/ops supported > + * b) channel physical capabilities > + * > + * @cap_mask: api/ops capability (DMA_INTERRUPT and DMA_PRIVATE > + * are invalid api/ops and will never be set) > + * @seg_nr: maximum number of SG segments supported on a SG/SLAVE > + * channel (0 for no maximum or not a SG/SLAVE channel) > + * @seg_len: maximum length of SG segments supported on a SG/SLAVE > + * channel (0 for no maximum or not a SG/SLAVE channel) > + */ > +struct dmaengine_chan_caps { > + dma_cap_mask_t cap_mask; > + int seg_nr; > + int seg_len; > +}; Now am really unclear why we would need direction as argument. Also, I would add the channel physical capablities like direction, widths, lengths etc supported. > +/** > + * dma_get_channel_caps - flush pending transactions to HW flush pending... ??? > + * driver does not implement per channel capbilities then > + * NULL is returned. > + */ > +static inline struct dmaengine_chan_caps > +*dma_get_channel_caps(struct dma_chan *chan, enum dma_transfer_direction dir) you need to add this for when CONFIG_DMA_ENGINE is not defined as well. > +{ > + if (chan->device->device_channel_caps) > + return chan->device->device_channel_caps(chan, dir); > + return NULL; > +} > + > enum dma_status dma_sync_wait(struct dma_chan *chan, dma_cookie_t cookie); > #ifdef CONFIG_DMA_ENGINE > enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx); -- ~Vinod
On Sun, Jan 20, 2013 at 12:52:43PM +0000, Vinod Koul wrote: > On Thu, Jan 10, 2013 at 02:07:04PM -0500, Matt Porter wrote: > > +/* struct dmaengine_chan_caps - expose capability of a channel > > + * Note: each channel can have same or different capabilities > > + * > > + * This primarily classifies capabilities into > > + * a) APIs/ops supported > > + * b) channel physical capabilities > > + * > > + * @cap_mask: api/ops capability (DMA_INTERRUPT and DMA_PRIVATE > > + * are invalid api/ops and will never be set) > > + * @seg_nr: maximum number of SG segments supported on a SG/SLAVE > > + * channel (0 for no maximum or not a SG/SLAVE channel) > > + * @seg_len: maximum length of SG segments supported on a SG/SLAVE > > + * channel (0 for no maximum or not a SG/SLAVE channel) > > + */ > > +struct dmaengine_chan_caps { > > + dma_cap_mask_t cap_mask; > > + int seg_nr; > > + int seg_len; > > +}; > Now am really unclear why we would need direction as argument. Best explanation is my reply to your comments on 0/3. In summary, the direction allows the edma driver to select the src vs dst addr_width and maxburst fields to be used to calculate the max segment size that can be handled. > Also, I would add the channel physical capablities like direction, widths, > lengths etc supported. Ok, I can take a stab at this...I didn't bother initially as I don't have user for that info at this point. Though, I suppose we don't have an immediate user for the cap_mask either. > > +/** > > + * dma_get_channel_caps - flush pending transactions to HW > flush pending... ??? ugh, c&p fail...will fix. > > > + * driver does not implement per channel capbilities then > > + * NULL is returned. > > + */ > > +static inline struct dmaengine_chan_caps > > +*dma_get_channel_caps(struct dma_chan *chan, enum dma_transfer_direction dir) > you need to add this for when CONFIG_DMA_ENGINE is not defined as well. ok, will fix. > > +{ > > + if (chan->device->device_channel_caps) > > + return chan->device->device_channel_caps(chan, dir); > > + return NULL; > > +} > > + > > enum dma_status dma_sync_wait(struct dma_chan *chan, dma_cookie_t cookie); > > #ifdef CONFIG_DMA_ENGINE > > enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx); > -- > ~Vinod
diff --git a/include/linux/dmaengine.h b/include/linux/dmaengine.h index c88f302..9fd0c5b 100644 --- a/include/linux/dmaengine.h +++ b/include/linux/dmaengine.h @@ -371,6 +371,26 @@ struct dma_slave_config { unsigned int slave_id; }; +/* struct dmaengine_chan_caps - expose capability of a channel + * Note: each channel can have same or different capabilities + * + * This primarily classifies capabilities into + * a) APIs/ops supported + * b) channel physical capabilities + * + * @cap_mask: api/ops capability (DMA_INTERRUPT and DMA_PRIVATE + * are invalid api/ops and will never be set) + * @seg_nr: maximum number of SG segments supported on a SG/SLAVE + * channel (0 for no maximum or not a SG/SLAVE channel) + * @seg_len: maximum length of SG segments supported on a SG/SLAVE + * channel (0 for no maximum or not a SG/SLAVE channel) + */ +struct dmaengine_chan_caps { + dma_cap_mask_t cap_mask; + int seg_nr; + int seg_len; +}; + static inline const char *dma_chan_name(struct dma_chan *chan) { return dev_name(&chan->dev->device); @@ -534,6 +554,7 @@ struct dma_tx_state { * struct with auxiliary transfer status information, otherwise the call * will just return a simple status code * @device_issue_pending: push pending transactions to hardware + * @device_channel_caps: return the channel capabilities */ struct dma_device { @@ -602,6 +623,8 @@ struct dma_device { dma_cookie_t cookie, struct dma_tx_state *txstate); void (*device_issue_pending)(struct dma_chan *chan); + struct dmaengine_chan_caps *(*device_channel_caps)( + struct dma_chan *chan, enum dma_transfer_direction direction); }; static inline int dmaengine_device_control(struct dma_chan *chan, @@ -969,6 +992,23 @@ dma_set_tx_state(struct dma_tx_state *st, dma_cookie_t last, dma_cookie_t used, } } +/** + * dma_get_channel_caps - flush pending transactions to HW + * @chan: target DMA channel + * @dir: direction of transfer + * + * Get the channel-specific capabilities. If the dmaengine + * driver does not implement per channel capbilities then + * NULL is returned. + */ +static inline struct dmaengine_chan_caps +*dma_get_channel_caps(struct dma_chan *chan, enum dma_transfer_direction dir) +{ + if (chan->device->device_channel_caps) + return chan->device->device_channel_caps(chan, dir); + return NULL; +} + enum dma_status dma_sync_wait(struct dma_chan *chan, dma_cookie_t cookie); #ifdef CONFIG_DMA_ENGINE enum dma_status dma_wait_for_async_tx(struct dma_async_tx_descriptor *tx);
Add a dmaengine API to retrieve per channel capabilities. Currently, only channel ops and SG segment limitations are implemented caps. The API is optionally implemented by drivers and when unimplemented will return a NULL pointer. It is intended to be executed after a channel has been requested and, if the channel is intended to be used with slave SG transfers, then it may only be called after dmaengine_slave_config() has executed. The slave driver provides parameters such as burst size and address width which may be necessary for the dmaengine driver to use in order to properly return SG segment limit caps. Suggested-by: Vinod Koul <vinod.koul@intel.com> Signed-off-by: Matt Porter <mporter@ti.com> --- include/linux/dmaengine.h | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+)