kernel: bump 5.4 to 5.4.161

[openwrt/staging/chunkeey.git] / target / linux / layerscape / patches-5.4 / 804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch

diff --git a/target/linux/layerscape/patches-5.4/804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch b/target/linux/layerscape/patches-5.4/804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch
index f0622762547966f3d7d8004e883d0819208aa447..106255449c9f05ffcff557bf7316799649d53e64 100644 (file)
--- a/target/linux/layerscape/patches-5.4/804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch
+++ b/target/linux/layerscape/patches-5.4/804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch
@@ -103,16 +103,16 @@ Signed-off-by: Horia Geantă <horia.geanta@nxp.com>
 @@ -1099,10 +1099,10 @@ int caam_pkc_init(struct device *ctrldev
  
        /* Determine public key hardware accelerator presence. */
-       if (priv->era < 10)
+       if (priv->era < 10) {
 -              pk_inst = (rd_reg32(&priv->ctrl->perfmon.cha_num_ls) &
 +              pk_inst = (rd_reg32(&priv->jr[0]->perfmon.cha_num_ls) &
                           CHA_ID_LS_PK_MASK) >> CHA_ID_LS_PK_SHIFT;
-       else
--              pk_inst = rd_reg32(&priv->ctrl->vreg.pkha) & CHA_VER_NUM_MASK;
-+              pk_inst = rd_reg32(&priv->jr[0]->vreg.pkha) & CHA_VER_NUM_MASK;
+       } else {
+-              pkha = rd_reg32(&priv->ctrl->vreg.pkha);
++              pkha = rd_reg32(&priv->jr[0]->vreg.pkha);
+               pk_inst = pkha & CHA_VER_NUM_MASK;
  
-       /* Do not register algorithms if PKHA is not present. */
-       if (!pk_inst)
+               /*
 --- a/drivers/crypto/caam/caamrng.c
 +++ b/drivers/crypto/caam/caamrng.c
 @@ -363,10 +363,10 @@ int caam_rng_init(struct device *ctrldev