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>

diff --git a/drivers/staging/ccree/ssi_driver.c b/drivers/staging/ccree/ssi_driver.c
index b17b81137db07f4935e5374f8cb9367055a1086e..3cb22967afb70f4bebff8e3a0545eada48e90877 100644 (file)
--- 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 ff9f5aaa67321be82238d1db8d68019821933d06..f92867b7607331398f2aea451767a05eb33e5afa 100644 (file)
--- 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 a2a82ef9e143ad21ec8e0e8ec29f8116eb566fee..0882efd208abcac6ca42caefd14a152cb0ac8908 100644 (file)
--- 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);