caam/qi frontend (i.e. caamalg_qi) mustn't be used in case it runs on a
DPAA2 part (this could happen when using a multiplatform kernel).

Fixes: 297b9cebd2fc ("crypto: caam/jr - add support for DPAA2 parts")
Signed-off-by: Horia Geantă <horia.gea...@nxp.com>
---
If this patch won't make it into v4.14 (likely the case),
eventually it should be sent to -stable.

 drivers/crypto/caam/caamalg_qi.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/drivers/crypto/caam/caamalg_qi.c b/drivers/crypto/caam/caamalg_qi.c
index 2eefc4a26bc2..f9f08fce4356 100644
--- a/drivers/crypto/caam/caamalg_qi.c
+++ b/drivers/crypto/caam/caamalg_qi.c
@@ -7,7 +7,7 @@
  */
 
 #include "compat.h"
-
+#include "ctrl.h"
 #include "regs.h"
 #include "intern.h"
 #include "desc_constr.h"
@@ -2312,6 +2312,11 @@ static int __init caam_qi_algapi_init(void)
        if (!priv || !priv->qi_present)
                return -ENODEV;
 
+       if (caam_dpaa2) {
+               dev_info(ctrldev, "caam/qi frontend driver not suitable for 
DPAA 2.x, aborting...\n");
+               return -ENODEV;
+       }
+
        INIT_LIST_HEAD(&alg_list);
 
        /*
-- 
2.12.0.264.gd6db3f216544

Reply via email to