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

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

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

Pull ARM updates from Russell King:
 "Bigger items included in this update are:

   - A series of updates from Arnd for ARM randconfig build failures
   - Updates from Dmitry for StrongARM SA-1100 to move IRQ handling to
     drivers/irqchip/
   - Move ARMs SP804 timer to drivers/clocksource/
   - Perf updates from Mark Rutland in preparation to move the ARM perf
     code into drivers/ so it can be shared with ARM64.
   - MCPM updates from Nicolas
   - Add support for taking platform serial number from DT
   - Re-implement Keystone2 physical address space switch to conform to
     architecture requirements
   - Clean up ARMv7 LPAE code, which goes in hand with the Keystone2
     changes.
   - L2C cleanups to avoid unlocking caches if we're prevented by the
     secure support to unlock.
   - Avoid cleaning a potentially dirty cache containing stale data on
     CPU initialisation
   - Add ARM-only entry point for secondary startup (for machines that
     can only call into a Thumb kernel in ARM mode).  Same thing is also
     done for the resume entry point.
   - Provide arch_irqs_disabled via asm-generic
   - Enlarge ARMv7M vector table
   - Always use BFD linker for VDSO, as gold doesn't accept some of the
     options we need.
   - Fix an incorrect BSYM (for Thumb symbols) usage, and convert all
     BSYM compiler macros to a "badr" (for branch address).
   - Shut up compiler warnings provoked by our cmpxchg() implementation.
   - Ensure bad xchg sizes fail to link"

* 'for-linus' of git://ftp.arm.linux.org.uk/~rmk/linux-arm: (75 commits)
  ARM: Fix build if CLKDEV_LOOKUP is not configured
  ARM: fix new BSYM() usage introduced via for-arm-soc branch
  ARM: 8383/1: nommu: avoid deprecated source register on mov
  ARM: 8391/1: l2c: add options to overwrite prefetching behavior
  ARM: 8390/1: irqflags: Get arch_irqs_disabled from asm-generic
  ARM: 8387/1: arm/mm/dma-mapping.c: Add arm_coherent_dma_mmap
  ARM: 8388/1: tcm: Don't crash when TCM banks are protected by TrustZone
  ARM: 8384/1: VDSO: force use of BFD linker
  ARM: 8385/1: VDSO: group link options
  ARM: cmpxchg: avoid warnings from macro-ized cmpxchg() implementations
  ARM: remove __bad_xchg definition
  ARM: 8369/1: ARMv7M: define size of vector table for Vybrid
  ARM: 8382/1: clocksource: make ARM_TIMER_SP804 depend on GENERIC_SCHED_CLOCK
  ARM: 8366/1: move Dual-Timer SP804 driver to drivers/clocksource
  ARM: 8365/1: introduce sp804_timer_disable and remove arm_timer.h inclusion
  ARM: 8364/1: fix BE32 module loading
  ARM: 8360/1: add secondary_startup_arm prototype in header file
  ARM: 8359/1: correct secondary_startup_arm mode
  ARM: proc-v7: sanitise and document registers around errata
  ARM: proc-v7: clean up MIDR access
  ...
parents abea9629 002af195

Documentation/devicetree/bindings/arm/l2cc.txt

+5 −0
Original line number Diff line number Diff line
@@ -67,6 +67,11 @@ Optional properties: 
  disable if zero.

- arm,prefetch-offset : Override prefetch offset value. Valid values are

  0-7, 15, 23, and 31.

- prefetch-data : Data prefetch. Value: <0> (forcibly disable), <1>

  (forcibly enable), property absent (retain settings set by firmware)

- prefetch-instr : Instruction prefetch. Value: <0> (forcibly disable),

  <1> (forcibly enable), property absent (retain settings set by

  firmware)



Example:

Documentation/devicetree/booting-without-of.txt

+4 −0
Original line number Diff line number Diff line
@@ -856,6 +856,10 @@ address which can extend beyond that limit. 
  name may clash with standard defined ones, you prefix them with your

  vendor name and a comma.



  Additional properties for the root node:



    - serial-number : a string representing the device's serial number



  b) The /cpus node



  This node is the parent of all individual CPU nodes. It doesn't

arch/arm/Kconfig

+23 −11
Original line number Diff line number Diff line
@@ -33,8 +33,8 @@ config ARM 
	select HARDIRQS_SW_RESEND

	select HAVE_ARCH_AUDITSYSCALL if (AEABI && !OABI_COMPAT)

	select HAVE_ARCH_BITREVERSE if (CPU_32v7M || CPU_32v7) && !CPU_32v6

	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_JUMP_LABEL if !XIP_KERNEL && !CPU_ENDIAN_BE32

	select HAVE_ARCH_KGDB if !CPU_ENDIAN_BE32

	select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT)

	select HAVE_ARCH_TRACEHOOK

	select HAVE_BPF_JIT
