From bbdc13b15b383b8b8d5492575e0a83cbe2af139b Mon Sep 17 00:00:00 2001 From: John Audia Date: Sat, 27 Nov 2021 14:56:33 -0500 Subject: 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 --- ...-0020-MLKU-25-3-crypto-caam-add-Secure-Memory-support.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'target/linux/layerscape/patches-5.4/804-crypto-0020-MLKU-25-3-crypto-caam-add-Secure-Memory-support.patch') diff --git a/target/linux/layerscape/patches-5.4/804-crypto-0020-MLKU-25-3-crypto-caam-add-Secure-Memory-support.patch b/target/linux/layerscape/patches-5.4/804-crypto-0020-MLKU-25-3-crypto-caam-add-Secure-Memory-support.patch index 91f1cebd55..db0e256ded 100644 --- a/target/linux/layerscape/patches-5.4/804-crypto-0020-MLKU-25-3-crypto-caam-add-Secure-Memory-support.patch +++ b/target/linux/layerscape/patches-5.4/804-crypto-0020-MLKU-25-3-crypto-caam-add-Secure-Memory-support.patch @@ -261,7 +261,7 @@ Signed-off-by: Horia Geantă --- a/drivers/crypto/caam/regs.h +++ b/drivers/crypto/caam/regs.h -@@ -382,6 +382,12 @@ struct version_regs { +@@ -385,6 +385,12 @@ struct version_regs { #define CHA_VER_VID_MD_LP512 0x1ull #define CHA_VER_VID_MD_HP 0x2ull @@ -274,7 +274,7 @@ Signed-off-by: Horia Geantă struct sec_vid { u16 ip_id; u8 maj_rev; -@@ -412,17 +418,22 @@ struct caam_perfmon { +@@ -415,17 +421,22 @@ struct caam_perfmon { #define CTPR_MS_PG_SZ_SHIFT 4 u32 comp_parms_ms; /* CTPR - Compile Parameters Register */ u32 comp_parms_ls; /* CTPR - Compile Parameters Register */ @@ -300,7 +300,7 @@ Signed-off-by: Horia Geantă /* Component Instantiation Parameters fe0-fff */ u32 rtic_id; /* RVID - RTIC Version ID */ -@@ -441,6 +452,62 @@ struct caam_perfmon { +@@ -444,6 +455,62 @@ struct caam_perfmon { u32 caam_id_ls; /* CAAMVID - CAAM Version ID LS */ }; @@ -363,7 +363,7 @@ Signed-off-by: Horia Geantă /* LIODN programming for DMA configuration */ #define MSTRID_LOCK_LIODN 0x80000000 #define MSTRID_LOCK_MAKETRUSTED 0x00010000 /* only for JR masterid */ -@@ -645,6 +712,35 @@ struct caam_ctrl { +@@ -648,6 +715,35 @@ struct caam_ctrl { #define JRSTART_JR2_START 0x00000004 /* Start Job ring 2 */ #define JRSTART_JR3_START 0x00000008 /* Start Job ring 3 */ @@ -399,7 +399,7 @@ Signed-off-by: Horia Geantă /* * caam_job_ring - direct job ring setup * 1-4 possible per instantiation, base + 1000/2000/3000/4000 -@@ -815,6 +911,62 @@ struct caam_job_ring { +@@ -818,6 +914,62 @@ struct caam_job_ring { #define JRCR_RESET 0x01 -- cgit v1.2.3