| Message ID | 20191123134817.30953-1-hslester96@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v3] crypto: picoxcell: adjust the position of tasklet_init and fix missed tasklet_kill | expand |
On Sat, Nov 23, 2019 at 09:48:17PM +0800, Chuhong Yuan wrote: > Since tasklet is needed to be initialized before registering IRQ > handler, adjust the position of tasklet_init to fix the wrong order. > > Besides, to fix the missed tasklet_kill, this patch adds a helper > function and uses devm_add_action_or_reset to kill the tasklet > automatically. > > Fixes: ce92136843cb ("crypto: picoxcell - add support for the picoxcell crypto engines") > Signed-off-by: Chuhong Yuan <hslester96@gmail.com> > --- > Changes in v3: > - Use devm_add_action_or_reset to simplify the patch. > > drivers/crypto/picoxcell_crypto.c | 15 +++++++++++++-- > 1 file changed, 13 insertions(+), 2 deletions(-) Thanks for the patch. It looks much nicer. > @@ -1655,6 +1660,14 @@ static int spacc_probe(struct platform_device *pdev) > return -ENXIO; > } > > + tasklet_init(&engine->complete, spacc_spacc_complete, > + (unsigned long)engine); > + > + ret = devm_add_action_or_reset(&pdev->dev, spacc_tasklet_kill, > + &engine->complete); Minor nit. You only need devm_add_action as calling tasklet_kill at this point should be a no-op. Cheers,
diff --git a/drivers/crypto/picoxcell_crypto.c b/drivers/crypto/picoxcell_crypto.c index 3cbefb41b099..497dbf1d6cf6 100644 --- a/drivers/crypto/picoxcell_crypto.c +++ b/drivers/crypto/picoxcell_crypto.c @@ -1613,6 +1613,11 @@ static const struct of_device_id spacc_of_id_table[] = { MODULE_DEVICE_TABLE(of, spacc_of_id_table); #endif /* CONFIG_OF */ +static void spacc_tasklet_kill(void *data) +{ + tasklet_kill(data); +} + static int spacc_probe(struct platform_device *pdev) { int i, err, ret; @@ -1655,6 +1660,14 @@ static int spacc_probe(struct platform_device *pdev) return -ENXIO; } + tasklet_init(&engine->complete, spacc_spacc_complete, + (unsigned long)engine); + + ret = devm_add_action_or_reset(&pdev->dev, spacc_tasklet_kill, + &engine->complete); + if (ret) + return ret; + if (devm_request_irq(&pdev->dev, irq->start, spacc_spacc_irq, 0, engine->name, engine)) { dev_err(engine->dev, "failed to request IRQ\n"); @@ -1712,8 +1725,6 @@ static int spacc_probe(struct platform_device *pdev) INIT_LIST_HEAD(&engine->completed); INIT_LIST_HEAD(&engine->in_progress); engine->in_flight = 0; - tasklet_init(&engine->complete, spacc_spacc_complete, - (unsigned long)engine); platform_set_drvdata(pdev, engine);
Since tasklet is needed to be initialized before registering IRQ handler, adjust the position of tasklet_init to fix the wrong order. Besides, to fix the missed tasklet_kill, this patch adds a helper function and uses devm_add_action_or_reset to kill the tasklet automatically. Fixes: ce92136843cb ("crypto: picoxcell - add support for the picoxcell crypto engines") Signed-off-by: Chuhong Yuan <hslester96@gmail.com> --- Changes in v3: - Use devm_add_action_or_reset to simplify the patch. drivers/crypto/picoxcell_crypto.c | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-)