diff options
| author | Gilad Ben-Yossef | 2017-11-13 15:45:50 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2017-11-27 09:20:40 +0100 |
| commit | d59c6d9cee8c8c66a0fe67e025a32266cc963e16 (patch) | |
| tree | 720d87d7e64e8ad39366ec134ef7e581187ecba3 /drivers/staging | |
| parent | staging: ccree: remove unused field (diff) | |
| download | kernel-qcow2-linux-d59c6d9cee8c8c66a0fe67e025a32266cc963e16.tar.gz kernel-qcow2-linux-d59c6d9cee8c8c66a0fe67e025a32266cc963e16.tar.xz kernel-qcow2-linux-d59c6d9cee8c8c66a0fe67e025a32266cc963e16.zip | |
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: Gilad Ben-Yossef <gilad@benyossef.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/ccree/ssi_driver.c | 2 | ||||
| -rw-r--r-- | drivers/staging/ccree/ssi_driver.h | 1 | ||||
| -rw-r--r-- | drivers/staging/ccree/ssi_request_mgr.c | 7 |
3 files changed, 8 insertions, 2 deletions
diff --git a/drivers/staging/ccree/ssi_driver.c b/drivers/staging/ccree/ssi_driver.c index b17b81137db0..3cb22967afb7 100644 --- a/drivers/staging/ccree/ssi_driver.c +++ b/drivers/staging/ccree/ssi_driver.c @@ -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; diff --git a/drivers/staging/ccree/ssi_driver.h b/drivers/staging/ccree/ssi_driver.h index ff9f5aaa6732..f92867b76073 100644 --- a/drivers/staging/ccree/ssi_driver.h +++ b/drivers/staging/ccree/ssi_driver.h @@ -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; diff --git a/drivers/staging/ccree/ssi_request_mgr.c b/drivers/staging/ccree/ssi_request_mgr.c index a2a82ef9e143..0882efd208ab 100644 --- a/drivers/staging/ccree/ssi_request_mgr.c +++ b/drivers/staging/ccree/ssi_request_mgr.c @@ -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); |