Commit cc07aabc authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux into next 

Pull arm64 updates from Catalin Marinas:
 - Optimised assembly string/memory routines (based on the AArch64
   Cortex Strings library contributed to glibc but re-licensed under
   GPLv2)
 - Optimised crypto algorithms making use of the ARMv8 crypto extensions
   (together with kernel API for using FPSIMD instructions in interrupt
   context)
 - Ftrace support
 - CPU topology parsing from DT
 - ESR_EL1 (Exception Syndrome Register) exposed to user space signal
   handlers for SIGSEGV/SIGBUS (useful to emulation tools like Qemu)
 - 1GB section linear mapping if applicable
 - Barriers usage clean-up
 - Default pgprot clean-up

Conflicts as per Catalin.

* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (57 commits)
  arm64: kernel: initialize broadcast hrtimer based clock event device
  arm64: ftrace: Add system call tracepoint
  arm64: ftrace: Add CALLER_ADDRx macros
  arm64: ftrace: Add dynamic ftrace support
  arm64: Add ftrace support
  ftrace: Add arm64 support to recordmcount
  arm64: Add 'notrace' attribute to unwind_frame() for ftrace
  arm64: add __ASSEMBLY__ in asm/insn.h
  arm64: Fix linker script entry point
  arm64: lib: Implement optimized string length routines
  arm64: lib: Implement optimized string compare routines
  arm64: lib: Implement optimized memcmp routine
  arm64: lib: Implement optimized memset routine
  arm64: lib: Implement optimized memmove routine
  arm64: lib: Implement optimized memcpy routine
  arm64: defconfig: enable a few more common/useful options in defconfig
  ftrace: Make CALLER_ADDRx macros more generic
  arm64: Fix deadlock scenario with smp_send_stop()
  arm64: Fix machine_shutdown() definition
  arm64: Support arch_irq_work_raise() via self IPIs
  ...
parents 9e47aaef 9358d755

arch/arm/include/asm/ftrace.h

+1 −9
Original line number Diff line number Diff line
@@ -52,15 +52,7 @@ extern inline void *return_address(unsigned int level) 


#endif



#define HAVE_ARCH_CALLER_ADDR



#define CALLER_ADDR0 ((unsigned long)__builtin_return_address(0))

#define CALLER_ADDR1 ((unsigned long)return_address(1))

#define CALLER_ADDR2 ((unsigned long)return_address(2))

#define CALLER_ADDR3 ((unsigned long)return_address(3))

#define CALLER_ADDR4 ((unsigned long)return_address(4))

#define CALLER_ADDR5 ((unsigned long)return_address(5))

#define CALLER_ADDR6 ((unsigned long)return_address(6))

#define ftrace_return_addr(n) return_address(n)



#endif /* ifndef __ASSEMBLY__ */

arch/arm64/Kconfig

+12 −0
Original line number Diff line number Diff line
@@ -30,12 +30,17 @@ config ARM64 
	select HAVE_ARCH_JUMP_LABEL

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_TRACEHOOK

	select HAVE_C_RECORDMCOUNT

	select HAVE_DEBUG_BUGVERBOSE

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DMA_API_DEBUG

	select HAVE_DMA_ATTRS

	select HAVE_DMA_CONTIGUOUS

	select HAVE_DYNAMIC_FTRACE

	select HAVE_EFFICIENT_UNALIGNED_ACCESS

	select HAVE_FTRACE_MCOUNT_RECORD

	select HAVE_FUNCTION_TRACER

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_GENERIC_DMA_COHERENT

	select HAVE_HW_BREAKPOINT if PERF_EVENTS

	select HAVE_MEMBLOCK
@@ -43,6 +48,7 @@ config ARM64 
	select HAVE_PERF_EVENTS

	select HAVE_PERF_REGS

	select HAVE_PERF_USER_STACK_DUMP

	select HAVE_SYSCALL_TRACEPOINTS

	select IRQ_DOMAIN

	select MODULES_USE_ELF_RELA

	select NO_BOOTMEM
@@ -245,6 +251,9 @@ config ARCH_WANT_HUGE_PMD_SHARE 
config HAVE_ARCH_TRANSPARENT_HUGEPAGE

	def_bool y



