Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3a7a77d7 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge branch 'android11-5.4' into 'android11-5.4-lts' 



Sync up with android11-5.4 for the following commits:

05137329 ANDROID: GKI: Enable CHACHA20POLY1305 and XCBC
55cb12f0 ANDROID: Incremental fs: Fix dentry get/put imbalance on vfs_mkdir() failure
59d82646 ANDROID: f2fs: fix potential deadlock by android ftrace
dc8c919c ANDROID: GKI: Update FCNT KMI symbol list No new symbols added that are not already in the .xml file.
e3f12f42 ANDROID: GKI : Update symbols to symbol list
47c8de47 BACKPORT: crypto: arch - conditionalize crypto api in arch glue for lib code
514e31d6 BACKPORT: crypto: arch/lib - limit simd usage to 4k chunks
568c0c89 UPSTREAM: crypto: arm/blake2s - fix for big endian
ce6e6983 ANDROID: gki_defconfig: enable BLAKE2b support
40501f73 BACKPORT: crypto: arm/blake2b - add NEON-accelerated BLAKE2b
47700006 BACKPORT: crypto: blake2b - update file comment
c5816192 BACKPORT: crypto: blake2b - sync with blake2s implementation
be7d8de4 UPSTREAM: crypto: arm/blake2s - add ARM scalar optimized BLAKE2s
d63d7c1e UPSTREAM: crypto: blake2s - include <linux/bug.h> instead of <asm/bug.h>
b8de6b8e UPSTREAM: crypto: blake2s - adjust include guard naming
609d9425 UPSTREAM: crypto: blake2s - add comment for blake2s_state fields
32ac79b0 UPSTREAM: crypto: blake2s - optimize blake2s initialization
74c75891 BACKPORT: crypto: blake2s - share the "shash" API boilerplate code
8a14e1d8 UPSTREAM: crypto: blake2s - move update and final logic to internal/blake2s.h
4c7a6f46 UPSTREAM: crypto: blake2s - remove unneeded includes
7537c648 UPSTREAM: crypto: x86/blake2s - define shash_alg structs using macros
b54930b3 UPSTREAM: crypto: blake2s - define shash_alg structs using macros
05e10b45 UPSTREAM: crypto: lib/blake2s - Move selftest prototype into header file
29ab2a57 UPSTREAM: crypto: blake2b - Fix clang optimization for ARMv7-M
27c00daf UPSTREAM: crypto: blake2b - rename tfm context and _setkey callback
196f7b51 UPSTREAM: crypto: blake2b - merge _update to api callback
a6233627 UPSTREAM: crypto: blake2b - open code set last block helper
00e77739 UPSTREAM: crypto: blake2b - delete unused structs or members
f03f8096 UPSTREAM: crypto: blake2b - simplify key init
fdb0b246 UPSTREAM: crypto: blake2b - merge blake2 init to api callback
75973ecd UPSTREAM: crypto: blake2b - merge _final implementation to callback
fbbe069b BACKPORT: crypto: testmgr - add test vectors for blake2b
9cd85693 BACKPORT: crypto: blake2b - add blake2b generic implementation
3e82f8af UPSTREAM: crypto: blake2s - x86_64 SIMD implementation
22bff7a3 UPSTREAM: crypto: blake2s - implement generic shash driver
43ec9b95 UPSTREAM: crypto: testmgr - add test cases for Blake2s
192edcb3 UPSTREAM: crypto: blake2s - generic C library implementation and selftest
078cebb3 UPSTREAM: crypto: lib - tidy up lib/crypto Kconfig and Makefile
160ab931 ANDROID: ion heap: init ion heaps in subsys_initcall

Change-Id: I3a9e13098b73ae21ea76d95c75572c124bd91cfd
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@google.com>
parents ff9005a6 05137329

android/abi_gki_aarch64.xml

+1891 −1746

File changed.

Preview size limit exceeded, changes collapsed.

