On 07/26/2016 03:02 PM, Uwe Kleine-König wrote:
> Allocating and preparing a dma descriptor doesn't need to happen under
> the channel's lock. So do this before taking the channel's lock. The only
> down side is that the dma descriptor might be allocated even though the
> channel is about to be stopped. This is unlikely though.
>
> Signed-off-by: Uwe Kleine-König <u.kleine-koe...@pengutronix.de>
> ---
> drivers/net/ethernet/ti/davinci_cpdma.c | 38
> +++++++++++++++++----------------
> 1 file changed, 20 insertions(+), 18 deletions(-)
>
> diff --git a/drivers/net/ethernet/ti/davinci_cpdma.c
> b/drivers/net/ethernet/ti/davinci_cpdma.c
> index 5ffa04a306c6..ba3462707ae3 100644
> --- a/drivers/net/ethernet/ti/davinci_cpdma.c
> +++ b/drivers/net/ethernet/ti/davinci_cpdma.c
> @@ -542,24 +542,10 @@ int cpdma_chan_submit(struct cpdma_chan *chan, void
> *token, void *data,
> u32 mode;
> int ret = 0;
>
> - spin_lock_irqsave(&chan->lock, flags);
> -
> - if (chan->state == CPDMA_STATE_TEARDOWN) {
> - ret = -EINVAL;
> - goto unlock_ret;
> - }
> -
> - if (chan->count >= chan->desc_num) {
> - chan->stats.desc_alloc_fail++;
> - ret = -ENOMEM;
> - goto unlock_ret;
> - }
I'm not sure this is right thing to do. This check is expected to be strict
and means "channel has exhausted the available descriptors, so further descs
allocation does not allowed".
This also might affect on Ivan's work [1] "[PATCH 0/4] net: ethernet: ti:
cpsw: add multi-queue support"
[1] https://lkml.org/lkml/2016/6/30/603
--
regards,
-grygorii
