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

Commit dfd437a2 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 support for syscall emulation via PTRACE_SYSEMU{,_SINGLESTEP}

 - Wire up VM_FLUSH_RESET_PERMS for arm64, allowing the core code to
   manage the permissions of executable vmalloc regions more strictly

 - Slight performance improvement by keeping softirqs enabled while
   touching the FPSIMD/SVE state (kernel_neon_begin/end)

 - Expose a couple of ARMv8.5 features to user (HWCAP): CondM (new
   XAFLAG and AXFLAG instructions for floating point comparison flags
   manipulation) and FRINT (rounding floating point numbers to integers)

 - Re-instate ARM64_PSEUDO_NMI support which was previously marked as
   BROKEN due to some bugs (now fixed)

 - Improve parking of stopped CPUs and implement an arm64-specific
   panic_smp_self_stop() to avoid warning on not being able to stop
   secondary CPUs during panic

 - perf: enable the ARM Statistical Profiling Extensions (SPE) on ACPI
   platforms

 - perf: DDR performance monitor support for iMX8QXP

 - cache_line_size() can now be set from DT or ACPI/PPTT if provided to
   cope with a system cache info not exposed via the CPUID registers

 - Avoid warning on hardware cache line size greater than
   ARCH_DMA_MINALIGN if the system is fully coherent

 - arm64 do_page_fault() and hugetlb cleanups

 - Refactor set_pte_at() to avoid redundant READ_ONCE(*ptep)

 - Ignore ACPI 5.1 FADTs reported as 5.0 (infer from the
   'arm_boot_flags' introduced in 5.1)

 - CONFIG_RANDOMIZE_BASE now enabled in defconfig

 - Allow the selection of ARM64_MODULE_PLTS, currently only done via
   RANDOMIZE_BASE (and an erratum workaround), allowing modules to spill
   over into the vmalloc area

 - Make ZONE_DMA32 configurable

* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (54 commits)
  perf: arm_spe: Enable ACPI/Platform automatic module loading
  arm_pmu: acpi: spe: Add initial MADT/SPE probing
  ACPI/PPTT: Add function to return ACPI 6.3 Identical tokens
  ACPI/PPTT: Modify node flag detection to find last IDENTICAL
  x86/entry: Simplify _TIF_SYSCALL_EMU handling
  arm64: rename dump_instr as dump_kernel_instr
  arm64/mm: Drop [PTE|PMD]_TYPE_FAULT
  arm64: Implement panic_smp_self_stop()
  arm64: Improve parking of stopped CPUs
  arm64: Expose FRINT capabilities to userspace
  arm64: Expose ARMv8.5 CondM capability to userspace
  arm64: defconfig: enable CONFIG_RANDOMIZE_BASE
  arm64: ARM64_MODULES_PLTS must depend on MODULES
  arm64: bpf: do not allocate executable memory
  arm64/kprobes: set VM_FLUSH_RESET_PERMS on kprobe instruction pages
  arm64/mm: wire up CONFIG_ARCH_HAS_SET_DIRECT_MAP
  arm64: module: create module allocations without exec permissions
  arm64: Allow user selection of ARM64_MODULE_PLTS
  acpi/arm64: ignore 5.1 FADTs that are reported as 5.0
  arm64: Allow selecting Pseudo-NMI again
  ...
parents 0ecfebd2 0c61efd3

Documentation/arm64/elf_hwcaps.txt

+8 −0
Original line number Diff line number Diff line
@@ -207,6 +207,10 @@ HWCAP_FLAGM 


    Functionality implied by ID_AA64ISAR0_EL1.TS == 0b0001.



HWCAP2_FLAGM2



    Functionality implied by ID_AA64ISAR0_EL1.TS == 0b0010.



HWCAP_SSBS



    Functionality implied by ID_AA64PFR1_EL1.SSBS == 0b0010.
@@ -223,6 +227,10 @@ HWCAP_PACG 
    ID_AA64ISAR1_EL1.GPI == 0b0001, as described by

    Documentation/arm64/pointer-authentication.txt.



HWCAP2_FRINT



    Functionality implied by ID_AA64ISAR1_EL1.FRINTTS == 0b0001.





4. Unused AT_HWCAP bits

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

Documentation/devicetree/bindings/perf/fsl-imx-ddr.txt

