crypto: rockchip - move the crypto completion from interrupt context

It's illegal to call the completion function from hardirq context,
it will cause runtime tests to fail. Let's build a new task (done_task)
for moving update operation from hardirq context.

Signed-off-by: zain wang <wzz@rock-chips.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/rockchip/rk3288_crypto.c b/drivers/crypto/rockchip/rk3288_crypto.c
index d0f80c6241f951636d2083ced5ea305100f9cf5d..c2b1dd70f9f72cd25980e141c7815d73b58a3be8 100644 (file)
--- a/drivers/crypto/rockchip/rk3288_crypto.c
+++ b/drivers/crypto/rockchip/rk3288_crypto.c
@@ -169,24 +169,22 @@ static irqreturn_t rk_crypto_irq_handle(int irq, void *dev_id)
 {
        struct rk_crypto_info *dev  = platform_get_drvdata(dev_id);
        u32 interrupt_status;
-       int err = 0;
 
        spin_lock(&dev->lock);
        interrupt_status = CRYPTO_READ(dev, RK_CRYPTO_INTSTS);
        CRYPTO_WRITE(dev, RK_CRYPTO_INTSTS, interrupt_status);
+
        if (interrupt_status & 0x0a) {
                dev_warn(dev->dev, "DMA Error\n");
-               err = -EFAULT;
-       } else if (interrupt_status & 0x05) {
-               err = dev->update(dev);
+               dev->err = -EFAULT;
        }
-       if (err)
-               dev->complete(dev, err);
+       tasklet_schedule(&dev->done_task);
+
        spin_unlock(&dev->lock);
        return IRQ_HANDLED;
 }
 
-static void rk_crypto_tasklet_cb(unsigned long data)
+static void rk_crypto_queue_task_cb(unsigned long data)
 {
        struct rk_crypto_info *dev = (struct rk_crypto_info *)data;
        struct crypto_async_request *async_req, *backlog;
@@ -210,11 +208,26 @@ static void rk_crypto_tasklet_cb(unsigned long data)
                dev->ablk_req = ablkcipher_request_cast(async_req);
        else
                dev->ahash_req = ahash_request_cast(async_req);
+       dev->err = 0;
        err = dev->start(dev);
        if (err)
                dev->complete(dev, err);
 }
 
+static void rk_crypto_done_task_cb(unsigned long data)
+{
+       struct rk_crypto_info *dev = (struct rk_crypto_info *)data;
+
+       if (dev->err) {
+               dev->complete(dev, dev->err);
+               return;
+       }
+
+       dev->err = dev->update(dev);
+       if (dev->err)
+               dev->complete(dev, dev->err);
+}
+
 static struct rk_crypto_tmp *rk_cipher_algs[] = {
        &rk_ecb_aes_alg,
        &rk_cbc_aes_alg,
@@ -361,8 +374,10 @@ static int rk_crypto_probe(struct platform_device *pdev)
        crypto_info->dev = &pdev->dev;
        platform_set_drvdata(pdev, crypto_info);
 
-       tasklet_init(&crypto_info->crypto_tasklet,
-                    rk_crypto_tasklet_cb, (unsigned long)crypto_info);
+       tasklet_init(&crypto_info->queue_task,
+                    rk_crypto_queue_task_cb, (unsigned long)crypto_info);
+       tasklet_init(&crypto_info->done_task,
+                    rk_crypto_done_task_cb, (unsigned long)crypto_info);
        crypto_init_queue(&crypto_info->queue, 50);
 
        crypto_info->enable_clk = rk_crypto_enable_clk;
@@ -380,7 +395,8 @@ static int rk_crypto_probe(struct platform_device *pdev)
        return 0;
 
 err_register_alg:
-       tasklet_kill(&crypto_info->crypto_tasklet);
+       tasklet_kill(&crypto_info->queue_task);
+       tasklet_kill(&crypto_info->done_task);
 err_crypto:
        return err;
 }
@@ -390,7 +406,8 @@ static int rk_crypto_remove(struct platform_device *pdev)
        struct rk_crypto_info *crypto_tmp = platform_get_drvdata(pdev);
 
        rk_crypto_unregister();
-       tasklet_kill(&crypto_tmp->crypto_tasklet);
+       tasklet_kill(&crypto_tmp->done_task);
+       tasklet_kill(&crypto_tmp->queue_task);
        return 0;
 }
 

diff --git a/drivers/crypto/rockchip/rk3288_crypto.h b/drivers/crypto/rockchip/rk3288_crypto.h
index d7b71fea320b1f08c51ef443b08c783ba01ff751..65ad1c261949010ac450aebc16003f3c9611ff5c 100644 (file)
--- a/drivers/crypto/rockchip/rk3288_crypto.h
+++ b/drivers/crypto/rockchip/rk3288_crypto.h
@@ -190,9 +190,11 @@ struct rk_crypto_info {
        void __iomem                    *reg;
        int                             irq;
        struct crypto_queue             queue;
-       struct tasklet_struct           crypto_tasklet;
+       struct tasklet_struct           queue_task;
+       struct tasklet_struct           done_task;
        struct ablkcipher_request       *ablk_req;
        struct ahash_request            *ahash_req;
+       int                             err;
        /* device lock */
        spinlock_t                      lock;
 

diff --git a/drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c b/drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c
index b5a3afe222e42b81b59e50bc6105ae6f11ac1976..8787e44593f85a4312726215c1258946c320e4f0 100644 (file)
--- a/drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c
+++ b/drivers/crypto/rockchip/rk3288_crypto_ablkcipher.c
@@ -42,7 +42,7 @@ static int rk_handle_req(struct rk_crypto_info *dev,
        spin_lock_irqsave(&dev->lock, flags);
        err = ablkcipher_enqueue_request(&dev->queue, req);
        spin_unlock_irqrestore(&dev->lock, flags);
-       tasklet_schedule(&dev->crypto_tasklet);
+       tasklet_schedule(&dev->queue_task);
        return err;
 }
 

diff --git a/drivers/crypto/rockchip/rk3288_crypto_ahash.c b/drivers/crypto/rockchip/rk3288_crypto_ahash.c
index 718588219f75a418e7ad7bd3f2c23c53f9ee05d7..9b55585a20fa04793f78946d3c12b76975b4b160 100644 (file)
--- a/drivers/crypto/rockchip/rk3288_crypto_ahash.c
+++ b/drivers/crypto/rockchip/rk3288_crypto_ahash.c
@@ -204,7 +204,7 @@ static int rk_ahash_digest(struct ahash_request *req)
        ret = crypto_enqueue_request(&dev->queue, &req->base);
        spin_unlock_irqrestore(&dev->lock, flags);
 
-       tasklet_schedule(&dev->crypto_tasklet);
+       tasklet_schedule(&dev->queue_task);
 
        /*
         * it will take some time to process date after last dma transmission.