Commit 4cb1fc6f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM updates from Russell King:

 - update unwinder to cope with module PLTs

 - enable UBSAN on ARM

 - improve kernel fault message

 - update UEFI runtime page tables dump

 - avoid clang's __aeabi_uldivmod generated in NWFPE code

 - disable FIQs on CPU shutdown paths

 - update XOR register usage

 - a number of build updates (using .arch, thread pointer, removal of
   lazy evaluation in Makefile)

 - conversion of stacktrace code to stackwalk

 - findbit assembly updates

 - hwcap feature updates for ARMv8 CPUs

 - instruction dump updates for big-endian platforms

 - support for function error injection

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm: (31 commits)
  ARM: 9279/1: support function error injection
  ARM: 9277/1: Make the dumped instructions are consistent with the disassembled ones
  ARM: 9276/1: Refactor dump_instr()
  ARM: 9275/1: Drop '-mthumb' from AFLAGS_ISA
  ARM: 9274/1: Add hwcap for Speculative Store Bypassing Safe
  ARM: 9273/1: Add hwcap for Speculation Barrier(SB)
  ARM: 9272/1: vfp: Add hwcap for FEAT_AA32I8MM
  ARM: 9271/1: vfp: Add hwcap for FEAT_AA32BF16
  ARM: 9270/1: vfp: Add hwcap for FEAT_FHM
  ARM: 9269/1: vfp: Add hwcap for FEAT_DotProd
  ARM: 9268/1: vfp: Add hwcap FPHP and ASIMDHP for FEAT_FP16
  ARM: 9267/1: Define Armv8 registers in AArch32 state
  ARM: findbit: add unwinder information
  ARM: findbit: operate by words
  ARM: findbit: convert to macros
  ARM: findbit: provide more efficient ARMv7 implementation
  ARM: findbit: document ARMv5 bit offset calculation
  ARM: 9259/1: stacktrace: Convert stacktrace to generic ARCH_STACKWALK
  ARM: 9258/1: stacktrace: Make stack walk callback consistent with generic code
  ARM: 9265/1: pass -march= only to compiler
  ...
parents 740afa4d aaa4dd1b

arch/arm/Kconfig

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ config ARM 
	select ARCH_HAS_PTE_SPECIAL if ARM_LPAE

	select ARCH_HAS_SETUP_DMA_OPS

	select ARCH_HAS_SET_MEMORY

	select ARCH_STACKWALK

	select ARCH_HAS_STRICT_KERNEL_RWX if MMU && !XIP_KERNEL

	select ARCH_HAS_STRICT_MODULE_RWX if MMU

	select ARCH_HAS_SYNC_DMA_FOR_DEVICE
@@ -27,6 +28,7 @@ config ARM 
	select ARCH_HAVE_NMI_SAFE_CMPXCHG if CPU_V7 || CPU_V7M || CPU_V6K

	select ARCH_HAS_GCOV_PROFILE_ALL

	select ARCH_KEEP_MEMBLOCK

	select ARCH_HAS_UBSAN_SANITIZE_ALL

	select ARCH_MIGHT_HAVE_PC_PARPORT

	select ARCH_OPTIONAL_KERNEL_RWX if ARCH_HAS_STRICT_KERNEL_RWX

	select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT if CPU_V7
@@ -95,6 +97,7 @@ config ARM 
	select HAVE_EXIT_THREAD

	select HAVE_FAST_GUP if ARM_LPAE

	select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL

	select HAVE_FUNCTION_ERROR_INJECTION

	select HAVE_FUNCTION_GRAPH_TRACER

	select HAVE_FUNCTION_TRACER if !XIP_KERNEL

	select HAVE_GCC_PLUGINS

arch/arm/Makefile

+45 −36
Original line number Diff line number Diff line
@@ -60,47 +60,54 @@ endif 
KBUILD_CFLAGS	+= $(call cc-option,-fno-ipa-sra)



# This selects which instruction set is used.

arch-$(CONFIG_CPU_32v7M)	:=-march=armv7-m

arch-$(CONFIG_CPU_32v7)		:=-march=armv7-a

arch-$(CONFIG_CPU_32v6)		:=-march=armv6

# Only override the compiler option if ARMv6. The ARMv6K extensions are

# always available in ARMv7

ifeq ($(CONFIG_CPU_32v6),y)

arch-$(CONFIG_CPU_32v6K)	:=-march=armv6k

endif

arch-$(CONFIG_CPU_32v5)		:=-march=armv5te

arch-$(CONFIG_CPU_32v4T)	:=-march=armv4t

arch-$(CONFIG_CPU_32v4)		:=-march=armv4

arch-$(CONFIG_CPU_32v3)		:=-march=armv3m



