crypto: caam/qi - execute library only on DPAA 1.x

In the process of turning caam/qi into a library, the check of
MCFGR[QI] bit has been inadvertently dropped.
Fix the condition for DPAA 1.x QI detection, which should be:
MCFGR[QI] && !MCFGR[DPAA2]

A check in the library exit point is currently not needed,
since the list of registered algorithms is empty.

While here, silence the library initialization abort - since jr.c
calls it unconditionally.

Fixes: 1b46c90c8e00 ("crypto: caam - convert top level drivers to libraries")
Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

diff --git a/drivers/crypto/caam/caamalg_qi.c b/drivers/crypto/caam/caamalg_qi.c
index 59b59f5e9550f6399ce6ec585226a62dd0649d44..fb54b2c9d337d9ad742f4094e78a54e1f7951879 100644 (file)
--- a/drivers/crypto/caam/caamalg_qi.c
+++ b/drivers/crypto/caam/caamalg_qi.c
@@ -2576,10 +2576,9 @@ int caam_qi_algapi_init(struct device *ctrldev)
        unsigned int md_limit = SHA512_DIGEST_SIZE;
        bool registered = false;
 
-       if (caam_dpaa2) {
-               dev_info(ctrldev, "caam/qi frontend driver not suitable for DPAA 2.x, aborting...\n");
-               return -ENODEV;
-       }
+       /* Make sure this runs only on (DPAA 1.x) QI */
+       if (!priv->qi_present || caam_dpaa2)
+               return 0;
 
        /*
         * Register crypto algorithms the device supports.