Commit 40ddad19 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:

 - add arch/arm/Kbuild from Masahiro Yamada.

 - simplify act_mm macro, since it contains an open-coded
   get_thread_info.

 - VFP updates for Clang from Stefan Agner.

 - Fix unwinder for Clang from Nathan Huckleberry.

 - Remove unused it8152 PCI host controller, used by the removed cm-x2xx
   platforms from Mike Rapoport.

 - Further explanation of __range_ok().

 - Remove kimage_voffset that isn't used anymore from Marc Zyngier.

 - Drop ancient Thumb-2 workaround for old binutils from Ard Biesheuvel.

 - Documentation cleanup for mach-* from Pete Zaitcev.

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 8996/1: Documentation/Clean up the description of mach-<class>
  ARM: 8995/1: drop Thumb-2 workaround for ancient binutils
  ARM: 8994/1: mm: drop kimage_voffset which was only used by KVM
  ARM: uaccess: add further explanation of __range_ok()
  ARM: 8993/1: remove it8152 PCI controller driver
  ARM: 8992/1: Fix unwind_frame for clang-built kernels
  ARM: 8991/1: use VFP assembler mnemonics if available
  ARM: 8990/1: use VFP assembler mnemonics in register load/store macros
  ARM: 8989/1: use .fpu assembler directives instead of assembler arguments
  ARM: 8982/1: mm: Simplify act_mm macro
  ARM: 8981/1: add arch/arm/Kbuild
parents 2044513f 918c950c

Documentation/arm/arm.rst

+2 −4
Original line number Diff line number Diff line
@@ -184,10 +184,8 @@ Kernel entry (head.S) 
  We group machine (or platform) support code into machine classes.  A

  class typically based around one or more system on a chip devices, and

  acts as a natural container around the actual implementations.  These

  classes are given directories - arch/arm/mach-<class> and

  arch/arm/mach-<class> - which contain the source files to/include/mach

  support the machine class.  This directories also contain any machine

  specific supporting code.

  classes are given directories - arch/arm/mach-<class> - which contain

  the source files and include/mach/ to support the machine class.



  For example, the SA1100 class is based upon the SA1100 and SA1110 SoC

  devices, and contains the code to support the way the on-board and off-

arch/arm/Kbuild

0 → 100644
+11 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

obj-$(CONFIG_FPE_NWFPE)		+= nwfpe/

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

obj-$(CONFIG_FPE_FASTFPE)	+= $(patsubst $(srctree)/$(src)/%,%,$(wildcard $(srctree)/$(src)/fastfpe/))

obj-$(CONFIG_VFP)		+= vfp/

obj-$(CONFIG_XEN)		+= xen/

obj-$(CONFIG_VDSO)		+= vdso/

obj-y				+= kernel/ mm/ common/

obj-y				+= probes/

obj-y				+= net/

obj-y				+= crypto/

arch/arm/Kconfig

+2 −37
Original line number Diff line number Diff line
@@ -1150,12 +1150,6 @@ config PCI_NANOENGINE 
	help

	  Enable PCI on the BSE nanoEngine board.



config PCI_HOST_ITE8152

	bool

	depends on PCI && MACH_ARMCORE

	default y

	select DMABOUNCE



config ARM_ERRATA_814220

	bool "ARM errata: Cache maintenance by set/way operations can execute out of order"

	depends on CPU_V7
@@ -1430,37 +1424,6 @@ config THUMB2_KERNEL 


	  If unsure, say N.



config THUMB2_AVOID_R_ARM_THM_JUMP11

	bool "Work around buggy Thumb-2 short branch relocations in gas"

	depends on THUMB2_KERNEL && MODULES

	default y

	help

	  Various binutils versions can resolve Thumb-2 branches to

	  locally-defined, preemptible global symbols as short-range "b.n"

	  branch instructions.



	  This is a problem, because there's no guarantee the final

	  destination of the symbol, or any candidate locations for a

	  trampoline, are within range of the branch.  For this reason, the

	  kernel does not support fixing up the R_ARM_THM_JUMP11 (102)

	  relocation in modules at all, and it makes little sense to add

	  support.



	  The symptom is that the kernel fails with an "unsupported

	  relocation" error when loading some modules.



	  Until fixed tools are available, passing

	  -fno-optimize-sibling-calls to gcc should prevent gcc generating

	  code which hits this problem, at the cost of a bit of extra runtime

	  stack usage in some cases.



	  The problem is described in more detail at:

	      https://bugs.launchpad.net/binutils-linaro/+bug/725126



	  Only Thumb-2 kernels are affected.



	  Unless you are sure your tools don't have this problem, say Y.



config ARM_PATCH_IDIV

	bool "Runtime patch udiv/sdiv instructions into __aeabi_{u}idiv()"

	depends on CPU_32v7 && !XIP_KERNEL
@@ -2099,3 +2062,5 @@ source "drivers/firmware/Kconfig" 
if CRYPTO

source "arch/arm/crypto/Kconfig"

endif



source "arch/arm/Kconfig.assembler"

arch/arm/Kconfig.assembler

0 → 100644
+6 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



config AS_VFP_VMRS_FPINST

	def_bool $(as-instr,.fpu vfpv2\nvmrs r0$(comma)FPINST)

	help

	  Supported by binutils >= 2.24 and LLVM integrated assembler.

arch/arm/Makefile

+1 −15
Original line number Diff line number Diff line
@@ -123,10 +123,6 @@ 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

# Work around buggy relocation from gas if requested:

ifeq ($(CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11),y)

KBUILD_CFLAGS_MODULE	+=-fno-optimize-sibling-calls

endif

else

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

AFLAGS_ISA	:=$(CFLAGS_ISA)
@@ -276,18 +272,8 @@ endif 


export	TEXT_OFFSET GZFLAGS MMUEXT



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

# 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_VDSO)		+= arch/arm/vdso/



core-y				+= arch/arm/

# If we have a machine-specific directory, then include it in the build.

core-y				+= arch/arm/kernel/ arch/arm/mm/ arch/arm/common/

core-y				+= arch/arm/probes/

core-y				+= arch/arm/net/

core-y				+= arch/arm/crypto/

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



# For cleaning

CRA Git | Maintained and supported by SUSTech CRA and CCSE