From caaf5f72e278457a104f56369f1dc6043078d0a1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Horia=20Geant=C4=83?= Date: Fri, 22 Mar 2019 18:26:35 +0200 Subject: [PATCH] crypto: caam - make 4.14 commit 335ae6c845da4 complete again :) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Commit 335ae6c845da ("MLK-18082: crypto: caam: Minimal fix for QX panic") has not been ported completely, add missing bits. Fixes: ebc02cc3be42 ("MLK-18082: crypto: caam: Minimal fix for QX panic") Signed-off-by: Horia Geantă --- drivers/crypto/caam/ctrl.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/drivers/crypto/caam/ctrl.c b/drivers/crypto/caam/ctrl.c index 74e8c9e91cb0..77768dd6483a 100644 --- a/drivers/crypto/caam/ctrl.c +++ b/drivers/crypto/caam/ctrl.c @@ -628,7 +628,7 @@ static int probe_w_seco(struct caam_drv_private *ctrlpriv) { int ret = 0; struct device_node *np; - u32 idx, status; + u32 idx; ctrlpriv->has_seco = true; /* @@ -651,8 +651,7 @@ static int probe_w_seco(struct caam_drv_private *ctrlpriv) return -ENODEV; } idx = ctrlpriv->first_jr_index; - status = rd_reg32(&ctrlpriv->jr[idx]->perfmon.status); - caam_little_end = !(bool)(status & (CSTA_PLEND | CSTA_ALT_PLEND)); + caam_little_end = true; ctrlpriv->assure = ((struct caam_assurance __force *) ((uint8_t *)ctrlpriv->ctrl + PG_SIZE_64K * ASSURE_BLOCK_NUMBER)); -- 2.17.1