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

Commit ce115556 authored by Alex Shi's avatar Alex Shi
Browse files

Merge branch 'v4.4/topic/hibernate' into linux-linaro-lsk-v4.4 

Conflicts:
	conflicts are almost come from mm-kaslr, focus on mm
	arch/arm64/include/asm/cpufeature.h
	arch/arm64/include/asm/pgtable.h
	arch/arm64/kernel/Makefile
	arch/arm64/kernel/cpufeature.c
	arch/arm64/kernel/head.S
	arch/arm64/kernel/suspend.c
	arch/arm64/kernel/vmlinux.lds.S
	arch/arm64/kvm/hyp.S
	arch/arm64/mm/init.c
	arch/arm64/mm/mmu.c
	arch/arm64/mm/proc-macros.S
parents ecad3954 602decea

arch/arm/Kconfig

+5 −4
Original line number Diff line number Diff line
@@ -38,6 +38,7 @@ config ARM 
	select HAVE_ARCH_HARDENED_USERCOPY

	select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT)

	select HAVE_ARCH_TRACEHOOK

	select HAVE_ARM_SMCCC if CPU_V7

	select HAVE_BPF_JIT

	select HAVE_CC_STACKPROTECTOR

	select HAVE_CONTEXT_TRACKING
@@ -1423,8 +1424,7 @@ config BIG_LITTLE 


config BL_SWITCHER

	bool "big.LITTLE switcher support"

	depends on BIG_LITTLE && MCPM && HOTPLUG_CPU

	select ARM_CPU_SUSPEND

	depends on BIG_LITTLE && MCPM && HOTPLUG_CPU && ARM_GIC

	select CPU_PM

	help

	  The big.LITTLE "switcher" provides the core functionality to
@@ -1482,7 +1482,7 @@ config HOTPLUG_CPU 


config ARM_PSCI

	bool "Support for the ARM Power State Coordination Interface (PSCI)"

	depends on CPU_V7

	depends on HAVE_ARM_SMCCC

	select ARM_PSCI_FW

	help

	  Say Y here if you want Linux to communicate with system firmware
@@ -2141,7 +2141,8 @@ config ARCH_SUSPEND_POSSIBLE 
	def_bool y



config ARM_CPU_SUSPEND

	def_bool PM_SLEEP

	def_bool PM_SLEEP || BL_SWITCHER || ARM_PSCI_FW

	depends on ARCH_SUSPEND_POSSIBLE



config ARCH_HIBERNATION_POSSIBLE

	bool

arch/arm/include/asm/kvm_arm.h

+17 −17
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#ifndef __ARM_KVM_ARM_H__

#define __ARM_KVM_ARM_H__



#include <linux/const.h>

#include <linux/types.h>



/* Hyp Configuration Register (HCR) bits */
@@ -132,10 +133,9 @@ 
 * space.

 */

#define KVM_PHYS_SHIFT	(40)

#define KVM_PHYS_SIZE	(1ULL << KVM_PHYS_SHIFT)

#define KVM_PHYS_MASK	(KVM_PHYS_SIZE - 1ULL)

#define PTRS_PER_S2_PGD	(1ULL << (KVM_PHYS_SHIFT - 30))

#define S2_PGD_ORDER	get_order(PTRS_PER_S2_PGD * sizeof(pgd_t))

#define KVM_PHYS_SIZE	(_AC(1, ULL) << KVM_PHYS_SHIFT)

#define KVM_PHYS_MASK	(KVM_PHYS_SIZE - _AC(1, ULL))

#define PTRS_PER_S2_PGD	(_AC(1, ULL) << (KVM_PHYS_SHIFT - 30))



/* Virtualization Translation Control Register (VTCR) bits */

#define VTCR_SH0	(3 << 12)
@@ -162,17 +162,17 @@ 
#define VTTBR_X		(5 - KVM_T0SZ)

#endif

#define VTTBR_BADDR_SHIFT (VTTBR_X - 1)

#define VTTBR_BADDR_MASK  (((1LLU << (40 - VTTBR_X)) - 1) << VTTBR_BADDR_SHIFT)

#define VTTBR_VMID_SHIFT  (48LLU)

#define VTTBR_VMID_MASK	  (0xffLLU << VTTBR_VMID_SHIFT)

