Re: [PATCHv2 09/11] dw_dmac: make usage of dw_dma_slave optional

[Andy Shevchenko]

Please, don't push this one yet. I forgot to update the name of is_slave_xfer.

On Thu, Jan 10, 2013 at 10:53 AM, Andy Shevchenko
<andriy.shevchenko@xxxxxxxxxxxxxxx> wrote:
> The driver requires a custom slave configuration to be present to be able to
> make the slave transfers. Nevertheless, in some cases we need only the request
> line as an additional information to the generic slave configuration.  The
> request line is provided by slave_id parameter of the dma_slave_config
> structure. That's why the custom slave configuration could be optional for such
> cases.
>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx>
> Acked-by: Viresh Kumar <viresh.kumar@xxxxxxxxxx>
> ---
>  drivers/dma/dw_dmac.c |   13 +++++++------
>  1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/dma/dw_dmac.c b/drivers/dma/dw_dmac.c
> index a2c5a60..c87d8ab 100644
> --- a/drivers/dma/dw_dmac.c
> +++ b/drivers/dma/dw_dmac.c
> @@ -50,11 +50,12 @@ static inline unsigned int dwc_get_sms(struct dw_dma_slave *slave)
>                 struct dw_dma_slave *__slave = (_chan->private);        \
>                 struct dw_dma_chan *_dwc = to_dw_dma_chan(_chan);       \
>                 struct dma_slave_config *_sconfig = &_dwc->dma_sconfig; \
> +               bool _is_slave = is_slave_xfer(_dwc->direction);        \
>                 int _dms = dwc_get_dms(__slave);                \
>                 int _sms = dwc_get_sms(__slave);                \
> -               u8 _smsize = __slave ? _sconfig->src_maxburst : \
> +               u8 _smsize = _is_slave ? _sconfig->src_maxburst :       \
>                         DW_DMA_MSIZE_16;                        \
> -               u8 _dmsize = __slave ? _sconfig->dst_maxburst : \
> +               u8 _dmsize = _is_slave ? _sconfig->dst_maxburst :       \
>                         DW_DMA_MSIZE_16;                        \
>                                                                 \
>                 (DWC_CTLL_DST_MSIZE(_dmsize)                    \
> @@ -328,7 +329,7 @@ dwc_descriptor_complete(struct dw_dma_chan *dwc, struct dw_desc *desc,
>         list_splice_init(&desc->tx_list, &dwc->free_list);
>         list_move(&desc->desc_node, &dwc->free_list);
>
> -       if (!dwc->chan.private) {
> +       if (!is_slave_xfer(dwc->direction)) {
>                 struct device *parent = chan2parent(&dwc->chan);
>                 if (!(txd->flags & DMA_COMPL_SKIP_DEST_UNMAP)) {
>                         if (txd->flags & DMA_COMPL_DEST_UNMAP_SINGLE)
> @@ -804,7 +805,7 @@ dwc_prep_slave_sg(struct dma_chan *chan, struct scatterlist *sgl,
>
>         dev_vdbg(chan2dev(chan), "%s\n", __func__);
>
> -       if (unlikely(!dws || !sg_len))
> +       if (unlikely(!is_slave_xfer(direction) || !sg_len))
>                 return NULL;
>
>         dwc->direction = direction;
> @@ -980,8 +981,8 @@ set_runtime_config(struct dma_chan *chan, struct dma_slave_config *sconfig)
>  {
>         struct dw_dma_chan *dwc = to_dw_dma_chan(chan);
>
> -       /* Check if it is chan is configured for slave transfers */
> -       if (!chan->private)
> +       /* Check if chan will be configured for slave transfers */
> +       if (!is_slave_xfer(sconfig->direction))
>                 return -EINVAL;
>
>         memcpy(&dwc->dma_sconfig, sconfig, sizeof(*sconfig));
> --
> 1.7.10.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at  http://www.tux.org/lkml/



-- 
With Best Regards,
Andy Shevchenko
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/