diff options
| author | John Audia <graysky@archlinux.us> | 2021-11-27 14:56:33 -0500 |
|---|---|---|
| committer | Hauke Mehrtens <hauke@hauke-m.de> | 2021-11-28 16:32:45 +0100 |
| commit | bbdc13b15b383b8b8d5492575e0a83cbe2af139b (patch) | |
| tree | e874ca367d12c68d8cdb5392f829bd53c37563a0 /target/linux/layerscape/patches-5.4/804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch | |
| parent | 26a7a385bbe2c8a258b9b845122e48935c8738c9 (diff) | |
| download | upstream-bbdc13b15b383b8b8d5492575e0a83cbe2af139b.tar.gz upstream-bbdc13b15b383b8b8d5492575e0a83cbe2af139b.tar.bz2 upstream-bbdc13b15b383b8b8d5492575e0a83cbe2af139b.zip | |
kernel: bump 5.4 to 5.4.161
Removed upstreamed:
ath79/patches-5.4/921-serial-core-add-support-for-boot-console-with-arbitr.patch[1]
Manually rebased:
layerscape/patches-5.4/804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch
octeontx/patches-5.4/0004-PCI-add-quirk-for-Gateworks-PLX-PEX860x-switch-with-.patch
All other patches automatically rebased.
1. Private email exchange with patch author, Hauke Mehrtens
Signed-off-by: John Audia <graysky@archlinux.us>
Diffstat (limited to 'target/linux/layerscape/patches-5.4/804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch')
| -rw-r--r-- | target/linux/layerscape/patches-5.4/804-crypto-0016-MLKU-114-1-crypto-caam-reduce-page-0-regs-access-to-.patch | 12 |
1 files changed, 6 insertions, 6 deletions
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 f062276254..106255449c 100644 --- 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 |