config ARCH_HAS_CACHE_LINE_SIZE

	def_bool y



source "mm/Kconfig"



config XEN_DOM0
@@ -359,5 +368,8 @@ source "arch/arm64/Kconfig.debug" 
source "security/Kconfig"



source "crypto/Kconfig"

if CRYPTO

source "arch/arm64/crypto/Kconfig"

endif



source "lib/Kconfig"

arch/arm64/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ export TEXT_OFFSET GZFLAGS 
core-y		+= arch/arm64/kernel/ arch/arm64/mm/

core-$(CONFIG_KVM) += arch/arm64/kvm/

core-$(CONFIG_XEN) += arch/arm64/xen/

core-$(CONFIG_CRYPTO) += arch/arm64/crypto/

libs-y		:= arch/arm64/lib/ $(libs-y)

libs-y		+= $(LIBGCC)

arch/arm64/configs/defconfig

+23 −13
Original line number Diff line number Diff line 
# CONFIG_LOCALVERSION_AUTO is not set

# CONFIG_SWAP is not set

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y

CONFIG_AUDIT=y

CONFIG_NO_HZ_IDLE=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_BSD_PROCESS_ACCT=y

CONFIG_BSD_PROCESS_ACCT_V3=y

CONFIG_NO_HZ=y

CONFIG_HIGH_RES_TIMERS=y

CONFIG_IKCONFIG=y

CONFIG_IKCONFIG_PROC=y

CONFIG_LOG_BUF_SHIFT=14
@@ -27,6 +27,7 @@ CONFIG_ARCH_VEXPRESS=y 
CONFIG_ARCH_XGENE=y

CONFIG_SMP=y

CONFIG_PREEMPT=y

CONFIG_TRANSPARENT_HUGEPAGE=y

CONFIG_CMA=y

CONFIG_CMDLINE="console=ttyAMA0"

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
@@ -44,7 +45,7 @@ CONFIG_IP_PNP_BOOTP=y 
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"

CONFIG_DEVTMPFS=y

CONFIG_DMA_CMA=y

CONFIG_SCSI=y

CONFIG_VIRTIO_BLK=y

# CONFIG_SCSI_PROC_FS is not set

CONFIG_BLK_DEV_SD=y

# CONFIG_SCSI_LOWLEVEL is not set
@@ -56,20 +57,18 @@ CONFIG_SMC91X=y 
CONFIG_SMSC911X=y

# CONFIG_WLAN is not set

CONFIG_INPUT_EVDEV=y

# CONFIG_SERIO_I8042 is not set

# CONFIG_SERIO_SERPORT is not set

CONFIG_LEGACY_PTY_COUNT=16

CONFIG_SERIAL_8250=y

CONFIG_SERIAL_8250_CONSOLE=y

CONFIG_SERIAL_OF_PLATFORM=y

CONFIG_SERIAL_AMBA_PL011=y

CONFIG_SERIAL_AMBA_PL011_CONSOLE=y

CONFIG_SERIAL_OF_PLATFORM=y

# CONFIG_HW_RANDOM is not set

# CONFIG_HWMON is not set

CONFIG_REGULATOR=y

CONFIG_REGULATOR_FIXED_VOLTAGE=y

CONFIG_FB=y

# CONFIG_VGA_CONSOLE is not set

CONFIG_FRAMEBUFFER_CONSOLE=y

CONFIG_LOGO=y

# CONFIG_LOGO_LINUX_MONO is not set
@@ -79,27 +78,38 @@ CONFIG_USB_ISP1760_HCD=y 
CONFIG_USB_STORAGE=y

CONFIG_MMC=y

CONFIG_MMC_ARMMMCI=y

CONFIG_VIRTIO_MMIO=y

# CONFIG_IOMMU_SUPPORT is not set

CONFIG_EXT2_FS=y

CONFIG_EXT3_FS=y

CONFIG_EXT4_FS=y

# CONFIG_EXT3_DEFAULTS_TO_ORDERED is not set

# CONFIG_EXT3_FS_XATTR is not set

