Commit 55a7b212 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 Will Deacon:

 - RAS reporting via GHES/APEI (ACPI)

 - Indirect ftrace trampolines for modules

 - Improvements to kernel fault reporting

 - Page poisoning

 - Sigframe cleanups and preparation for SVE context

 - Core dump fixes

 - Sparse fixes (mainly relating to endianness)

 - xgene SoC PMU v3 driver

 - Misc cleanups and non-critical fixes

* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (75 commits)
  arm64: fix endianness annotation for 'struct jit_ctx' and friends
  arm64: cpuinfo: constify attribute_group structures.
  arm64: ptrace: Fix incorrect get_user() use in compat_vfp_set()
  arm64: ptrace: Remove redundant overrun check from compat_vfp_set()
  arm64: ptrace: Avoid setting compat FP[SC]R to garbage if get_user fails
  arm64: fix endianness annotation for __apply_alternatives()/get_alt_insn()
  arm64: fix endianness annotation in get_kaslr_seed()
  arm64: add missing conversion to __wsum in ip_fast_csum()
  arm64: fix endianness annotation in acpi_parking_protocol.c
  arm64: use readq() instead of readl() to read 64bit entry_point
  arm64: fix endianness annotation for reloc_insn_movw() & reloc_insn_imm()
  arm64: fix endianness annotation for aarch64_insn_write()
  arm64: fix endianness annotation in aarch64_insn_read()
  arm64: fix endianness annotation in call_undef_hook()
  arm64: fix endianness annotation for debug-monitors.c
  ras: mark stub functions as 'inline'
  arm64: pass endianness info to sparse
  arm64: ftrace: fix !CONFIG_ARM64_MODULE_PLTS kernels
  arm64: signal: Allow expansion of the signal frame
  acpi: apei: check for pending errors when probing GHES entries
  ...
parents e5f76a2e 425e1ed7

arch/arm/include/asm/kvm_arm.h

+10 −0
Original line number Diff line number Diff line
@@ -187,6 +187,16 @@ 
#define FSC_FAULT	(0x04)

#define FSC_ACCESS	(0x08)

#define FSC_PERM	(0x0c)

#define FSC_SEA		(0x10)

#define FSC_SEA_TTW0	(0x14)

#define FSC_SEA_TTW1	(0x15)

#define FSC_SEA_TTW2	(0x16)

#define FSC_SEA_TTW3	(0x17)

#define FSC_SECC	(0x18)

#define FSC_SECC_TTW0	(0x1c)

#define FSC_SECC_TTW1	(0x1d)

#define FSC_SECC_TTW2	(0x1e)

#define FSC_SECC_TTW3	(0x1f)



/* Hyp Prefetch Fault Address Register (HPFAR/HDFAR) */

#define HPFAR_MASK	(~0xf)

arch/arm/include/asm/system_misc.h

+5 −0
Original line number Diff line number Diff line
@@ -22,6 +22,11 @@ extern void (*arm_pm_idle)(void); 


extern unsigned int user_debug;



static inline int handle_guest_sea(phys_addr_t addr, unsigned int esr)

{

	return -1;

}



#endif /* !__ASSEMBLY__ */



#endif /* __ASM_ARM_SYSTEM_MISC_H */

arch/arm/kernel/perf_event_v6.c

+1 −1
Original line number Diff line number Diff line
@@ -552,7 +552,7 @@ static int armv6mpcore_pmu_init(struct arm_pmu *cpu_pmu) 
	return 0;

}



static struct of_device_id armv6_pmu_of_device_ids[] = {

static const struct of_device_id armv6_pmu_of_device_ids[] = {

	{.compatible = "arm,arm11mpcore-pmu",	.data = armv6mpcore_pmu_init},

	{.compatible = "arm,arm1176-pmu",	.data = armv6_1176_pmu_init},

	{.compatible = "arm,arm1136-pmu",	.data = armv6_1136_pmu_init},

arch/arm64/Kconfig

+8 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ config ARM64 
	select ACPI_CCA_REQUIRED if ACPI

	select ACPI_GENERIC_GSI if ACPI

	select ACPI_GTDT if ACPI

	select ACPI_IORT if ACPI

	select ACPI_REDUCED_HARDWARE_ONLY if ACPI

	select ACPI_MCFG if ACPI

	select ACPI_SPCR_TABLE if ACPI
@@ -19,7 +20,9 @@ config ARM64 
	select ARCH_HAS_STRICT_KERNEL_RWX

	select ARCH_HAS_STRICT_MODULE_RWX

	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_HAVE_NMI_SAFE_CMPXCHG if ACPI_APEI_SEA

	select ARCH_USE_CMPXCHG_LOCKREF

	select ARCH_SUPPORTS_MEMORY_FAILURE

	select ARCH_SUPPORTS_ATOMIC_RMW

	select ARCH_SUPPORTS_NUMA_BALANCING

	select ARCH_WANT_COMPAT_IPC_PARSE_VERSION
@@ -93,6 +96,7 @@ config ARM64 
	select HAVE_IRQ_TIME_ACCOUNTING

	select HAVE_MEMBLOCK

	select HAVE_MEMBLOCK_NODE_MAP if NUMA

	select HAVE_NMI if ACPI_APEI_SEA

	select HAVE_PATA_PLATFORM

	select HAVE_PERF_EVENTS

	select HAVE_PERF_REGS
@@ -245,6 +249,9 @@ config PGTABLE_LEVELS 
config ARCH_SUPPORTS_UPROBES

	def_bool y



config ARCH_PROC_KCORE_TEXT

	def_bool y



source "init/Kconfig"



source "kernel/Kconfig.freezer"
@@ -983,7 +990,7 @@ config RANDOMIZE_BASE 


config RANDOMIZE_MODULE_REGION_FULL

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

	depends on RANDOMIZE_BASE && !DYNAMIC_FTRACE

	depends on RANDOMIZE_BASE

	default y

	help

	  Randomizes the location of the module region without considering the

arch/arm64/Makefile

+6 −1
Original line number Diff line number Diff line
@@ -52,17 +52,19 @@ KBUILD_AFLAGS += $(lseinstr) $(brokengasinst) 


ifeq ($(CONFIG_CPU_BIG_ENDIAN), y)

KBUILD_CPPFLAGS	+= -mbig-endian

CHECKFLAGS	+= -D__AARCH64EB__

AS		+= -EB

LD		+= -EB

UTS_MACHINE	:= aarch64_be

else

KBUILD_CPPFLAGS	+= -mlittle-endian

CHECKFLAGS	+= -D__AARCH64EL__

AS		+= -EL

LD		+= -EL

UTS_MACHINE	:= aarch64

endif



CHECKFLAGS	+= -D__aarch64__

CHECKFLAGS	+= -D__aarch64__ -m64



ifeq ($(CONFIG_ARM64_MODULE_CMODEL_LARGE), y)

KBUILD_CFLAGS_MODULE	+= -mcmodel=large
@@ -70,6 +72,9 @@ endif 


ifeq ($(CONFIG_ARM64_MODULE_PLTS),y)

KBUILD_LDFLAGS_MODULE	+= -T $(srctree)/arch/arm64/kernel/module.lds

ifeq ($(CONFIG_DYNAMIC_FTRACE),y)

KBUILD_LDFLAGS_MODULE	+= $(objtree)/arch/arm64/kernel/ftrace-mod.o

endif

endif



# Default value

CRA Git | Maintained and supported by SUSTech CRA and CCSE