Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 49a20454 authored by Cyrille Pitchen's avatar Cyrille Pitchen Committed by Herbert Xu
Browse files

crypto: atmel-aes - remove calls of clk_prepare() from atomic contexts 



clk_prepare()/clk_unprepare() must not be called within atomic context.

This patch calls clk_prepare() once for all from atmel_aes_probe() and
clk_unprepare() from atmel_aes_remove().

Then calls of clk_prepare_enable()/clk_disable_unprepare() were replaced
by calls of clk_enable()/clk_disable().

Cc: stable@vger.kernel.org
Signed-off-by: default avatarCyrille Pitchen <cyrille.pitchen@atmel.com>
Reported-by: default avatarMatthias Mayr <matthias.mayr@student.kit.edu>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent fe097861

drivers/crypto/atmel-aes.c

+12 −4
Original line number Diff line number Diff line
@@ -400,7 +400,7 @@ static int atmel_aes_hw_init(struct atmel_aes_dev *dd) 
{

	int err;



	err = clk_prepare_enable(dd->iclk);

	err = clk_enable(dd->iclk);

	if (err)

		return err;
@@ -430,7 +430,7 @@ static int atmel_aes_hw_version_init(struct atmel_aes_dev *dd) 


	dev_info(dd->dev, "version: 0x%x\n", dd->hw_version);



	clk_disable_unprepare(dd->iclk);

	clk_disable(dd->iclk);

	return 0;

}
@@ -448,7 +448,7 @@ static inline bool atmel_aes_is_encrypt(const struct atmel_aes_dev *dd) 


static inline int atmel_aes_complete(struct atmel_aes_dev *dd, int err)

{

	clk_disable_unprepare(dd->iclk);

	clk_disable(dd->iclk);

	dd->flags &= ~AES_FLAGS_BUSY;



	if (dd->is_async)
@@ -2091,10 +2091,14 @@ static int atmel_aes_probe(struct platform_device *pdev) 
		goto res_err;

	}



	err = atmel_aes_hw_version_init(aes_dd);

	err = clk_prepare(aes_dd->iclk);

	if (err)

		goto res_err;



	err = atmel_aes_hw_version_init(aes_dd);

	if (err)

		goto iclk_unprepare;



	atmel_aes_get_cap(aes_dd);



	err = atmel_aes_buff_init(aes_dd);
@@ -2127,6 +2131,8 @@ static int atmel_aes_probe(struct platform_device *pdev) 
err_aes_dma:

	atmel_aes_buff_cleanup(aes_dd);

err_aes_buff:

iclk_unprepare:

	clk_unprepare(aes_dd->iclk);

res_err:

	tasklet_kill(&aes_dd->done_task);

	tasklet_kill(&aes_dd->queue_task);
@@ -2155,6 +2161,8 @@ static int atmel_aes_remove(struct platform_device *pdev) 
	atmel_aes_dma_cleanup(aes_dd);

	atmel_aes_buff_cleanup(aes_dd);



	clk_unprepare(aes_dd->iclk);



	return 0;

}