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

Commit 82b51734 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:
 - CPU suspend support on top of PSCI (firmware Power State Coordination
   Interface)
 - jump label support
 - CMA can now be enabled on arm64
 - HWCAP bits for crypto and CRC32 extensions
 - optimised percpu using tpidr_el1 register
 - code cleanup

* tag 'arm64-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: (42 commits)
  arm64: fix typo in entry.S
  arm64: kernel: restore HW breakpoint registers in cpu_suspend
  jump_label: use defined macros instead of hard-coding for better readability
  arm64, jump label: optimize jump label implementation
  arm64, jump label: detect %c support for ARM64
  arm64: introduce aarch64_insn_gen_{nop|branch_imm}() helper functions
  arm64: move encode_insn_immediate() from module.c to insn.c
  arm64: introduce interfaces to hotpatch kernel and module code
  arm64: introduce basic aarch64 instruction decoding helpers
  arm64: dts: Reduce size of virtio block device for foundation model
  arm64: Remove unused __data_loc variable
  arm64: Enable CMA
  arm64: Warn on NULL device structure for dma APIs
  arm64: Add hwcaps for crypto and CRC32 extensions.
  arm64: drop redundant macros from read_cpuid()
  arm64: Remove outdated comment
  arm64: cmpxchg: update macros to prevent warnings
  arm64: support single-step and breakpoint handler hooks
  ARM64: fix framepointer check in unwind_frame
  ARM64: check stack pointer in get_wchan
  ...
parents 15c81026 883c0573

arch/arm/kvm/arm.c

+30 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
 */



#include <linux/cpu.h>

#include <linux/cpu_pm.h>

#include <linux/errno.h>

#include <linux/err.h>

#include <linux/kvm_host.h>
@@ -853,6 +854,33 @@ static struct notifier_block hyp_init_cpu_nb = { 
	.notifier_call = hyp_init_cpu_notify,

};



#ifdef CONFIG_CPU_PM

static int hyp_init_cpu_pm_notifier(struct notifier_block *self,

				    unsigned long cmd,

				    void *v)

{

	if (cmd == CPU_PM_EXIT) {

		cpu_init_hyp_mode(NULL);

		return NOTIFY_OK;

	}



	return NOTIFY_DONE;

}



static struct notifier_block hyp_init_cpu_pm_nb = {

	.notifier_call = hyp_init_cpu_pm_notifier,

};



static void __init hyp_cpu_pm_init(void)

{

	cpu_pm_register_notifier(&hyp_init_cpu_pm_nb);

}

#else

static inline void hyp_cpu_pm_init(void)

{

}

#endif



/**

 * Inits Hyp-mode on all online CPUs

 */
@@ -1013,6 +1041,8 @@ int kvm_arch_init(void *opaque) 
		goto out_err;

	}



	hyp_cpu_pm_init();



	kvm_coproc_table_init();

	return 0;

out_err:

arch/arm64/Kconfig

+27 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ config ARM64 
	def_bool y

	select ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE

	select ARCH_USE_CMPXCHG_LOCKREF

	select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST

	select ARCH_WANT_OPTIONAL_GPIOLIB

	select ARCH_WANT_COMPAT_IPC_PARSE_VERSION

	select ARCH_WANT_FRAME_POINTERS
@@ -11,19 +12,27 @@ config ARM64 
	select BUILDTIME_EXTABLE_SORT

	select CLONE_BACKWARDS

	select COMMON_CLK

	select CPU_PM if (SUSPEND || CPU_IDLE)

	select DCACHE_WORD_ACCESS

	select GENERIC_CLOCKEVENTS

	select GENERIC_CLOCKEVENTS_BROADCAST if SMP

	select GENERIC_IOMAP

	select GENERIC_IRQ_PROBE

	select GENERIC_IRQ_SHOW

	select GENERIC_SCHED_CLOCK

	select GENERIC_SMP_IDLE_THREAD

	select GENERIC_STRNCPY_FROM_USER

	select GENERIC_STRNLEN_USER

	select GENERIC_TIME_VSYSCALL

	select HARDIRQS_SW_RESEND

	select HAVE_ARCH_JUMP_LABEL

	select HAVE_ARCH_TRACEHOOK

	select HAVE_DEBUG_BUGVERBOSE

	select HAVE_DEBUG_KMEMLEAK

	select HAVE_DMA_API_DEBUG

	select HAVE_DMA_ATTRS

	select HAVE_DMA_CONTIGUOUS

	select HAVE_EFFICIENT_UNALIGNED_ACCESS

	select HAVE_GENERIC_DMA_COHERENT

	select HAVE_HW_BREAKPOINT if PERF_EVENTS

	select HAVE_MEMBLOCK
@@ -275,6 +284,24 @@ config SYSVIPC_COMPAT 


endmenu



menu "Power management options"



source "kernel/power/Kconfig"



config ARCH_SUSPEND_POSSIBLE

	def_bool y



config ARM64_CPU_SUSPEND

	def_bool PM_SLEEP



endmenu



menu "CPU Power Management"



source "drivers/cpuidle/Kconfig"



endmenu



source "net/Kconfig"



source "drivers/Kconfig"

arch/arm64/boot/dts/foundation-v8.dts

+1 −1
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ 


			virtio_block@0130000 {

				compatible = "virtio,mmio";

				reg = <0x130000 0x1000>;

				reg = <0x130000 0x200>;

				interrupts = <42>;

			};

		};

arch/arm64/boot/dts/rtsm_ve-motherboard.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -183,6 +183,12 @@ 
				clocks = <&v2m_oscclk1>, <&v2m_clk24mhz>;

				clock-names = "clcdclk", "apb_pclk";

			};



			virtio_block@0130000 {

				compatible = "virtio,mmio";

				reg = <0x130000 0x200>;

				interrupts = <42>;

			};

		};



		v2m_fixed_3v3: fixedregulator@0 {

arch/arm64/include/asm/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ generic-y += mman.h 
generic-y += msgbuf.h

generic-y += mutex.h

generic-y += pci.h

generic-y += percpu.h

generic-y += poll.h

generic-y += posix_types.h

generic-y += resource.h