android/abi_gki_aarch64_fcnt

100644 → 100755
+10 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
  sync_blockdev

  read_cache_page

  blkdev_put

  blkdev_get_by_dev

  blkdev_get_by_path



# required by pt.ko

  input_mt_sync_frame
@@ -69,3 +69,12 @@ 


# required by chipone-ts.ko

  input_mt_sync_frame



# required by hardware_info.ko

  simple_strtoull



# required by spidev.ko

  stream_open



# required by sdhci-msm.ko

  mmc_gpio_set_cd_wake

android/abi_gki_aarch64_oplus

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
  regulator_set_voltage

  remove_proc_entry

  schedule_timeout

  sdio_writeb_readb

  seq_printf

  seq_read

  simple_open

arch/arm/crypto/Kconfig

+19 −0
Original line number Diff line number Diff line
@@ -62,6 +62,25 @@ config CRYPTO_SHA512_ARM 
	  SHA-512 secure hash standard (DFIPS 180-2) implemented

	  using optimized ARM assembler and NEON, when available.



config CRYPTO_BLAKE2S_ARM

	tristate "BLAKE2s digest algorithm (ARM)"

	select CRYPTO_ARCH_HAVE_LIB_BLAKE2S

	help

	  BLAKE2s digest algorithm optimized with ARM scalar instructions.  This

	  is faster than the generic implementations of BLAKE2s and BLAKE2b, but

	  slower than the NEON implementation of BLAKE2b.  (There is no NEON

	  implementation of BLAKE2s, since NEON doesn't really help with it.)



config CRYPTO_BLAKE2B_NEON

	tristate "BLAKE2b digest algorithm (ARM NEON)"

	depends on KERNEL_MODE_NEON

	select CRYPTO_BLAKE2B

	help

	  BLAKE2b digest algorithm optimized with ARM NEON instructions.

	  On ARM processors that have NEON support but not the ARMv8

	  Crypto Extensions, typically this BLAKE2b implementation is

	  much faster than SHA-2 and slightly faster than SHA-1.



config CRYPTO_AES_ARM

	tristate "Scalar AES cipher for ARM"

	select CRYPTO_ALGAPI

arch/arm/crypto/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ obj-$(CONFIG_CRYPTO_SHA1_ARM) += sha1-arm.o 
obj-$(CONFIG_CRYPTO_SHA1_ARM_NEON) += sha1-arm-neon.o

obj-$(CONFIG_CRYPTO_SHA256_ARM) += sha256-arm.o

obj-$(CONFIG_CRYPTO_SHA512_ARM) += sha512-arm.o

obj-$(CONFIG_CRYPTO_BLAKE2S_ARM) += blake2s-arm.o

obj-$(CONFIG_CRYPTO_BLAKE2B_NEON) += blake2b-neon.o

obj-$(CONFIG_CRYPTO_CHACHA20_NEON) += chacha-neon.o

obj-$(CONFIG_CRYPTO_NHPOLY1305_NEON) += nhpoly1305-neon.o
@@ -47,6 +49,8 @@ sha256-arm-neon-$(CONFIG_KERNEL_MODE_NEON) := sha256_neon_glue.o 
sha256-arm-y	:= sha256-core.o sha256_glue.o $(sha256-arm-neon-y)

sha512-arm-neon-$(CONFIG_KERNEL_MODE_NEON) := sha512-neon-glue.o

sha512-arm-y	:= sha512-core.o sha512-glue.o $(sha512-arm-neon-y)

blake2s-arm-y   := blake2s-core.o blake2s-glue.o

blake2b-neon-y  := blake2b-neon-core.o blake2b-neon-glue.o

sha1-arm-ce-y	:= sha1-ce-core.o sha1-ce-glue.o

sha2-arm-ce-y	:= sha2-ce-core.o sha2-ce-glue.o

aes-arm-ce-y	:= aes-ce-core.o aes-ce-glue.o