Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5da5c56 authored by Gary R Hook's avatar Gary R Hook Committed by Herbert Xu
Browse files

crypto: ccp - Fix double add when creating new DMA command 



Eliminate a double-add by creating a new list to manage
command descriptors when created; move the descriptor to
the pending list when the command is submitted.

Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarGary R Hook <gary.hook@amd.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 500c0106

drivers/crypto/ccp/ccp-dev.h

+1 −0
Original line number Diff line number Diff line
@@ -238,6 +238,7 @@ struct ccp_dma_chan { 
	struct ccp_device *ccp;



	spinlock_t lock;

	struct list_head created;

	struct list_head pending;

	struct list_head active;

	struct list_head complete;

drivers/crypto/ccp/ccp-dmaengine.c

+5 −1
Original line number Diff line number Diff line
@@ -63,6 +63,7 @@ static void ccp_free_chan_resources(struct dma_chan *dma_chan) 
	ccp_free_desc_resources(chan->ccp, &chan->complete);

	ccp_free_desc_resources(chan->ccp, &chan->active);

	ccp_free_desc_resources(chan->ccp, &chan->pending);

	ccp_free_desc_resources(chan->ccp, &chan->created);



	spin_unlock_irqrestore(&chan->lock, flags);

}
@@ -273,6 +274,7 @@ static dma_cookie_t ccp_tx_submit(struct dma_async_tx_descriptor *tx_desc) 
	spin_lock_irqsave(&chan->lock, flags);



	cookie = dma_cookie_assign(tx_desc);

	list_del(&desc->entry);

	list_add_tail(&desc->entry, &chan->pending);



	spin_unlock_irqrestore(&chan->lock, flags);
@@ -426,7 +428,7 @@ static struct ccp_dma_desc *ccp_create_desc(struct dma_chan *dma_chan, 


	spin_lock_irqsave(&chan->lock, sflags);



	list_add_tail(&desc->entry, &chan->pending);

	list_add_tail(&desc->entry, &chan->created);



	spin_unlock_irqrestore(&chan->lock, sflags);
@@ -610,6 +612,7 @@ static int ccp_terminate_all(struct dma_chan *dma_chan) 
	/*TODO: Purge the complete list? */

	ccp_free_desc_resources(chan->ccp, &chan->active);

	ccp_free_desc_resources(chan->ccp, &chan->pending);

	ccp_free_desc_resources(chan->ccp, &chan->created);



	spin_unlock_irqrestore(&chan->lock, flags);
@@ -679,6 +682,7 @@ int ccp_dmaengine_register(struct ccp_device *ccp) 
		chan->ccp = ccp;



		spin_lock_init(&chan->lock);

		INIT_LIST_HEAD(&chan->created);

		INIT_LIST_HEAD(&chan->pending);

		INIT_LIST_HEAD(&chan->active);

		INIT_LIST_HEAD(&chan->complete);