# Note that GCC does not numerically define an architecture version

# macro, but instead defines a whole series of macros which makes

# testing for a specific architecture or later rather impossible.

arch-$(CONFIG_CPU_32v7M)	=-D__LINUX_ARM_ARCH__=7 -march=armv7-m

arch-$(CONFIG_CPU_32v7)		=-D__LINUX_ARM_ARCH__=7 -march=armv7-a

arch-$(CONFIG_CPU_32v6)		=-D__LINUX_ARM_ARCH__=6 -march=armv6

cpp-$(CONFIG_CPU_32v7M)		:=-D__LINUX_ARM_ARCH__=7

cpp-$(CONFIG_CPU_32v7)		:=-D__LINUX_ARM_ARCH__=7

cpp-$(CONFIG_CPU_32v6)		:=-D__LINUX_ARM_ARCH__=6

# Only override the compiler option if ARMv6. The ARMv6K extensions are

# always available in ARMv7

ifeq ($(CONFIG_CPU_32v6),y)

arch-$(CONFIG_CPU_32v6K)	=-D__LINUX_ARM_ARCH__=6 -march=armv6k

cpp-$(CONFIG_CPU_32v6K)		:=-D__LINUX_ARM_ARCH__=6

endif

arch-$(CONFIG_CPU_32v5)		=-D__LINUX_ARM_ARCH__=5 -march=armv5te

arch-$(CONFIG_CPU_32v4T)	=-D__LINUX_ARM_ARCH__=4 -march=armv4t

arch-$(CONFIG_CPU_32v4)		=-D__LINUX_ARM_ARCH__=4 -march=armv4

arch-$(CONFIG_CPU_32v3)		=-D__LINUX_ARM_ARCH__=3 -march=armv3m



# Evaluate arch cc-option calls now

arch-y := $(arch-y)

cpp-$(CONFIG_CPU_32v5)		:=-D__LINUX_ARM_ARCH__=5

cpp-$(CONFIG_CPU_32v4T)		:=-D__LINUX_ARM_ARCH__=4

cpp-$(CONFIG_CPU_32v4)		:=-D__LINUX_ARM_ARCH__=4

cpp-$(CONFIG_CPU_32v3)		:=-D__LINUX_ARM_ARCH__=3



# This selects how we optimise for the processor.

tune-$(CONFIG_CPU_ARM7TDMI)	=-mtune=arm7tdmi

tune-$(CONFIG_CPU_ARM720T)	=-mtune=arm7tdmi

tune-$(CONFIG_CPU_ARM740T)	=-mtune=arm7tdmi

tune-$(CONFIG_CPU_ARM9TDMI)	=-mtune=arm9tdmi

tune-$(CONFIG_CPU_ARM940T)	=-mtune=arm9tdmi

tune-$(CONFIG_CPU_ARM946E)	=-mtune=arm9e

tune-$(CONFIG_CPU_ARM920T)	=-mtune=arm9tdmi

tune-$(CONFIG_CPU_ARM922T)	=-mtune=arm9tdmi

tune-$(CONFIG_CPU_ARM925T)	=-mtune=arm9tdmi

tune-$(CONFIG_CPU_ARM926T)	=-mtune=arm9tdmi

tune-$(CONFIG_CPU_FA526)	=-mtune=arm9tdmi

tune-$(CONFIG_CPU_SA110)	=-mtune=strongarm110

tune-$(CONFIG_CPU_SA1100)	=-mtune=strongarm1100

tune-$(CONFIG_CPU_XSCALE)	=-mtune=xscale

tune-$(CONFIG_CPU_XSC3)		=-mtune=xscale

tune-$(CONFIG_CPU_FEROCEON)	=-mtune=xscale

tune-$(CONFIG_CPU_V6)		=-mtune=arm1136j-s

tune-$(CONFIG_CPU_V6K)		=-mtune=arm1136j-s



# Evaluate tune cc-option calls now

tune-y := $(tune-y)

tune-$(CONFIG_CPU_ARM7TDMI)	:=-mtune=arm7tdmi

tune-$(CONFIG_CPU_ARM720T)	:=-mtune=arm7tdmi

tune-$(CONFIG_CPU_ARM740T)	:=-mtune=arm7tdmi

tune-$(CONFIG_CPU_ARM9TDMI)	:=-mtune=arm9tdmi

tune-$(CONFIG_CPU_ARM940T)	:=-mtune=arm9tdmi

tune-$(CONFIG_CPU_ARM946E)	:=-mtune=arm9e

tune-$(CONFIG_CPU_ARM920T)	:=-mtune=arm9tdmi

tune-$(CONFIG_CPU_ARM922T)	:=-mtune=arm9tdmi

