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: Christian Hohnstaedt <chohnstaedt@innominate.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
This commit is contained in:
Christian Hohnstaedt 2009-04-12 13:01:44 +08:00 committed by Herbert Xu
parent 0d44dc59b2
commit 295c01f90d
1 changed files with 32 additions and 1 deletions

View File

@ -415,6 +415,7 @@ static void crypto_done_action(unsigned long arg)
static int init_ixp_crypto(void) static int init_ixp_crypto(void)
{ {
int ret = -ENODEV; int ret = -ENODEV;
u32 msg[2] = { 0, 0 };
if (! ( ~(*IXP4XX_EXP_CFG2) & (IXP4XX_FEATURE_HASH | if (! ( ~(*IXP4XX_EXP_CFG2) & (IXP4XX_FEATURE_HASH |
IXP4XX_FEATURE_AES | IXP4XX_FEATURE_DES))) { IXP4XX_FEATURE_AES | IXP4XX_FEATURE_DES))) {
@ -426,9 +427,35 @@ static int init_ixp_crypto(void)
return ret; return ret;
if (!npe_running(npe_c)) { 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, /* buffer_pool will also be used to sometimes store the hmac,
* so assure it is large enough * so assure it is large enough
*/ */
@ -459,6 +486,10 @@ static int init_ixp_crypto(void)
qmgr_enable_irq(RECV_QID); qmgr_enable_irq(RECV_QID);
return 0; return 0;
npe_error:
printk(KERN_ERR "%s not responding\n", npe_name(npe_c));
ret = -EIO;
err: err:
if (ctx_pool) if (ctx_pool)
dma_pool_destroy(ctx_pool); dma_pool_destroy(ctx_pool);