0 → 100644
+21 −0
Original line number Diff line number Diff line 
* Freescale(NXP) IMX8 DDR performance monitor



Required properties:



- compatible: should be one of:

	"fsl,imx8-ddr-pmu"

	"fsl,imx8m-ddr-pmu"



- reg: physical address and size



- interrupts: single interrupt

	generated by the control block



Example:



	ddr-pmu@5c020000 {

		compatible = "fsl,imx8-ddr-pmu";

		reg = <0x5c020000 0x10000>;

		interrupt-parent = <&gic>;

		interrupts = <GIC_SPI 131 IRQ_TYPE_LEVEL_HIGH>;

	};

MAINTAINERS

+7 −0
Original line number Diff line number Diff line
@@ -6337,6 +6337,13 @@ L: linux-i2c@vger.kernel.org 
S:	Maintained

F:	drivers/i2c/busses/i2c-cpm.c



FREESCALE IMX DDR PMU DRIVER

M:	Frank Li <Frank.li@nxp.com>

L:	linux-arm-kernel@lists.infradead.org

S:	Maintained

F:	drivers/perf/fsl_imx8_ddr_perf.c

F:	Documentation/devicetree/bindings/perf/fsl-imx-ddr.txt



FREESCALE IMX LPI2C DRIVER

M:	Dong Aisheng <aisheng.dong@nxp.com>

L:	linux-i2c@vger.kernel.org

arch/arm64/Kconfig

+31 −4
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ config ARM64 
	select ARCH_HAS_MEMBARRIER_SYNC_CORE

	select ARCH_HAS_PTE_SPECIAL

	select ARCH_HAS_SETUP_DMA_OPS

	select ARCH_HAS_SET_DIRECT_MAP

	select ARCH_HAS_SET_MEMORY

	select ARCH_HAS_STRICT_KERNEL_RWX

	select ARCH_HAS_STRICT_MODULE_RWX
@@ -260,7 +261,8 @@ config GENERIC_CALIBRATE_DELAY 
	def_bool y



config ZONE_DMA32

	def_bool y

	bool "Support DMA32 zone" if EXPERT

	default y



config HAVE_GENERIC_GUP

	def_bool y
@@ -933,7 +935,6 @@ config PARAVIRT 
config PARAVIRT_TIME_ACCOUNTING

	bool "Paravirtual steal time accounting"

	select PARAVIRT

	default n

	help

	  Select this option to enable fine granularity task steal time

	  accounting. Time spent executing other tasks in parallel with
@@ -1418,12 +1419,27 @@ config ARM64_SVE 
	  KVM in the same kernel image.



config ARM64_MODULE_PLTS

	bool

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

	depends on MODULES

	select HAVE_MOD_ARCH_SPECIFIC

	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.



	  When running with address space randomization (KASLR), the module

	  region itself may be too far away for ordinary relative jumps and

	  calls, and so in that case, module PLTs are required and cannot be

	  disabled.



	  Specific errata workaround(s) might also force module PLTs to be

	  enabled (ARM64_ERRATUM_843419).



config ARM64_PSEUDO_NMI

	bool "Support for NMI-like interrupts"

	depends on BROKEN # 1556553607-46531-1-git-send-email-julien.thierry@arm.com

	select CONFIG_ARM_GIC_V3

	help

	  Adds support for mimicking Non-Maskable Interrupts through the use of
@@ -1436,6 +1452,17 @@ config ARM64_PSEUDO_NMI 


	  If unsure, say N



if ARM64_PSEUDO_NMI

config ARM64_DEBUG_PRIORITY_MASKING

	bool "Debug interrupt priority masking"

	help

	  This adds runtime checks to functions enabling/disabling

	  interrupts when using priority masking. The additional checks verify

	  the validity of ICC_PMR_EL1 when calling concerned functions.



	  If unsure, say N

endif



config RELOCATABLE

	bool

	help

arch/arm64/configs/defconfig

+1 −0
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ CONFIG_KEXEC=y 
CONFIG_CRASH_DUMP=y

CONFIG_XEN=y

CONFIG_COMPAT=y

CONFIG_RANDOMIZE_BASE=y

CONFIG_HIBERNATION=y

CONFIG_WQ_POWER_EFFICIENT_DEFAULT=y

CONFIG_ARM_CPUIDLE=y