tune-$(CONFIG_CPU_ARM925T)	:=-mtune=arm9tdmi

tune-$(CONFIG_CPU_ARM926T)	:=-mtune=arm9tdmi

tune-$(CONFIG_CPU_FA526)	:=-mtune=arm9tdmi

tune-$(CONFIG_CPU_SA110)	:=-mtune=strongarm110

tune-$(CONFIG_CPU_SA1100)	:=-mtune=strongarm1100

tune-$(CONFIG_CPU_XSCALE)	:=-mtune=xscale

tune-$(CONFIG_CPU_XSC3)		:=-mtune=xscale

tune-$(CONFIG_CPU_FEROCEON)	:=-mtune=xscale

tune-$(CONFIG_CPU_V6)		:=-mtune=arm1136j-s

tune-$(CONFIG_CPU_V6K)		:=-mtune=arm1136j-s



ifeq ($(CONFIG_AEABI),y)

CFLAGS_ABI	:=-mabi=aapcs-linux -mfpu=vfp
@@ -117,23 +124,25 @@ CFLAGS_ABI += -meabi gnu 
endif



ifeq ($(CONFIG_CURRENT_POINTER_IN_TPIDRURO),y)

CFLAGS_ABI	+= -mtp=cp15

KBUILD_CFLAGS	+= -mtp=cp15

endif



# Accept old syntax despite ".syntax unified"

AFLAGS_NOWARN	:=$(call as-option,-Wa$(comma)-mno-warn-deprecated,-Wa$(comma)-W)



ifeq ($(CONFIG_THUMB2_KERNEL),y)

CFLAGS_ISA	:=-mthumb -Wa,-mimplicit-it=always $(AFLAGS_NOWARN)

AFLAGS_ISA	:=$(CFLAGS_ISA) -Wa$(comma)-mthumb

CFLAGS_ISA	:=-Wa,-mimplicit-it=always $(AFLAGS_NOWARN)

AFLAGS_ISA	:=$(CFLAGS_ISA) -Wa$(comma)-mthumb -D__thumb2__=2

CFLAGS_ISA	+=-mthumb

else

CFLAGS_ISA	:=$(call cc-option,-marm,) $(AFLAGS_NOWARN)

AFLAGS_ISA	:=$(CFLAGS_ISA)

endif



# Need -Uarm for gcc < 3.x

KBUILD_CPPFLAGS	+=$(cpp-y)

KBUILD_CFLAGS	+=$(CFLAGS_ABI) $(CFLAGS_ISA) $(arch-y) $(tune-y) $(call cc-option,-mshort-load-bytes,$(call cc-option,-malignment-traps,)) -msoft-float -Uarm

KBUILD_AFLAGS	+=$(CFLAGS_ABI) $(AFLAGS_ISA) $(arch-y) $(tune-y) -include asm/unified.h -msoft-float

KBUILD_AFLAGS	+=$(CFLAGS_ABI) $(AFLAGS_ISA) -Wa,$(arch-y) $(tune-y) -include asm/unified.h -msoft-float



CHECKFLAGS	+= -D__arm__

arch/arm/boot/compressed/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ KASAN_SANITIZE := n 


# Prevents link failures: __sanitizer_cov_trace_pc() is not linked in.

KCOV_INSTRUMENT		:= n

UBSAN_SANITIZE		:= n



#

# Architecture dependencies
@@ -163,4 +164,3 @@ $(obj)/piggy_data: $(obj)/../Image FORCE 
$(obj)/piggy.o: $(obj)/piggy_data



CFLAGS_font.o := -Dstatic=
 
AFLAGS_hyp-stub.o := -Wa,-march=armv7-a

arch/arm/common/Makefile

+0 −2
Original line number Diff line number Diff line
@@ -13,7 +13,5 @@ obj-$(CONFIG_SHARP_SCOOP) += scoop.o 
obj-$(CONFIG_CPU_V7)		+= secure_cntvoff.o

obj-$(CONFIG_MCPM)		+= mcpm_head.o mcpm_entry.o mcpm_platsmp.o vlock.o

CFLAGS_REMOVE_mcpm_entry.o	= -pg

AFLAGS_mcpm_head.o		:= -march=armv7-a

AFLAGS_vlock.o			:= -march=armv7-a

obj-$(CONFIG_BL_SWITCHER)	+= bL_switcher.o

obj-$(CONFIG_BL_SWITCHER_DUMMY_IF) += bL_switcher_dummy_if.o

arch/arm/common/mcpm_head.S

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ 


#include "vlock.h"



.arch armv7-a



.if MCPM_SYNC_CLUSTER_CPUS

.error "cpus must be the first member of struct mcpm_sync_struct"

.endif