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

Commit 97ebe8f5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64 

Pull ARM64 updates from Catalin Marinas:

 - Generic execve, kernel_thread, fork/vfork/clone.

 - Preparatory patches for KVM support (initialising EL2 mode for later
   installing KVM support, hypervisor stub).

 - Signal handling corner case fix (alternative signal stack set up for
   a SEGV handler, which is raised in response to RLIMIT_STACK being
   reached).

 - Sub-nanosecond timer error fix.

* tag 'arm64-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux-aarch64: (30 commits)
  arm64: Update the MAINTAINERS entry
  arm64: compat for clock_adjtime(2) is miswired
  arm64: move FP-SIMD save/restore code to a macro
  arm64: hyp: initialize vttbr_el2 to zero
  arm64: add hypervisor stub
  arm64: record boot mode when entering the kernel
  arm64: move vector entry macro to assembler.h
  arm64: add AArch32 execution modes to ptrace.h
  arm64: expand register mapping between AArch32 and AArch64
  arm64: generic timer: use virtual counter instead of physical at EL0
  arm64: vdso: defer shifting of nanosecond component of timespec
  arm64: vdso: rework __do_get_tspec register allocation and return shift
  arm64: vdso: check sequence counter even for coarse realtime operations
  arm64: vdso: fix clocksource mask when extracting bottom 56 bits
  ARM64: Remove incorrect Kconfig symbol HAVE_SPARSE_IRQ
  Documentation: Fixes a word in Documentation/arm64/memory.txt
  arm64: Make !dirty ptes read-only
  arm64: Convert empty flush_cache_{mm,page} functions to static inline
  arm64: signal: let the compiler inline compat_get_sigframe
  arm64: signal: return struct rt_sigframe from get_sigframe
  ...

Conflicts:
	arch/arm64/include/asm/unistd32.h
parents d07e43d7 d19766ec

Documentation/arm64/memory.txt

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ ffffffbbffff0000 ffffffbcffffffff ~2MB [guard] 


ffffffbffc000000	ffffffbfffffffff	  64MB		modules



ffffffc000000000	ffffffffffffffff	 256GB		memory

ffffffc000000000	ffffffffffffffff	 256GB		kernel logical memory map





Translation table lookup with 4KB pages:

MAINTAINERS

+2 −0
Original line number Diff line number Diff line
@@ -1248,9 +1248,11 @@ F: arch/arm/mach-pxa/include/mach/z2.h 


ARM64 PORT (AARCH64 ARCHITECTURE)

M:	Catalin Marinas <catalin.marinas@arm.com>

M:	Will Deacon <will.deacon@arm.com>

L:	linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)

S:	Maintained

F:	arch/arm64/

F:	Documentation/arm64/



ASC7621 HARDWARE MONITOR DRIVER

M:	George Joseph <george.joseph@fairview5.com>

arch/arm64/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -2,11 +2,14 @@ config ARM64 
	def_bool y

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

	select ARCH_WANT_COMPAT_IPC_PARSE_VERSION

	select COMMON_CLK

	select GENERIC_CLOCKEVENTS

	select GENERIC_HARDIRQS_NO_DEPRECATED

	select GENERIC_IOMAP

	select GENERIC_IRQ_PROBE

	select GENERIC_IRQ_SHOW

	select GENERIC_KERNEL_EXECVE

	select GENERIC_KERNEL_THREAD

	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_TIME_VSYSCALL

	select HARDIRQS_SW_RESEND
@@ -21,7 +24,6 @@ config ARM64 
	select HAVE_IRQ_WORK

	select HAVE_MEMBLOCK

	select HAVE_PERF_EVENTS

	select HAVE_SPARSE_IRQ

	select IRQ_DOMAIN

	select MODULES_USE_ELF_RELA

	select NO_BOOTMEM

arch/arm64/include/asm/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
generic-y += bug.h

generic-y += bugs.h

generic-y += checksum.h

generic-y += clkdev.h

generic-y += cputime.h

generic-y += current.h

generic-y += delay.h

arch/arm64/include/asm/arm_generic.h

+4 −4
Original line number Diff line number Diff line
@@ -70,12 +70,12 @@ static inline void __cpuinit arch_counter_enable_user_access(void) 
{

	u32 cntkctl;



	/* Disable user access to the timers and the virtual counter. */

	/* Disable user access to the timers and the physical counter. */

	asm volatile("mrs	%0, cntkctl_el1" : "=r" (cntkctl));

	cntkctl &= ~((3 << 8) | (1 << 1));

	cntkctl &= ~((3 << 8) | (1 << 0));



	/* Enable user access to the physical counter and frequency. */

	cntkctl |= 1;

	/* Enable user access to the virtual counter and frequency. */

	cntkctl |= (1 << 1);

	asm volatile("msr	cntkctl_el1, %0" : : "r" (cntkctl));

}