CONFIG_EXT4_FS=y

CONFIG_FUSE_FS=y

CONFIG_CUSE=y

CONFIG_VFAT_FS=y

CONFIG_TMPFS=y

CONFIG_HUGETLBFS=y

# CONFIG_MISC_FILESYSTEMS is not set

CONFIG_NFS_FS=y

CONFIG_ROOT_NFS=y

CONFIG_NLS_CODEPAGE_437=y

CONFIG_NLS_ISO8859_1=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_VIRTUALIZATION=y

CONFIG_KVM=y

CONFIG_DEBUG_INFO=y

CONFIG_DEBUG_FS=y

CONFIG_MAGIC_SYSRQ=y

CONFIG_DEBUG_KERNEL=y

CONFIG_LOCKUP_DETECTOR=y

# CONFIG_SCHED_DEBUG is not set

CONFIG_DEBUG_INFO=y

# CONFIG_FTRACE is not set

CONFIG_ATOMIC64_SELFTEST=y

CONFIG_VIRTIO_MMIO=y

CONFIG_VIRTIO_BLK=y
 
CONFIG_CRYPTO_ANSI_CPRNG=y

CONFIG_ARM64_CRYPTO=y

CONFIG_CRYPTO_SHA1_ARM64_CE=y

CONFIG_CRYPTO_SHA2_ARM64_CE=y

CONFIG_CRYPTO_GHASH_ARM64_CE=y

CONFIG_CRYPTO_AES_ARM64_CE=y

CONFIG_CRYPTO_AES_ARM64_CE_CCM=y

CONFIG_CRYPTO_AES_ARM64_CE_BLK=y

CONFIG_CRYPTO_AES_ARM64_NEON_BLK=y

arch/arm64/crypto/Kconfig

0 → 100644
+53 −0
Original line number Diff line number Diff line 


menuconfig ARM64_CRYPTO

	bool "ARM64 Accelerated Cryptographic Algorithms"

	depends on ARM64

	help

	  Say Y here to choose from a selection of cryptographic algorithms

	  implemented using ARM64 specific CPU features or instructions.



if ARM64_CRYPTO



config CRYPTO_SHA1_ARM64_CE

	tristate "SHA-1 digest algorithm (ARMv8 Crypto Extensions)"

	depends on ARM64 && KERNEL_MODE_NEON

	select CRYPTO_HASH



config CRYPTO_SHA2_ARM64_CE

	tristate "SHA-224/SHA-256 digest algorithm (ARMv8 Crypto Extensions)"

	depends on ARM64 && KERNEL_MODE_NEON

	select CRYPTO_HASH



config CRYPTO_GHASH_ARM64_CE

	tristate "GHASH (for GCM chaining mode) using ARMv8 Crypto Extensions"

	depends on ARM64 && KERNEL_MODE_NEON

	select CRYPTO_HASH



config CRYPTO_AES_ARM64_CE

	tristate "AES core cipher using ARMv8 Crypto Extensions"

	depends on ARM64 && KERNEL_MODE_NEON

	select CRYPTO_ALGAPI

	select CRYPTO_AES



config CRYPTO_AES_ARM64_CE_CCM

	tristate "AES in CCM mode using ARMv8 Crypto Extensions"

	depends on ARM64 && KERNEL_MODE_NEON

	select CRYPTO_ALGAPI

	select CRYPTO_AES

	select CRYPTO_AEAD



config CRYPTO_AES_ARM64_CE_BLK

	tristate "AES in ECB/CBC/CTR/XTS modes using ARMv8 Crypto Extensions"

	depends on ARM64 && KERNEL_MODE_NEON

	select CRYPTO_BLKCIPHER

	select CRYPTO_AES

	select CRYPTO_ABLK_HELPER



config CRYPTO_AES_ARM64_NEON_BLK

	tristate "AES in ECB/CBC/CTR/XTS modes using NEON instructions"

	depends on ARM64 && KERNEL_MODE_NEON

	select CRYPTO_BLKCIPHER

	select CRYPTO_AES

	select CRYPTO_ABLK_HELPER



endif

CRA Git | Maintained and supported by SUSTech CRA and CCSE