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

Commit 295c01f9 authored by Christian Hohnstaedt's avatar Christian Hohnstaedt Committed by Herbert Xu
Browse files

crypto: ixp4xx - check firmware for crypto support 



 - the loaded firmware may not support crypto at all or
   only support DES and 3DES but not AES or
   support DES, 3DES and AES.

 - in case of no crypto support of the firmware, the module load will fail.
 - in case of missing AES support, the AES algorithms are not registered
   and a warning is printed during module load.

Signed-off-by: default avatarChristian Hohnstaedt <chohnstaedt@innominate.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent 0d44dc59

drivers/crypto/ixp4xx_crypto.c

+32 −1
Original line number Diff line number Diff line
@@ -415,6 +415,7 @@ static void crypto_done_action(unsigned long arg) 
static int init_ixp_crypto(void)

{

	int ret = -ENODEV;

	u32 msg[2] = { 0, 0 };



	if (! ( ~(*IXP4XX_EXP_CFG2) & (IXP4XX_FEATURE_HASH |

				IXP4XX_FEATURE_AES | IXP4XX_FEATURE_DES))) {
@@ -426,9 +427,35 @@ static int init_ixp_crypto(void) 
		return ret;



	if (!npe_running(npe_c)) {

		npe_load_firmware(npe_c, npe_name(npe_c), dev);

		ret = npe_load_firmware(npe_c, npe_name(npe_c), dev);

		if (ret) {

			return ret;

		}

		if (npe_recv_message(npe_c, msg, "STATUS_MSG"))

			goto npe_error;

	} else {

		if (npe_send_message(npe_c, msg, "STATUS_MSG"))

			goto npe_error;



		if (npe_recv_message(npe_c, msg, "STATUS_MSG"))

			goto npe_error;

	}



	switch ((msg[1]>>16) & 0xff) {

	case 3:

		printk(KERN_WARNING "Firmware of %s lacks AES support\n",

				npe_name(npe_c));

		support_aes = 0;

		break;

	case 4:

	case 5:

		support_aes = 1;

		break;

	default:

		printk(KERN_ERR "Firmware of %s lacks crypto support\n",

			npe_name(npe_c));

		return -ENODEV;

	}

	/* buffer_pool will also be used to sometimes store the hmac,

	 * so assure it is large enough

	 */
@@ -459,6 +486,10 @@ static int init_ixp_crypto(void) 


	qmgr_enable_irq(RECV_QID);

	return 0;



npe_error:

	printk(KERN_ERR "%s not responding\n", npe_name(npe_c));

	ret = -EIO;

err:

	if (ctx_pool)

		dma_pool_destroy(ctx_pool);