Commit d59c6d9c authored by Gilad Ben-Yossef's avatar Gilad Ben-Yossef Committed by Greg Kroah-Hartman
Browse files

staging: ccree: replace msleep with a completion 



When the driver would try to queue commands to the HW FIFO but ran out of
slots it would use msleep as a delay until the FIFO would clear. This is
messy and not accurate.

Replace the msleep with a proper completion on the event of command
completion which should indicate at least one slot is free.

Signed-off-by: default avatarGilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5a83a393

drivers/staging/ccree/ssi_driver.c

+2 −0
Original line number Diff line number Diff line
@@ -251,6 +251,8 @@ static int init_cc_resources(struct platform_device *plat_dev) 
	}

	dev_dbg(dev, "Registered to IRQ: %d\n", new_drvdata->irq);



	init_completion(&new_drvdata->hw_queue_avail);



	if (!plat_dev->dev.dma_mask)

		plat_dev->dev.dma_mask = &plat_dev->dev.coherent_dma_mask;

drivers/staging/ccree/ssi_driver.h

+1 −0
Original line number Diff line number Diff line
@@ -125,6 +125,7 @@ struct ssi_drvdata { 
	int irq;

	u32 irq_mask;

	u32 fw_ver;

	struct completion hw_queue_avail; /* wait for HW queue availability */

	struct platform_device *plat_dev;

	ssi_sram_addr_t mlli_sram_addr;

	void *buff_mgr_handle;

drivers/staging/ccree/ssi_request_mgr.c

+5 −2
Original line number Diff line number Diff line
@@ -312,8 +312,9 @@ int send_request( 
			return rc;

		}



		/* HW queue is full - short sleep */

		msleep(1);

		/* HW queue is full - wait for it to clear up */

		wait_for_completion_interruptible(&drvdata->hw_queue_avail);

		reinit_completion(&drvdata->hw_queue_avail);

	} while (1);



	/* Additional completion descriptor is needed incase caller did not
@@ -452,6 +453,8 @@ void complete_request(struct ssi_drvdata *drvdata) 
{

	struct ssi_request_mgr_handle *request_mgr_handle =

						drvdata->request_mgr_handle;



	complete(&drvdata->hw_queue_avail);

#ifdef COMP_IN_WQ

	queue_delayed_work(request_mgr_handle->workq,

			   &request_mgr_handle->compwork, 0);

CRA Git | Maintained and supported by SUSTech CRA and CCSE