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

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

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fixes from Will Deacon:
 "Most of these are CC'd for stable, but there are a few fixing issues
  introduced during the recent merge window too.

  There's also a fix for the xgene PMU driver, but it seemed daft to
  send as a separate pull request, so I've included it here with the
  rest of the fixes.

   - Fix ACPI boot due to recent broken NUMA changes
   - Fix remote enabling of CPU features requiring PSTATE bit manipulation
   - Add address range check when emulating user cache maintenance
   - Fix LL/SC loops that allow compiler to introduce memory accesses
   - Fix recently added write_sysreg_s macro
   - Ensure MDCR_EL2 is initialised on qemu targets without a PMU
   - Avoid kaslr breakage due to MODVERSIONs and DYNAMIC_FTRACE
   - Correctly drive recent ld when building relocatable Image
   - Remove junk IS_ERR check from xgene PMU driver added during merge window
   - pr_cont fixes after core changes in the merge window"

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: remove pr_cont abuse from mem_init
  arm64: fix show_regs fallout from KERN_CONT changes
  arm64: kernel: force ET_DYN ELF type for CONFIG_RELOCATABLE=y
  arm64: suspend: Reconfigure PSTATE after resume from idle
  arm64: mm: Set PSTATE.PAN from the cpu_enable_pan() call
  arm64: cpufeature: Schedule enable() calls instead of calling them via IPI
  arm64: Cortex-A53 errata workaround: check for kernel addresses
  arm64: percpu: rewrite ll/sc loops in assembly
  arm64: swp emulation: bound LL/SC retries before rescheduling
  arm64: sysreg: Fix use of XZR in write_sysreg_s
  arm64: kaslr: keep modules close to the kernel when DYNAMIC_FTRACE=y
  arm64: kernel: Init MDCR_EL2 even in the absence of a PMU
  perf: xgene: Remove bogus IS_ERR() check
  arm64: kernel: numa: fix ACPI boot cpu numa node mapping
  arm64: kaslr: fix breakage with CONFIG_MODVERSIONS=y
parents bdcff415 f7881bd6

arch/arm64/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -915,7 +915,7 @@ config RANDOMIZE_BASE 


config RANDOMIZE_MODULE_REGION_FULL

	bool "Randomize the module region independently from the core kernel"

	depends on RANDOMIZE_BASE

	depends on RANDOMIZE_BASE && !DYNAMIC_FTRACE

	default y

	help

	  Randomizes the location of the module region without considering the

arch/arm64/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ CPPFLAGS_vmlinux.lds = -DTEXT_OFFSET=$(TEXT_OFFSET) 
GZFLAGS		:=-9



ifneq ($(CONFIG_RELOCATABLE),)

LDFLAGS_vmlinux		+= -pie -Bsymbolic

LDFLAGS_vmlinux		+= -pie -shared -Bsymbolic

endif



ifeq ($(CONFIG_ARM64_ERRATUM_843419),y)

arch/arm64/include/asm/cpufeature.h

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ struct arm64_cpu_capabilities { 
	u16 capability;

	int def_scope;			/* default scope */

	bool (*matches)(const struct arm64_cpu_capabilities *caps, int scope);

	void (*enable)(void *);		/* Called on all active CPUs */

	int (*enable)(void *);		/* Called on all active CPUs */

	union {

		struct {	/* To be used for erratum handling only */

			u32 midr_model;

arch/arm64/include/asm/exec.h

+3 −0
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ 
#ifndef __ASM_EXEC_H

#define __ASM_EXEC_H



#include <linux/sched.h>



extern unsigned long arch_align_stack(unsigned long sp);

void uao_thread_switch(struct task_struct *next);



#endif	/* __ASM_EXEC_H */

arch/arm64/include/asm/module.h

+5 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#define __ASM_MODULE_H



#include <asm-generic/module.h>

#include <asm/memory.h>



#define MODULE_ARCH_VERMAGIC	"aarch64"
@@ -32,6 +33,10 @@ u64 module_emit_plt_entry(struct module *mod, const Elf64_Rela *rela, 
			  Elf64_Sym *sym);



#ifdef CONFIG_RANDOMIZE_BASE

#ifdef CONFIG_MODVERSIONS

#define ARCH_RELOCATES_KCRCTAB

#define reloc_start 		(kimage_vaddr - KIMAGE_VADDR)

#endif

extern u64 module_alloc_base;

#else

#define module_alloc_base	((u64)_etext - MODULES_VSIZE)