@@ -45,7 +45,7 @@ config ARM 
	select HAVE_DMA_API_DEBUG

	select HAVE_DMA_ATTRS

	select HAVE_DMA_CONTIGUOUS if MMU

	select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL)

	select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL) && !CPU_ENDIAN_BE32

	select HAVE_EFFICIENT_UNALIGNED_ACCESS if (CPU_V6 || CPU_V6K || CPU_V7) && MMU

	select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL)

	select HAVE_FUNCTION_GRAPH_TRACER if (!THUMB2_KERNEL)
@@ -59,10 +59,10 @@ config ARM 
	select HAVE_KERNEL_LZMA

	select HAVE_KERNEL_LZO

	select HAVE_KERNEL_XZ

	select HAVE_KPROBES if !XIP_KERNEL

	select HAVE_KPROBES if !XIP_KERNEL && !CPU_ENDIAN_BE32 && !CPU_V7M

	select HAVE_KRETPROBES if (HAVE_KPROBES)

	select HAVE_MEMBLOCK

	select HAVE_MOD_ARCH_SPECIFIC if ARM_UNWIND

	select HAVE_MOD_ARCH_SPECIFIC

	select HAVE_OPROFILE if (HAVE_PERF_EVENTS)

	select HAVE_OPTPROBES if !THUMB2_KERNEL

	select HAVE_PERF_EVENTS
@@ -173,7 +173,7 @@ config LOCKDEP_SUPPORT 


config TRACE_IRQFLAGS_SUPPORT

	bool

	default y

	default !CPU_V7M



config RWSEM_XCHGADD_ALGORITHM

	bool
@@ -1010,11 +1010,6 @@ config PLAT_PXA 
config PLAT_VERSATILE

	bool



config ARM_TIMER_SP804

	bool

	select CLKSRC_MMIO

	select CLKSRC_OF if OF



source "arch/arm/firmware/Kconfig"



source arch/arm/mm/Kconfig
@@ -1342,6 +1337,7 @@ config SMP 
	depends on GENERIC_CLOCKEVENTS

	depends on HAVE_SMP

	depends on MMU || ARM_MPU

	select IRQ_WORK

	help

	  This enables support for systems with more than one CPU. If you have

	  a system with only one CPU, say N. If you have a system with more
@@ -1717,6 +1713,21 @@ config HAVE_ARCH_TRANSPARENT_HUGEPAGE 
config ARCH_WANT_GENERAL_HUGETLB

	def_bool y



config ARM_MODULE_PLTS

	bool "Use PLTs to allow module memory to spill over into vmalloc area"

	depends on MODULES

	help

	  Allocate PLTs when loading modules so that jumps and calls whose

	  targets are too far away for their relative offsets to be encoded

	  in the instructions themselves can be bounced via veneers in the

	  module's PLT. This allows modules to be allocated in the generic

	  vmalloc area after the dedicated module memory area has been

	  exhausted. The modules will use slightly more memory, but after

	  rounding up to page size, the actual memory footprint is usually

	  the same.



	  Say y if you are getting out of memory errors while loading modules



source "mm/Kconfig"



config FORCE_MAX_ZONEORDER
@@ -1987,6 +1998,7 @@ config XIP_PHYS_ADDR 
config KEXEC

	bool "Kexec system call (EXPERIMENTAL)"

	depends on (!SMP || PM_SLEEP_SMP)

	depends on !CPU_V7M

	help

	  kexec is a system call that implements the ability to shutdown your

	  current kernel, and to start another kernel.  It is like a reboot

arch/arm/Kconfig.debug

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ source "lib/Kconfig.debug" 
config ARM_PTDUMP

	bool "Export kernel pagetable layout to userspace via debugfs"

	depends on DEBUG_KERNEL

	depends on MMU

	select DEBUG_FS

	---help---

	  Say Y here if you want to show the kernel pagetable layout in a

arch/arm/Makefile

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,10 @@ LDFLAGS_vmlinux += --be8 
LDFLAGS_MODULE	+= --be8

endif



ifeq ($(CONFIG_ARM_MODULE_PLTS),y)

LDFLAGS_MODULE	+= -T $(srctree)/arch/arm/kernel/module.lds

endif



OBJCOPYFLAGS	:=-O binary -R .comment -S

GZFLAGS		:=-9

#KBUILD_CFLAGS	+=-pipe