#define VTTBR_BADDR_MASK  (((_AC(1, ULL) << (40 - VTTBR_X)) - 1) << VTTBR_BADDR_SHIFT)

#define VTTBR_VMID_SHIFT  _AC(48, ULL)

#define VTTBR_VMID_MASK(size)	(_AT(u64, (1 << size) - 1) << VTTBR_VMID_SHIFT)



/* Hyp Syndrome Register (HSR) bits */

#define HSR_EC_SHIFT	(26)

#define HSR_EC		(0x3fU << HSR_EC_SHIFT)

#define HSR_IL		(1U << 25)

#define HSR_EC		(_AC(0x3f, UL) << HSR_EC_SHIFT)

#define HSR_IL		(_AC(1, UL) << 25)

#define HSR_ISS		(HSR_IL - 1)

#define HSR_ISV_SHIFT	(24)

#define HSR_ISV		(1U << HSR_ISV_SHIFT)

#define HSR_ISV		(_AC(1, UL) << HSR_ISV_SHIFT)

#define HSR_SRT_SHIFT	(16)

#define HSR_SRT_MASK	(0xf << HSR_SRT_SHIFT)

#define HSR_FSC		(0x3f)
@@ -180,9 +180,9 @@ 
#define HSR_SSE		(1 << 21)

#define HSR_WNR		(1 << 6)

#define HSR_CV_SHIFT	(24)

#define HSR_CV		(1U << HSR_CV_SHIFT)

#define HSR_CV		(_AC(1, UL) << HSR_CV_SHIFT)

#define HSR_COND_SHIFT	(20)

#define HSR_COND	(0xfU << HSR_COND_SHIFT)

#define HSR_COND	(_AC(0xf, UL) << HSR_COND_SHIFT)



#define FSC_FAULT	(0x04)

#define FSC_ACCESS	(0x08)
@@ -210,13 +210,13 @@ 
#define HSR_EC_DABT	(0x24)

#define HSR_EC_DABT_HYP	(0x25)



#define HSR_WFI_IS_WFE		(1U << 0)

#define HSR_WFI_IS_WFE		(_AC(1, UL) << 0)



#define HSR_HVC_IMM_MASK	((1UL << 16) - 1)

#define HSR_HVC_IMM_MASK	((_AC(1, UL) << 16) - 1)



#define HSR_DABT_S1PTW		(1U << 7)

#define HSR_DABT_CM		(1U << 8)

#define HSR_DABT_EA		(1U << 9)

#define HSR_DABT_S1PTW		(_AC(1, UL) << 7)

#define HSR_DABT_CM		(_AC(1, UL) << 8)

#define HSR_DABT_EA		(_AC(1, UL) << 9)



#define kvm_arm_exception_type	\

	{0, "RESET" }, 		\

arch/arm/include/asm/kvm_host.h

+4 −0
Original line number Diff line number Diff line
@@ -214,6 +214,10 @@ static inline void __cpu_init_hyp_mode(phys_addr_t boot_pgd_ptr, 
	kvm_call_hyp((void*)hyp_stack_ptr, vector_ptr, pgd_ptr);

}



static inline void __cpu_init_stage2(void)

{

}



static inline int kvm_arch_dev_ioctl_check_extension(long ext)

{

	return 0;

arch/arm/include/asm/kvm_mmu.h

+5 −0
Original line number Diff line number Diff line
@@ -279,6 +279,11 @@ static inline void __kvm_extend_hypmap(pgd_t *boot_hyp_pgd, 
				       pgd_t *merged_hyp_pgd,

				       unsigned long hyp_idmap_start) { }



static inline unsigned int kvm_get_vmid_bits(void)

{

	return 8;

}



#endif	/* !__ASSEMBLY__ */



#endif /* __ARM_KVM_MMU_H__ */

arch/arm/include/asm/virt.h

+9 −0
Original line number Diff line number Diff line
@@ -74,6 +74,15 @@ static inline bool is_hyp_mode_mismatched(void) 
{

	return !!(__boot_cpu_mode & BOOT_CPU_MODE_MISMATCH);

}



static inline bool is_kernel_in_hyp_mode(void)

{

	return false;

}



/* The section containing the hypervisor text */

extern char __hyp_text_start[];

extern char __hyp_text_end[];

#endif



#endif /* __ASSEMBLY__ */