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

Commit 6325e940 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:
 - eBPF JIT compiler for arm64
 - CPU suspend backend for PSCI (firmware interface) with standard idle
   states defined in DT (generic idle driver to be merged via a
   different tree)
 - Support for CONFIG_DEBUG_SET_MODULE_RONX
 - Support for unmapped cpu-release-addr (outside kernel linear mapping)
 - set_arch_dma_coherent_ops() implemented and bus notifiers removed
 - EFI_STUB improvements when base of DRAM is occupied
 - Typos in KGDB macros
 - Clean-up to (partially) allow kernel building with LLVM
 - Other clean-ups (extern keyword, phys_addr_t usage)

* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (51 commits)
  arm64: Remove unneeded extern keyword
  ARM64: make of_device_ids const
  arm64: Use phys_addr_t type for physical address
  aarch64: filter $x from kallsyms
  arm64: Use DMA_ERROR_CODE to denote failed allocation
  arm64: Fix typos in KGDB macros
  arm64: insn: Add return statements after BUG_ON()
  arm64: debug: don't re-enable debug exceptions on return from el1_dbg
  Revert "arm64: dmi: Add SMBIOS/DMI support"
  arm64: Implement set_arch_dma_coherent_ops() to replace bus notifiers
  of: amba: use of_dma_configure for AMBA devices
  arm64: dmi: Add SMBIOS/DMI support
  arm64: Correct ftrace calls to aarch64_insn_gen_branch_imm()
  arm64:mm: initialize max_mapnr using function set_max_mapnr
  setup: Move unmask of async interrupts after possible earlycon setup
  arm64: LLVMLinux: Fix inline arm64 assembly for use with clang
  arm64: pageattr: Correctly adjust unaligned start addresses
  net: bpf: arm64: fix module memory leak when JIT image build fails
  arm64: add PSCI CPU_SUSPEND based cpu_suspend support
  arm64: kernel: introduce cpu_init_idle CPU operation
  ...
parents 536fd93d 0a6479b0

Documentation/devicetree/bindings/arm/cpus.txt

+8 −0
Original line number Diff line number Diff line
@@ -219,6 +219,12 @@ nodes to be present and contain the properties described below. 
		Value type: <phandle>

		Definition: Specifies the ACC[2] node associated with this CPU.



	- cpu-idle-states

		Usage: Optional

		Value type: <prop-encoded-array>

		Definition:

			# List of phandles to idle state nodes supported

			  by this cpu [3].



Example 1 (dual-cluster big.LITTLE system 32-bit):
@@ -415,3 +421,5 @@ cpus { 
--

[1] arm/msm/qcom,saw2.txt

[2] arm/msm/qcom,kpss-acc.txt

[3] ARM Linux kernel documentation - idle states bindings

    Documentation/devicetree/bindings/arm/idle-states.txt

Documentation/devicetree/bindings/arm/idle-states.txt

0 → 100644
+679 −0

File added.

Preview size limit exceeded, changes collapsed.

Documentation/devicetree/bindings/arm/psci.txt

+13 −1
Original line number Diff line number Diff line
@@ -50,6 +50,16 @@ Main node optional properties: 


 - migrate       : Function ID for MIGRATE operation



Device tree nodes that require usage of PSCI CPU_SUSPEND function (ie idle

state nodes, as per bindings in [1]) must specify the following properties:



- arm,psci-suspend-param

		Usage: Required for state nodes[1] if the corresponding

                       idle-states node entry-method property is set

                       to "psci".

		Value type: <u32>

		Definition: power_state parameter to pass to the PSCI

			    suspend call.



Example:
@@ -64,7 +74,6 @@ Case 1: PSCI v0.1 only. 
		migrate		= <0x95c10003>;

	};





Case 2: PSCI v0.2 only



	psci {
@@ -88,3 +97,6 @@ Case 3: PSCI v0.2 and PSCI v0.1. 


		...

	};



[1] Kernel documentation - ARM idle states bindings

    Documentation/devicetree/bindings/arm/idle-states.txt

Documentation/networking/filter.txt

+3 −3
Original line number Diff line number Diff line
@@ -462,9 +462,9 @@ JIT compiler 
------------



The Linux kernel has a built-in BPF JIT compiler for x86_64, SPARC, PowerPC,

ARM, MIPS and s390 and can be enabled through CONFIG_BPF_JIT. The JIT compiler

is transparently invoked for each attached filter from user space or for

internal kernel users if it has been previously enabled by root:

ARM, ARM64, MIPS and s390 and can be enabled through CONFIG_BPF_JIT. The JIT

compiler is transparently invoked for each attached filter from user space

or for internal kernel users if it has been previously enabled by root:



  echo 1 > /proc/sys/net/core/bpf_jit_enable

arch/arm64/Kconfig

+4 −3
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ config ARM64 
	select HAVE_ARCH_JUMP_LABEL

	select HAVE_ARCH_KGDB

	select HAVE_ARCH_TRACEHOOK

	select HAVE_BPF_JIT

	select HAVE_C_RECORDMCOUNT

	select HAVE_CC_STACKPROTECTOR

	select HAVE_DEBUG_BUGVERBOSE
@@ -252,11 +253,11 @@ config SCHED_SMT 
	  places. If unsure say N here.



config NR_CPUS

	int "Maximum number of CPUs (2-32)"

	range 2 32

	int "Maximum number of CPUs (2-64)"

	range 2 64

	depends on SMP

	# These have to remain sorted largest to smallest

	default "8"

	default "64"



config HOTPLUG_CPU

	bool "Support for hot-pluggable CPUs"