Commit 6b00f7ef 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 

Pull arm64 updates from Catalin Marinas:
 "arm64 updates for 3.20:

   - reimplementation of the virtual remapping of UEFI Runtime Services
     in a way that is stable across kexec
   - emulation of the "setend" instruction for 32-bit tasks (user
     endianness switching trapped in the kernel, SCTLR_EL1.E0E bit set
     accordingly)
   - compat_sys_call_table implemented in C (from asm) and made it a
     constant array together with sys_call_table
   - export CPU cache information via /sys (like other architectures)
   - DMA API implementation clean-up in preparation for IOMMU support
   - macros clean-up for KVM
   - dropped some unnecessary cache+tlb maintenance
   - CONFIG_ARM64_CPU_SUSPEND clean-up
   - defconfig update (CPU_IDLE)

  The EFI changes going via the arm64 tree have been acked by Matt
  Fleming.  There is also a patch adding sys_*stat64 prototypes to
  include/linux/syscalls.h, acked by Andrew Morton"

* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (47 commits)
  arm64: compat: Remove incorrect comment in compat_siginfo
  arm64: Fix section mismatch on alloc_init_p[mu]d()
  arm64: Avoid breakage caused by .altmacro in fpsimd save/restore macros
  arm64: mm: use *_sect to check for section maps
  arm64: drop unnecessary cache+tlb maintenance
  arm64:mm: free the useless initial page table
  arm64: Enable CPU_IDLE in defconfig
  arm64: kernel: remove ARM64_CPU_SUSPEND config option
  arm64: make sys_call_table const
  arm64: Remove asm/syscalls.h
  arm64: Implement the compat_sys_call_table in C
  syscalls: Declare sys_*stat64 prototypes if __ARCH_WANT_(COMPAT_)STAT64
  compat: Declare compat_sys_sigpending and compat_sys_sigprocmask prototypes
  arm64: uapi: expose our struct ucontext to the uapi headers
  smp, ARM64: Kill SMP single function call interrupt
  arm64: Emulate SETEND for AArch32 tasks
  arm64: Consolidate hotplug notifier for instruction emulation
  arm64: Track system support for mixed endian EL0
  arm64: implement generic IOMMU configuration
  arm64: Combine coherent and non-coherent swiotlb dma_ops
  ...
parents b3d6524f d476d94f

Documentation/arm64/legacy_instructions.txt

+12 −0
Original line number Diff line number Diff line
@@ -32,6 +32,9 @@ The default mode depends on the status of the instruction in the 
architecture. Deprecated instructions should default to emulation

while obsolete instructions must be undefined by default.



Note: Instruction emulation may not be possible in all cases. See

individual instruction notes for further information.



Supported legacy instructions

-----------------------------

* SWP{B}
@@ -43,3 +46,12 @@ Default: Undef (0) 
Node: /proc/sys/abi/cp15_barrier

Status: Deprecated

Default: Emulate (1)



* SETEND

Node: /proc/sys/abi/setend

Status: Deprecated

Default: Emulate (1)*

Note: All the cpus on the system must have mixed endian support at EL0

for this feature to be enabled. If a new CPU - which doesn't support mixed

endian - is hotplugged in after this feature has been enabled, there could

be unexpected results in the application.

arch/arm64/Kconfig

+15 −3
Original line number Diff line number Diff line
@@ -540,6 +540,21 @@ config CP15_BARRIER_EMULATION 


	  If unsure, say Y



config SETEND_EMULATION

	bool "Emulate SETEND instruction"

	help

	  The SETEND instruction alters the data-endianness of the

	  AArch32 EL0, and is deprecated in ARMv8.



	  Say Y here to enable software emulation of the instruction

	  for AArch32 userspace code.



	  Note: All the cpus on the system must have mixed endian support at EL0

	  for this feature to be enabled. If a new CPU - which doesn't support mixed

	  endian - is hotplugged in after this feature has been enabled, there could

	  be unexpected results in the applications.



	  If unsure, say Y

endif



endmenu
@@ -627,9 +642,6 @@ source "kernel/power/Kconfig" 
config ARCH_SUSPEND_POSSIBLE

	def_bool y



config ARM64_CPU_SUSPEND

	def_bool PM_SLEEP



endmenu



menu "CPU Power Management"

arch/arm64/Kconfig.debug

+23 −0
Original line number Diff line number Diff line
@@ -66,4 +66,27 @@ config DEBUG_SET_MODULE_RONX 
          against certain classes of kernel exploits.

          If in doubt, say "N".



config DEBUG_RODATA

	bool "Make kernel text and rodata read-only"

	help

	  If this is set, kernel text and rodata will be made read-only. This

	  is to help catch accidental or malicious attempts to change the

	  kernel's executable code. Additionally splits rodata from kernel

	  text so it can be made explicitly non-executable.



          If in doubt, say Y



config DEBUG_ALIGN_RODATA

	depends on DEBUG_RODATA && !ARM64_64K_PAGES

	bool "Align linker sections up to SECTION_SIZE"

	help

	  If this option is enabled, sections that may potentially be marked as

	  read only or non-executable will be aligned up to the section size of

	  the kernel. This prevents sections from being split into pages and

	  avoids a potential TLB penalty. The downside is an increase in

	  alignment and potentially wasted space. Turn on this option if

	  performance is more important than memory pressure.



	  If in doubt, say N



endmenu

arch/arm64/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -15,8 +15,6 @@ CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET) 
OBJCOPYFLAGS	:=-O binary -R .note -R .note.gnu.build-id -R .comment -S

GZFLAGS		:=-9



LIBGCC 		:= $(shell $(CC) $(KBUILD_CFLAGS) -print-libgcc-file-name)



KBUILD_DEFCONFIG := defconfig



KBUILD_CFLAGS	+= -mgeneral-regs-only
@@ -50,7 +48,6 @@ 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)

libs-$(CONFIG_EFI_STUB) += drivers/firmware/efi/libstub/



# Default target when executing plain make

arch/arm64/configs/defconfig

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ CONFIG_CMA=y 
CONFIG_CMDLINE="console=ttyAMA0"

# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set

CONFIG_COMPAT=y

CONFIG_CPU_IDLE=y

CONFIG_ARM64_CPUIDLE=y

CONFIG_NET=y

CONFIG_PACKET=y

CONFIG_UNIX=y

CRA Git | Maintained and supported by SUSTech CRA and CCSE