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

Commit 8808cf8c 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:

 - fix various clang build and cppcheck issues

 - switch ARM to use new common outgoing-CPU-notification code

 - add some additional explanation about the boot code

 - kbuild "make clean" fixes

 - get rid of another "(____ptrval____)", this time for the VDSO code

 - avoid treating cache maintenance faults as a write

 - add a frame pointer unwinder implementation for clang

 - add EDAC support for Aurora L2 cache

 - improve robustness of adjust_lowmem_bounds() finding the bounds of
   lowmem.

 - add reset control for AMBA primecell devices

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm: (24 commits)
  ARM: 8906/1: drivers/amba: add reset control to amba bus probe
  ARM: 8905/1: Emit __gnu_mcount_nc when using Clang 10.0.0 or newer
  ARM: 8904/1: skip nomap memblocks while finding the lowmem/highmem boundary
  ARM: 8903/1: ensure that usable memory in bank 0 starts from a PMD-aligned address
  ARM: 8891/1: EDAC: armada_xp: Add support for more SoCs
  ARM: 8888/1: EDAC: Add driver for the Marvell Armada XP SDRAM and L2 cache ECC
  ARM: 8892/1: EDAC: Add missing debugfs_create_x32 wrapper
  ARM: 8890/1: l2x0: add marvell,ecc-enable property for aurora
  ARM: 8889/1: dt-bindings: document marvell,ecc-enable binding
  ARM: 8886/1: l2x0: support parity-enable/disable on aurora
  ARM: 8885/1: aurora-l2: add defines for parity and ECC registers
  ARM: 8887/1: aurora-l2: add prefix to MAX_RANGE_SIZE
  ARM: 8902/1: l2c: move cache-aurora-l2.h to asm/hardware
  ARM: 8900/1: UNWINDER_FRAME_POINTER implementation for Clang
  ARM: 8898/1: mm: Don't treat faults reported from cache maintenance as writes
  ARM: 8896/1: VDSO: Don't leak kernel addresses
  ARM: 8895/1: visit mach-* and plat-* directories when cleaning
  ARM: 8894/1: boot: Replace open-coded nop with macro
  ARM: 8893/1: boot: Explain the 8 nops
  ARM: 8876/1: fix O= building with CONFIG_FPE_FASTFPE
  ...
parents 5c6bd5de 79bdcb20

Documentation/devicetree/bindings/arm/l2c2x0.yaml

+4 −0
Original line number Diff line number Diff line
@@ -176,6 +176,10 @@ properties: 
    description: disable parity checking on the L2 cache (L220 or PL310).

    type: boolean



  marvell,ecc-enable:

    description: enable ECC protection on the L2 cache

    type: boolean



  arm,outer-sync-disable:

    description: disable the outer sync operation on the L2 cache.

      Some core tiles, especially ARM PB11MPCore have a faulty L220 cache that

MAINTAINERS

+6 −0
Original line number Diff line number Diff line
@@ -5802,6 +5802,12 @@ L: linux-edac@vger.kernel.org 
S:	Maintained

F:	drivers/edac/amd64_edac*













EDAC-ARMADA













M:	Jan Luebbe <jlu@pengutronix.de>













L:	linux-edac@vger.kernel.org













S:	Maintained













F:	drivers/edac/armada_xp_*



























EDAC-AST2500















M:	Stefan Schaeckeler <sschaeck@cisco.com>















S:	Supported

































arch/arm/Kconfig



+4
−3




























Original line number
Diff line number
Diff line








@@ -82,7 +82,7 @@ config ARM













	select HAVE_FAST_GUP if ARM_LPAE















	select HAVE_FTRACE_MCOUNT_RECORD if !XIP_KERNEL















	select HAVE_FUNCTION_GRAPH_TRACER if !THUMB2_KERNEL && !CC_IS_CLANG













	select HAVE_FUNCTION_TRACER if !XIP_KERNEL













	select HAVE_FUNCTION_TRACER if !XIP_KERNEL && (CC_IS_GCC || CLANG_VERSION >= 100000)















	select HAVE_GCC_PLUGINS















	select HAVE_HW_BREAKPOINT if PERF_EVENTS && (CPU_V6 || CPU_V6K || CPU_V7)















	select HAVE_IDE if PCI || ISA || PCMCIA










@@ -1476,8 +1476,9 @@ config ARM_PATCH_IDIV













	  code to do integer division.































config AEABI













	bool "Use the ARM EABI to compile the kernel" if !CPU_V7 && !CPU_V7M && !CPU_V6 && !CPU_V6K













	default CPU_V7 || CPU_V7M || CPU_V6 || CPU_V6K













	bool "Use the ARM EABI to compile the kernel" if !CPU_V7 && \













		!CPU_V7M && !CPU_V6 && !CPU_V6K && !CC_IS_CLANG













	default CPU_V7 || CPU_V7M || CPU_V6 || CPU_V6K || CC_IS_CLANG















	help















	  This option allows for the kernel to be compiled using the latest















	  ARM ABI (aka EABI).  This is only useful if you are using a user

































arch/arm/Kconfig.debug



+1
−1




























Original line number
Diff line number
Diff line








@@ -56,7 +56,7 @@ choice





























config UNWINDER_FRAME_POINTER















	bool "Frame pointer unwinder"













	depends on !THUMB2_KERNEL && !CC_IS_CLANG













	depends on !THUMB2_KERNEL















	select ARCH_WANT_FRAME_POINTERS















	select FRAME_POINTER















	help

































arch/arm/Makefile



+14
−8




























Original line number
Diff line number
Diff line








@@ -36,7 +36,10 @@ KBUILD_CFLAGS	+= $(call cc-option,-mno-unaligned-access)













endif































ifeq ($(CONFIG_FRAME_POINTER),y)













KBUILD_CFLAGS	+=-fno-omit-frame-pointer -mapcs -mno-sched-prolog













KBUILD_CFLAGS	+=-fno-omit-frame-pointer













ifeq ($(CONFIG_CC_IS_GCC),y)













KBUILD_CFLAGS += -mapcs -mno-sched-prolog













endif















endif































ifeq ($(CONFIG_CPU_BIG_ENDIAN),y)










@@ -112,6 +115,10 @@ ifeq ($(CONFIG_ARM_UNWIND),y)













CFLAGS_ABI	+=-funwind-tables















endif





























ifeq ($(CONFIG_CC_IS_CLANG),y)













CFLAGS_ABI	+= -meabi gnu













endif





























# Accept old syntax despite ".syntax unified"















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


























@@ -266,14 +273,9 @@ endif





























export	TEXT_OFFSET GZFLAGS MMUEXT





























# Do we have FASTFPE?













FASTFPE		:=arch/arm/fastfpe













ifeq ($(FASTFPE),$(wildcard $(FASTFPE)))













FASTFPE_OBJ	:=$(FASTFPE)/













endif





























core-$(CONFIG_FPE_NWFPE)	+= arch/arm/nwfpe/













core-$(CONFIG_FPE_FASTFPE)	+= $(FASTFPE_OBJ)













# Put arch/arm/fastfpe/ to use this.













core-$(CONFIG_FPE_FASTFPE)	+= $(patsubst $(srctree)/%,%,$(wildcard $(srctree)/arch/arm/fastfpe/))















core-$(CONFIG_VFP)		+= arch/arm/vfp/















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















core-$(CONFIG_KVM_ARM_HOST) 	+= arch/arm/kvm/









@@ -286,6 +288,10 @@ core-y				+= arch/arm/net/













core-y				+= arch/arm/crypto/















core-y				+= $(machdirs) $(platdirs)





























# For cleaning













core-				+= $(patsubst %,arch/arm/mach-%/, $(machine-))













core-				+= $(patsubst %,arch/arm/plat-%/, $(plat-))





























drivers-$(CONFIG_OPROFILE)      += arch/arm/oprofile/































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